consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #207 from AyuntamientoMadrid/pagination

Browse Source 
Pagination styles
This commit is contained in:
Juanjo Bazán
2015-08-20 13:15:42 +02:00
parent 839314868c d70ca040f3
commit 2b6ea3a40f
11 changed files with 54 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/stylesheets/participacion.scss
View File

@@ -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;
}
}

14
app/views/kaminari/_first_page.html.erb
View File

@@ -1,11 +1,3 @@
<%# Link to the "First" page
- available local variables
url: url to the first 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="first">
<%= link_to_unless current_page.first?, t('views.pagination.first').html_safe, url, :remote => remote %>
</span>
<li>
<%= link_to t("views.pagination.first").html_safe, url, :remote => remote %>
</li>

11
app/views/kaminari/_gap.html.erb
View File

@@ -1,8 +1,3 @@
<%# Non-link tag that stands for skipped pages...
- 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
-%>
<span class="page gap"><%= t('views.pagination.truncate').html_safe %></span>
<li>
<%= t("views.pagination.truncate").html_safe %>
</li>

14
app/views/kaminari/_last_page.html.erb
View File

@@ -1,11 +1,3 @@
<%# Link to the "Last" page
- available local variables
url: url to the last 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="last">
<%= link_to_unless current_page.last?, t('views.pagination.last').html_safe, url, :remote => remote %>
</span>
<li>
<%= link_to t("views.pagination.last").html_safe, url, :remote => remote %>
</li>

14
app/views/kaminari/_next_page.html.erb
View File

@@ -1,11 +1,3 @@
<%# Link to the "Next" page
- available local variables
url: url to the next 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="next">
<%= link_to_unless current_page.last?, t('views.pagination.next').html_safe, url, :rel => 'next', :remote => remote %>
</span>
<li>
<%= link_to t("views.pagination.next").html_safe, url, :rel => "next", :remote => remote %>
</li>

15
app/views/kaminari/_page.html.erb
View File

@@ -1,12 +1,3 @@
<%# Link showing page number
- available local variables
page: a page object for "this" page
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>
<li class="<%= 'current' if page.current? %>">
<%= link_to page, url, {:remote => remote, :rel => page.next? ? "next" : page.prev? ? "prev" : nil} %>
</li>

16
app/views/kaminari/_paginator.html.erb
View File

@@ -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 -%>

14
app/views/kaminari/_prev_page.html.erb
View File

@@ -1,11 +1,3 @@
<%# Link to the "Previous" page
- available local variables
url: url to the previous 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="prev">
<%= link_to_unless current_page.first?, t('views.pagination.previous').html_safe, url, :rel => 'prev', :remote => remote %>
</span>
<li>
<%= link_to t("views.pagination.previous").html_safe, url, :rel => "prev", :remote => remote %>
</li>

3
config/i18n-tasks.yml
View File

@@ -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}.*'

2
spec/features/comments_spec.rb
View File

@@ -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")

2
spec/features/debates_spec.rb
View File

@@ -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")