cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace the existing pagination of changesets in the browser with a

Browse source 
simple next/previous pagination that avoids the need to count the total
number of matches.
This commit is contained in:
Tom Hughes 2009-11-18 20:21:54 +00:00
parent 7913dafe50
commit 261a93fbbc
36 changed files with 25 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/controllers/changeset_controller.rb
View file

@ -307,11 +307,15 @@ class ChangesetController < ApplicationController
@description = t 'changeset.list.description'
end
@edit_pages, @edits = paginate(:changesets,
:include => [:user, :changeset_tags],
:conditions => conditions,
:order => "changesets.created_at DESC",
:per_page => 20)
@page = (params[:page] || 1).to_i
@page_size = 20
@edits = Changeset.find(:all,
:include => [:user, :changeset_tags],
:conditions => conditions,
:order => "changesets.created_at DESC",
:offset => (@page - 1) * @page_size,
:limit => @page_size)
end
private

22
app/views/changeset/_changeset_paging_nav.html.erb
View file

@ -1,13 +1,17 @@
<p>
<% current_page = @edit_pages.current_page %>
<%= t'changeset.changeset_paging_nav.showing_page' %>
<%= current_page.number %> (<%= current_page.first_item %><%
if (current_page.first_item < current_page.last_item) # if more than 1 changeset on page
%>-<%= current_page.last_item %><%
end %>
<%= t'changeset.changeset_paging_nav.of'%> <%= @edit_pages.item_count %>)
<% if @edit_pages.page_count > 1 %>
| <%= pagination_links_each(@edit_pages, {}) { |n| link_to(n, params.merge({ :page => n })) } %>
<% if @page > 1 %>
<%= link_to t('changeset.changeset_paging_nav.previous'), :page => @page - 1 %>
<% else %>
<%= t('changeset.changeset_paging_nav.previous') %>
<% end %>
| <%= t('changeset.changeset_paging_nav.showing_page', :page => @page) %> |
<% if @edits.size < @page_size %>
<%= t('changeset.changeset_paging_nav.next') %>
<% else %>
<%= link_to t('changeset.changeset_paging_nav.next'), :page => @page + 1 %>
<% end %>
</p>

3
config/locales/af.yml
View file

@ -199,9 +199,6 @@ af:
no_comment: (geen)
no_edits: (geen wysigings)
still_editing: (steeds besig met wysiging)
changeset_paging_nav:
of: van
showing_page: Wys bladsy
changesets:
area: Gebied
comment: Opmerking

3
config/locales/be.yml
View file

@ -188,9 +188,6 @@ be:
show_area_box: паказаць мяжу мясцовасці
still_editing: (у працэсе рэдагавання)
view_changeset_details: Падрабязней пра набор зменаў
changeset_paging_nav:
of: з
showing_page: Паказваецца старонка
changesets:
area: Мясцовасць
comment: Каментар

3
config/locales/br.yml
View file

@ -241,9 +241,6 @@ br:
show_area_box: diskouez takad ar voest
still_editing: (oc'h aozañ c'hoazh)
view_changeset_details: Gwelet munudoù ar strollad kemmoù
changeset_paging_nav:
of: eus
showing_page: O tiskouez ar bajenn
changesets:
area: Takad
comment: Addispleg

3
config/locales/cs.yml
View file

@ -213,9 +213,6 @@ cs:
no_comment: (žádný)
still_editing: (stále se upravuje)
view_changeset_details: Zobrazit detaily sady změn
changeset_paging_nav:
of: z
showing_page: Zobrazuji stranu
changesets:
area: Oblast
comment: Komentář

3
config/locales/de.yml
View file

@ -251,9 +251,6 @@ de:
show_area_box: Bereich anzeigen
still_editing: (in Bearbeitung)
view_changeset_details: Details des Changesets
changeset_paging_nav:
of: von
showing_page: Seite
changesets:
area: Bereich
comment: Kommentar

3
config/locales/dsb.yml
View file

@ -248,9 +248,6 @@ dsb:
show_area_box: wobłuk pokazaś
still_editing: (wobźěłujo se)
view_changeset_details: Drobnostki sajźbow změnow pokazaś
changeset_paging_nav:
of: z
showing_page: Pokazujo se bok
changesets:
area: Wurězk
comment: Komentar

2
config/locales/el.yml
View file

@ -186,8 +186,6 @@ el:
anonymous: Ανόνυμος
show_area_box: δείξε περιοχή κουτιού
view_changeset_details: Δες αλλαγή συλλογής λεπτομερειών
changeset_paging_nav:
showing_page: Eμφάνιση σελίδας
changesets:
area: Περιοχή
comment: Σχόλιο

5
config/locales/en.yml
View file

@ -241,8 +241,9 @@ en:
edit: "edit"
changeset:
changeset_paging_nav:
showing_page: "Showing page"
of: "of"
showing_page: "Showing page {{page}}"
next: "Next &raquo;"
previous: "&laquo; Previous"
changeset:
id: "#{{id}}"
still_editing: "(still editing)"

2
config/locales/eo.yml
View file

@ -222,8 +222,6 @@ eo:
no_comment: (neniu)
no_edits: (neniaj redaktoj)
still_editing: (estas ankoraŭ redaktata)
changeset_paging_nav:
showing_page: Montrante paĝon
changesets:
area: Areo
comment: Komento

3
config/locales/es.yml
View file

@ -242,9 +242,6 @@ es:
show_area_box: mostrar caja
still_editing: (todavía en edición)
view_changeset_details: Ver detalles del conjunto de cambios
changeset_paging_nav:
of: de
showing_page: Mostrando página
changesets:
area: Área
comment: Comentario

3
config/locales/fi.yml
View file

@ -225,9 +225,6 @@ fi:
show_area_box: näytä alueen rajat kartalla
still_editing: (muokkaus kesken)
view_changeset_details: Näytä muutoskokoelman tarkemmat tiedot
changeset_paging_nav:
of: " /"
showing_page: Sivu
changesets:
area: Alue
comment: Kommentti

3
config/locales/fr.yml
View file

@ -246,9 +246,6 @@ fr:
show_area_box: afficher la zone de la boîte
still_editing: (en cours de modification)
view_changeset_details: Afficher les détails du groupe de modifications
changeset_paging_nav:
of: de
showing_page: Affichage de la page
changesets:
area: Zone
comment: Commentaire

3
config/locales/fur.yml
View file

@ -167,9 +167,6 @@ fur:
no_edits: (nissun cambiament)
still_editing: (ancjemò in cambiament)
view_changeset_details: Viôt detais dal grup di cambiaments
changeset_paging_nav:
of: su
showing_page: Daûr a mostrâ la pagjine
changesets:
area: Aree
comment: Coment

3
config/locales/hi.yml
View file

@ -174,9 +174,6 @@ hi:
no_edits: (कोई संपादित नहीं है)
still_editing: (संपादित किया जा रहा है)
view_changeset_details: इस changeset के विवरण देखे
changeset_paging_nav:
of: "पृष्ठ गिनती:"
showing_page: "इस पृष्ठ का प्रदर्शन:"
changesets:
area: क्षेत्र
comment: टिप्पणी

3
config/locales/hr.yml
View file

@ -246,9 +246,6 @@ hr:
show_area_box: prikaži okvir područja
still_editing: (još uređuje)
view_changeset_details: Prikaži detalje changeseta
changeset_paging_nav:
of: od
showing_page: Prikazujem stranicu
changesets:
area: Područje
comment: Komentar

3
config/locales/hsb.yml
View file

@ -248,9 +248,6 @@ hsb:
show_area_box: wobłuk pokazać
still_editing: (wobdźěłuje so hišće)
view_changeset_details: Podrobnosće sadźby změnow pokazać
changeset_paging_nav:
of: z
showing_page: Pokazuje so strona
changesets:
area: Wobłuk
comment: Komentar

3
config/locales/hu.yml
View file

@ -243,9 +243,6 @@ hu:
show_area_box: területhatároló megjelenítése
still_editing: (szerkesztés alatt)
view_changeset_details: Módosításcsomag részleteinek megtekintése
changeset_paging_nav:
of: "összesen:"
showing_page: "Jelenlegi oldal:"
changesets:
area: Terület
comment: Megjegyzés

3
config/locales/ia.yml
View file

@ -240,9 +240,6 @@ ia:
show_area_box: monstrar quadro del area
still_editing: (ancora in modification)
view_changeset_details: Vider detalios del gruppo de modificationes
changeset_paging_nav:
of: de
showing_page: Monstrante pagina
changesets:
area: Area
comment: Commento

3
config/locales/is.yml
View file

@ -238,9 +238,6 @@ is:
show_area_box: sýna svæðismörk
still_editing: (enn að breyta)
view_changeset_details: Skoða breytingarsett
changeset_paging_nav:
of: af
showing_page: Sýni síðu
changesets:
area: Svæði
comment: Athugasemd

3
config/locales/it.yml
View file

@ -177,9 +177,6 @@ it:
show_area_box: visualizza il riquadro dell'area
still_editing: (ancora in modifica)
view_changeset_details: Visualizza i dettagli del gruppo di modifiche
changeset_paging_nav:
of: di
showing_page: Visualizzata la pagina
changesets:
area: Area
comment: Commento

2
config/locales/ja.yml
View file

@ -230,8 +230,6 @@ ja:
show_area_box: 領域境界を表示
still_editing: （まだ編集中です）
view_changeset_details: 変更セットの詳細表示
changeset_paging_nav:
showing_page: ページ表示
changesets:
area: 領域
comment: コメント

3
config/locales/mk.yml
View file

@ -240,9 +240,6 @@ mk:
show_area_box: прикажи рамка на површина
still_editing: (сè уште уредува)
view_changeset_details: Преглед на детали од измените
changeset_paging_nav:
of: од
showing_page: Приказ на страница
changesets:
area: Површина
comment: Коментар

3
config/locales/nds.yml
View file

@ -138,9 +138,6 @@ nds:
no_comment: (keen)
no_edits: (keen Ännern)
still_editing: (noch an’t Ännern)
changeset_paging_nav:
of: von
showing_page: an’t Sied weddergeven
changesets:
area: Rebeed
comment: Kommentar

3
config/locales/nl.yml
View file

@ -242,9 +242,6 @@ nl:
show_area_box: toon rechthoek
still_editing: (nog aan het bewerken)
view_changeset_details: Details wijzigingenset weergeven
changeset_paging_nav:
of: van
showing_page: Bezig met weergeven van pagina
changesets:
area: Gebied
comment: Opmerking

3
config/locales/no.yml
View file

@ -237,9 +237,6 @@
show_area_box: vis boks for område
still_editing: (redigerer forsatt)
view_changeset_details: Vis detaljer for endringssett
changeset_paging_nav:
of: av
showing_page: Viser side
changesets:
area: Område
comment: Kommentar

3
config/locales/pl.yml
View file

@ -236,9 +236,6 @@ pl:
show_area_box: pokaż prostokąt zawierający
still_editing: (nadal edytowany)
view_changeset_details: Zobacz szczegóły changesetu
changeset_paging_nav:
of: z
showing_page: Widoczna jest strona
changesets:
area: Obszar
comment: Komentarz

3
config/locales/pt-BR.yml
View file

@ -244,9 +244,6 @@ pt-BR:
show_area_box: exibir limite da área
still_editing: (ainda editando)
view_changeset_details: Ver detalhes das alterações
changeset_paging_nav:
of: de
showing_page: Exibindo página
changesets:
area: Área
comment: Comentário

3
config/locales/ro.yml
View file

@ -210,9 +210,6 @@ ro:
show_area_box: afișează chenarul zonei
still_editing: (încă se editează)
view_changeset_details: Vizualizare detalii set de schimbări
changeset_paging_nav:
of: din
showing_page: Se afișează pagina
changesets:
area: Zonă
comment: Comentariu

3
config/locales/ru.yml
View file

@ -242,9 +242,6 @@ ru:
show_area_box: Показать рамку, охватывающую область пакета правок
still_editing: (ещё редактируется)
view_changeset_details: Просмотреть подробности пакета правок
changeset_paging_nav:
of: из
showing_page: Страница
changesets:
area: Область
comment: Комментарий

3
config/locales/sl.yml
View file

@ -212,9 +212,6 @@ sl:
show_area_box: prikaži pravokotno področje
still_editing: (še ureja)
view_changeset_details: Ogled podrobnosti paketa sprememb
changeset_paging_nav:
of: od
showing_page: Prikaz strani
changesets:
area: Področje
comment: Komentar

3
config/locales/sv.yml
View file

@ -233,9 +233,6 @@ sv:
no_comment: (ingen)
no_edits: (inga ändringar)
still_editing: (redigerar fortfarande)
changeset_paging_nav:
of: av
showing_page: Visar sida
changesets:
area: Area
comment: Kommentar

3
config/locales/vi.yml
View file

@ -240,9 +240,6 @@ vi:
show_area_box: hiện hộp vùng
still_editing: (đang mở)
view_changeset_details: Xem chi tiết của bộ thay đổi
changeset_paging_nav:
of: trong
showing_page: Đang hiện trang
changesets:
area: Vùng
comment: Miêu tả

2
config/locales/zh-CN.yml
View file

@ -172,8 +172,6 @@ zh-CN:
show_area_box: 显示区域窗口
still_editing: (仍在编辑中)
view_changeset_details: 查看详细变更
changeset_paging_nav:
showing_page: 显示网页
changesets:
area: 区域
comment: 评论

3
config/locales/zh-TW.yml
View file

@ -227,9 +227,6 @@ zh-TW:
show_area_box: 顯示區域方塊
still_editing: (尚在編輯)
view_changeset_details: 檢視變更組合詳細資訊
changeset_paging_nav:
of: ／
showing_page: 正在顯示頁面
changesets:
area: 區域
comment: 註解