cm-admin 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccdee9067f16c0163a29773911a644dc8aa6db619a424941d249c772baaa965e
-  data.tar.gz: 928bdb9b4043d03a99873bd436d54be57ff55b3bd9b728e1b016fcdfe184e02d
+  metadata.gz: edc4e96d677eaa2324f074cf028cf3defc717a49a64a64331e65d18c2b55ecce
+  data.tar.gz: d3cb35655e16e1c36ebb221be9782d6720f556ed0dba3acff74afdf45981f61d
 SHA512:
-  metadata.gz: 669c963c009987392eed2454e7168368b939e4ed76b9e47692e3b53221035fab221bf2ec1c743e2434d26a3e1d80323e81c7771098c5d538a7e923bff5162161
-  data.tar.gz: 11d176b610d4ee0992cb0bb6dbbe02838ea9ee8fda42c35e85b133b734dbdd2a2a6792b2cde710d3aed73dd79fc29392bb09787a44109481a275838a190bbfa5
+  metadata.gz: '0686244e80d49a67a4caaa628c1dd05b6f09917fe6a74edd7707607f86d6e41325d7ba0da9d637080a8e0a616856f90d2f4d191a436a6a0fe724b1e94eeae674'
+  data.tar.gz: 0fd14c5144600550b7cde3644c1f44e30f3aaa3c3099feb849784d8673cb1eac9dfa88a7257a42bad27b1f943bee1fc27ce44ba6c7ec488c50bdf0d914d2a3d1

data/Gemfile.lock

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

data/app/assets/stylesheets/cm_admin/base/form.scss

@@ -9,14 +9,10 @@
 .form-page {
   background-color: $white;
   &__header {
-    @extend .position-sticky, .top-0, .bg-white;
+    @extend .top-0, .bg-white;
     z-index: 5;
   }
-  &__body {
-    padding: 24px;
-  }
   .form-container {
-    margin-bottom: 24px;
     .form-title {
       @extend .h6, .fw-semibold;
       color: $primary-text-clr;
@@ -33,6 +29,17 @@
       }
     }
   }
+
+  .form-section-container {
+    @extend .p-4;
+    margin-bottom: 64px;
+  }
+
+  .form-submit-button-container {
+    @extend .position-absolute, .bottom-0, .bg-white, .py-3, .px-4, .w-100;
+    border-top: 1px solid $gray-300;
+    z-index: 5;
+  }
 }
 
 //form field styles
@@ -151,4 +158,3 @@
     gap: 8px;
   }
 }
-

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

@@ -4,16 +4,14 @@
       .breadcrumb
         = link_to "#{@model.model_name.titleize.pluralize} /", cm_admin.send(:"cm_index_#{@model.name.underscore}_path"), class: 'text-reset'
     h4 = action_title
-    / - if @model.current_action.page_description
-    /   p.mb-0.text-body-secondary = @model.current_action.page_description
   .entity-header__actions
     - if @model.current_action.name == 'index'
       - if has_valid_policy(@ar_object, :exportable)
         .export-container
           .dropdown
             button.btn-secondary.dropdown-toggle data-bs-toggle='dropdown'
-                i.fa.fa-arrow-down
-                | Export
+              i.fa.fa-arrow-down
+              | Export
             ul.dropdown-menu.export-popup
               li
                 .popup-option.pointer data-bs-toggle='modal' data-bs-target='#exportmodal'

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '3.0.5'
+  VERSION = '3.0.6'
 end

data/lib/cm_admin/view_helpers/form_helper.rb

@@ -40,7 +40,7 @@ module CmAdmin
       end
 
       def split_form_into_section(resource, form_obj, entities)
-        content_tag :div do
+        content_tag :div, class: 'form-section-container' do
           entities.each do |entity|
             if entity.class == CmAdmin::Models::Row
               concat create_rows(resource, form_obj, entity)
@@ -187,13 +187,14 @@ module CmAdmin
           end
 
           concat split_form_into_section(resource, form_obj, entities)
-          concat tag.br
-          concat form_obj.submit 'Save', class: 'btn-cta', data: { behaviour: 'form_submit', form_class: "cm_#{form_obj.object.class.name.downcase}_form", turbo_submits_with: 'Submitting...' }
-          concat (button_tag(type: 'button', class: 'btn-loading visually-hidden', data: { behaviour: 'form_submit_spinner' }) do
-            concat content_tag(:span, '', class: 'spinner-border spinner-border-sm', role: 'status')
-            concat ' Submitting...'
+          concat(content_tag(:div, class: 'form-submit-button-container') do
+            concat form_obj.submit 'Save', class: 'btn-cta', data: { behaviour: 'form_submit', form_class: "cm_#{form_obj.object.class.name.downcase}_form", turbo_submits_with: 'Submitting...' }
+            concat(button_tag(type: 'button', class: 'btn-loading visually-hidden', data: { behaviour: 'form_submit_spinner' }) do
+              concat content_tag(:span, '', class: 'spinner-border spinner-border-sm', role: 'status')
+              concat ' Submitting...'
+            end)
+            concat button_tag 'Discard', class: 'btn-secondary discard-form', data: { behaviour: 'discard_form' } unless @is_drawer_form
           end)
-          concat button_tag 'Discard', class: 'btn-secondary discard-form', data: { behaviour: 'discard_form' } unless @is_drawer_form
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
 platform: ruby
 authors:
 - Michael
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-28 00:00:00.000000000 Z
+date: 2024-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails