card-mod-layout 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eae60ab480a1985e43a70c077377a025e51d30b1b39a395b04c6907c3c57a41d
-  data.tar.gz: 672b7bf9992a129a5ca1f5ff497fc19511b55b0ff5146226b25152a1d4e9d14c
+  metadata.gz: 7551057bc088cc3d56c23c4f289538cd69e173910cddf566f03cebd74b5fff53
+  data.tar.gz: 7af3417d1a7105111b640d89039f9d45d08943cca6faa1eb5200e2134d36ba15
 SHA512:
-  metadata.gz: 7b08ce988ef614da4dc3c4c675a1b717e0bdbb481c6c4b98b862dab1de79f951a446ecd6837ee49dcbea22c71c2758d7d6040c7415e7d7de2e79b964732788c5
-  data.tar.gz: ec94cb6a8b07a78e54de66ef5145d13c0c607f338275a5b167f7ddc7a7688a6b57e6f05f7f01893ee76e7a46587dc064d3230e1cdb107a7ed766188e0fff6ee1
+  metadata.gz: 4e2dfbd8c3703421c22338e2cac1de19474c2824f9110a03b2fafc800a895add2032fa20b46633ed36c3657096c6d1b364a92ebde54db87ce4cf208cb7b9a499
+  data.tar.gz: 531e532901ebed6a6ff2a70aa88c3c2f352a0e3a25ca756d5349504d2c2de8048abcc4e5c47ae6516364ea415271d16759e00aa0789e776c070edfaabcad6e61

data/assets/style/modal.scss

@@ -39,4 +39,5 @@
 
 .modal-header .btn-close {
   background: none;
+  background-image: none;
 }

data/set/abstract/account_dropdown.rb

@@ -1,29 +1,36 @@
 format :html do
-  def link_to_mycard
-    link_to_card Auth.current.name, nil,
+  def link_to_mycard text=nil
+    link_to_card Auth.current.name, text,
                  id: "my-card-link", class: "nav-link #{classy('my-card')}"
   end
 
-  def account_dropdown &render_role_item
+  def account_dropdown
     class_up "dropdown-toggle-split", "nav-link"
-    split_dropdown_button link_to_mycard do
-      [
-        [[Auth.current, :account_settings], "Account"],
-        [:signin, t("account_sign_out"), { path: { action: :delete } }]
-      ] + account_dropdown_roles(&render_role_item)
+    split_dropdown_button account_dropdown_label do
+      account_dropdown_items
     end
   end
 
   private
 
-  def account_dropdown_roles &block
+  def account_dropdown_label
+    link_to_mycard
+  end
+
+  def account_dropdown_items
+    [[[Auth.current, :account_settings], "Account"],
+     [:signin, t("account_sign_out"), { path: { action: :delete } }]] +
+      account_dropdown_roles
+  end
+
+  def account_dropdown_roles
     return [] unless special_roles?
 
-    [dropdown_header("Roles")] + account_dropdown_role_items(&block)
+    [dropdown_header("Roles")] + account_dropdown_role_items
   end
 
   def account_dropdown_role_items
-    Auth.current_roles.map { |role| block_given? ? yield(role) : [role] }
+    Auth.current_roles.map { |role| [role] }
   end
 
   def special_roles?

data/set/all/overlay.rb

@@ -29,7 +29,7 @@ format :html do
   view :overlay_help_link, cache: :never, unknown: true do
     opts = help_popover_opts
     add_open_guide_opts opts
-    overlay_menu_link "question-circle", opts
+    overlay_menu_link :help, opts
   end
 
   def add_open_guide_opts opts
@@ -44,7 +44,7 @@ format :html do
   end
 
   def slotify_overlay_link
-    overlay_menu_link "external-link-square-alt", card: card
+    overlay_menu_link :new_window, card: card
   end
 
   def close_overlay_link
@@ -69,7 +69,7 @@ format :html do
 
   def overlay_menu_link icon, args={}
     add_class args, "border-light text-dark p-1 ms-1"
-    button_link fa_icon(icon, class: "fa-lg"), args.merge(btn_type: "outline-secondary")
+    button_link icon_tag(icon), args.merge(btn_type: "outline-secondary")
   end
 
   def overlay_header title=nil

data/set/right/enabled_roles.rb

@@ -50,8 +50,9 @@ format :html do
 
   def checkbox_input
     card.ensure_roles
+    voo.show! :role_item_checkbox
     wrap_with :div, class: "pointer-checkbox-list" do
-      account_dropdown(&method(:role_item_checkbox))
+      account_dropdown
     end
   end
 
@@ -60,4 +61,8 @@ format :html do
                          checked: card.item_names.include?(role_name),
                          option_name: role_name
   end
+
+  def account_dropdown_role_items
+    Auth.current_roles.map { |role| role_item_checkbox role }
+  end
 end

data/set/self/layout_options.rb

@@ -1,3 +1,3 @@
 def item_names _args={}
-  Card.search(type: :layout) + Card::Layout.built_in_layouts
+  Card.search(type: :layout_type, return: :name) + Card::Layout.built_in_layouts
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-layout
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-04 00:00:00.000000000 Z
+date: 2023-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,56 +18,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.105.0
+        version: 1.105.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.105.0
+        version: 1.105.1
 - !ruby/object:Gem::Dependency
   name: card-mod-account
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
   name: card-mod-session
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
   name: card-mod-tabs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.1
 description: ''
 email:
 - info@decko.org
@@ -81,6 +81,8 @@ files:
 - assets/style/layout.scss
 - assets/style/modal.scss
 - assets/style/overlay.scss
+- config/locales/de.yml
+- config/locales/en.yml
 - data/files/mod_layout_script_asset_output/file.js
 - data/real.yml
 - data/test.yml
@@ -89,8 +91,6 @@ files:
 - lib/card/layout/code_layout.rb
 - lib/card/layout/proc_layout.rb
 - lib/card/layout/unknown_layout.rb
-- locales/de.yml
-- locales/en.yml
 - set/abstract/account_dropdown.rb
 - set/abstract/items.rb
 - set/abstract/list.rb