Merge pull request #2651 from benjaminwood/rename-bootstrap-kaminari-…

…views Rename bootstrap-kaminari-views
railsadminteam · Jun 8, 2016 · 49aafbb · 49aafbb
2 parents 3924e5b + 6657f67
commit 49aafbb
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 2 deletions.
diff --git a/...kaminari/twitter-bootstrap/_gap.html.haml → ...inari/ra-twitter-bootstrap/_gap.html.haml b/...kaminari/twitter-bootstrap/_gap.html.haml → ...inari/ra-twitter-bootstrap/_gap.html.haml
diff --git a/...ri/twitter-bootstrap/_next_page.html.haml → ...ra-twitter-bootstrap/_next_page.html.haml b/...ri/twitter-bootstrap/_next_page.html.haml → ...ra-twitter-bootstrap/_next_page.html.haml
diff --git a/...aminari/twitter-bootstrap/_page.html.haml → ...nari/ra-twitter-bootstrap/_page.html.haml b/...aminari/twitter-bootstrap/_page.html.haml → ...nari/ra-twitter-bootstrap/_page.html.haml
diff --git a/...ri/twitter-bootstrap/_paginator.html.haml → ...ra-twitter-bootstrap/_paginator.html.haml b/...ri/twitter-bootstrap/_paginator.html.haml → ...ra-twitter-bootstrap/_paginator.html.haml
diff --git a/...ri/twitter-bootstrap/_prev_page.html.haml → ...ra-twitter-bootstrap/_prev_page.html.haml b/...ri/twitter-bootstrap/_prev_page.html.haml → ...ra-twitter-bootstrap/_prev_page.html.haml
diff --git a/app/views/rails_admin/main/history.html.haml b/app/views/rails_admin/main/history.html.haml
@@ -46,6 +46,6 @@
         %td= object.message.in?(['delete', 'new']) ? t("admin.actions.#{object.message}.done").capitalize : object.message
 
 - unless params[:all] || !@history.respond_to?(:current_page)
-  = paginate(@history, theme: 'twitter-bootstrap', remote: true)
+  = paginate(@history, theme: 'ra-twitter-bootstrap', remote: true)
   = link_to(t("admin.misc.show_all"), send(path_method, params.merge(all: true)), class: "show-all btn pjax") unless (tc = @history.total_count) <= @history.size || tc > 100
 
diff --git a/app/views/rails_admin/main/index.html.haml b/app/views/rails_admin/main/index.html.haml
@@ -106,7 +106,7 @@
     - if @objects.respond_to?(:total_count)
       - total_count = @objects.total_count.to_i
       .row
-        .col-md-6= paginate(@objects, theme: 'twitter-bootstrap', remote: true)
+        .col-md-6= paginate(@objects, theme: 'ra-twitter-bootstrap', remote: true)
       .row
         .col-md-6= link_to(t("admin.misc.show_all"), index_path(params.merge(all: true)), class: "show-all btn btn-default clearfix pjax") unless total_count > 100 || total_count <= @objects.to_a.size
       .clearfix.total-count= "#{total_count} #{@model_config.pluralize(total_count).downcase}"