##// END OF EJS Templates
Merged r14948 and r14949 (#19097)....
Jean-Philippe Lang -
r14572:9ead3ea0a5fc
parent child
Show More
@@ -185,7 +185,7 module Redmine
185 previous = nil
185 previous = nil
186 paginator.linked_pages.each do |page|
186 paginator.linked_pages.each do |page|
187 if previous && previous != page - 1
187 if previous && previous != page - 1
188 html << content_tag('li', content_tag('span', '...'), :class => 'spacer')
188 html << content_tag('li', content_tag('span', '&hellip;'.html_safe), :class => 'spacer')
189 end
189 end
190 if page == paginator.page
190 if page == paginator.page
191 html << content_tag('li', content_tag('span', page.to_s), :class => 'current')
191 html << content_tag('li', content_tag('span', page.to_s), :class => 'current')
@@ -207,11 +207,12 module Redmine
207 end
207 end
208 html << '</ul>'
208 html << '</ul>'
209
209
210 html << content_tag('span', "(#{paginator.first_item}-#{paginator.last_item}/#{paginator.item_count})", :class => 'items') + ' '
210 info = ''.html_safe
211
211 info << content_tag('span', "(#{paginator.first_item}-#{paginator.last_item}/#{paginator.item_count})", :class => 'items') + ' '
212 if per_page_links != false && links = per_page_links(paginator, &block)
212 if per_page_links != false && links = per_page_links(paginator, &block)
213 html << content_tag('span', links.to_s, :class => 'per-page')
213 info << content_tag('span', links.to_s, :class => 'per-page')
214 end
214 end
215 html << content_tag('span', info)
215
216
216 html.html_safe
217 html.html_safe
217 end
218 end
@@ -509,6 +509,9 span.pagination {margin-left:3px; color:#888;}
509 border: 1px solid #ccc;
509 border: 1px solid #ccc;
510 margin-left: -1px;
510 margin-left: -1px;
511 line-height: 2em;
511 line-height: 2em;
512 margin-bottom: 1em;
513 white-space: nowrap;
514 text-align: center;
512 }
515 }
513 .pagination ul.pages li a,
516 .pagination ul.pages li a,
514 .pagination ul.pages li span {
517 .pagination ul.pages li span {
@@ -535,6 +538,7 span.pagination {margin-left:3px; color:#888;}
535 color: inherit;
538 color: inherit;
536 text-decoration: inherit;
539 text-decoration: inherit;
537 }
540 }
541 span.pagination>span {white-space:nowrap;}
538
542
539 #search-form fieldset p {margin:0.2em 0;}
543 #search-form fieldset p {margin:0.2em 0;}
540
544
@@ -825,3 +825,11
825 width: 100%;
825 width: 100%;
826 }
826 }
827 }
827 }
828
829 @media all and (max-width: 599px) {
830 .pagination ul.pages li {display:none;}
831 .pagination ul.pages li.current,
832 .pagination ul.pages li.previous,
833 .pagination ul.pages li.next {display:inline-block; width:32%; overflow:hidden;}
834 }
835
General Comments 0
You need to be logged in to leave comments. Login now