Merge pull request #26 from goosys/wip/issue-7-13

Wip/issue 7 13

app/views/administrate/application/_flashes.html.erb

@@ -15,7 +15,18 @@ This partial renders flash messages on every page.
   <div class="flashes">
     <% flash.each do |key, value| -%>
       <% next unless value.respond_to?(:html_safe) %>
-      <div class="flash flash-<%= key %>"><%= value.html_safe %></div>
+      <div class="flash flash-<%= key %>">
+        <% if value.is_a?(Array) %>
+          <ul>
+            <% value.each do |v| %>
+              <% next unless v.respond_to?(:html_safe) %>
+              <li><%= v.html_safe %></li>
+            <% end %>
+          </ul>
+        <% else %>
+          <%= value.html_safe %>
+        <% end %>
+      </div>
     <% end -%>
   </div>
 <% end %>

app/views/administrate/application/_page_entries_info.html.erb

@@ -0,0 +1,2 @@
+<% return if resources.total_pages < 2 && position.eql?(:top) %>
+<p class="resource-total-count"><%= page_entries_info resources %></p>

app/views/administrate/application/index.html.erb

@@ -38,6 +38,8 @@ It renders the `_table` partial to display details about the resources.
   <%= content_for(:main) %>
 <% else %>
   <section class="main-content__body main-content__body--flush">
+    <%= render("page_entries_info", resources: resources, position: :top) %>
+
     <%= render(
       "collection",
       collection_presenter: page,
@@ -48,6 +50,7 @@ It renders the `_table` partial to display details about the resources.
     ) %>
 
     <%= render("pagination", resources: resources) %>
+    <%= render("page_entries_info", resources: resources, position: :bottom) %>
   </section>
 <% end %>