card-mod-layout 0.17.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ec837afb468af7b7cb4e750530af0e9a4969c25790b1d6bd38ae925a911d206
-  data.tar.gz: 9a250e05b0c1de8923dc5ec3625293e4f1944dcdd0e7245606da6ed082a6dcc1
+  metadata.gz: 5de3f9715ba3570c0f92a0c67ce81707753a181c55c5b64f28ef75f0dd464d13
+  data.tar.gz: ac0a2284f80ed0794cc6e7be35fa58d63e28aaaa8163fa9efa13db42e68844fb
 SHA512:
-  metadata.gz: 9afc1d38fdd83efd10eebae08ceffee72849209db77a7e48e03808d16cbf60b47bc0c5e780628d9d48df0f693485c9373eda8decdef16cebd6e511a99e178e16
-  data.tar.gz: '081c2125e0fd671a18f0f9b0ccf69aedeb3f957cec1281cfb5367974ef153776acc56e7cf90b03e840e97b9dffab586ef0fa5259edf2f2730b4f91bc142681a1'
+  metadata.gz: eb1a2bc8859ac4a0622f399263192534e9352a863cce98329f5396e27650c9d9ba9a9b3964f0d172db5788d33527f9947e30b922a51108ec8e724cf0aaf67bb4
+  data.tar.gz: 1c25377e173ab1efa47c4a711f60a7f27c5b547e6c7557303e09b6ad722ebdeff069da6c8af53209790d686b96b21cc7717ca56d59449c71b839f1162012f359

data/set/all/modal.rb

@@ -16,24 +16,9 @@ format :html do
     ""
   end
 
-  def show_in_modal_link link_text, body
-    link_to_view :modal, link_text, "data-modal-body": body, "data-slotter-mode": "modal"
-  end
-
-  def modal_close_button link_text="Close", opts={}
-    classes = opts.delete(:class)
-    button_opts = opts.merge(MODAL_CLOSE_OPTS)
-    add_class button_opts, classes if classes
-    button_tag link_text, button_opts
-  end
-
-  def modal_submit_button opts={}
-    add_class opts, "submit-button _close-modal"
-    submit_button opts
-  end
-
   view :modal_menu, unknown: true, wrap: :modal_menu do
-    [close_modal_window, pop_out_modal_window]
+    [render_close_modal_link,
+     render_pop_out_modal_link(optional: :show)]
   end
 
   wrapper :modal_menu, :div, class: "modal-menu _modal-menu ms-auto"
@@ -52,6 +37,32 @@ format :html do
     modal_link _render_title, size: voo.size
   end
 
+  view :close_modal_link, unknown: true do
+    link_to icon_tag(:close), path: "",
+                              class: "_close-modal btn-close",
+                              "data-bs-dismiss": "modal"
+  end
+
+  view :pop_out_modal_link, unknown: :blank do
+    link_to icon_tag(:modal), path: {}, class: "pop-out-modal btn-close"
+  end
+
+  def show_in_modal_link link_text, body
+    link_to_view :modal, link_text, "data-modal-body": body, "data-slotter-mode": "modal"
+  end
+
+  def modal_close_button link_text="Close", opts={}
+    classes = opts.delete(:class)
+    button_opts = opts.merge(MODAL_CLOSE_OPTS)
+    add_class button_opts, classes if classes
+    button_tag link_text, button_opts
+  end
+
+  def modal_submit_button opts={}
+    add_class opts, "submit-button _close-modal"
+    submit_button opts
+  end
+
   def modal_link text=nil, opts={}
     opts = modal_link_opts(opts)
     opts[:path][:layout] ||= :modal
@@ -87,18 +98,6 @@ format :html do
     size.in?(MODAL_SIZE.keys) ? size : cast_modal_option(size)
   end
 
-  def close_modal_window
-    link_to icon_tag(:close), path: "",
-                              class: "_close-modal btn-close",
-                              "data-bs-dismiss": "modal"
-  end
-
-  def pop_out_modal_window
-    return unless card.known?
-
-    link_to icon_tag(:modal), path: {}, class: "pop-out-modal btn-close"
-  end
-
   private
 
   def normalize_modal_option key, opts

data/set/all/process_layout.rb

@@ -1,8 +1,19 @@
+basket[:cache_seed_names] << %i[all layout]
+
 format :html do
-  # TODO: use CodeFile cards for these
-  # builtin layouts allow for rescue / testing
-  # HTML_LAYOUTS = Mod::Loader.load_layouts(:html).merge "none" => "{{_main}}"
-  # HAML_LAYOUTS = Mod::Loader.load_layouts(:haml)
+  # for override
+  def layout_for_view _view
+    nil
+  end
+
+  # public for testing
+  def explicit_modal_wrapper? view
+    return unless (wrap_view = view_setting :wrap, view)
+
+    (wrapper_names(wrap_view) & %i[modal board]).any?
+  end
+
+  private
 
   def show_with_page_layout view, args
     main!
@@ -19,35 +30,10 @@ format :html do
     params[:layout] || layout_for_view(view) || layout_name_from_rule || :default
   end
 
-  # for override
-  def layout_for_view _view
-    nil
-  end
-
-  def render_with_layout view, layout, args={}
-    view_opts = Layout.main_nest_opts(layout, self)
-    view ||= view_opts.delete(:view) || default_page_view
-    view_opts[:home_view] = view
-    view_opts[:layout] = layout
-    render! view, view_opts.reverse_merge(args)
-  end
-
-  def default_page_view
-    default_nest_view
-  end
-
-  def show_layout?
-    !Env.ajax? || params[:layout]
-  end
-
-  def explicit_modal_wrapper? view
-    return unless (wrap_view = view_setting :wrap, view)
-
-    (wrapper_names(wrap_view) & %i[modal board]).any?
+  def layout_name_from_rule
+    card.rule_card(:layout)&.try :first_name
   end
 
-  private
-
   def main_render_args view, args
     args[:view] = view if view
     args[:main] = true
@@ -55,15 +41,19 @@ format :html do
     args
   end
 
-  def layout_name_from_rule
-    card.rule_card(:layout)&.try :first_name
-  end
-
   def render_outside_of_layout view, args
     body = render_with_layout nil, page_layout(view), {}
     body_with_modal body, render!(view, args)
   end
 
+  def render_with_layout view, layout, args={}
+    view_opts = Layout.main_nest_opts(layout, self)
+    view ||= view_opts.delete(:view) || default_page_view
+    view_opts[:home_view] = view
+    view_opts[:layout] = layout
+    render! view, view_opts.reverse_merge(args)
+  end
+
   def body_with_modal body, modal
     if body.include? "</body>"
       # a bit hacky

data/set/right/head.rb

@@ -5,7 +5,7 @@ def ok_to_read?
 end
 
 format :html do
-  view :head_content do
+  view :head_content, cache: :yes do
     process_content render_raw
   end
 

data/set/right/layout.rb

@@ -1 +1,5 @@
 assign_type :pointer
+
+# def item_references?
+#   false
+# end

data/set/self/account_links.rb

@@ -72,7 +72,7 @@ format :html do
 
   def can_disable_roles?
     Auth.current_roles.size > 1 &&
-      Card::Codename.exists?(:enabled_roles) # workaround for broken migrations
+      Card::Codename.exist?(:enabled_roles) # workaround for broken migrations
   end
 
   def account_link_text purpose

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-layout
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.1
 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-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,56 +18,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.107.0
+        version: 1.108.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.107.0
+        version: 1.108.1
 - !ruby/object:Gem::Dependency
   name: card-mod-account
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.1
 - !ruby/object:Gem::Dependency
   name: card-mod-session
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.1
 - !ruby/object:Gem::Dependency
   name: card-mod-tabs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.1
 description: ''
 email:
 - info@decko.org
@@ -123,7 +123,7 @@ files:
 - set/type/layout_type.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