ndr_ui 5.0.0 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b932ab48f36e6593dfbcb4de77da6f3026262e4a63db157668b2888a2e59cf46
-  data.tar.gz: 0a817d12dfffdb8053b58006dcf0359bc14be594c8cbe4a15ff8c76ee9c69a92
+  metadata.gz: a2fe83273bc89d89c52221125280a72d2e21d8d1a6b5a08a60f705a822ee4892
+  data.tar.gz: a7582a30f48f0b3b448f90f462adb12d66163ebf1fbefd5ca619c039130109b2
 SHA512:
-  metadata.gz: 1caf182beb7757e40762e3ba5373fd823083ce53af7f632eb94cee88d257ee615d660c72034c4f2ea857f434262054c1d77658952ed60bafd61e6a51d8e93f02
-  data.tar.gz: baa4a91ace512e0dbe82c9468d37291c6eddd82387f7551594d678c4314b0e89ab2c99e561e9ab05d32316d5db19df8409ae25240ad00ca32eaeb201e5891a1a
+  metadata.gz: 297e03b359f052b0945aefa379ebc60cf34aff58862c8623d2be1cd7c4888ce1a5b2d2964de0457e970c23d25956c8aa6349cc7207a9eb2ca1b34c30970400a4
+  data.tar.gz: 459e1b57cc9573c494c72fef667e0c7efc5b02217fc6f4a4f605d56f3eaccc5a34d50393d3a19df10c6e86b6bfcf16fd96993748c816d437632224539495fae2

data/CHANGELOG.md

@@ -1,6 +1,20 @@
 ## [Unreleased]
 * no unreleased changes *
 
+## 5.0.2 / 2025-03-02
+### Fixed
+* add row class to horizontal form row (.form-group)
+* add `has-validation` class to input fields with addons
+
+## 5.0.1 / 2025-02-03
+### Fixed
+* fix cancel modal button
+* re-introdce `btn-default` style
+* fix `bootstrap_tab_nav_tag` helper method with required classes
+* allow more padding at the end for `bootstrap_list_badge_and_link_to`
+* fix offset class name in line with Bootstrap 5 upgrade
+* fix `bootstrap_alert_tag` style with close button option
+
 ## 5.0.0 / 2025-01-24
 ### Changed
 * Support Bootstrap to v5.3.3

data/app/assets/stylesheets/ndr_ui/index.scss

@@ -7,9 +7,9 @@ $bootstrap-icons-font-dir: ".";
 // Fieldsets don't behave properly with Bootstrap in Firefox
 // https://stackoverflow.com/questions/17408815/fieldset-resizes-wrong-appears-to-have-unremovable-min-width-min-content/17863685#17863685
 @-moz-document url-prefix() {
-    fieldset {
-        display: table-cell;
-    }
+  fieldset {
+    display: table-cell;
+  }
 }
 
 // for input fields with input-addons, remove background and border when the form is readonly. 
@@ -19,3 +19,25 @@ $bootstrap-icons-font-dir: ".";
     border:0;
   }
 }
+
+// UI fix for .input-group in readonly mode
+form .input-group {
+  // for input-addons in readonly mode, remove background and border
+  .form-control-plaintext + .input-group-text,
+  .input-group-text:has(+ .form-control-plaintext) {
+    background: none;
+    border:0;
+  }
+
+  // for readonly fields following or followed by input-addons, set auto width to display content in one line
+  .form-control-plaintext:has(+ .input-group-text),
+  .input-group-text + .form-control-plaintext {
+    width: auto;
+  }
+}
+
+// Bootstrap don't have btn-default anymore
+// however, we keep btn-default in codebase/helpers and set global default setting here.
+.btn-default {
+  @extend .btn-outline-secondary;
+}

data/app/builders/ndr_ui/bootstrap/input_group_addons.rb

@@ -18,7 +18,7 @@ module NdrUi
         div_content << text_field_without_inline_errors(method, options)
         div_content << @template.content_tag(:span, append, class: 'input-group-text') if append.present?
 
-        @template.content_tag(:div, @template.safe_join(div_content), class: 'input-group')
+        @template.content_tag(:div, @template.safe_join(div_content), class: 'input-group has-validation')
       end
     end
   end

data/app/helpers/ndr_ui/bootstrap/modal_helper.rb

@@ -218,7 +218,7 @@ module NdrUi
       end
 
       def bootstrap_modal_button(label)
-        button_tag(label, class: 'btn btn-default', 'data-bs-dismiss': 'modal')
+        button_tag(label, type: 'button', class: 'btn btn-default', 'data-bs-dismiss': 'modal')
       end
 
       private
@@ -227,8 +227,8 @@ module NdrUi
       def bootstrap_modal_classes(options)
         options = options.stringify_keys
 
-        classes = %w(modal-dialog)
-        classes << "modal-#{options['size']}" if MODAL_SIZES.include?(options['size'])
+        classes = %w[modal-dialog]
+        classes << "modal-#{options['size']}" if MODAL_SIZES.include?(options['size'].to_s)
         classes.join(' ')
       end
     end

data/app/helpers/ndr_ui/bootstrap_helper.rb

@@ -51,8 +51,8 @@ module NdrUi
     #   <%= bootstrap_alert_tag(:info) do %>
     #     Check it out!!
     #   <% end %>
-    #   # => <div class="alert alert-info"><button type="button" class="btn-close"
-    #   data-bs-dismiss="alert"></button>Check it out!!</div>
+    #   # => <div class="alert alert-info">Check it out!!
+    #        <button type="button" class="btn-close" data-bs-dismiss="alert"></button></div>
     #
     # Ids for css and/or javascript are easy to produce:
     #
@@ -79,7 +79,7 @@ module NdrUi
         options['class'] = classes.join(' ')
 
         if options.delete('dismissible')
-          message = button_tag('', type: 'button', class: 'btn-close', 'data-bs-dismiss': 'alert') + message
+          message = message.html_safe + button_tag('', type: 'button', class: 'btn-close', 'data-bs-dismiss': 'alert')
         end
         content_tag(:div, message, options)
       end
@@ -203,16 +203,18 @@ module NdrUi
     # ==== Examples
     #
     #   <%= bootstrap_tab_nav_tag("Fruits", "#fruits", true) %>
-    #   # => <li class="active"><a href="#fruits" data-bs-toggle="tab">Fruits</a></li>
+    #   # => <li class="nav-item"><a class="nav-link active" href="#fruits" data-bs-toggle="tab">Fruits</a></li>
     def bootstrap_tab_nav_tag(title, linkto, active = false)
       content_tag('li',
-                  link_to(title, linkto, 'data-bs-toggle': 'tab'),
-                  active ? { class: 'active' } : {})
+                  link_to(title, linkto, 'data-bs-toggle': 'tab', class: "nav-link#{active ? ' active' : ''}"),
+                  class: 'nav-item')
     end
 
     # Convenience wrapper for a bootstrap_list_link_to with badge
     def bootstrap_list_badge_and_link_to(type, count, name, path)
-      html = content_tag(:div, bootstrap_badge_tag(type, count), class: 'float-end') + name
+      html = content_tag(:div, bootstrap_badge_tag(type, count), class: 'float-end') +
+             content_tag(:div, name, class: 'pe-5')
+
       bootstrap_list_link_to(html, path)
     end
 
@@ -306,7 +308,7 @@ module NdrUi
     #   <%= button_control_group("Apples", class: "some_class") %>
     #   # =>
     #   <div class="form-group">
-    #     <div class="col-sm-9 col-sm-offset-3">
+    #     <div class="col-sm-9 offset-sm-3">
     #       <div class="some_class">Apples</div>
     #     </div>
     #   </div>
@@ -379,21 +381,21 @@ module NdrUi
     # ==== Examples
     #   bootstrap_horizontal_form_group("The Label", [3, 9]) { 'This is the content' }
     #   # =>
-    #     <div class="form-group">
+    #     <div class="form-group row">
     #       <label class="col-sm-3 col-form-label">The Label</label>
     #       <div class="col-sm-9">This is the content</div>
     #     </div>
     #
     def bootstrap_horizontal_form_group(label = nil, ratio = [2, 10], &block)
       l, r   = ratio[0..1].map(&:to_i)
-      offset = label.nil? ? " col-sm-offset-#{l}" : ''
+      offset = label.nil? ? " offset-sm-#{l}" : ''
 
       # Main content:
       content = content_tag(:div, class: "col-sm-#{r}" + offset, &block)
       # Prepend optional label:
       content = content_tag(:label, label, class: "col-sm-#{l} col-form-label") + content unless label.nil?
 
-      content_tag(:div, content, class: 'form-group')
+      content_tag(:div, content, class: 'form-group row')
     end
 
     # This helper produces a pair of HTML dt, dd tags to display name and value pairs.

data/lib/ndr_ui/version.rb

@@ -2,5 +2,5 @@
 
 # This stores the current version of the NdrUi gem. Use semantic versioning http://semver.org
 module NdrUi
-  VERSION = '5.0.0'
+  VERSION = '5.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_ui
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.2
 platform: ruby
 authors:
 - NDR Development Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-24 00:00:00.000000000 Z
+date: 2025-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap