card-mod-layout 0.15.3 → 0.15.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a092cbce9c28af63f3190f447cee299025feccb77858d1199228258b77ecc493
-  data.tar.gz: 3a82db57c13a7981dcf2abe975901aff85271ae6c8a63358d7c3127cce3622a0
+  metadata.gz: c8ab6ecd17d44c151ca1d37dfdc48ad5819be19909d86d8380184e593fa51ad6
+  data.tar.gz: 1bdfe8eafc32352188e3e4a8375e181aebfecdc9c716da821082364b80f5ba76
 SHA512:
-  metadata.gz: 829d90844c5748dbed9dab1b4ad47720ccba3de042f53717a0047365d2073f76109d00225992f498fac57270d467eabd6be7dc2bbb6bf073bafe8df06ea0519c
-  data.tar.gz: a19b1106132692a475358cacce750d9156762fe4564f8d0841b18b7bc22005459ca012a36d44f68633d651673d2cebda887337748a2eda10d0f31f0b07e8e0d3
+  metadata.gz: 56a2cf1ad562e11776a234757cc0d335a6b1e78622a902cd6ec3c28de5cbcab011aea8c336cf0123af90dc7edd89a44679f94dcf57825395d4ebcfe638138497
+  data.tar.gz: 9666e58a145c0bfdf09fec7c9e8f784581ba5baca9d9259b4898dc4ae056d7db08c6164212e2d2869d91b0049d0255da12bd999b69be61ef52ecb1d2c2baaff5

data/assets/script/overlay.js.coffee

@@ -26,7 +26,7 @@ jQuery.fn.extend
   replaceOverlay: (overlay) ->
     @overlaySlot().trigger "decko.slot.destroy"
     @overlaySlot().replaceWith overlay
-    $(".bridge-sidebar .tab-pane:not(.active) .bridge-pills > .nav-item > .nav-link.active").removeClass("active")
+    $(".board-sidebar .tab-pane:not(.active) .board-pills > .nav-item > .nav-link.active").removeClass("active")
 
   isInOverlay: ->
     return @closest(".card-slot._overlay").length
@@ -45,7 +45,7 @@ jQuery.fn.extend
           bottomlay.parent().removeClass("overlay-container")
         else
           bottomlay.unwrap()
-        bottomlay.removeClass("_bottomlay-slot").updateBridge(true, bottomlay)
+        bottomlay.removeClass("_bottomlay-slot").updateBoard(true, bottomlay)
 
         #bottomlay.find(".tinymce-textarea").each ->
         #  tinymce.EditorManager.execCommand('mceAddControl',true, editor_id);

data/assets/style/overlay.scss

@@ -8,6 +8,9 @@
   overflow: auto;
   .card-slot.overlay_rule-view {
     border-left: 5px solid $primary;
+    .d0-card-body {
+      padding: 0 1em;
+    }
   }
 
   .d0-card-overlay
@@ -43,6 +46,11 @@
   }
 }
 
+.overlay-menu {
+  display: inline-flex;
+  vertical-align: middle;
+}
+
 // FIXME: this directly overrides above rule.
 
 .d0-card-overlay > .d0-card-frame > .d0-card-header {

data/data/files/mod_layout_script_asset_output/file.js

@@ -3,4 +3,4 @@
 // modal.js.coffee
 (function(){var o,d;$(window).ready(function(){return $("body").on("hidden.bs.modal",function(){return decko.removeModal()}),$("body").on("show.bs.modal","._modal-slot",function(d){var a;return a=$(d.relatedTarget),o($(this),a),$(this).modal("handleUpdate"),decko.contentLoaded($(d.target),a)}),$("._modal-slot").each(function(){return d($(this)),o($(this))}),$("body").on("click",".submit-modal",function(){return $(this).closest(".modal-content").find("form").submit()})}),d=function(o){var d;if((d=o.find(".modal-content")).length>0&&d.html().length>0)return $("#main > .card-slot").registerAsOrigin("modal",o),o.modal("show")},o=function(o,d){var a,l;if(l=o.find(".modal-dialog"),null!=(a=null!=d?d.data("modal-class"):o.data("modal-class"))&&null!=l)return l.addClass(a)},jQuery.fn.extend({showAsModal:function(o){var d;return null!=o&&(d=this.modalify(o)),$("body > ._modal-slot").is(":visible")?this.addModal(d,o):($("body > ._modal-slot")[0]?($("._modal-slot").trigger("decko.slot.destroy"),$("body > ._modal-slot").replaceWith(d)):$("body").append(d),o.registerAsOrigin("modal",d),d.modal("show",o))},addModal:function(d,a){var l;return"modal-replace"===a.data("slotter-mode")?(o(d,a),l=d.find(".modal-dialog"),d.adoptModalOrigin(),$("._modal-slot").trigger("decko.slot.destroy"),$("body > ._modal-slot > .modal-dialog").replaceWith(l),decko.contentLoaded(l,a)):(decko.pushModal(d),a.registerAsOrigin("modal",d),d.modal("show",a))},adoptModalOrigin:function(){var o;return o=$("body > ._modal-slot .card-slot[data-modal-origin-slot-id]").data("modal-origin-slot-id"),this.find(".modal-body .card-slot").attr("data-modal-origin-slot-id",o)},modalSlot:function(){var o;return(o=$("#modal-container")).length>0?o:decko.createModalSlot()},modalify:function(o){var d;return null!=o.data("modal-body")&&this.find(".modal-body").append(o.data("modal-body")),this.hasClass("_modal-slot")?this:((d=$("<div/>",{id:"modal-container","class":"modal fade _modal-slot"})).append($("<div/>",{"class":"modal-dialog"}).append($("<div/>",{"class":"modal-content"}).append(this))),d)}}),$.extend(decko,{createModalSlot:function(){var o;return o=$("<div/>",{id:"modal-container","class":"modal fade _modal-slot"}),$("body").append(o),o},removeModal:function(){return $("._modal-stack")[0]?decko.popModal():($("._modal-slot").trigger("decko.slot.destroy"),$(".modal-dialog").empty())},pushModal:function(o){var d;return(d=$("body > ._modal-slot")).removeAttr("id"),d.removeClass("_modal-slot").addClass("_modal-stack").removeClass("modal").addClass("background-modal"),o.insertBefore(d),$(".modal-backdrop").removeClass("show")},popModal:function(){return $(".modal-backdrop").addClass("show"),$("body > ._modal-slot").trigger("decko.slot.destroy"),$("body > ._modal-slot").remove(),$($("._modal-stack")[0]).addClass("_modal-slot").removeClass("_modal-stack").attr("id","modal-container").addClass("modal").removeClass("background-modal"),$(document.body).addClass("modal-open")}})}).call(this);
 // overlay.js.coffee
-(function(){jQuery.fn.extend({overlaySlot:function(){var e;return null!=(e=this.closest(".card-slot._overlay"))[0]?e:null!=(e=this.closest(".overlay-container").find("._overlay"))[0]&&$(e[0])},addOverlay:function(e,r){return this.parent().hasClass("overlay-container")?$(e).hasClass("_stack-overlay")?this.before(e):($("._overlay-origin").removeClass("_overlay-origin"),this.replaceOverlay(e)):(this.parent().hasClass("_overlay-container-placeholder")?this.parent().addClass("overlay-container"):this.wrapAll('<div class="overlay-container">'),this.addClass("_bottomlay-slot"),this.before(e)),r.registerAsOrigin("overlay",e),decko.contentLoaded(e,r)},replaceOverlay:function(e){return this.overlaySlot().trigger("decko.slot.destroy"),this.overlaySlot().replaceWith(e),$(".bridge-sidebar .tab-pane:not(.active) .bridge-pills > .nav-item > .nav-link.active").removeClass("active")},isInOverlay:function(){return this.closest(".card-slot._overlay").length},removeOverlay:function(){var e;if(e=this.overlaySlot())return e.removeOverlaySlot()},removeOverlaySlot:function(){var e;return this.trigger("decko.slot.destroy"),1===this.siblings().length&&(e=$(this.siblings()[0])).hasClass("_bottomlay-slot")&&(e.parent().hasClass("_overlay-container-placeholder")?e.parent().removeClass("overlay-container"):e.unwrap(),e.removeClass("_bottomlay-slot").updateBridge(!0,e)),this.remove()}})}).call(this);
+(function(){jQuery.fn.extend({overlaySlot:function(){var e;return null!=(e=this.closest(".card-slot._overlay"))[0]?e:null!=(e=this.closest(".overlay-container").find("._overlay"))[0]&&$(e[0])},addOverlay:function(e,r){return this.parent().hasClass("overlay-container")?$(e).hasClass("_stack-overlay")?this.before(e):($("._overlay-origin").removeClass("_overlay-origin"),this.replaceOverlay(e)):(this.parent().hasClass("_overlay-container-placeholder")?this.parent().addClass("overlay-container"):this.wrapAll('<div class="overlay-container">'),this.addClass("_bottomlay-slot"),this.before(e)),r.registerAsOrigin("overlay",e),decko.contentLoaded(e,r)},replaceOverlay:function(e){return this.overlaySlot().trigger("decko.slot.destroy"),this.overlaySlot().replaceWith(e),$(".board-sidebar .tab-pane:not(.active) .board-pills > .nav-item > .nav-link.active").removeClass("active")},isInOverlay:function(){return this.closest(".card-slot._overlay").length},removeOverlay:function(){var e;if(e=this.overlaySlot())return e.removeOverlaySlot()},removeOverlaySlot:function(){var e;return this.trigger("decko.slot.destroy"),1===this.siblings().length&&(e=$(this.siblings()[0])).hasClass("_bottomlay-slot")&&(e.parent().hasClass("_overlay-container-placeholder")?e.parent().removeClass("overlay-container"):e.unwrap(),e.removeClass("_bottomlay-slot").updateBoard(!0,e)),this.remove()}})}).call(this);

data/data/real.yml

@@ -32,18 +32,10 @@
   :content: "[[:recent|Recent Changes]]"
   :codename: main_menu
   :conflict: :defer
-  :fields:
-    :self:
-      :fields:
-        :read: Anyone
 
 - :name: "*header"
   :type: :html
   :codename: header
-  :fields:
-    :self:
-      :fields:
-        :read: Anyone
   :content: |
     <nav class="navbar navbar-expand-lg navbar-dark bg-dark mb-3 nodblclick">
       <div class="container">
@@ -68,6 +60,18 @@
       </div>
     </nav>
 
+- :name:
+    - :header
+    - :self
+    - :read
+  :content: Anyone
+
+- :name:
+    - :main_menu
+    - :self
+    - :read
+  :content: Anyone
+
 - :name: "*footer"
   :codename: footer
   :type: :html

data/db/migrate_core_cards/20230406205931_fix_old_navbar_issue.rb

@@ -0,0 +1,12 @@
+# -*- encoding : utf-8 -*-
+
+class FixOldNavbarIssue < Cardio::Migration
+  NEST_REGEP = /\{\{\*navbox\|navbar\}\}/
+
+  def up
+    header = "*header".card # name, not codename, is correct here
+    return unless header.content.match? NEST_REGEP
+
+    header.update! content: header.content.gsub(NEST_REGEP, "{{:search|search_box}}")
+  end
+end

data/set/all/overlay.rb

@@ -21,7 +21,7 @@ format :html do
   end
 
   view :overlay_menu do
-    wrap_with :div, class: "btn-group btn-group-sm align-self-start ms-auto" do
+    wrap_with :div, class: "overlay-menu" do
       [render_overlay_help_link, slotify_overlay_link, close_overlay_link]
     end
   end
@@ -35,7 +35,7 @@ format :html do
   def add_open_guide_opts opts
     return unless card.guide_card
 
-    slot_selector = ".bridge-sidebar > ._overlay-container-placeholder > .card-slot"
+    slot_selector = ".board-sidebar > ._overlay-container-placeholder > .card-slot"
     opts.merge! remote: true,
                 href: path(mark: card, view: :overlay_guide),
                 "data-slot-selector": slot_selector,
@@ -68,8 +68,8 @@ format :html do
   end
 
   def overlay_menu_link icon, args={}
-    add_class args, "border-light text-dark p-1 ms-1"
-    button_link icon_tag(icon), args.merge(btn_type: "outline-secondary")
+    add_class args, "text-muted p-1 ms-1"
+    smart_link_to icon_tag(icon), args
   end
 
   def overlay_header title=nil

data/set/all/process_layout.rb

@@ -43,7 +43,7 @@ format :html do
   def explicit_modal_wrapper? view
     return unless (wrap_view = view_setting :wrap, view)
 
-    (wrapper_names(wrap_view) & %i[modal bridge]).any?
+    (wrapper_names(wrap_view) & %i[modal board]).any?
   end
 
   private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-layout
 version: !ruby/object:Gem::Version
-  version: 0.15.3
+  version: 0.15.5
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-29 00:00:00.000000000 Z
+date: 2023-04-20 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.3
+        version: 1.105.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.105.3
+        version: 1.105.5
 - !ruby/object:Gem::Dependency
   name: card-mod-account
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.3
+        version: 0.15.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.3
+        version: 0.15.5
 - !ruby/object:Gem::Dependency
   name: card-mod-session
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.3
+        version: 0.15.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.3
+        version: 0.15.5
 - !ruby/object:Gem::Dependency
   name: card-mod-tabs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.3
+        version: 0.15.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.3
+        version: 0.15.5
 description: ''
 email:
 - info@decko.org
@@ -86,6 +86,7 @@ files:
 - data/files/mod_layout_script_asset_output/file.js
 - data/real.yml
 - data/test.yml
+- db/migrate_core_cards/20230406205931_fix_old_navbar_issue.rb
 - lib/card/layout.rb
 - lib/card/layout/card_layout.rb
 - lib/card/layout/code_layout.rb