Merge afff5c5 into d46be24

app/views/admin_public_body/_tag_help.html.erb

@@ -1,16 +1,12 @@
 <h2>List of tags</h2>
-<% first_row = true %>
-<% for row in PublicBodyCategory.get().with_headings() %>
-  <% if row.instance_of?(Array) %>
-    <% if row[0] != 'other' %>
-      <strong><%= row[0] %></strong>=<%= row[1] %>
+
+<% PublicBody.categories.each do |heading| %>
+  <% if heading.children.any? %>
+    <h3><%= heading.title %></h3>
+    <% heading.children.each do |category| %>
+      <% next unless category.category_tag.present? %>
+      <strong><%= category.category_tag %></strong>=<%= category.title %>
       <br/>
     <% end %>
-  <% elsif row != 'Miscellaneous' %>
-    <% if not first_row %>
-    <% else %>
-      <% first_row = false %>
-    <% end %>
-    <h3><%=h row%></h3>
   <% end %>
 <% end %>

app/views/admin_public_body/import_csv.html.erb

@@ -142,14 +142,6 @@ Another One,another@example.com,Otro organismo,a_tag
   </div>
 
   <div id="standard-tags" class="span4">
-    <h2>Standard tags:</h2>
-
-    <ul>
-      <% PublicBodyCategory.get().by_tag().each do |category, description| %>
-        <% if category != "other" %>
-          <li><strong><%= category %></strong>=<%= description %></li>
-        <% end %>
-      <% end %>
-    </ul>
+    <%= render partial: 'tag_help' %>
   </div>
 </div>