card-mod-bootstrap 0.16.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65c3edd6e18e607b53c39c1a815386fb26af21c2d628dd93dd8b870742610525
-  data.tar.gz: 503036793a7ba7e553f34682bc522713f9c440fe01a9abde020c0d2889aebb85
+  metadata.gz: 78ca197a8d574b5edc4af65d19a6856010a88ab9f3c1e53c5685c5025f02cd80
+  data.tar.gz: 618f483444d3af1e8f231ef2d6da8f80490bcbe014a6f476c71102faad993367
 SHA512:
-  metadata.gz: b738342bfbb3a06fe1ec7296a0412dbc5882e0281fee6013e016a2cd370010fd66b34243c2ac28cb06f66c3db65198ccf721b2d44d35f5fa94aa7a9182656b02
-  data.tar.gz: d93b189158a69ebebd467716eea64eda38209f75fe599b42e5e4a2ce94b860afd5d1b8ff30a084d60eb6fae120716f288fda2c6a192b29bd1fbfe78ac5d4d4fd
+  metadata.gz: 2806022fa05cab04f58f07cc8e363b6c897fa8657a28778681a08b1519a21a2c87677317adf6cb66c3a85881da6991ea3277231967ac4d9bf28675ba79a155ed
+  data.tar.gz: 77ab703b2e9049d72a1dc7580102e6e86d92ce85b79a1d5c06bb3710d6c35dbbef89b8ee2347e1a2e137bca73a89892c3201b5c0ab4bf694f4c992933a9441a9

data/assets/script/script_load_select2.js.coffee

@@ -13,25 +13,9 @@ $.extend decko,
     if elem.length == 0
       return
     else if elem.length > 1
-      decko.initSelect2($(single_el)) for single_el in elem
+      initSingleSelect2($(single_el)) for single_el in elem
     else
-      opts = {
-        dropdownAutoWidth: "true",
-        # containerCssClass: ":all:",
-        width: "auto",
-        dropdownParent: elem.parent()
-      }
-
-      elem.attr "id", decko.uniqSelect2Id(elem.attr("id"))
-
-      if elem.hasClass("tags")
-        opts.tags = "true"
-      if elem.data("placeholder")
-        opts.placeholder = elem.data("placeholder")
-      if elem.data("minimum-results-for-search")?
-        opts.minimumResultsForSearch = elem.data("minimum-results-for-search")
-
-      elem.select2(opts)
+      initSingleSelect2 elem
 
   uniqSelect2Id: (id) ->
     return id unless $("[data-select2-id=" + id + "]").length > 0
@@ -64,3 +48,39 @@ $.fn.extend
     @select2 "destroy"
     @removeAttr "data-select2-id"
     @find("option").removeAttr "data-select2-id"
+
+
+initSingleSelect2 = (elem) ->
+  opts = {
+    dropdownAutoWidth: "true",
+    # containerCssClass: ":all:",
+    width: "auto",
+    dropdownParent: elem.parent()
+  }
+
+  elem.attr "id", decko.uniqSelect2Id(elem.attr("id"))
+
+  if elem.hasClass("tags")
+    opts.tags = "true"
+  if elem.data("placeholder")
+    opts.placeholder = elem.data("placeholder")
+  if elem.data("minimum-results-for-search")?
+    opts.minimumResultsForSearch = elem.data("minimum-results-for-search")
+  if elem.data("options-card")
+    opts.ajax =
+      delay: 200
+      cache: true
+      url: decko.path elem.data("options-card")
+      processResults: (data) -> results: data
+      data: (params) ->
+        term: params.term
+        format: "json"
+        view: elem.data("options-view") || "name_match"
+        slot: { items: { view: elem.data("options-item-view") || "select2_option" } }
+    opts.templateResult = (data) ->
+      if data.html
+        $(data.html)
+      else
+        data.text
+
+  elem.select2(opts)

data/assets/style/decko_bootstrap.scss

@@ -16,3 +16,7 @@
 .dropdown-menu {
   z-index: 1005;
 }
+
+.select2-dropdown a {
+  text-decoration: none !important;
+}

data/config/admin.yml

@@ -0,0 +1,5 @@
+cardtypes:
+  styling:
+    - bootswatch_skin
+views:
+  - carousel

data/data/files/mod_bootstrap_script_asset_output/file.js

@@ -12,7 +12,7 @@ const i=this._directionToOrder(t),n=Ce.findOne(ai,this._element),s=this._getItem
 // decko_popover.js.coffee
 (function(){$(window).ready(function(){return $("body").on("show.bs.popover","._card-menu-popover",function(){return $(this).closest(".card-menu._show-on-hover").removeClass("_show-on-hover").addClass("_show-on-hover-disabled")}),$("body").on("hide.bs.popover","._card-menu-popover",function(){return $(this).closest(".card-menu._show-on-hover-disabled").removeClass("_show-on-hover-disabled").addClass("_show-on-hover")})}),decko.slot.ready(function(o){return o.find('[data-tooltip="true"]').tooltip(),o.find('[data-bs-toggle="popover"]').popover({html:!0})})}).call(this);
 // script_load_select2.js.coffee
-(function(){$.fn.select2.defaults.set("theme","bootstrap-5"),decko.slot.ready(function(e){return e.find("select:not(._no-select2):not(._no-select2-init)").each(function(){return decko.initSelect2($(this))})}),decko.slot.destroy(function(e){return e.find("select:not(._no-select2)").each(function(){return $(this).deInitSelect2()})}),$.extend(decko,{initSelect2:function(e){var t,n,i,c,o;if(0!==e.length){if(e.length>1){for(c=[],t=0,n=e.length;t<n;t++)o=e[t],c.push(decko.initSelect2($(o)));return c}return i={dropdownAutoWidth:"true",width:"auto",dropdownParent:e.parent()},e.attr("id",decko.uniqSelect2Id(e.attr("id"))),e.hasClass("tags")&&(i.tags="true"),e.data("placeholder")&&(i.placeholder=e.data("placeholder")),null!=e.data("minimum-results-for-search")&&(i.minimumResultsForSearch=e.data("minimum-results-for-search")),e.select2(i)}},uniqSelect2Id:function(e){return $("[data-select2-id="+e+"]").length>0?decko.uniqSelect2Id(e+"1"):e}}),$(window).ready(function(){return $("body").on("select2:select","._go-to-selected",function(){var e;if(""!==(e=$(this).val()))return window.location=decko.path(escape(e))}),$("body").on("select2:select","._submit-on-select",function(e){return $(e.target).closest("form").submit()})}),$.fn.extend({cloneSelect2:function(e,t){var n,i;return(i=this.is("select")?this:this.find("select")).deInitSelect2(),n=this.clone(e,t),decko.initSelect2(i),n.is("select")?decko.initSelect2(n):decko.initSelect2(n.find("select")),n},deInitSelect2:function(){if(this.attr("data-select2-id"))return this.select2("destroy"),this.removeAttr("data-select2-id"),this.find("option").removeAttr("data-select2-id")}})}).call(this);
+(function(){var t;$.fn.select2.defaults.set("theme","bootstrap-5"),decko.slot.ready(function(t){return t.find("select:not(._no-select2):not(._no-select2-init)").each(function(){return decko.initSelect2($(this))})}),decko.slot.destroy(function(t){return t.find("select:not(._no-select2)").each(function(){return $(this).deInitSelect2()})}),$.extend(decko,{initSelect2:function(e){var n,i,o,c;if(0!==e.length){if(e.length>1){for(o=[],n=0,i=e.length;n<i;n++)c=e[n],o.push(t($(c)));return o}return t(e)}},uniqSelect2Id:function(t){return $("[data-select2-id="+t+"]").length>0?decko.uniqSelect2Id(t+"1"):t}}),$(window).ready(function(){return $("body").on("select2:select","._go-to-selected",function(){var t;if(""!==(t=$(this).val()))return window.location=decko.path(escape(t))}),$("body").on("select2:select","._submit-on-select",function(t){return $(t.target).closest("form").submit()})}),$.fn.extend({cloneSelect2:function(t,e){var n,i;return(i=this.is("select")?this:this.find("select")).deInitSelect2(),n=this.clone(t,e),decko.initSelect2(i),n.is("select")?decko.initSelect2(n):decko.initSelect2(n.find("select")),n},deInitSelect2:function(){if(this.attr("data-select2-id"))return this.select2("destroy"),this.removeAttr("data-select2-id"),this.find("option").removeAttr("data-select2-id")}}),t=function(t){var e;return e={dropdownAutoWidth:"true",width:"auto",dropdownParent:t.parent()},t.attr("id",decko.uniqSelect2Id(t.attr("id"))),t.hasClass("tags")&&(e.tags="true"),t.data("placeholder")&&(e.placeholder=t.data("placeholder")),null!=t.data("minimum-results-for-search")&&(e.minimumResultsForSearch=t.data("minimum-results-for-search")),t.data("options-card")&&(e.ajax={delay:200,cache:!0,url:decko.path(t.data("options-card")),processResults:function(t){return{results:t}},data:function(e){return{term:e.term,format:"json",view:t.data("options-view")||"name_match",slot:{items:{view:t.data("options-item-view")||"select2_option"}}}}},e.templateResult=function(t){return t.html?$(t.html):t.text}),t.select2(e)}}).call(this);
 // bootstrap-colorpicker.min.js
 /*!
  * Bootstrap Colorpicker v2.5.2

data/data/transform/20171110164934_customizable_skin.rb

@@ -20,7 +20,7 @@ class CustomizableSkin < Cardio::Migration::Transform
     end
 
     def create_or_update
-      Card.exists?(@skin_name) ? update_skin : create_skin
+      Card.exist?(@skin_name) ? update_skin : create_skin
     end
 
     private

data/data/transform/20220514141025_remove_customized_bootswatch_skins.rb

@@ -9,7 +9,7 @@ class RemoveCustomizedBootswatchSkins < Cardio::Migration::Transform
   end
 
   def convert_bootswatch_skins
-    Card.search(type_id: ::Card::CustomizedBootswatchSkinID) do |card|
+    Card.search(type: :customized_bootswatch_skin) do |card|
       update_args = { type_id: Card::BootswatchSkinID, skip: :asset_input_changed }
       parent = find_parent(card.name)
       if parent && parent.id != card.id

data/data/transform/lib/skin.rb

@@ -33,7 +33,7 @@ class Skin
   end
 
   def create_or_update
-    Card.exists?(@skin_name) ? update_skin : create_skin
+    Card.exist?(@skin_name) ? update_skin : create_skin
   end
 
   def create_skin

data/lib/card/bootstrap/component/carousel.rb

@@ -12,7 +12,7 @@ class Card
           @items = []
           instance_exec(&block)
 
-          @html.div class: "carousel slide", id: id, "data-ride" => "carousel" do
+          @html.div class: "carousel slide", id: id, "data-bs-ride" => "true" do
             indicators
             items
             control_prev
@@ -25,7 +25,7 @@ class Card
         end
 
         def items
-          @html.div class: "carousel-inner", role: "listbox" do
+          @html.div class: "carousel-inner" do
             @items.each_with_index do |item, index|
               carousel_item item, carousel_item_opts(index)
             end
@@ -46,31 +46,35 @@ class Card
         end
 
         def control_prev
-          @html.a class: "carousel-control-prev", href: "##{@id}", role: "button",
-                  "data-slide" => "prev" do
-            @html.span class: "carousel-control-prev-icon", "aria-hidden" => "true"
-            @html.span "Previous", class: "sr-only"
-          end
+          control_button :prev, "Previous"
         end
 
         def control_next
-          @html.a class: "carousel-control-next", href: "##{@id}", role: "button",
-                  "data-slide": "next"  do
-            @html.span class: "carousel-control-next-icon", "aria-hidden" => "true"
-            @html.span "Next", class: "sr-only"
+          control_button :next, "Next"
+        end
+
+        def control_button direction, description
+          @html.button class: "carousel-control-#{direction}",
+                       "data-bs-target": "##{@id}", type: "button" do
+            @html.span class: "carousel-control-#{direction}-icon",
+                       "aria-hidden": "true" do
+              ""
+            end
+            @html.span description, class: "visually-hidden"
           end
         end
 
         def indicators
-          @html.ol class: "carousel-indicators" do
+          @html.div class: "carousel-indicators" do
             @items.size.times { |i| indicator i }
           end
         end
 
         def indicator index
-          html_opts = { "data-slide-to" => index, "data-bs-target": "##{@id}" }
+          html_opts = { "data-bs-slide-to": index, "data-bs-target": "##{@id}",
+                        type: "button", "aria-label": "Slide #{index + 1}" }
           add_class html_opts, "active" if index == @active_item_index
-          @html.li html_opts
+          @html.button html_opts
         end
       end
     end

data/set/abstract/bs_badge/labeled_badge.haml

@@ -1,4 +1,4 @@
-%span.labeled-badge{ class: klass, title: title }
+%span.labeled-badge{ class: klass, title: title, "data-bs-toggle": "tooltip", "data-bs-placement": "bottom" }
   %label
     = label
   %span.badge{ class: "bg-#{color}" }

data/set/abstract/bs_badge.rb

@@ -13,6 +13,6 @@ format :html do
     if count.try(:zero?) && !opts[:zero_ok]
       opts[:klass] = [opts[:klass], "disabled-o"].compact.join " "
     end
-    opts[:color] ||= "secondary"
+    opts[:color] ||= "light"
   end
 end

data/set/all/bootstrap/icon.rb

@@ -85,6 +85,17 @@ basket[:icons] = {
 format :html do
   view :icons, template: :haml
 
+  # Generates an HTML tag for an icon with optional parameters.
+  #
+  # @param [String] icon_key The key representing the desired icon.
+  # @param [Hash] opts The options for the icon tag.
+  # @option opts [String] :class Additional CSS classes for the icon tag.
+  # @option opts [String] :style Additional inline styles for the icon tag.
+  #
+  # @return [String] The HTML code for the icon tag.
+  #
+  # @example
+  #   icon_tag(:heart, class: 'favorite-icon', style: 'color: red')
   def icon_tag icon_key, opts={}
     return "" unless icon_key.present?
 
@@ -119,6 +130,7 @@ format :html do
   end
 
   def universal_icon_tag library, icon, opts={}
+    add_class opts, "notranslate"
     with_icon_tag_opts(opts) do |tag_opts|
       send "#{library}_icon_tag", icon, tag_opts
     end

data/set/all/bootstrap/navbar.rb

@@ -40,6 +40,9 @@ format :html do
     end
   end
 
+  # Generates HTML markup for a breadcrumb trail.
+  # @param items [list]: A list of items representing the breadcrumb trail.
+  # @return [String] HTML markup for the breadcrumb trail.
   def breadcrumb items
     wrap_with :ol, class: "breadcrumb" do
       items.map do |item|

data/set/type/bootswatch_skin.rb

@@ -50,7 +50,7 @@ end
 def item_names _args={}
   (PRE_VARIABLES_CARD_NAMES + variables_card_names +
     POST_VARIABLES_CARD_NAMES + stylesheets_card_names).compact.map do |n|
-    Card.fetch_name(n)
+    Codename.name n
   end.compact
 end
 
@@ -81,11 +81,11 @@ def editable_item_cards
 end
 
 def variables_card_names
-  %i[colors variables].map { |s| Card.fetch_name name, s }
+  %i[colors variables].map { |s| [name, s].cardname }
 end
 
 def stylesheets_card_names
-  [Card.fetch_name(name, :stylesheets)]
+  [[name, :stylesheets].cardname]
 end
 
 def content_from_theme field

data/set/type_plus_right/bootswatch_skin/colors.rb

@@ -63,11 +63,11 @@ def virtual?
   new?
 end
 
-def ok_to_create
+def ok_to_create?
   left.parent? && super
 end
 
-def ok_to_update
+def ok_to_update?
   left.parent? && super
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-18 00:00:00.000000000 Z
+date: 2024-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,70 +18,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.106.0
+        version: 1.108.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.106.0
+        version: 1.108.0
 - !ruby/object:Gem::Dependency
   name: card-mod-edit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: card-mod-bar_and_box
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: card-mod-style
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: card-mod-script
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.18.0
 description: ''
 email:
 - info@decko.org
@@ -102,6 +102,7 @@ files:
 - assets/style/font_awesome.css
 - assets/style/manifest.yml
 - assets/style/material_icons.css
+- config/admin.yml
 - config/locales/de.yml
 - config/locales/en.yml
 - data/files/cerulean_skin_image/image-icon.png
@@ -3935,7 +3936,7 @@ files:
 - vendor/select2/tests/vendor/qunit-1.23.1.js
 homepage: https://decko.org
 licenses:
-- GPL-3.0
+- GPL-3.0-or-later
 metadata:
   source_code_uri: https://github.com/decko-commons/decko
   homepage_uri: https://decko.org
@@ -3952,14 +3953,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.7
 signing_key:
 specification_version: 4
 summary: Bootstrap