diff app/views/users/_form.rhtml @ 195:172b8d25c1ae live

Merge from branch "feature_64"

--- a/app/views/users/_form.rhtml	Wed Feb 02 11:44:48 2011 +0000
+++ b/app/views/users/_form.rhtml	Mon Feb 07 13:47:47 2011 +0000
@@ -1,3 +1,6 @@
+<%= javascript_include_tag "ssamr_institutions" %>
+
+
 <%= error_messages_for 'user' %>
 
 <!--[form:user]-->
@@ -23,12 +26,25 @@
 	<h3><%=l(:label_ssamr_details)%></h3>
           <% fields_for :ssamr_user_details, :builder => TabularFormBuilder, :lang => current_language do |ssamr_user_detail| %>
             <p>
-              <%= ssamr_user_detail.text_area :description, :rows => 3, :cols => 40, :required => true, :class => 'wiki-edit'  %>
-              <%= wikitoolbar_for 'ssamr_user_details_description' %>
-              <br />
-              <em> <%=l(:text_user_ssamr_description_info)%></em>
+              <%= ssamr_user_detail.text_area :description, :rows => 3, :cols => 40, :required => true, :class => 'wiki-edit'  %>                            
             </p>
-          <% end %>          
+
+            <p><label for="institution"><%=l("field_ssamr_user_detail.institution")%> <span class="required">*</span></label>
+			 <nobr>
+              <%= ssamr_user_detail.radio_button :institution_type, true %>
+              <%= ssamr_user_detail.collection_select(:institution_id, Institution.find(:all, :order => "institutions.order"), :id, :name, {:selected => @selected_institution_id, :prompt => true} ).gsub('&amp;', '&')  %>
+             </nobr>
+			</p>
+
+
+
+            <p>
+				<nobr>
+               <%= ssamr_user_detail.radio_button :institution_type, false %> Other:
+               <%= ssamr_user_detail.text_field :other_institution %>
+				</nobr>
+            </p>
+          <% end %>
 </div>