diff --git a/app/views/admin/contact_versions/show.haml b/app/views/admin/contact_versions/show.haml
index a412b4312..901f5ee1a 100644
--- a/app/views/admin/contact_versions/show.haml
+++ b/app/views/admin/contact_versions/show.haml
@@ -106,4 +106,4 @@
= l(vs.created_at, format: :short)
= vs.event
%span{:style => "padding-left:10px; position: absolute; bottom: 10px;"}
- = paginate @versions, theme: :admin
+ = paginate @versions
diff --git a/app/views/admin/domain_versions/show.haml b/app/views/admin/domain_versions/show.haml
index 9a38150be..cb95f231c 100644
--- a/app/views/admin/domain_versions/show.haml
+++ b/app/views/admin/domain_versions/show.haml
@@ -129,4 +129,4 @@
= l(vs.created_at, format: :short)
= vs.event
%span{:style => "padding-left:10px; position: absolute; bottom: 10px;"}
- = paginate @versions, theme: :admin
+ = paginate @versions
diff --git a/app/views/kaminari/admin/_first_page.html.haml b/app/views/kaminari/admin/_first_page.html.haml
deleted file mode 100644
index c5bbf13e1..000000000
--- a/app/views/kaminari/admin/_first_page.html.haml
+++ /dev/null
@@ -1,11 +0,0 @@
--# 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.first
- - param_name = current_page.instance_variable_get("@options")[:param_name] || Kaminari.config.param_name
- - urlik = url_for( params.merge(param_name => 1, :only_path => true))
- = link_to_unless current_page.first?, t('views.pagination.first').html_safe, urlik, :remote => remote
diff --git a/app/views/kaminari/admin/_gap.html.haml b/app/views/kaminari/admin/_gap.html.haml
deleted file mode 100644
index dd5789cc1..000000000
--- a/app/views/kaminari/admin/_gap.html.haml
+++ /dev/null
@@ -1,8 +0,0 @@
--# 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.page.gap
- = t('views.pagination.truncate').html_safe
diff --git a/app/views/kaminari/admin/_last_page.html.haml b/app/views/kaminari/admin/_last_page.html.haml
deleted file mode 100644
index cdddb9e7c..000000000
--- a/app/views/kaminari/admin/_last_page.html.haml
+++ /dev/null
@@ -1,9 +0,0 @@
--# 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.last
- = link_to_unless current_page.last?, t('views.pagination.last').html_safe, url, :remote => remote
diff --git a/app/views/kaminari/admin/_next_page.html.haml b/app/views/kaminari/admin/_next_page.html.haml
deleted file mode 100644
index 2865dcd0c..000000000
--- a/app/views/kaminari/admin/_next_page.html.haml
+++ /dev/null
@@ -1,9 +0,0 @@
--# 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.next
- = link_to_unless current_page.last?, t('views.pagination.next').html_safe, url, :rel => 'next', :remote => remote
diff --git a/app/views/kaminari/admin/_page.html.haml b/app/views/kaminari/admin/_page.html.haml
deleted file mode 100644
index d583c58f1..000000000
--- a/app/views/kaminari/admin/_page.html.haml
+++ /dev/null
@@ -1,12 +0,0 @@
--# 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?}"}
- - param_name = current_page.instance_variable_get("@options")[:param_name] || Kaminari.config.param_name
- - urlik = url_for( params.merge(param_name => page.to_i, :only_path => true))
- = link_to_unless page.current?, page, urlik, {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil}
diff --git a/app/views/kaminari/admin/_paginator.html.haml b/app/views/kaminari/admin/_paginator.html.haml
deleted file mode 100644
index 4f33e2dee..000000000
--- a/app/views/kaminari/admin/_paginator.html.haml
+++ /dev/null
@@ -1,18 +0,0 @@
--# 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.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
- - elsif !page.was_truncated?
- = gap_tag
- = next_page_tag unless current_page.last?
- = last_page_tag unless current_page.last?
diff --git a/app/views/kaminari/admin/_prev_page.html.haml b/app/views/kaminari/admin/_prev_page.html.haml
deleted file mode 100644
index 3b565fa6f..000000000
--- a/app/views/kaminari/admin/_prev_page.html.haml
+++ /dev/null
@@ -1,11 +0,0 @@
--# 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.prev
- - param_name = current_page.instance_variable_get("@options")[:param_name] || Kaminari.config.param_name
- - urlik = url_for( params.merge(param_name => current_page.to_i - 1, :only_path => true))
- = link_to_unless current_page.first?, t('views.pagination.previous').html_safe, urlik, :rel => 'prev', :remote => remote
diff --git a/config/initializers/kaminari.rb b/config/initializers/kaminari.rb
new file mode 100644
index 000000000..d1ac7c117
--- /dev/null
+++ b/config/initializers/kaminari.rb
@@ -0,0 +1,3 @@
+Kaminari.configure do |config|
+ config.default_per_page = 75
+end
diff --git a/config/initializers/kaminari_config.rb b/config/initializers/kaminari_config.rb
deleted file mode 100644
index 2eeb4bab6..000000000
--- a/config/initializers/kaminari_config.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-Kaminari.configure do |config|
- config.default_per_page = 75
- # config.max_per_page = nil
- # config.window = 4
- # config.outer_window = 0
- # config.left = 0
- # config.right = 0
- # config.page_method_name = :page
- # config.param_name = :page
-end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 04d3a1a67..e57723cd1 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,21 +1,4 @@
en:
- views:
- pagination:
- first: "« First"
- last: "Last »"
- previous: "‹ Prev"
- next: "Next ›"
- truncate: "…"
- helpers:
- page_entries_info:
- one_page:
- display_entries:
- zero: "No %{entry_name} found"
- one: "Displaying 1 %{entry_name}"
- other: "Displaying all %{count} %{entry_name}"
- more_pages:
- display_entries: "Displaying %{entry_name} %{first} - %{last} of %{total} in total"
-
time:
formats:
default: "%Y-%m-%d %H:%M"