Commit 9c45291

mo khan <mo@mokhan.ca>
2016-07-22 03:24:07
make pagination mobile friendly.
1 parent 0cc6b29
app/views/kaminari/_next_page.html.erb
@@ -1,3 +1,7 @@
-<li>
-  <%= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote %>
-</li>
+<% if current_page.last? %>
+   <li class="pagination-next disabled"><%= raw(t 'views.pagination.next')%></li>
+<% else %>
+  <li class="pagination-next">
+    <%= link_to raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote %>
+  </li>
+<% end %>
app/views/kaminari/_page.html.erb
@@ -1,6 +1,6 @@
 <li class="<%= 'current' if page.current? %>">
   <% if page.current? %>
-    <%= page %>
+    <span class="show-for-sr">You're on page</span> <%= page %>
   <% else %>
     <%= link_to page, url, {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
   <% end %>
app/views/kaminari/_paginator.html.erb
@@ -1,6 +1,6 @@
 <%= paginator.render do %>
-  <ul aria-label="Pagination" class="pagination" role="pagination">
-    <%= first_page_tag unless current_page.first? %>
+  <ul aria-label="Pagination" class="pagination text-center" role="navigation">
+    <% first_page_tag unless current_page.first? %>
     <%= prev_page_tag unless current_page.first? %>
     <% each_page do |page| %>
       <% if page.left_outer? || page.right_outer? || page.inside_window? %>
@@ -9,7 +9,7 @@
         <%= gap_tag %>
       <% end %>
     <% end %>
-    <%= next_page_tag unless current_page.last? %>
-    <%= last_page_tag unless current_page.last? %>
+    <%= next_page_tag %>
+    <% last_page_tag unless current_page.last? %>
   </ul>
 <% end %>
app/views/kaminari/_prev_page.html.erb
@@ -1,3 +1,7 @@
-<li>
-  <%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote %>
-</li>
+<% if current_page.first? %>
+  <li class="pagination-previous disabled">Previous</li>
+<% else %>
+  <li class="pagination-previous">
+    <%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote %>
+  </li>
+<% end %>
app/views/workouts/index.html.erb
@@ -1,16 +1,14 @@
 <% if @workouts.any? %>
+  <div class="row show-for-small-only">
+    <div class="columns">
+      <%= paginate @workouts, remote: false %>
+    </div>
+  </div>
   <div class="row">
     <div class="columns">
-      <% if feature_enabled?(:csv_import) %>
-        <p class="text-center">
-          <a data-open="sendToStrongLiftsModal">
-            <%= User.human_attribute_name(:import_address) %>
-          </a>
-        </p>
-      <% end %>
       <ul class="accordion" data-accordion data-multi-expand="true" data-allow-all-closed="true">
-        <% @workouts.each.with_index do |workout, index| %>
-        <li class="accordion-item <%= index == 0 ? "is-active" : "" %>" data-accordion-item>
+        <% @workouts.each do |workout| %>
+        <li class="accordion-item" data-accordion-item>
           <a href="#" class="accordion-title">
             <%= workout.name %> - <strong><%= I18n.l workout.occurred_at, format: :short %></strong> - <%= workout.body_weight.to(:lbs) %> lbs
           </a>
@@ -28,13 +26,24 @@
     </div>
   </div>
   <div class="row">
-    <div class="large-12 columns">
+    <div class="columns">
       <%= paginate @workouts, remote: false %>
     </div>
   </div>
+  <% if feature_enabled?(:csv_import) %>
+  <div class="row">
+    <div class="columns">
+      <p class="text-center">
+        <a data-open="sendToStrongLiftsModal">
+          <%= User.human_attribute_name(:import_address) %>
+        </a>
+      </p>
+    </div>
+  </div>
+  <% end %>
 <% else %>
   <div class="row">
-    <div class="large-12 columns">
+    <div class="columns">
       <% if feature_enabled?(:csv_import) %>
       <p class="text-center"> <a href="#" data-reveal-id="sendToStrongLiftsModal"><%= User.human_attribute_name(:import_address) %></a> </p>
       <% end %>
config/locales/en.yml
@@ -114,3 +114,10 @@ en:
       warning: To ensure your workouts are imported correctly we suggest that you update your timezone.
   footer:
     copyright: "© Copyright www.stronglifters.com. All rights reserved."
+  views:
+    pagination:
+      first: "&laquo; First"
+      last: "Last &raquo;"
+      previous: "Previous"
+      next: "Next"
+      truncate: "&hellip;"