fields: sort fields with multiple values

app/views/shared/fields/_anatomy.html.erb

@@ -18,8 +18,8 @@
 %>
 
 	  <ul class="unstyled glyphicon-list glyphicon-list-tag">
-	    <% fieldData.each do |topic| %>
-	      <li><%= link_to topic, facet_uri(topic, 'subject_anatomy_sim') %></li>
+	    <% fieldData.sort_by(&:downcase).each do |topic| %>
+	      <li><%= link_to topic.upcase_first, facet_uri(topic, 'subject_anatomy_sim') %></li>
 	    <% end %>
 	  </ul>
 

app/views/shared/fields/_built_work_place.html.erb

@@ -18,8 +18,8 @@
 %>
 
 	  <ul class="unstyled glyphicon-list glyphicon-list-tag">
-	    <% fieldData.each do |topic| %>
-	      <li><%= link_to topic, facet_uri(topic, 'subject_topic_sim') %></li>
+	    <% fieldData.sort_by(&:downcase).each do |topic| %>
+	      <li><%= link_to topic.upcase_first, facet_uri(topic, 'subject_topic_sim') %></li>
 	    <% end %>
 	  </ul>
 

app/views/shared/fields/_common_name.html.erb

@@ -18,8 +18,8 @@
 %>
 
 	  <ul class="unstyled glyphicon-list glyphicon-list-tag">
-	    <% fieldData.each do |topic| %>
-	      <li><%= link_to topic, facet_uri(topic, 'subject_common_name_sim') %></li>
+	    <% fieldData.sort_by(&:downcase).each do |topic| %>
+	      <li><%= link_to topic.upcase_first, facet_uri(topic, 'subject_common_name_sim') %></li>
 	    <% end %>
 	  </ul>
 

app/views/shared/fields/_conference_name.html.erb

@@ -18,8 +18,8 @@
 %>
 
 	  <ul class="unstyled glyphicon-list glyphicon-list-tag">
-	    <% fieldData.each do |topic| %>
-	      <li><%= link_to topic, facet_uri(topic, 'subject_topic_sim') %></li>
+	    <% fieldData.sort_by(&:downcase).each do |topic| %>
+	      <li><%= link_to topic.upcase_first, facet_uri(topic, 'subject_topic_sim') %></li>
 	    <% end %>
 	  </ul>
 

app/views/shared/fields/_corporate_name.html.erb

@@ -18,11 +18,11 @@
 %>
 
 	  <ul class="unstyled glyphicon-list glyphicon-list-tag">
-	    <% fieldData.each do |topic| %>
-	      <li><%= link_to topic, facet_uri(topic, 'subject_topic_sim') %></li>
+	    <% fieldData.sort_by(&:downcase).each do |topic| %>
+	      <li><%= link_to topic.upcase_first, facet_uri(topic, 'subject_topic_sim') %></li>
 	    <% end %>
 	  </ul>
 
 	  <% concat htmlClose.html_safe %>
 
-	<% end %>
+	<% end %>

app/views/shared/fields/_cruise.html.erb

@@ -18,8 +18,8 @@
 %>
 
 	  <ul class="unstyled glyphicon-list glyphicon-list-tag">
-	    <% fieldData.each do |topic| %>
-	      <li><%= link_to topic, facet_uri(topic, 'subject_cruise_sim') %></li>
+	    <% fieldData.sort_by(&:downcase).each do |topic| %>
+	      <li><%= link_to topic.upcase_first, facet_uri(topic, 'subject_cruise_sim') %></li>
 	    <% end %>
 	  </ul>
 

app/views/shared/fields/_cultural_context.html.erb

@@ -18,8 +18,8 @@
 %>
 
 	  <ul class="unstyled glyphicon-list glyphicon-list-tag">
-	    <% fieldData.each do |topic| %>
-	      <li><%= link_to topic, facet_uri(topic, 'subject_cultural_context_sim') %></li>
+	    <% fieldData.sort_by(&:downcase).each do |topic| %>
+	      <li><%= link_to topic.upcase_first, facet_uri(topic, 'subject_cultural_context_sim') %></li>
 	    <% end %>
 	  </ul>
 

app/views/shared/fields/_family_name.html.erb

@@ -18,8 +18,8 @@
 %>
 
 	  <ul class="unstyled glyphicon-list glyphicon-list-tag">
-	    <% fieldData.each do |topic| %>
-	      <li><%= link_to topic, facet_uri(topic, 'subject_topic_sim') %></li>
+	    <% fieldData.sort_by(&:downcase).each do |topic| %>
+	      <li><%= link_to topic.upcase_first, facet_uri(topic, 'subject_topic_sim') %></li>
 	    <% end %>
 	  </ul>
 

app/views/shared/fields/_function.html.erb

@@ -18,8 +18,8 @@
 %>
 
 	  <ul class="unstyled glyphicon-list glyphicon-list-tag">
-	    <% fieldData.each do |topic| %>
-	      <li><%= link_to topic, facet_uri(topic, 'subject_topic_sim') %></li>
+	    <% fieldData.sort_by(&:downcase).each do |topic| %>
+	      <li><%= link_to topic.upcase_first, facet_uri(topic, 'subject_topic_sim') %></li>
 	    <% end %>
 	  </ul>
 

app/views/shared/fields/_genre_form.html.erb

@@ -18,11 +18,11 @@
 %>
 
 	  <ul class="unstyled glyphicon-list glyphicon-list-tag">
-	    <% fieldData.each do |topic| %>
-	      <li><%= link_to topic, facet_uri(topic, 'subject_topic_sim') %></li>
+	    <% fieldData.sort_by(&:downcase).each do |topic| %>
+	      <li><%= link_to topic.upcase_first, facet_uri(topic, 'subject_topic_sim') %></li>
 	    <% end %>
 	  </ul>
 
 	  <% concat htmlClose.html_safe %>
 
-	<% end %>
+	<% end %>

app/views/shared/fields/_geographic.html.erb

@@ -18,8 +18,8 @@
 %>
 
 	  <ul class="unstyled glyphicon-list glyphicon-list-tag">
-	    <% fieldData.each do |topic| %>
-	      <li><%= link_to topic, facet_uri(topic, 'subject_topic_sim') %></li>
+	    <% fieldData.sort_by(&:downcase).each do |topic| %>
+	      <li><%= link_to topic.upcase_first, facet_uri(topic, 'subject_topic_sim') %></li>
 	    <% end %>
 	  </ul>
 

app/views/shared/fields/_iconography.html.erb

@@ -18,8 +18,8 @@
 %>
 
 	  <ul class="unstyled glyphicon-list glyphicon-list-tag">
-	    <% fieldData.each do |topic| %>
-	      <li><%= link_to topic, facet_uri(topic, 'subject_topic_sim') %></li>
+	    <% fieldData.sort_by(&:downcase).each do |topic| %>
+	      <li><%= link_to topic.upcase_first, facet_uri(topic, 'subject_topic_sim') %></li>
 	    <% end %>
 	  </ul>
 

app/views/shared/fields/_language.html.erb

@@ -21,31 +21,29 @@
 	 	if lang.count > 0
 	 		htmlOpen %= 'Language'.pluralize(lang.count)
 	 		concat htmlOpen.html_safe
-	 		i = 0
-	 		while( i < lang.count )
+      lang.sort_by(&:downcase).each do |l|
 %>
-					<li><%= lang[i] %></li>
+        <li><%= l.upcase_first %></li>
 <%
-				i += 1
-			end
+      end
 		end
 		concat htmlClose.html_safe
 
-	else 
+	else
 		language = @document["#{prefix}language_tesim"]
 
 		 if (language != nil && language.first.downcase != "no linguistic content")
-	
+
 			 htmlOpen %= 'Language'
 			 concat htmlOpen.html_safe
 %>
-	
+
 					<li><%= language.first %></li>
 
 <%
 			 concat htmlClose.html_safe
-	
+
 		 end
-		
+
 	end
-%>
+%>

app/views/shared/fields/_lithology.html.erb

@@ -18,8 +18,8 @@
 %>
 
 	  <ul class="unstyled glyphicon-list glyphicon-list-tag">
-	    <% fieldData.each do |topic| %>
-	      <li><%= link_to topic, facet_uri(topic, 'subject_lithology_sim') %></li>
+	    <% fieldData.sort_by(&:downcase).each do |topic| %>
+	      <li><%= link_to topic.upcase_first, facet_uri(topic, 'subject_lithology_sim') %></li>
 	    <% end %>
 	  </ul>
 

app/views/shared/fields/_name.html.erb

@@ -16,10 +16,10 @@
 		 htmlOpen %= 'Other Name'.pluralize(fieldData.count)
 		 concat htmlOpen.html_safe
 
-		 fieldData.each do |datum|
+		 fieldData.sort_by(&:downcase).each do |datum|
 	 		name = datum
 %>
-		<li><%= name %></li>
+		<li><%= name.upcase_first %></li>
 <%
 		 end
 

app/views/shared/fields/_occupation.html.erb

@@ -18,8 +18,8 @@
 %>
 
 	  <ul class="unstyled glyphicon-list glyphicon-list-tag">
-	    <% fieldData.each do |topic| %>
-	      <li><%= link_to topic, facet_uri(topic, 'subject_topic_sim') %></li>
+	    <% fieldData.sort_by(&:downcase).each do |topic| %>
+	      <li><%= link_to topic.upcase_first, facet_uri(topic, 'subject_topic_sim') %></li>
 	    <% end %>
 	  </ul>
 

app/views/shared/fields/_personal_name.html.erb

@@ -18,11 +18,11 @@
 %>
 
 	  <ul class="unstyled glyphicon-list glyphicon-list-tag">
-	    <% fieldData.each do |topic| %>
-	      <li><%= link_to topic, facet_uri(topic, 'subject_topic_sim') %></li>
+	    <% fieldData.sort_by(&:downcase).each do |topic| %>
+	      <li><%= link_to topic.upcase_first, facet_uri(topic, 'subject_topic_sim') %></li>
 	    <% end %>
 	  </ul>
 
 	  <% concat htmlClose.html_safe %>
 
-	<% end %>
+	<% end %>

app/views/shared/fields/_relationships_data.html.erb

@@ -4,9 +4,9 @@
 %>
 
 	<ul class="unstyled glyphicon-list glyphicon-list-tag">
-		<% value.sort.each do |name| %>
-			<li><%= link_to name, facet_uri(name, 'creator_sim') %></li>
+		<% value.sort_by(&:downcase).each do |name| %>
+			<li><%= link_to name.upcase_first, facet_uri(name, 'creator_sim') %></li>
 		<% end %>
 	</ul>
 
-	<% concat htmlClose.html_safe %>
+	<% concat htmlClose.html_safe %>

app/views/shared/fields/_resource_type.html.erb

@@ -10,7 +10,7 @@ if @document['resource_type_tesim'] != nil && !defined?(componentIndex)
 </dt>
 <dd>
   <ul class='unstyled glyphicon-list glyphicon-list-tag'>
-    <% fieldData.each do |resource_type|
+    <% fieldData.sort_by(&:downcase).each do |resource_type|
       facet_uri_list['f'].merge!({'object_type_sim'=>["#{resource_type}"]}) %>
       <li><%= link_to resource_type, facet_uri_list %></li>
     <% end %>

app/views/shared/fields/_rights_holder.html.erb

@@ -16,10 +16,10 @@
 		 htmlOpen %= 'Rights Holder'.pluralize(fieldData.count)
 		 concat htmlOpen.html_safe
 
-		 fieldData.each do |datum|
+		 fieldData.sort_by(&:downcase).each do |datum|
 			 rightsHolder = datum
 %>
-		<li><%= rightsHolder %></li>
+		<li><%= rightsHolder.upcase_first %></li>
 	<%
 		 end
 

app/views/shared/fields/_scientific_name.html.erb

@@ -18,8 +18,8 @@
 %>
 
 	  <ul class="unstyled glyphicon-list glyphicon-list-tag">
-	    <% fieldData.each do |topic| %>
-	      <li><%= link_to topic, facet_uri(topic, 'subject_scientific_name_sim') %></li>
+	    <% fieldData.sort_by(&:downcase).each do |topic| %>
+	      <li><%= link_to topic.upcase_first, facet_uri(topic, 'subject_scientific_name_sim') %></li>
 	    <% end %>
 	  </ul>
 

app/views/shared/fields/_series.html.erb

@@ -18,8 +18,8 @@
 %>
 
 	  <ul class="unstyled glyphicon-list glyphicon-list-tag">
-	    <% fieldData.each do |topic| %>
-	      <li><%= link_to topic, facet_uri(topic, 'subject_series_sim') %></li>
+	    <% fieldData.sort_by(&:downcase).each do |topic| %>
+	      <li><%= link_to topic.upcase_first, facet_uri(topic, 'subject_series_sim') %></li>
 	    <% end %>
 	  </ul>
 

app/views/shared/fields/_style_period.html.erb

@@ -18,8 +18,8 @@
 %>
 
 	  <ul class="unstyled glyphicon-list glyphicon-list-tag">
-	    <% fieldData.each do |topic| %>
-	      <li><%= link_to topic, facet_uri(topic, 'subject_topic_sim') %></li>
+	    <% fieldData.sort_by(&:downcase).each do |topic| %>
+	      <li><%= link_to topic.upcase_first, facet_uri(topic, 'subject_topic_sim') %></li>
 	    <% end %>
 	  </ul>
 

app/views/shared/fields/_subject.html.erb

@@ -16,17 +16,15 @@
     fieldData.concat(values) unless values.nil?
   end
 
-  fieldData.sort!
-
   unless fieldData.empty?
 
     htmlOpen %= 'Topic'.pluralize(fieldData.count)
     concat htmlOpen.html_safe
 %>
 
     <ul class="unstyled glyphicon-list glyphicon-list-tag">
-      <% fieldData.each do |topic| %>
-        <li><%= link_to topic, facet_uri(topic, 'subject_topic_sim') %></li>
+      <% fieldData.sort_by(&:downcase).each do |topic| %>
+        <li><%= link_to topic.upcase_first, facet_uri(topic, 'subject_topic_sim') %></li>
       <% end %>
     </ul>
 

app/views/shared/fields/_technique.html.erb

@@ -18,8 +18,8 @@
 %>
 
 	  <ul class="unstyled glyphicon-list glyphicon-list-tag">
-	    <% fieldData.each do |topic| %>
-	      <li><%= link_to topic, facet_uri(topic, 'subject_topic_sim') %></li>
+	    <% fieldData.sort_by(&:downcase).each do |topic| %>
+	      <li><%= link_to topic.upcase_first, facet_uri(topic, 'subject_topic_sim') %></li>
 	    <% end %>
 	  </ul>
 

app/views/shared/fields/_temporal.html.erb

@@ -18,8 +18,8 @@
 %>
 
 	  <ul class="unstyled glyphicon-list glyphicon-list-tag">
-	    <% fieldData.each do |topic| %>
-	      <li><%= link_to topic, facet_uri(topic, 'subject_topic_sim') %></li>
+	    <% fieldData.sort_by(&:downcase).each do |topic| %>
+	      <li><%= link_to topic.upcase_first, facet_uri(topic, 'subject_topic_sim') %></li>
 	    <% end %>
 	  </ul>
 

app/views/shared/fields/_title.html.erb

@@ -13,37 +13,37 @@
 <% if fieldData != nil %>
 
 	<hgroup>
-	<% fieldData.each do |datum| 
+	<% fieldData.each do |datum|
       result = JSON.parse(datum)
       partName = result['partName'] || ""
       partNumber = result['partNumber'] || ""
       subtitle = result['subtitle'] || ""
       translationVariant = result['translationVariant'] || []
 
-      subtitleVal = subtitle      
+      subtitleVal = subtitle
       if !partName.blank?
-      	subtitleVal += (subtitleVal.blank? ? "" : ", ") + partName     	
+      	subtitleVal += (subtitleVal.blank? ? "" : ", ") + partName
       	subtitleVal += " " + partNumber if !partNumber.blank?
-      end      
-      
+      end
+
       if translationVariant.class == Array
         translationVariant.each do |transV|
           subtitleVal += (subtitleVal.blank? ? "" : ", ") + transV
         end
-      elsif translationVariant.class == String && !translationVariant.blank?      
+      elsif translationVariant.class == String && !translationVariant.blank?
         subtitleVal += (subtitleVal.blank? ? "" : ", ") + translationVariant
       end
-      
+
       if !result['name'].blank?
-         title = result['name'] 
+         title = result['name']
         break
       else
         title = getFullTitle result || ""
       end
-      
+
     end
   %>
-    
+
 	<h1><%= title.html_safe %></h1>
     <h2><%= subtitleVal.html_safe %></h2>
 	</hgroup>