Mercurial > hg > soundsoftware-site
changeset 192:d1713ab10813 feature_64
feature_64: link to terms and conditions wiki page; fixed form resubmission bug.
| author | luisf <luis.figueira@eecs.qmul.ac.uk> |
|---|---|
| date | Mon, 07 Feb 2011 12:30:26 +0000 |
| parents | 440c4f4bf2d6 |
| children | 90cc857e968a c56dcdfe6722 172b8d25c1ae a2450090c0f4 |
| files | app/controllers/account_controller.rb app/views/account/register.rhtml config/locales/en-GB.yml config/locales/en.yml public/javascripts/ssamr_registration.js |
| diffstat | 5 files changed, 14 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/app/controllers/account_controller.rb Thu Feb 03 17:11:33 2011 +0000 +++ b/app/controllers/account_controller.rb Mon Feb 07 12:30:26 2011 +0000 @@ -108,7 +108,9 @@ # associates the 2 objects @user.ssamr_user_detail = @ssamr_user_details + @selected_institution_id = params[:ssamr_user_details][:institution_id].to_i + case Setting.self_registration when '1' register_by_email_activation(@user)
--- a/app/views/account/register.rhtml Thu Feb 03 17:11:33 2011 +0000 +++ b/app/views/account/register.rhtml Mon Feb 07 12:30:26 2011 +0000 @@ -43,7 +43,7 @@ <p><label for="institution"><%=l("field_ssamr_user_detail.institution")%> <span class="required">*</span></label> <%= ssamr_user_detail.radio_button :institution_type, true %> - <%= ssamr_user_detail.collection_select(:institution_id, Institution.find(:all, :order => "institutions.order"), :id, :name, {:prompt => true}).gsub('&', '&') %> + <%= ssamr_user_detail.collection_select(:institution_id, Institution.find(:all, :order => "institutions.order"), :id, :name, {:selected => @selected_institution_id, :prompt => true}).gsub('&', '&') %> </p> <p> @@ -63,7 +63,7 @@ <!--[eoform:user]--> </div> -<%= check_box :user, :terms_and_conditions %> I have read and agree with the terms and conditions. +<%= check_box :user, :terms_and_conditions %> <%= l(:accept_terms_and_conditions) %> <%= link_to("Terms and Conditions", "https://code.soundsoftware.ac.uk/projects/soundsoftware-site/wiki/TandCs", {:target => "_blank"}) %>. <br /> <br />
--- a/config/locales/en-GB.yml Thu Feb 03 17:11:33 2011 +0000 +++ b/config/locales/en-GB.yml Mon Feb 07 12:30:26 2011 +0000 @@ -418,6 +418,7 @@ label_tipoftheday: Tip of the day label_notifications: Important Message field_terms_and_conditions: 'Terms and Conditions:' + accept_terms_and_conditions: 'I have read and agree with the ' label_ssamr_description: Research description label_ssamr_details: Other Details label_ssamr_institution: Institution
--- a/config/locales/en.yml Thu Feb 03 17:11:33 2011 +0000 +++ b/config/locales/en.yml Mon Feb 07 12:30:26 2011 +0000 @@ -308,6 +308,7 @@ setting_tipoftheday_text: Tip of the Day setting_notifications_text: Notifications field_terms_and_conditions: 'Terms and Conditions:' + accept_terms_and_conditions: 'I have read and agree with the ' label_ssamr_description: Research description setting_app_title: Application title setting_app_subtitle: Application subtitle
--- a/public/javascripts/ssamr_registration.js Thu Feb 03 17:11:33 2011 +0000 +++ b/public/javascripts/ssamr_registration.js Mon Feb 07 12:30:26 2011 +0000 @@ -5,12 +5,14 @@ /* institution related functions */ Event.observe(window, 'load', function() { - - $('ssamr_user_details_other_institution').disable(); - $('ssamr_user_details_institution_id').enable(); - $('ssamr_user_details_institution_type_true').checked = true; - $('ssamr_user_details_institution_type_false').checked = false; -} + + if(!$('ssamr_user_details_institution_type_true').checked && $('ssamr_user_details_institution_type_true').checked){ + $('ssamr_user_details_other_institution').disable(); + $('ssamr_user_details_institution_id').enable(); + $('ssamr_user_details_institution_type_true').checked = true; + $('ssamr_user_details_institution_type_false').checked = false; + } + } );