Show changeset element counts using badges

diff --git a/app/views/changesets/_paging_nav.html.erb b/app/views/changesets/_paging_nav.html.erb
index 47b0c7590e72b6a00ac04c3ca1346ca1eb580843..9fa23f6701f2bf438adc5ee818937561814703da 100644 (file)
--- a/app/views/changesets/_paging_nav.html.erb
+++ b/app/views/changesets/_paging_nav.html.erb
@@ -1,12 +1,18 @@
 <% if pages.page_count == 1 %>
   <h4 class="fs-5">
 <% if pages.page_count == 1 %>
   <h4 class="fs-5">

-    <%= t ".#{type.pluralize}", :count => pages.item_count %>
+    <%= t ".#{type.pluralize}_title" %>
+    <span class="badge count-number">
+      <%= pages.item_count %>
+    </span>

   </h4>
 <% elsif pages.page_count > 1 %>
   <h4 class="fs-5">
   </h4>
 <% elsif pages.page_count > 1 %>
   <h4 class="fs-5">

-    <%= t ".#{type.pluralize}_paginated", :x => pages.current_page.first_item,
-                                          :y => pages.current_page.last_item,
-                                          :count => pages.item_count %>
+    <%= t ".#{type.pluralize}_title" %>
+    <span class="badge count-number">
+      <%= t ".range", :x => pages.current_page.first_item,
+                      :y => pages.current_page.last_item,
+                      :count => pages.item_count %>
+    </span>

   </h4>
 
   <%= sidebar_classic_pagination(pages, "#{type}_page") do |page|
   </h4>
 
   <%= sidebar_classic_pagination(pages, "#{type}_page") do |page|

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 32b0bc6bcc680fea9ba486ed7e1cf81eddeefb76..2fffdabddd62e0088cd23e3d23eefc9e7e425f9a 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -523,12 +523,13 @@ en:
       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
     paging_nav:
       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
     paging_nav:

-      nodes: "Nodes (%{count})"
+      nodes_title: "Nodes"

       nodes_paginated: "Nodes (%{x}-%{y} of %{count})"
       nodes_paginated: "Nodes (%{x}-%{y} of %{count})"

-      ways: "Ways (%{count})"
+      ways_title: "Ways"

       ways_paginated: "Ways (%{x}-%{y} of %{count})"
       ways_paginated: "Ways (%{x}-%{y} of %{count})"

-      relations: "Relations (%{count})"
+      relations_title: "Relations"

       relations_paginated: "Relations (%{x}-%{y} of %{count})"
       relations_paginated: "Relations (%{x}-%{y} of %{count})"

+      range: "%{x}-%{y} of %{count}"

     not_found_message:
       sorry: "Sorry, changeset #%{id} could not be found."
     timeout:
     not_found_message:
       sorry: "Sorry, changeset #%{id} could not be found."
     timeout: