# HG changeset patch # User luisf # Date 1384194350 0 # Node ID cf78a7ade302a8b7c5ae894f3d7d3fafdcd5ca9d # Parent 5e0957fe308dd2db7122debeedac3f57794bc9c4# Parent b1f4c9a2af244645dab5e974abb1e7c348634dc1 Merge from branch "bug_794" diff -r 5e0957fe308d -r cf78a7ade302 app/views/account/register.html.erb --- 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 @@

<%= f.text_field :lastname, :required => true %>

<%= f.text_field :mail, :required => true %>

- - + <%= labelled_fields_for :ssamr_user_details, @ssamr_user_details do |fields| %>

<%=l(:label_ssamr_details)%>

- +

<%= fields.text_area :description, :rows => 3, :cols => 40, :required => true, :class => 'wiki-edit' %> <%=l(:text_user_ssamr_description_info).html_safe%>

- <%= 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 %>

@@ -44,7 +44,7 @@ <%= fields.text_field(:other_institution) %>

<% end %> - + <% if Setting.openid? %>

<%= f.text_field :identity_url %>