cm-admin 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86d2406a7cec46cd375fad274561e1545668f65124652803db2e533c48ba9721
-  data.tar.gz: 6a8aa052b4e7264822320a588a95f6aa5187c548383de450a4d287299b818601
+  metadata.gz: f2b9f1cf37a3437b3fd5d0c759579d58899c58454294fed88a21bd77c33ff5c1
+  data.tar.gz: 12430d2c8fbee0722d022c7c93a48ade59fc12ea05a2e298e8dfda7c8a29275d
 SHA512:
-  metadata.gz: 79dca0f6279868346d75204aff4fa4188778530b2443f87623f0855737b9008032b4661ca82b40c857c29224a084e243d6571c5cbcdfbde84b59ead69f855df6
-  data.tar.gz: 0d5f9f625e5536bed4590f1ec4957bc3b9e4e028beca1be33138972755744b5c6e0f109c295e32f7cd8adfcde18b297968b9b922a5503410a19b42528ba842e9
+  metadata.gz: b3585639e36e464ee71b24ad6a9b67ab3c247563df9cd02671bc0e6e8cd79fc792e87622b7137b38e6c99cd2530dbe04c370637e58443b5b544cac1acf2d54f5
+  data.tar.gz: 3a60816b1cc72c53d25290bb338b85b3a7580223bca9137c27678a7da8f95f839e277c0e5dd2f5328415fa73d0029a0090b7b62ed79c5dd0d4959aff28f343cc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-admin (1.2.1)
+    cm-admin (1.2.2)
       caxlsx_rails
       cocoon (~> 1.2.15)
       csv-importer (~> 0.8.2)

data/app/views/cm_admin/main/_top_navbar.html.slim

@@ -32,9 +32,12 @@
       - edit_action = @model.available_actions.select{|act| act if act.action_type.eql?(:default) && act.name.eql?('edit')}
       - destroy_action = available_actions(@model, 'destroy')
       - if edit_action.any? && policy([:cm_admin, @model.name.classify.constantize]).edit?
-        = link_to "Edit #{@model.name.titleize.pluralize}", cm_admin.send(:"#{@model.name.underscore}_edit_path", @ar_object), class: 'btn-primary ms-2'
+        = link_to cm_admin.send(:"#{@model.name.underscore}_edit_path", @ar_object), class: 'btn-primary ms-2' do
+          span
+            i.fa.fa-edit
+          | Edit
       - if destroy_action
-        = link_to '', data: { bs_toggle: 'modal', bs_target: "##{@model.name.classify}DestroyModal-#{@ar_object.id.to_s}" }, class: 'btn-primary ms-2' do
+        = link_to '', data: { bs_toggle: 'modal', bs_target: "##{@model.name.classify}DestroyModal-#{@ar_object.id.to_s}" }, class: 'btn-danger ms-2' do
           span
-            i.fa.fa-trash
-          | Destroy
+            i.fa-regular.fa-trash-can
+          | Delete

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

data/lib/cm_admin/view_helpers/filter_helper.rb

@@ -86,7 +86,7 @@ module CmAdmin
       end
 
       def add_search_filter(filter)
-        tag.div class: 'filter-search mr-3' do
+        tag.div class: 'filter-search me-3' do
           concat(content_tag(:div, class: 'input-group input-group-sm') do
             concat(content_tag(:span, class: 'input-group-text') do
               tag.i class: 'fa fa-search'
@@ -98,7 +98,7 @@ module CmAdmin
 
       def add_range_filter(filter)
         value = params.dig(:filters, :range, :"#{filter.db_column_name}")
-        concat(content_tag(:div, class: "position-relative mr-3 #{value ? '' : 'hidden'}") do
+        concat(content_tag(:div, class: "position-relative me-3 #{value ? '' : 'hidden'}") do
           concat filter_chip(value, filter)
 
           concat(content_tag(:div, class: 'position-absolute mt-2 range-container hidden') do
@@ -111,7 +111,7 @@ module CmAdmin
 
       def add_date_filter(filter)
         value = params.dig(:filters, :date, :"#{filter.db_column_name}")
-        concat(content_tag(:div, class: "position-relative mr-3 #{value ? '' : 'hidden'}") do
+        concat(content_tag(:div, class: "position-relative me-3 #{value ? '' : 'hidden'}") do
           concat filter_chip(value, filter)
 
           concat(content_tag(:div, class: 'date-filter-wrapper w-100') do
@@ -123,7 +123,7 @@ module CmAdmin
 
       def add_single_select_filter(filter)
         value = params.dig(:filters, :"#{filter.filter_type}", :"#{filter.db_column_name}")
-        concat(content_tag(:div, class: "position-relative mr-3 #{value ? '' : 'hidden'}") do
+        concat(content_tag(:div, class: "position-relative me-3 #{value ? '' : 'hidden'}") do
           if value && filter.collection[0].class == Array
             selected_value_text = filter.collection.map{|collection| collection[0] if collection[1].to_s.eql?(value) }.compact.join(', ')
           else
@@ -168,7 +168,7 @@ module CmAdmin
           value_mapped_text = value
         end
 
-        concat(content_tag(:div, class: "position-relative mr-3 #{value ? '' : 'hidden'}") do
+        concat(content_tag(:div, class: "position-relative me-3 #{value ? '' : 'hidden'}") do
           concat filter_chip(value_mapped_text, filter)
 
           concat(content_tag(:div, class: 'position-absolute mt-2 dropdown-popup hidden') do

data/lib/cm_admin/view_helpers/page_info_helper.rb

@@ -71,7 +71,12 @@ module CmAdmin
       end
 
       def custom_modal_button(custom_action)
-        link_to custom_action_title(custom_action), '', class: 'btn-secondary ms-2', data: { bs_toggle: "modal", bs_target: "##{custom_action.name.classify}Modal-#{@ar_object.id}" }
+        link_to '', class: 'btn-secondary ms-2', data: { bs_toggle: "modal", bs_target: "##{custom_action.name.classify}Modal-#{@ar_object.id}" } do
+          concat(content_tag(:span) do
+            tag.i class: custom_action.icon_name
+          end)
+          concat content_tag(:span, custom_action_title(custom_action))
+        end
       end
 
       def custom_action_title(custom_action)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - sajinmp
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-25 00:00:00.000000000 Z
+date: 2023-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails