Mercurial > hg > soundsoftware-site
changeset 1459:cf78a7ade302 luisf
Merge from branch "bug_794"
author | luisf <luis.figueira@eecs.qmul.ac.uk> |
---|---|
date | Mon, 11 Nov 2013 18:25:50 +0000 |
parents | 5e0957fe308d (current diff) b1f4c9a2af24 (diff) |
children | 926dce5f5778 |
files | |
diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/app/views/account/register.html.erb Thu Nov 07 17:12:00 2013 +0000 +++ b/app/views/account/register.html.erb Mon Nov 11 18:25:50 2013 +0000 @@ -22,20 +22,20 @@ <p><%= f.text_field :lastname, :required => true %></p> <p><%= f.text_field :mail, :required => true %></p> -<!-- We only support English in this site +<!-- We only support English in this site <p><%= f.select :language, lang_options_for_select %></p> --> - + <%= labelled_fields_for :ssamr_user_details, @ssamr_user_details do |fields| %> <h3><%=l(:label_ssamr_details)%></h3> - + <p> <%= fields.text_area :description, :rows => 3, :cols => 40, :required => true, :class => 'wiki-edit' %> <em> <%=l(:text_user_ssamr_description_info).html_safe%></em> </p> <p><label for="institution"><%=l("field_ssamr_user_detail.institution")%> <span class="required">*</span></label> - <%= fields.radio_button :institution_type, true %> + <%= fields.radio_button :institution_type, true, :checked => true %> <%= fields.collection_select(:institution_id, Institution.find(:all, :order => "institutions.order"), :id, :name, {:selected => @selected_institution_id, :prompt => true}).gsub('&', '&').html_safe %> </p> @@ -44,7 +44,7 @@ <%= fields.text_field(:other_institution) %> </p> <% end %> - + <% if Setting.openid? %> <p><%= f.text_field :identity_url %></p>