web47core 3.2.36 → 3.2.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51addb55203d5e9bca94ca014394dc522b41ef51c1dabb32e2b1fa294f1aa1b8
-  data.tar.gz: 341d01b151ce0c08ee6409c434a37f292dd424c8bcea2647f0434bf7e52cdb3f
+  metadata.gz: 36566c9389b2ee92272fe7432399a3d55029ed0bdaa52ffcd14c2db78aa2a031
+  data.tar.gz: 883b36a38dd85e4fa04b6204ee8d3da95a16ccdd4ee66faa34f6b93780786916
 SHA512:
-  metadata.gz: f3278e6e57ed98a3e54910cb10676844554e8e418397a991193342b09c5500a6bc6915cae2f11a5d616f4699ceeb18f35c0bbfba0400342a577cbb23d5dbd035
-  data.tar.gz: 73694c5acd82fbd7879289fe536be74cef0024073ae3f182333ec97323907dc0c040f44b1df16eea53c5908473cae84ada2cc10af6fc97b6a12ef76d2bfc1e49
+  metadata.gz: 8c6cb73735a771a00c40a7d305f7c8bfc6aa065bafa3ca92683e14c6decea87c7dbdf79a869d14c2e651737323661a323d2b0dd131b2434bebf6e886653a8abc
+  data.tar.gz: 3c022b643ec889afc646d67974825ccda35656e8a0ac5b5d929bf3845239a993cbe9832f51cf2c0bd259f6eb680cff6926c834ca680a756d1fd88da98c8f75cf

data/app/helpers/core_link_helper.rb

@@ -115,14 +115,6 @@ module CoreLinkHelper
     end
   end
 
-  def edit_modal_tag(obj, path, _options = {})
-    return unless can? :edit, obj
-
-    content_tag(:a, href: path, class: 'modal-action') do
-      concat(I18n.t('ui_form.actions.edit'))
-    end
-  end
-
   #
   # Restart a thingy
   #

data/app/helpers/model_modal_helper.rb

@@ -69,15 +69,20 @@ module ModelModalHelper
   end
 
   def model_modal_action(model, _options = {})
-    content_tag(:a, class: 'modal-trigger', href: "#modal-#{model.id}") do
+    content_tag(:a, data: { bs_toggle: :modal, bs_target: "#modal-#{model.id}" }) do
       concat(model.name)
     end
   end
 
   def model_modal(model, edit_path, options = {})
-    content_tag(:div, class: 'modal', id: "modal-#{model.id}") do
+    content_tag(:div, class: 'modal', id: "modal-#{model.id}", tabindex: -1) do
+      concat(model_modal_dialog(model, options))
+    end
+  end
+
+  def model_modal_dialog(model, edit_path, options = {})
+    content_tag(:div, class: 'modal-dialog', role: :document) do
       concat(model_modal_content(model, options))
-      concat(model_modal_footer(model, edit_path))
     end
   end
 
@@ -87,27 +92,47 @@ module ModelModalHelper
 
   def model_modal_content(model, options = {})
     content_tag(:div, class: 'modal-content') do
+      concat(model_modal_header(model, edit_path, options))
+      concat(model_modal_body(model, edit_path, options))
+      concat(model_modal_footer(model, edit_path))
+    end
+  end
+
+  def model_modal_header(model, edit_path, options = {})
+    content_tag(:div, class: 'modal-header') do
       concat(content_tag(:h2) { model.name })
-      concat(content_tag(:div, class: 'row') do
-        concat(model_modal_tabs(model, options))
-        concat(model_modal_fields_tab(model, options))
-        concat(model_modal_standard_tab(model, options))
-        concat(model_modal_logs_tab(model, options)) if model.respond_to?(:logs) && options[:show_audit_logs]
-      end)
+      concat(tag(:button, class: 'btn-close', data: { bs_dismiss: :modal }, aria_label: :close))
     end
   end
 
+  def model_modal_body(model, edit_path, options = {})
+    concat(content_tag(:div, class: 'model-body') do
+      concat(model_modal_tabs(model, options))
+      concat(model_modal_tab_content(model, options))
+    end)
+  end
+
   def model_modal_tabs(model, _options = {})
-    content_tag(:div, class: 'col s12') do
-      concat(content_tag(:ul, class: 'tabs tabs-fixed-width') do
-        concat(content_tag(:li, class: 'tab') do
-          content_tag(:a, href: "#field-tab-#{model.id}") { model.class.to_s.titleize }
-        end)
-        concat(content_tag(:li, class: 'tab') { content_tag(:a, href: "#standard-tab-#{model.id}") { 'Details' } })
-        if model.respond_to?(:logs)
-          concat(content_tag(:li, class: 'tab') { content_tag(:a, href: "#logs-tab-#{model.id}") { 'Logs' } })
-        end
+    content_tag(:ul, class: 'nav nav-tabs', data: { bs_toggle: :tabs }) do
+      concat(content_tag(:li, class: 'nav-item') do
+        content_tag(:a, class: 'nav-link', href: "#field-tab-#{model.id}", data: { bs_toggle: :tab }) { model.class.to_s.titleize }
       end)
+      concat(content_tag(:li, class: 'nav-item') do
+        content_tag(:a, class: 'nav-link', href: "#standard-tab-#{model.id}", data: { bs_toggle: :tab }) { 'Details' }
+      end)
+      if model.respond_to?(:logs)
+        concat(content_tag(:li, class: 'nav-item') do
+          content_tag(:a, class: 'nav-item', href: "#logs-tab-#{model.id}", data: { bs_toggler: :tab }) { 'Logs' }
+        end)
+      end
+    end
+  end
+
+  def model_modal_tab_content(model, options = {})
+    content_tag(:div, class: 'tab-content') do
+      concat(model_modal_fields_tab(model, options))
+      concat(model_modal_standard_tab(model, options))
+      # concat(model_modal_logs_tab(model, options)) if model.respond_to?(:logs) && options[:show_audit_logs]
     end
   end
 
@@ -118,7 +143,7 @@ module ModelModalHelper
   end
 
   def model_modal_fields_tab(model, options = {})
-    content_tag(:div, id: "field-tab-#{model.id}", class: 'col s12') do
+    content_tag(:div, id: "field-tab-#{model.id}", class: 'tab-pane active') do
       concat(model_modal_fields(model, options))
     end
   end
@@ -150,33 +175,28 @@ module ModelModalHelper
   end
 
   def model_modal_fields(model, _options = {})
-    content_tag(:table, class: 'center-align') do
-      concat(content_tag(:tbody) do
-        model.class.allowed_param_names.sort.each do |field_name|
-          concat(model_modal_field(model, field_name))
-        end
-      end)
+    content_tag(:div, class: '.datagrid') do
+      model.class.allowed_param_names.sort.each do |field_name|
+        next if %w[_id _type created_at updated_at search_text sort_text].include?(field_name)
+        next if model.respond_to?(field_name) && model.send(field_name).blank?
+
+        concat(model_modal_field(model, field_name))
+      end
     end
   end
 
   def model_modal_standard(model, _options = {})
-    content_tag(:table, class: 'center-align highlight') do
-      concat(content_tag(:tbody) do
-        %w[_id _type created_at updated_at search_text sort_text].each do |field_name|
-          concat(model_modal_field(model, field_name))
-        end
-      end)
+    content_tag(:div, class: '.datagrid') do
+      %w[_id _type created_at updated_at search_text sort_text].each do |field_name|
+        concat(model_modal_field(model, field_name))
+      end
     end
   end
 
   def model_modal_field(model, field_name)
-    content_tag(:tr) do
-      concat(content_tag(:th, class: 'right-align') do
-        field_name
-      end)
-      concat(content_tag(:td) do
-        model_modal_field_value(model, field_name)
-      end)
+    content_tag(:div, class: 'datagrid-item') do
+      concat(content_tag(:div, class: 'datagrid-title') { field_name })
+      concat(content_tag(:div, class: 'datagrid-content') { model_modal_field_value(model, field_name) })
     end
   end
 
@@ -207,7 +227,20 @@ module ModelModalHelper
 
   def model_modal_footer(model, edit_path)
     content_tag(:div, class: 'modal-footer') do
+      concat(content_tag(:button, class: 'btn me-auto', data: { bs_dismiss: :modal }) do
+        concat(I18n.t('ui_form.actions.close'))
+        concat(svg_icon(:close))
+      end)
       concat(edit_modal_tag(model, edit_path))
     end
   end
+
+  def edit_modal_tag(obj, path, _options = {})
+    return unless can? :edit, obj
+
+    content_tag(:a, href: path, class: 'modal-action') do
+      concat(I18n.t('ui_form.actions.edit'))
+      concat(svg_icon(:edit))
+    end
+  end
 end

data/app/helpers/svg_icon_helper.rb

@@ -2,8 +2,12 @@
 module SvgIconHelper
   # @abstract Render the appropriate icon based on the name and type
   # @return [View]
-  def svg_icon(name, size: 24, type: :outline, classes: [], color: 'currentColor')
-    classes = ['icon', classes].compact.flatten.join(' ')
+  def svg_icon(name, size: 24, type: :outline, classes: [], color: 'currentColor', stroke_width: 2)
+    classes = if size <= 24
+                ['icon', classes].compact.flatten.join(' ')
+              else
+                classes.compact.flatten.join(' ')
+              end
     key = "icon_partial_path:#{name}:#{type}"
     (partial, stroke) = Rails.cache.fetch(key, expires_in: 1.hour) do
       path_with_type = "icons/#{name}-#{type}"
@@ -27,12 +31,12 @@ module SvgIconHelper
             class: classes,
             fill: 'none',
             stroke: stroke,
-            stroke_width: 1,
+            stroke_width: stroke_width,
             stroke_linecap: 'round',
             stroke_linejoin: 'round') do
       render partial
     end
-  rescue StandardError 
+  rescue StandardError
     tag.svg(xmlns: "http://www.w3.org/2000/svg",
             viewBox: "0 0 24 24",
             width: size,
@@ -40,7 +44,7 @@ module SvgIconHelper
             class: classes,
             fill: 'none',
             stroke: 'red',
-            stroke_width: 1,
+            stroke_width: stroke_width,
             stroke_linecap: 'round',
             stroke_linejoin: 'round',
             data: { bs_toggle: :tooltip },

data/config/locales/en.yml

@@ -22,6 +22,7 @@ en:
       axlsx: '%Y-%m-%d'
   ui_form:
     actions:
+      close: Close
       reset: Reset
       cancel: Cancel
       update: Update

data/lib/web47core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Web47core
-  VERSION = '3.2.36'
+  VERSION = '3.2.38'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 3.2.36
+  version: 3.2.38
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-06 00:00:00.000000000 Z
+date: 2025-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel