card-mod-layout 0.13.0 → 0.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d118944f69f6a156c860975de73cbe54494323ab843314c0a5a5f0be5f67a012
-  data.tar.gz: 2c909ce53adeb835030a51758871c039761a8f95a46835799df9aeff2d7702bf
+  metadata.gz: b79ba221bbfe29b368db0957bb24f7fe5245c2d30fb5d651929a7c5fc2eadefc
+  data.tar.gz: 2d85972536746977ad3a21855a2ac8ab1ef6332f27978b17853098ef3c02639b
 SHA512:
-  metadata.gz: 5933463490d623052bbad3be8303aab698ae452cc6e2dd9a1e489be1710b944a980c17640db524725c8f3773cb0fefd24a4cf4733b81f08cbb72185840569e59
-  data.tar.gz: 80a450d7a1ab2b13a5f2e3c5b25b4161fc0f0a2d0682c670f8f17d608cf77afe082c2abf378be35be5582222446c90daab0eab26247424d3eb980e578f20a0a2
+  metadata.gz: '083328ffb3ab5571fceb0f542989ae0649ca0585351b6e4c2eb766ee3f06d5fc92e31969afe26ab1b57f667acbc502adb7ae163540a4b5665a3c2ae64a41a354'
+  data.tar.gz: c1868dc0d5fc746c422bd3a15be174b0410d25313c289c79fc0684a28c99a39f07df7aee11d014733b1fb1d21a7bf44c6a38fba637a8b68216c42747ec202f92

data/locales/en.yml

@@ -0,0 +1,4 @@
+en:
+  layout_available_layouts: "Available Layouts: %{available_layouts}"
+  layout_unknown_layout: "Unknown layout: %{name}"
+  legacy_toc: Table of Contents

data/set/all/layouts.rb

@@ -1,5 +1,5 @@
 format :html do
-  attr_reader :interior
+  delegate :interior, to: :voo
 
   def layout_nest
     wrap_main { interior }

data/set/all/overlay.rb

@@ -4,7 +4,7 @@ format :html do
                          type: "button" }.freeze
 
   wrapper :overlay do |opts|
-    class_up "card-slot", "_overlay d0-card-overlay bg-body"
+    class_up "card-slot", "_overlay d0-card-overlay bg-body", :single_use
     @content_body = true
     voo.hide! :menu
     overlay_frame true, overlay_header(opts[:title]), opts[:slot] do
@@ -44,7 +44,7 @@ format :html do
   end
 
   def slotify_overlay_link
-    overlay_menu_link "external-link-square", card: card
+    overlay_menu_link "external-link-square-alt", card: card
   end
 
   def close_overlay_link

data/set/all/process_layout.rb

@@ -6,26 +6,36 @@ format :html do
 
   def show_with_page_layout view, args
     main!
+    layout = page_layout view
     args = main_render_args view, args
-    if explicit_modal_wrapper?(view) && page_layout.to_sym != :modal
+    if explicit_modal_wrapper?(view) && layout.to_sym != :modal
       render_outside_of_layout view, args
     else
-      render_with_layout view, page_layout, args
+      render_with_layout view, layout, args
     end
   end
 
-  def page_layout
-    params[:layout] || layout_name_from_rule || :default
+  def page_layout view
+    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_nest_view
+    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
@@ -50,7 +60,7 @@ format :html do
   end
 
   def render_outside_of_layout view, args
-    body = render_with_layout nil, page_layout, {}
+    body = render_with_layout nil, page_layout(view), {}
     body_with_modal body, render!(view, args)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-layout
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.4
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-06 00:00:00.000000000 Z
+date: 2021-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,42 +18,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.0
+        version: 1.103.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.0
+        version: 1.103.4
 - !ruby/object:Gem::Dependency
   name: card-mod-account
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.13.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.13.4
 - !ruby/object:Gem::Dependency
   name: card-mod-session
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.13.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.13.4
 description: ''
 email:
 - info@decko.org
@@ -66,6 +66,7 @@ files:
 - lib/card/layout/code_layout.rb
 - lib/card/layout/proc_layout.rb
 - lib/card/layout/unknown_layout.rb
+- locales/en.yml
 - set/abstract/account_dropdown.rb
 - set/abstract/pointer/html_views.rb
 - set/all/alert.rb