Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-02-07 15:20:11 +01:00
Code Issues Packages Projects Releases Activity

Merged r14948 and r14949 (#19097).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14954 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2015-12-06 10:54:03 +00:00
parent 0a45d594d5
commit 9ead3ea0a5
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/redmine/pagination.rb
View File

@@ -185,7 +185,7 @@ module Redmine
previous = nil
paginator.linked_pages.each do |page|
if previous && previous != page - 1
html << content_tag('li', content_tag('span', '...'), :class => 'spacer')
html << content_tag('li', content_tag('span', '&hellip;'.html_safe), :class => 'spacer')
end
if page == paginator.page
html << content_tag('li', content_tag('span', page.to_s), :class => 'current')
@@ -207,11 +207,12 @@ module Redmine
end
html << '</ul>'
html << content_tag('span', "(#{paginator.first_item}-#{paginator.last_item}/#{paginator.item_count})", :class => 'items') + ' '
info = ''.html_safe
info << content_tag('span', "(#{paginator.first_item}-#{paginator.last_item}/#{paginator.item_count})", :class => 'items') + ' '
if per_page_links != false && links = per_page_links(paginator, &block)
html << content_tag('span', links.to_s, :class => 'per-page')
info << content_tag('span', links.to_s, :class => 'per-page')
end
html << content_tag('span', info)
html.html_safe
end

4
public/stylesheets/application.css
View File

@@ -509,6 +509,9 @@ span.pagination {margin-left:3px; color:#888;}
border: 1px solid #ccc;
margin-left: -1px;
line-height: 2em;
margin-bottom: 1em;
white-space: nowrap;
text-align: center;
}
.pagination ul.pages li a,
.pagination ul.pages li span {
@@ -535,6 +538,7 @@ span.pagination {margin-left:3px; color:#888;}
color: inherit;
text-decoration: inherit;
}
span.pagination>span {white-space:nowrap;}
#search-form fieldset p {margin:0.2em 0;}

8
public/stylesheets/responsive.css
View File

@@ -825,3 +825,11 @@
width: 100%;
}
}
@media all and (max-width: 599px) {
.pagination ul.pages li {display:none;}
.pagination ul.pages li.current,
.pagination ul.pages li.previous,
.pagination ul.pages li.next {display:inline-block; width:32%; overflow:hidden;}
}