Merge pull request #207 from AyuntamientoMadrid/pagination

Pagination styles

app/assets/stylesheets/participacion.scss

@@ -12,6 +12,7 @@
 // 10. User account
 // 11. Filters
 // 12. Official levels
+// 13. Pagination
 //
 
 // 01. Variables
@@ -673,3 +674,14 @@ img.initialjs-avatar {
 .level-5 {
   background: $level-5;
 }
+
+// 13. Pagination
+// - - - - - - - - - - - - - - - - - - - - - - - - -
+
+ul.pagination {
+  margin-top: rem-calc(24);
+
+  li {
+    color: $text-medium;
+  }
+}

app/views/kaminari/_first_page.html.erb

@@ -1,11 +1,3 @@
-<%# Link to the "First" page
+<li>
-  - available local variables
+  <%= link_to t("views.pagination.first").html_safe, url, :remote => remote %>
-    url:           url to the first page
+</li>
-    current_page:  a page object for the currently displayed page
-    total_pages:   total number of pages
-    per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
-<span class="first">
-  <%= link_to_unless current_page.first?, t('views.pagination.first').html_safe, url, :remote => remote %>
-</span>

app/views/kaminari/_gap.html.erb

@@ -1,8 +1,3 @@
-<%# Non-link tag that stands for skipped pages...
+<li>
-  - available local variables
+  <%= t("views.pagination.truncate").html_safe %>
-    current_page:  a page object for the currently displayed page
+</li>
-    total_pages:   total number of pages
-    per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
-<span class="page gap"><%= t('views.pagination.truncate').html_safe %></span>

app/views/kaminari/_last_page.html.erb

@@ -1,11 +1,3 @@
-<%# Link to the "Last" page
+<li>
-  - available local variables
+  <%= link_to t("views.pagination.last").html_safe, url, :remote => remote %>
-    url:           url to the last page
+</li>
-    current_page:  a page object for the currently displayed page
-    total_pages:   total number of pages
-    per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
-<span class="last">
-  <%= link_to_unless current_page.last?, t('views.pagination.last').html_safe, url, :remote => remote %>
-</span>

app/views/kaminari/_next_page.html.erb

@@ -1,11 +1,3 @@
-<%# Link to the "Next" page
+<li>
-  - available local variables
+  <%= link_to t("views.pagination.next").html_safe, url, :rel => "next", :remote => remote %>
-    url:           url to the next page
+</li>
-    current_page:  a page object for the currently displayed page
-    total_pages:   total number of pages
-    per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
-<span class="next">
-  <%= link_to_unless current_page.last?, t('views.pagination.next').html_safe, url, :rel => 'next', :remote => remote %>
-</span>

app/views/kaminari/_page.html.erb

@@ -1,12 +1,3 @@
-<%# Link showing page number
+<li class="<%= 'current' if page.current? %>">
-  - available local variables
+  <%= link_to page, url, {:remote => remote, :rel => page.next? ? "next" : page.prev? ? "prev" : nil} %>
-    page:          a page object for "this" page
+</li>
-    url:           url to this page
-    current_page:  a page object for the currently displayed page
-    total_pages:   total number of pages
-    per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
-<span class="page<%= ' current' if page.current? %>">
-  <%= link_to_unless page.current?, page, url, {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
-</span>

app/views/kaminari/_paginator.html.erb

@@ -1,15 +1,10 @@
-<%# The container tag
-  - available local variables
-    current_page:  a page object for the currently displayed page
-    total_pages:   total number of pages
-    per_page:      number of items to fetch per page
-    remote:        data-remote
-    paginator:     the paginator that renders the pagination tags inside
--%>
 <%= paginator.render do -%>
-  <nav class="pagination">
+  <div class="pagination-centered">
+    <nav role="navigation">
+      <ul class="pagination">
         <%= 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? -%>
             <%= page_tag page %>
@@ -17,7 +12,10 @@
             <%= gap_tag %>
           <% end -%>
         <% end -%>
+
         <%= next_page_tag unless current_page.last? %>
         <%= last_page_tag unless current_page.last? %>
+      </ul>
     </nav>
+  </div>
 <% end -%>

app/views/kaminari/_prev_page.html.erb

@@ -1,11 +1,3 @@
-<%# Link to the "Previous" page
+<li>
-  - available local variables
+  <%= link_to t("views.pagination.previous").html_safe, url, :rel => "prev", :remote => remote %>
-    url:           url to the previous page
+</li>
-    current_page:  a page object for the currently displayed page
-    total_pages:   total number of pages
-    per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
-<span class="prev">
-  <%= link_to_unless current_page.first?, t('views.pagination.previous').html_safe, url, :rel => 'prev', :remote => remote %>
-</span>

config/i18n-tasks.yml

@@ -26,6 +26,7 @@ data:
     - config/locales/moderation.%{locale}.yml
     - config/locales/devise_views.%{locale}.yml
     - config/locales/responders.%{locale}.yml
+    - config/locales/kaminari.%{locale}.yml
 
   # Locale files to write new keys to, based on a list of key pattern => file rules. Matched from top to bottom:
   # `i18n-tasks normalize -p` will force move the keys according to these rules
@@ -98,6 +99,8 @@ ignore_unused:
   - 'unauthorized.*'
   - 'simple_captcha.*'
   - 'admin.officials.level_*'
+  - 'helpers.page_entries_info.*' # kaminari
+  - 'views.pagination.*' # kaminari
 # - '{devise,kaminari,will_paginate}.*'
 # - 'simple_form.{yes,no}'
 # - 'simple_form.{placeholders,hints,labels}.*'

spec/features/comments_spec.rb

@@ -27,7 +27,7 @@ feature 'Comments' do
     visit debate_path(debate)
 
     expect(page).to have_css('.comment', count: per_page)
-    within("nav.pagination") do
+    within("ul.pagination") do
       expect(page).to have_content("1")
       expect(page).to have_content("2")
       expect(page).to_not have_content("3")

spec/features/debates_spec.rb

@@ -24,7 +24,7 @@ feature 'Debates' do
 
     expect(page).to have_selector('#debates .debate', count: per_page)
 
-    within("nav.pagination") do
+    within("ul.pagination") do
       expect(page).to have_content("1")
       expect(page).to have_content("2")
       expect(page).to_not have_content("3")