Simplify the form view for entering institution data.

app/assets/javascripts/ror/institution-typeahead.js

@@ -1,17 +1,12 @@
 var ROR_API_URL = "https://api.ror.org/organizations";
 
 function extractRorId(rorUrl) {
-    // Define the regular expression to match the ROR ID
     const regex = /https:\/\/ror\.org\/([^\/]+)/;
-
-    // Try to match the URL with the regex
     const match = rorUrl.match(regex);
-
-    // If a match is found, return the extracted ROR ID
     if (match) {
-        return match[1];  // Return the captured ID
+        return match[1];
     } else {
-        return null;  // Return null if no match is found
+        return null;
     }
 }
 
@@ -68,7 +63,7 @@ $j(document).ready(function() {
             templates: {
                 pending: [
                     '<div class="empty-message">',
-                    'Fetching organizations list',
+                    'Fetching list ...',
                     '</div>'
                 ].join('\n'),
                 suggestion: function (data) {

app/views/institutions/_form.html.erb

@@ -1,36 +1,13 @@
 <%= f.error_messages -%>
-
-<div class="form-group">
-  <%= f.label :title, 'Name', class: 'required' -%>
-  <%= f.text_field :title, :class=>"form-control" -%>
+<div>
+  <div class="tab-pane fade active in" id="search-by-name-tab" role="tabpanel" aria-labelledby="search-by-name-tab">
+    <%= render partial: 'institution_fields', locals: {f:f, institution:institution} %>
+  </div>
 </div>
 
-<div class="form-group">
-  <%= f.label :ror_id, 'ROR ID' -%>
-  <%= f.text_field :ror_id, :class=>"form-control" -%>
-  <small class="form-text text-muted">
-    <em>The ROR ID (Research Organization Registry Identifier) is a unique 9-character alphanumeric code (e.g., 01f7bcy98).
-      Please do not include the prefix (e.g., https://ror.org/).</em>
-  </small>
-</div>
+<%= render :partial=> "assets/discussion_links_form", :locals=>{:resource => @institution} -%>
 
-<div class="form-group">
-  <%= f.label :web_page -%>
-  <%= f.text_field :web_page, :class=>"form-control" -%>
-</div>
-
-<div class="form-group">
-  <%= f.label :address -%>
-  <%= f.text_area :address, :rows => 5, :class=>"form-control" -%>
-</div>
-
-<div class="form-group">
-  <%= f.label :city -%>
-  <%= f.text_field :city, :class=>"form-control" -%>
-</div>
-
-<div class="form-group">
-  <%= f.label :country -%>
-  <%= f.country_select :country, { include_blank: 'Please select...' }, class: 'form-control' -%>
-</div>
+<%= f.submit(institution ? "Update" : "Create",data: { disable_with: (institution ? "Updating..." : "Creating...") },
+             :class => 'btn btn-primary') -%> or
+<%= cancel_button(institution ? institution_path(institution.id) : institutions_path) -%>
 

app/views/institutions/edit.html.erb

@@ -2,9 +2,6 @@
 
 <div class="asset_form">
 	<%= form_for(@institution) do |f| %>
-	  <%= render :partial => "form", :locals => { :f => f, :institution => @institution } -%>
-		<%= render :partial=> "assets/discussion_links_form", :locals=>{:resource => @institution} -%>
-		<%= f.submit("Update", data: { disable_with: ("Updating...") }, class: 'btn btn-primary') %> or
-		<%= cancel_button(institutions_path) %>
+	  <%= render partial: "form", locals: { f:f, institution:@institution } -%>
 	<% end %>
 </div>

app/views/institutions/new.html.erb

@@ -4,6 +4,6 @@
 
 <div class="asset_form">
   <%= form_for(@institution) do |f| %>
-    <%= render partial: 'multi_tabs', locals: {f:f, institution:nil } %>
+    <%= render partial: 'form', locals: { f:f, institution:nil } %>
   <% end %>
 </div>