Download as
Browse Code »

Commit a65d1a5891237cd35a3c0e5d60b46330715ee057

Authored by Daniela Feitosa
Committed by Daniela Feitosa
1 parent 184394a0
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

More enhancements on signup screen 

Changed strings to be more clear to user
Changed colors of images
Showing 10 changed files with 20 additions and 18 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @a65d1a5
@@ -1341,7 +1341,7 @@ module ApplicationHelper @@ -1341,7 +1341,7 @@ module ApplicationHelper
1341 end.join("\n") 1341 end.join("\n")
1342 1342
1343 content_tag('div', content_tag('label', _('Profile organization'), :for => 'template-options', :class => 'formlabel') + 1343 content_tag('div', content_tag('label', _('Profile organization'), :for => 'template-options', :class => 'formlabel') +
1344 - content_tag('p', _('Your profile will be created according to the selected template. Click on the options to view them'), :style => 'margin: 5px 15px;padding: 0px 10px;') + 1344 + content_tag('p', _('Your profile will be created according to the selected template. Click on the options to view them.'), :style => 'margin: 5px 15px;padding: 0px 10px;') +
1345 content_tag('ul', radios, :style => 'list-style: none; padding-left: 20px; margin-top: 0.5em;'), 1345 content_tag('ul', radios, :style => 'list-style: none; padding-left: 20px; margin-top: 0.5em;'),
1346 :id => 'template-options', 1346 :id => 'template-options',
1347 :style => 'margin-top: 1em' 1347 :style => 'margin-top: 1em'
app/views/account/_signup_form.rhtml
  Diff comments   View file @a65d1a5
1 -<%= error_messages_for :user, :person %> 1 +<% @profile_data = @person %>
  2 +
  3 +<%= error_messages_for :user, :person, :header_message => _('The account could not be created') %>
2 4
3 <% labelled_form_for :user, @user, :html => { :multipart => true, :id => 'signup-form' } do |f| %> 5 <% labelled_form_for :user, @user, :html => { :multipart => true, :id => 'signup-form' } do |f| %>
4 6
plugins/stoa/lib/ext/person.rb
  Diff comments   View file @a65d1a5
@@ -11,7 +11,7 @@ class Person @@ -11,7 +11,7 @@ class Person
11 11
12 def usp_id_or_invitation 12 def usp_id_or_invitation
13 if usp_id.blank? && !is_template && (invitation_code.blank? || !invitation_task) 13 if usp_id.blank? && !is_template && (invitation_code.blank? || !invitation_task)
14 - errors.add(:usp_id, "can't register without usp_id or a valid invitation code") 14 + errors.add(:usp_id, "is being used by another user or is not valid")
15 end 15 end
16 end 16 end
17 17
plugins/stoa/lib/stoa_plugin.rb
  Diff comments   View file @a65d1a5
@@ -19,9 +19,9 @@ class StoaPlugin &lt; Noosfero::Plugin @@ -19,9 +19,9 @@ class StoaPlugin &lt; Noosfero::Plugin
19 19
20 def signup_extra_contents 20 def signup_extra_contents
21 lambda { 21 lambda {
22 - content_tag(:div, labelled_form_field(_('USP number'), text_field_tag('profile_data[usp_id]', '', :id => 'usp_id_field')) + 22 + content_tag(:div, labelled_form_field(_('USP number'), text_field(:profile_data, :usp_id, :id => 'usp_id_field')) +
23 content_tag(:small, _('The usp id grants you special powers in the network. Don\'t forget to fill it with a valid number if you have one.'), :id => 'usp-id-balloon') + 23 content_tag(:small, _('The usp id grants you special powers in the network. Don\'t forget to fill it with a valid number if you have one.'), :id => 'usp-id-balloon') +
24 - content_tag('p', _("This usp number is not valid or doesn't exists"), :id => 'usp-id-invalid') + 24 + content_tag('p', _("Either this usp number is being used by another user or is not valid"), :id => 'usp-id-invalid') +
25 content_tag('p', _('Checking usp number...'), :id => 'usp-id-checking'), :id => 'signup-usp-id') + 25 content_tag('p', _('Checking usp number...'), :id => 'usp-id-checking'), :id => 'signup-usp-id') +
26 content_tag('div', required(labelled_form_field(_('Birth date (yyyy-mm-dd)'), text_field_tag('birth_date', ''))) + 26 content_tag('div', required(labelled_form_field(_('Birth date (yyyy-mm-dd)'), text_field_tag('birth_date', ''))) +
27 content_tag(:small, _('Confirm your birth date. Pay attention to the format: yyyy-mm-dd.'), :id => 'usp-birth-date-balloon'), :id => 'signup-birth-date', :style => 'display: none') + 27 content_tag(:small, _('Confirm your birth date. Pay attention to the format: yyyy-mm-dd.'), :id => 'usp-birth-date-balloon'), :id => 'signup-birth-date', :style => 'display: none') +
plugins/stoa/public/style.css
  Diff comments   View file @a65d1a5
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 padding: 5px 10px 45px 10px; 31 padding: 5px 10px 45px 10px;
32 margin: 0; 32 margin: 0;
33 line-height: 1.5em; 33 line-height: 1.5em;
34 - background: transparent url(/images/orange-balloon.png) bottom center no-repeat; 34 + background: transparent url(/images/gray-balloon.png) bottom center no-repeat;
35 position: absolute; 35 position: absolute;
36 z-index: 2; 36 z-index: 2;
37 right: -150px; 37 right: -150px;
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 } 50 }
51 51
52 #usp-id-invalid{ 52 #usp-id-invalid{
53 - color: #FFA000; 53 + color: #7f0000;
54 } 54 }
55 55
56 #usp-id-checking { 56 #usp-id-checking {
public/images/gray-balloon.png 0 → 100644
View file @a65d1a5

1005 Bytes
public/images/gray-bg.png 0 → 100644
View file @a65d1a5

161 Bytes
public/images/passwords_match.png
View file @a65d1a5

777 Bytes | W: | H:

381 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
public/images/passwords_nomatch.png
View file @a65d1a5

374 Bytes | W: | H:

223 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
public/stylesheets/application.css
  Diff comments   View file @a65d1a5
@@ -5613,7 +5613,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { @@ -5613,7 +5613,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
5613 } 5613 }
5614 5614
5615 .unavailable { 5615 .unavailable {
5616 - color: #FFA000; 5616 + color: #7f0000;
5617 } 5617 }
5618 5618
5619 .checking { 5619 .checking {
@@ -5656,13 +5656,13 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { @@ -5656,13 +5656,13 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
5656 } 5656 }
5657 5657
5658 #signup-form input.invalid_input { 5658 #signup-form input.invalid_input {
5659 - border: 2px solid #FFA000; 5659 + border: 2px solid #7f0000;
5660 background: #FFF; 5660 background: #FFF;
5661 padding: 5px 30px 8px 5px; 5661 padding: 5px 30px 8px 5px;
5662 } 5662 }
5663 5663
5664 #signup-form input.valid_input { 5664 #signup-form input.valid_input {
5665 - border: 2px solid #88BD00; 5665 + border: 2px solid #005000;
5666 background: #FFF; 5666 background: #FFF;
5667 padding: 5px 30px 8px 5px; 5667 padding: 5px 30px 8px 5px;
5668 } 5668 }
@@ -5760,7 +5760,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { @@ -5760,7 +5760,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
5760 } 5760 }
5761 5761
5762 #signup-form .invalid { 5762 #signup-form .invalid {
5763 - border-color: #FFA000; 5763 + border-color: #7f0000;
5764 background-image: url(/images/passwords_nomatch.png); 5764 background-image: url(/images/passwords_nomatch.png);
5765 } 5765 }
5766 5766
@@ -5768,7 +5768,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { @@ -5768,7 +5768,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
5768 border: none; 5768 border: none;
5769 padding: 0px; 5769 padding: 0px;
5770 background: transparent; 5770 background: transparent;
5771 - color: #FFA000; 5771 + color: #7f0000;
5772 } 5772 }
5773 5773
5774 #signup-form .checking { 5774 #signup-form .checking {
@@ -5784,13 +5784,13 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { @@ -5784,13 +5784,13 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
5784 } 5784 }
5785 5785
5786 #signup-form .validated { 5786 #signup-form .validated {
5787 - border-color: #88BD00; 5787 + border-color: #005000;
5788 background-image: url(/images/passwords_match.png); 5788 background-image: url(/images/passwords_match.png);
5789 } 5789 }
5790 5790
5791 #signup-form span.validated { 5791 #signup-form span.validated {
5792 background: transparent; 5792 background: transparent;
5793 - color: #88BD00; 5793 + color: #005000;
5794 } 5794 }
5795 5795
5796 #signup-domain { 5796 #signup-domain {
@@ -5838,7 +5838,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { @@ -5838,7 +5838,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
5838 padding: 5px 10px 45px 10px; 5838 padding: 5px 10px 45px 10px;
5839 margin: 0; 5839 margin: 0;
5840 line-height: 1.5em; 5840 line-height: 1.5em;
5841 - background: transparent url(/images/orange-balloon.png) bottom center no-repeat; 5841 + background: transparent url(/images/gray-balloon.png) bottom center no-repeat;
5842 position: absolute; 5842 position: absolute;
5843 z-index: 2; 5843 z-index: 2;
5844 right: -150px; 5844 right: -150px;
@@ -5899,11 +5899,11 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { @@ -5899,11 +5899,11 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
5899 #content #signup-form .submit { 5899 #content #signup-form .submit {
5900 border: 0; 5900 border: 0;
5901 padding: 8px 36px 12px; 5901 padding: 8px 36px 12px;
5902 - background: transparent url(/images/orange-bg.png) left center repeat-x; 5902 + background: transparent url(/images/gray-bg.png) left center repeat-x;
5903 font-size: 17px; 5903 font-size: 17px;
5904 - color: #FFFFD5; 5904 + color: #FFF;
5905 text-align: center; 5905 text-align: center;
5906 - text-shadow: #d45500 0 -1px 0; 5906 + text-shadow: #424242 0 -1px 0;
5907 border-radius: 7px; 5907 border-radius: 7px;
5908 -moz-border-radius: 7px; 5908 -moz-border-radius: 7px;
5909 -webkit-border-radius: 7px; 5909 -webkit-border-radius: 7px;