Merge pull request #5191 from neenu-chacko/5150-switch-pagination-order

#5150 - Switch order of page totals and grand totals throughout the app

Author: cielf

app/views/distributions/_distribution_total.html.erb

@@ -5,14 +5,14 @@
   <td></td>
   <td></td>
   <td class="overall-total-items text-right">
-    <%= number_with_delimiter(@total_items_all_distributions, :delimiter => ',') %> (Total)
-  <br>
     <%= number_with_delimiter(@total_items_paginated_distributions, :delimiter => ',') %> (This page)
+  <br>
+    <%= number_with_delimiter(@total_items_all_distributions, :delimiter => ',') %> (Total)
   </td>
   <td class="overall-total-value text-right">
-    <strong><%= dollar_value(@total_value_all_distributions) %></strong> (Total)
-  <br>
     <strong><%= dollar_value(@total_value_paginated_distributions) %></strong> (This page)
+  <br>
+    <strong><%= dollar_value(@total_value_all_distributions) %></strong> (Total)
   </td>
   <td>
   </td>

app/views/donations/index.html.erb

@@ -124,25 +124,25 @@
                 <td></td>
                 <td></td>
                 <td class="text-left numeric">
+                  <%= @paginated_donations_quantity %>
+                  <br>
+                  (This page)
+                  <br>
                   <strong id="donation_quantity">
                     <%= @donations_quantity %>
                     <br>
                     (Total)
                   </strong>
-                  <br>
-                  <%= @paginated_donations_quantity %>
-                  <br>
-                  (This page)
                 </td>
                 <td class="text-left numeric"><strong><%= dollar_value(@total_money_raised) %></strong></td>
                 <td class="text-left numeric in-kind">
-                  <strong>
-                    <%= dollar_value(@total_value_all_donations) %> (Total)
-                  </strong>
-                  <br>
                   <%= dollar_value(@paginated_in_kind_value) %>
                   <br>
                    (This page)
+                  <br>
+                  <strong>
+                    <%= dollar_value(@total_value_all_donations) %> (Total)
+                  </strong>
                 </td>
               </tr>
               </tfoot>

app/views/purchases/index.html.erb

@@ -95,26 +95,26 @@
               <tr>
                 <td colspan="2" style="text-align: left"><strong>Total</strong></td>
                 <td class="numeric">
+                  <%= @paginated_purchases_quantity %> (This page)
+                  <br>
                   <strong id="purchase_quantity">
                     <%= @purchases_quantity %> (Total)
                   </strong>
-                  <br>
-                  <%= @paginated_purchases_quantity %> (This page)
                 </td>
                 <td></td>
                 <td class="numeric">
+                  <%= dollar_value(@paginated_purchases_value) %> (This page)
+                  <br>
                   <strong>
                     <%= dollar_value(@total_value_all_purchases) %> (Total)
                   </strong>
-                  <br>
-                  <%= dollar_value(@paginated_purchases_value) %> (This page)
                   </td>
                   <td class="numeric">
+                    <%= dollar_value(@paginated_fair_market_values) %> (This page)
+                  <br>
                   <strong>
                     <%= dollar_value(@total_fair_market_values) %> (Total)
                   </strong>
-                  <br>
-                  <%= dollar_value(@paginated_fair_market_values) %> (This page)
                   </td>
                 <td></td>
               </tr>