administration-zero 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5535d5c246174e4d3f6db561d68f9e89466752094029e9cfdc45735b220bce78
-  data.tar.gz: b93e1c1793e35aae39e5b8d127c9253524ca3a022a5692fce47a7c342b766209
+  metadata.gz: d82b34403451e2ff66cae9d8475b235f3c63f063a4781b323502054c0e73f398
+  data.tar.gz: a09b53b077a1f327e064e28f0faeb0a875c61c9cef1227691897fd219cdaf0fd
 SHA512:
-  metadata.gz: f3f3660673d5698081315d20630b4d72835bab63c3aa038b05b355d80df5a6522e1208ab8c179e5b6cf5014b9bb2e73ef20872f8a9ed2f99e3dd5f1fefdefcac
-  data.tar.gz: e1ba7313c918f5b294ec59fe4211c1a5a3e059d44cbb3812deb48818bc803f5aed11da75f2f146aa3a0dffbc7306e29da522937e6f81a23f3a507ae899addceb
+  metadata.gz: 742d6bcb516e30d8a0bda81e221092271277422fee9bbdd67623354e20080cd147ec538a8d41c11f5e0ba3dd274e42aec3edd64076e42e60aef567cd1dce52b8
+  data.tar.gz: 44cc0737abd7a70eed80bd4f1c9292568d9db70798b6a5e778bbedd5bf8a58624c6baa237e667e2a6f810890d7500b682e38592dba160e50006e94a56e852a5b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    administration-zero (1.0.1)
+    administration-zero (1.0.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/administration_zero/version.rb

@@ -1,3 +1,3 @@
 module AdministrationZero
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/generators/admin/install/templates/erb/admin/users/index.html.erb

@@ -31,7 +31,7 @@
                 <td>
                   <%= link_to "View", user, class: "btn btn-white btn-sm" %>
                   <%= link_to "Edit", edit_admin_user_path(user), class: "btn btn-white btn-sm" %>
-                  <%= button_to "Delete", user, method: :delete, "data-confirm": "Are you sure?", form_class: "d-inline", class: "btn btn-white btn-sm" %>
+                  <%= link_to "Delete", user, class: "btn btn-white btn-sm", data: { method: :delete, confirm: "Are you sure?" } %>
                 </td>
               </tr>
             <% end %>
@@ -41,10 +41,10 @@
       <div class="card-footer d-flex align-items-center fs-5">
         <div class="d-none d-md-block">
           <div>Download: <%= link_to "CSV", admin_users_path(format: :csv, q: request.params[:q]) %></div>
-          <%= raw pagy_info(@pagy) %>
+          <%== pagy_info(@pagy) %>
         </div>
         <div class="ms-auto">
-          <%= render "pagination", pagy: @pagy %>
+          <%== pagy_bootstrap_nav(@pagy) %>
         </div>
       </div>
     </div>

data/lib/generators/admin/install/templates/erb/admin/users/show.html.erb

@@ -6,7 +6,7 @@
 
   <%= render "page_header_actions" do %>
     <%= link_to "Edit user", edit_admin_user_path(@user), class: "btn btn-primary" %>
-    <%= button_to "Delete user", @user, method: :delete, "data-confirm": "Are you sure?", form_class: "d-inline", class: "btn btn-white" %>
+    <%= link_to "Delete user", @user, class: "btn btn-white", data: { method: :delete, confirm: "Are you sure?" } %>
   <% end %>
 <% end %>
 

data/lib/generators/admin/install/templates/helpers/admin/application_helper.rb

@@ -1,3 +1,5 @@
+require "pagy/extras/bootstrap"
+
 module Admin::ApplicationHelper
   include Pagy::Frontend
 

data/lib/generators/admin/scaffold/templates/erb/index.html.erb.tt

@@ -39,7 +39,7 @@
                 <td>
                   <%%= link_to "View", <%= model_resource_name %>, class: "btn btn-white btn-sm" %>
                   <%%= link_to "Edit", <%= edit_helper(singular_table_name, type: :path) %>, class: "btn btn-white btn-sm" %>
-                  <%%= button_to "Delete", <%= model_resource_name %>, method: :delete, "data-confirm": "Are you sure?", form_class: "d-inline", class: "btn btn-white btn-sm" %>
+                  <%%= link_to "Delete", <%= model_resource_name %>, class: "btn btn-white btn-sm", data: { method: :delete, confirm: "Are you sure?" } %>
                 </td>
               </tr>
             <%% end %>
@@ -49,10 +49,10 @@
       <div class="card-footer d-flex align-items-center fs-5">
         <div class="d-none d-md-block">
           <div>Download: <%%= link_to "CSV", url_for(format: :csv, q: request.params[:q]) %></div>
-          <%%= raw pagy_info(@pagy) %>
+          <%%== pagy_info(@pagy) %>
         </div>
         <div class="ms-auto">
-          <%%= render "pagination", pagy: @pagy %>
+          <%%== pagy_bootstrap_nav(@pagy) %>
         </div>
       </div>
     </div>

data/lib/generators/admin/scaffold/templates/erb/show.html.erb.tt

@@ -6,7 +6,7 @@
 
   <%%= render "page_header_actions" do %>
     <%%= link_to "Edit <%= human_name.downcase %>", <%= edit_helper(type: :path) %>, class: "btn btn-primary" %>
-    <%%= button_to "Delete <%= human_name.downcase %>", <%= model_resource_name(prefix: "@") %>, method: :delete, "data-confirm": "Are you sure?", form_class: "d-inline", class: "btn btn-white" %>
+    <%%= link_to "Delete <%= human_name.downcase %>", <%= model_resource_name(prefix: "@") %>, class: "btn btn-white", data: { method: :delete, confirm: "Are you sure?" } %>
   <%% end %>
 <%% end %>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: administration-zero
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Nixon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-03 00:00:00.000000000 Z
+date: 2023-03-21 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -44,7 +44,6 @@ files:
 - lib/generators/admin/install/templates/erb/admin/base/_page_header.html.erb
 - lib/generators/admin/install/templates/erb/admin/base/_page_header_actions.html.erb
 - lib/generators/admin/install/templates/erb/admin/base/_page_header_breadcrumb.html.erb
-- lib/generators/admin/install/templates/erb/admin/base/_pagination.html.erb
 - lib/generators/admin/install/templates/erb/admin/base/_primary_navbar.html.erb
 - lib/generators/admin/install/templates/erb/admin/base/_secondary_navbar.html.erb
 - lib/generators/admin/install/templates/erb/admin/base/_stylesheet_link_tags.html.erb

data/lib/generators/admin/install/templates/erb/admin/base/_pagination.html.erb

@@ -1,24 +0,0 @@
-<%#
-  This template is i18n-ready: if you don't use i18n, then you can replace the pagy_t
-  calls with the actual strings ("&lsaquo; Prev", "Next &rsaquo;", "&hellip;").
-
-  The link variable is set to a proc that returns the link tag.
-  Usage: link.call( page_number [, text [, extra_attributes_string ]])
--%>
-<% link = pagy_link_proc(pagy, link_extra: 'class="page-link"') -%>
-<%#                            -%><nav aria-label="pager" class="pagy-bootstrap-nav d-inline-block" role="navigation">
-<%#                            -%>  <ul class="pagination m-0">
-<% if pagy.prev                -%>    <li class="page-item prev"><%== link.call(pagy.prev, pagy_t('pagy.nav.prev'), 'aria-label="previous"') %></li>
-<% else                        -%>    <li class="page-item prev disabled"><a href="#" class="page-link"><%== pagy_t('pagy.nav.prev') %></a></li>
-<% end                         -%>
-<% pagy.series.each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36] -%>
-<%   if    item.is_a?(Integer) -%>    <li class="page-item"><%== link.call(item) %></li>
-<%   elsif item.is_a?(String)  -%>    <li class="page-item active"><%== link.call(item) %></li>
-<%   elsif item == :gap        -%>    <li class="page-item disabled gap"><a href="#" class="page-link"><%== pagy_t('pagy.nav.gap') %></a></li>
-<%   end                       -%>
-<% end                         -%>
-<% if pagy.next                -%>    <li class="page-item next"><%== link.call(pagy.next, pagy_t('pagy.nav.next'), 'aria-label="next"') %></li>
-<% else                        -%>    <li class="page-item next disabled"><a href="#" class="page-link"><%== pagy_t('pagy.nav.next') %></a></li>
-<% end                         -%>
-<%#                            -%>  </ul>
-<%#                            -%></nav>