diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index a811cb7..8cfd288 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1341,7 +1341,7 @@ module ApplicationHelper end.join("\n") content_tag('div', content_tag('label', _('Profile organization'), :for => 'template-options', :class => 'formlabel') + - 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;') + + 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;') + content_tag('ul', radios, :style => 'list-style: none; padding-left: 20px; margin-top: 0.5em;'), :id => 'template-options', :style => 'margin-top: 1em' diff --git a/app/views/account/_signup_form.rhtml b/app/views/account/_signup_form.rhtml index 39c81c3..ceedf0f 100644 --- a/app/views/account/_signup_form.rhtml +++ b/app/views/account/_signup_form.rhtml @@ -1,4 +1,6 @@ -<%= error_messages_for :user, :person %> +<% @profile_data = @person %> + +<%= error_messages_for :user, :person, :header_message => _('The account could not be created') %> <% labelled_form_for :user, @user, :html => { :multipart => true, :id => 'signup-form' } do |f| %> diff --git a/plugins/stoa/lib/ext/person.rb b/plugins/stoa/lib/ext/person.rb index 8dd48f0..093dc46 100644 --- a/plugins/stoa/lib/ext/person.rb +++ b/plugins/stoa/lib/ext/person.rb @@ -11,7 +11,7 @@ class Person def usp_id_or_invitation if usp_id.blank? && !is_template && (invitation_code.blank? || !invitation_task) - errors.add(:usp_id, "can't register without usp_id or a valid invitation code") + errors.add(:usp_id, "is being used by another user or is not valid") end end diff --git a/plugins/stoa/lib/stoa_plugin.rb b/plugins/stoa/lib/stoa_plugin.rb index 64e2ee1..cb2c27e 100644 --- a/plugins/stoa/lib/stoa_plugin.rb +++ b/plugins/stoa/lib/stoa_plugin.rb @@ -19,9 +19,9 @@ class StoaPlugin < Noosfero::Plugin def signup_extra_contents lambda { - content_tag(:div, labelled_form_field(_('USP number'), text_field_tag('profile_data[usp_id]', '', :id => 'usp_id_field')) + + content_tag(:div, labelled_form_field(_('USP number'), text_field(:profile_data, :usp_id, :id => 'usp_id_field')) + 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') + - content_tag('p', _("This usp number is not valid or doesn't exists"), :id => 'usp-id-invalid') + + content_tag('p', _("Either this usp number is being used by another user or is not valid"), :id => 'usp-id-invalid') + content_tag('p', _('Checking usp number...'), :id => 'usp-id-checking'), :id => 'signup-usp-id') + content_tag('div', required(labelled_form_field(_('Birth date (yyyy-mm-dd)'), text_field_tag('birth_date', ''))) + 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') + diff --git a/plugins/stoa/public/style.css b/plugins/stoa/public/style.css index c53e52e..7a42189 100644 --- a/plugins/stoa/public/style.css +++ b/plugins/stoa/public/style.css @@ -31,7 +31,7 @@ padding: 5px 10px 45px 10px; margin: 0; line-height: 1.5em; - background: transparent url(/images/orange-balloon.png) bottom center no-repeat; + background: transparent url(/images/gray-balloon.png) bottom center no-repeat; position: absolute; z-index: 2; right: -150px; @@ -50,7 +50,7 @@ } #usp-id-invalid{ - color: #FFA000; + color: #7f0000; } #usp-id-checking { diff --git a/public/images/gray-balloon.png b/public/images/gray-balloon.png new file mode 100644 index 0000000..fbe6cb2 Binary files /dev/null and b/public/images/gray-balloon.png differ diff --git a/public/images/gray-bg.png b/public/images/gray-bg.png new file mode 100644 index 0000000..c41a4af Binary files /dev/null and b/public/images/gray-bg.png differ diff --git a/public/images/passwords_match.png b/public/images/passwords_match.png index a837436..6776e7e 100644 Binary files a/public/images/passwords_match.png and b/public/images/passwords_match.png differ diff --git a/public/images/passwords_nomatch.png b/public/images/passwords_nomatch.png index 1cc786b..6f5ce9e 100644 Binary files a/public/images/passwords_nomatch.png and b/public/images/passwords_nomatch.png differ diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 5e5f5b6..b39d640 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -5613,7 +5613,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { } .unavailable { - color: #FFA000; + color: #7f0000; } .checking { @@ -5656,13 +5656,13 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { } #signup-form input.invalid_input { - border: 2px solid #FFA000; + border: 2px solid #7f0000; background: #FFF; padding: 5px 30px 8px 5px; } #signup-form input.valid_input { - border: 2px solid #88BD00; + border: 2px solid #005000; background: #FFF; padding: 5px 30px 8px 5px; } @@ -5760,7 +5760,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { } #signup-form .invalid { - border-color: #FFA000; + border-color: #7f0000; background-image: url(/images/passwords_nomatch.png); } @@ -5768,7 +5768,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { border: none; padding: 0px; background: transparent; - color: #FFA000; + color: #7f0000; } #signup-form .checking { @@ -5784,13 +5784,13 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { } #signup-form .validated { - border-color: #88BD00; + border-color: #005000; background-image: url(/images/passwords_match.png); } #signup-form span.validated { background: transparent; - color: #88BD00; + color: #005000; } #signup-domain { @@ -5838,7 +5838,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { padding: 5px 10px 45px 10px; margin: 0; line-height: 1.5em; - background: transparent url(/images/orange-balloon.png) bottom center no-repeat; + background: transparent url(/images/gray-balloon.png) bottom center no-repeat; position: absolute; z-index: 2; right: -150px; @@ -5899,11 +5899,11 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { #content #signup-form .submit { border: 0; padding: 8px 36px 12px; - background: transparent url(/images/orange-bg.png) left center repeat-x; + background: transparent url(/images/gray-bg.png) left center repeat-x; font-size: 17px; - color: #FFFFD5; + color: #FFF; text-align: center; - text-shadow: #d45500 0 -1px 0; + text-shadow: #424242 0 -1px 0; border-radius: 7px; -moz-border-radius: 7px; -webkit-border-radius: 7px; -- libgit2 0.21.2