card-mod-bar_and_box 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 636fadbb9bbe3602992ed6066c6fcab12d57edf178bac8c460b159f3a7abdb3d
-  data.tar.gz: f651af530fb42581530e5fcee9071ad75e3f3f18521b24c2cd6dfbbca1d1d252
+  metadata.gz: 190d7d4831a2ae497659729cec7e0e2d6b75cde8160b3313474452b5d6ea9c5a
+  data.tar.gz: c5f650e79126ad7b072c2ebdba5450212cd9432444605950c31e7b7c9984e234
 SHA512:
-  metadata.gz: cf405d9341c1bf03478acbd6bfb62d9f509bf9c1e6ed7bb7df8a0cb71a9155f763624179626b5720a8245c2e55396754487d0ec380e59821c5c4799b91252c46
-  data.tar.gz: bfc0790319ccb91fdd96c7ee2eedf07580cd560ad4d950aff86fa447413dea678af1390301482cdd2c0069fe5e46bb2470450cb7d466f5c6df4bb68cf33ec258
+  metadata.gz: 1472daa4fff82f6660d17995383f6861b294b912464ec1aaec8f0f4cd384405ae4e3b1fdfb489b50bb0953bd78835ea63d364283de0d83b2a6731f1a9b14afca
+  data.tar.gz: bef94ea876185503f22cff962615dd308f8193f88881c30a5da6c4b8ad3844f931bacc0ca60281922e431306b424d7d265a5ead97ce7bfd95e39efbb8d68db90

data/assets/script/bar_and_box.js.coffee

@@ -1,4 +1,4 @@
-$(window).ready ->
+$ ->
 # $("body").on "click", ".bar-menu", (e) ->
 #   e.stopImmediatePropagation()
 
@@ -13,6 +13,11 @@ $(window).ready ->
     else
       window.location = cardLinkPath(cl)
 
+  $("body").on "shown.bs.collapse", ".bar > .collapse", (_event) ->
+    s = $(this).find "> .d0-card-body > .card-slot-stub"
+    s.slotReload s.data("stubUrl")
+    s.removeClass "card-slot-stub"
+
 openInNewTab = (event) -> event.metaKey
 cardLinkPath = (cl) -> decko.path(cl.data("cardLinkUrl") || cl.data("cardLinkName"))
 

data/assets/style/bar.scss

@@ -1,4 +1,7 @@
 $bar_stripe_color: $dark !default;
+$bar-body-hover-color: rgba($gray-100, 0.5) !default;
+$bar-transition: $accordion-transition !default;
+
 
 ._card-link {
   cursor: pointer;
@@ -6,13 +9,16 @@ $bar_stripe_color: $dark !default;
 
 .bar {
   border: 1px solid $border-color;
-  &:hover {
+  > .bar-body, > .bar-menu, > .accordion-header > .accordion-button {
+    @include transition($bar-transition);
+  }
+  &:hover:not(.no-bar-hover) {
     cursor: pointer;
-    > .bar-body, > .bar-menu, > .accordion-header >.accordion-button {
-      background-color: $gray-200;
+    > .bar-body, > .bar-menu, > .accordion-header > .accordion-button {
+      background-color: $bar-body-hover-color;
     }
   }
-  &.accordion-item {
+  &.accordion-item > .accordion-header {
     .bar-left, .bar-right {
       padding: 0;
     }

data/assets/style/box.scss

@@ -8,7 +8,6 @@ $box_stripe_color: $secondary !default;
     cursor: pointer
   }
   border-top: 3px solid $box_stripe_color;
-  width: 320px;
 }
 
 .box-top {
@@ -55,12 +54,19 @@ $box_stripe_color: $secondary !default;
 .card-list-box {
   display: flex;
   flex-wrap: wrap;
-  justify-content: center;
+  justify-content: space-around;
 }
 
 // wrapper around box in list context
 .item-box {
-  display: inline-block;
-  padding: 10px 1%;
+  display: flex;
+  padding: 1rem 0;
   vertical-align: top;
-}
+  justify-content: center;
+}
+
+.box, .item-box {
+  min-width: 320px;
+  max-width: 400px;
+  width: 100%
+}

data/config/admin.yml

@@ -1,8 +1,7 @@
 views:
   - box
   - bar
-  - expanded_bar
-  - one_line_content
   - mini_bar
   - closed
   - open
+  - one_line_content

data/set/all/bar.rb

@@ -5,17 +5,24 @@ format :html do
   bar_cols 9, 3
   mini_bar_cols 9, 3
 
-  view :bar, unknown: :mini_bar do
+  # drops bar-middle in small viewports
+  view :bar, unknown: :mini_bar, cache: :yes do
     cols = bar_cols.size == 3 ? [mini_bar_cols, bar_cols] : [bar_cols]
     prepare_bar(*cols)
     build_bar
   end
 
-  view :mini_bar, unknown: true do
+  view :mini_bar, cache: :yes, unknown: true do
     prepare_bar mini_bar_cols
     build_bar
   end
 
+  view :full_bar, unknown: :mini_bar, cache: :yes do
+    class_up "bar", full_page_card.safe_set_keys
+    class_up_cols %w[bar-left bar-middle bar-right], bar_cols
+    build_bar
+  end
+
   view(:bar_left, unknown: true) { render_title }
   view(:bar_middle, unknown: :blank) { "" }
   view(:bar_right, unknown: :blank) { "" }
@@ -28,17 +35,17 @@ format :html do
   view :bar_menu, unknown: true, template: :haml
   view :bar_body, unknown: true, template: :haml
 
-  view :accordion_bar, unknown: :mini_bar do
+  view :closed, unknown: :mini_bar, cache: :yes do
     build_accordion_bar
   end
-  view :closed_bar, :accordion_bar
-  view :closed, :accordion_bar
+  view :closed_bar, :closed
+  view :accordion_bar, :closed
 
-  view :open_bar do
+  view :open, cache: :yes do
     build_accordion_bar open: true
   end
-  view :expanded_bar, :open_bar
-  view :open, :open_bar
+  view :open_bar, :open
+  view :expanded_bar, :open
 
   def build_accordion_bar open: false
     prepare_bar mini_bar_cols
@@ -46,9 +53,9 @@ format :html do
     wrap do
       accordion_item render_bar_body,
                      subheader: render_menu,
-                     body: render_bar_bottom,
+                     body: bar_bottom(open: open),
                      open: open,
-                     context: :accordion_bar
+                     context: :closed
     end
   end
 
@@ -86,4 +93,18 @@ format :html do
   def bar_wrap_data
     full_page_card == card ? wrap_data : full_page_card.format.wrap_data
   end
+
+  # TODO: make card_stubs work
+  def bar_bottom open: false
+    open ? render_bar_bottom : card_stub(view: :bar_bottom)
+  end
+
+  # TODO: move to a more general accessible place (or its own abstract module)
+  def card_stub path_args
+    wrap_with :div,
+              class: "card-slot card-slot-stub",
+              data: { "stub-url": path(path_args) } do
+      ""
+    end
+  end
 end

data/set/all/box.rb

@@ -1,4 +1,4 @@
-view :box, template: :haml do
+view :box, template: :haml, cache: :yes do
   voo.hide :menu
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-bar_and_box
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-12 00:00:00.000000000 Z
+date: 2024-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.107.0
+        version: 1.108.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.107.0
+        version: 1.108.0
 - !ruby/object:Gem::Dependency
   name: card-mod-style
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.0
 description: ''
 email:
 - info@decko.org
@@ -67,7 +67,7 @@ files:
 - set/type/image.rb
 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
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.10
+rubygems_version: 3.5.7
 signing_key:
 specification_version: 4
 summary: bar and box views