Skip to content

Commit

Permalink
Merge pull request #8334 from dmarcoux/bootstrap-kaminari
Browse files Browse the repository at this point in the history
Move Kaminari views under app/views/webui
  • Loading branch information
hennevogel committed Sep 13, 2019
2 parents 929c733 + f73a0ef commit adb9225
Show file tree
Hide file tree
Showing 13 changed files with 14 additions and 22 deletions.
2 changes: 2 additions & 0 deletions src/api/app/views/webui/kaminari/_first_page.html.haml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
%li.page-item
= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, remote: remote, class: 'page-link'
2 changes: 2 additions & 0 deletions src/api/app/views/webui/kaminari/_gap.html.haml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
%li.page-item.disabled
= link_to raw(t 'views.pagination.truncate'), '#', class: 'page-link'
2 changes: 2 additions & 0 deletions src/api/app/views/webui/kaminari/_last_page.html.haml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
%li.page-item
= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, remote: remote, class: 'page-link'
2 changes: 2 additions & 0 deletions src/api/app/views/webui/kaminari/_next_page.html.haml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
%li.page-item
= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, rel: 'next', remote: remote, class: 'page-link'
2 changes: 2 additions & 0 deletions src/api/app/views/webui/kaminari/_prev_page.html.haml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
%li.page-item
= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, rel: 'prev', remote: remote, class: 'page-link'
2 changes: 0 additions & 2 deletions src/api/app/views/webui2/webui/kaminari/_first_page.html.haml

This file was deleted.

2 changes: 0 additions & 2 deletions src/api/app/views/webui2/webui/kaminari/_gap.html.haml

This file was deleted.

2 changes: 0 additions & 2 deletions src/api/app/views/webui2/webui/kaminari/_last_page.html.haml

This file was deleted.

2 changes: 0 additions & 2 deletions src/api/app/views/webui2/webui/kaminari/_next_page.html.haml

This file was deleted.

2 changes: 0 additions & 2 deletions src/api/app/views/webui2/webui/kaminari/_prev_page.html.haml

This file was deleted.

16 changes: 4 additions & 12 deletions src/api/config/locales/kaminari.en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,8 @@
en:
views:
pagination:
first: "<<First"
last: "Last>>"
previous: "<Prev"
next: "Next>"
first: "First"
last: "Last"
previous: "Previous"
next: "Next"
truncate: "..."
# TODO: Use these translations when switch_to_webui2, without webui2 namespace. Modify also the kaminari views affected.
webui2:
pagination:
first: "First"
last: "Last"
previous: "Previous"
next: "Next"
truncate: "..."

0 comments on commit adb9225

Please sign in to comment.