card-mod-format 0.16.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 145d87510394b9aba7420406a71e248b75f4a130d361c0afe49fb77e2f9e8b4c
-  data.tar.gz: 22fd7dd81e8565fc26cb012ba7a43632fc37573e825442146e72b069825985aa
+  metadata.gz: cab523b20f35c8ea7c8107b3d8b1cadcb9607fd100bc2141be6d7d621661c693
+  data.tar.gz: 827196f633de45d6c34ad8e28055f167d37ec5385fd047c40adbe30487a37d48
 SHA512:
-  metadata.gz: c74b05756440c35fb17760bfdb5a80974928eadc8de9b3bce8e2742d44a9a148421248c6f1395b9b6951be2f3f14ecad967f38869e7c1725a93051570a56de8f
-  data.tar.gz: 150196fe1ab672b1580059d1d7cd354532751b8ae492f76abed06d8427a4c664997d39b02f0fd6403d306eb26fa44b49a8caa5225ba36d51dd11dd17b06c7c00
+  metadata.gz: f1e207c0f720a853add22b1c07d82d61caa2c295793e49c960394c83fb59a92495adb61a270b1a94f3c131889fdf13f2f099d6b86f98ec1ee456e5b68c0d9cf4
+  data.tar.gz: 20e3f3063a4f1a108ba2a05a6cea6c62054a6794f79b673a2cdd7615b403600f7656234feeb9bfa20ebb74c37910f474a9572353c396c04dd38e26a0eb4c4fd2

data/assets/script/decko/slot.js.coffee

@@ -1,7 +1,8 @@
 decko.slot =
   # returns full path with slot parameters
-  path: (path, slot)->
+  path: (path, slot, slotterMode)->
     params = slotPathParams slot
+    params["slotter_mode"] = slotterMode if slotterMode?
     decko.path(path) + ( (if path.match /\?/ then '&' else '?') + $.param(params) )
 
   ready: (func)->
@@ -19,7 +20,6 @@ decko.slot =
         e.stopPropagation()
         func.call this, $(this)
 
-
 jQuery.fn.extend
   isSlot: -> $(this).hasClass "card-slot"
 
@@ -53,7 +53,7 @@ jQuery.fn.extend
     overlaySlot = @closest("[data-#{type}-origin-slot-id]")
     origin_slot_id = overlaySlot.data("#{type}-origin-slot-id")
     origin_slot = $("[data-slot-id=#{origin_slot_id}]")
-    if origin_slot[0]?
+    if origin_slot.length > 0
       origin_slot
     else
       decko.warn "couldn't find origin with slot id #{origin_slot_id}"
@@ -61,12 +61,18 @@ jQuery.fn.extend
   slotReload: (url) ->
     @each -> $(this)._slotReloadSingle url
 
+  slotReloading: ()->
+    # TODO: add default spinner behavior
+
+  slotLoadingComplete: ()->
+    # TODO: add default spinner behavior
+
   slotUpdate: (newContent, mode) ->
     mode ||= "replace"
     @slotContent newContent, mode, $(this)
 
   slotContent: (newContent, mode, $slotter) ->
-    v = $(newContent)[0] && $(newContent) || newContent
+    v = $(newContent).length > 0 && $(newContent) || newContent
 
     if typeof(v) == "string"
       # Needed to support "TEXT: result" pattern in success (eg deleting nested cards)
@@ -114,6 +120,7 @@ jQuery.fn.extend
     # that's where handleRemote gets the url from
     # .attr(href, url) only works for anchors
     $.rails.handleRemote $slot
+    $slot.slotReloading()
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~
 # "private" helper methods

data/assets/script/decko/slotter.js.coffee

@@ -65,12 +65,18 @@
 #
 #
 $(window).ready ->
+  $('body').on 'ajax:send', '.slotter', (event, data) ->
+    $(this).slot().slotReloading()
+
   $('body').on 'ajax:success', '.slotter', (event, data) ->
     $(this).slotterSuccess event, data
 
   $('body').on 'ajax:error', '.slotter', (event, xhr) ->
     $(this).showErrorResponse xhr.status, xhr.responseText
 
+  $('body').on 'ajax:complete', '.slotter', (event, data) ->
+    $(this).slot().slotLoadingComplete()
+
   $('body').on 'click', 'button.slotter', ->
     return false if !$.rails.allowAction $(this)
     $.rails.handleRemote $(this)
@@ -103,6 +109,15 @@ $(window).ready ->
   $('body').on 'ajax:beforeSend', '.slotter', (event, xhr, opt)->
     $(this).slotterBeforeSend opt
 
+  # NOTE: without the following two propagation checks, slotter events can propagate
+  # from one slot to another and cause weird problems, as with the type editor
+  $('body').on 'ajax:beforeSend', '.card-slot', (event)->
+    event.stopPropagation()
+
+  $('body').on 'ajax:send', '.card-slot', (event)->
+    event.stopPropagation()
+
+
 jQuery.fn.extend
   mainSuccess: ()->
     form = $(this)
@@ -204,7 +219,14 @@ jQuery.fn.extend
 
   slotterBeforeSend: (opt) ->
     # avoiding duplication. could be better test?
+    mode = @slotterMode()
+
     return if opt.noSlotParams or opt.url.match(/home_view/) or
-      @data("slotter-mode") == "modal" or @data("slotter-mode") == "override"
+      mode == "modal" or mode == "override"
+
+    opt.url = decko.slot.path opt.url, @slot(), mode
 
-    opt.url = decko.slot.path opt.url, @slot()
+  slotterMode: () ->
+    mode = @data "slotter-mode"
+    return if !mode? || (mode.match(/origin/) && !@slotOrigin())
+    mode

data/assets/style/menu.scss

@@ -6,6 +6,10 @@
   position: absolute;
   right: 8px;
   top: 5px;
+  width: auto;
+  > a {
+    text-decoration: none !important;
+  }
 }
 
 .d0-card-content, .titled-view > .d0-card-header {
@@ -14,8 +18,10 @@
   }
 }
 
-.d0-card-content .card-menu i {
-  font-size: 1.2em
+.d0-card-content, .labeled-view {
+  .card-menu i {
+    font-size: 1.2em
+  }
 }
 
 .modal-menu, .overlay-menu {
@@ -33,7 +39,7 @@
   // Hover over these, and only the card menus that are immediate children will appear
   .card-slot > .d0-card-frame > .d0-card-header,
   .card-slot > .d0-card-header,
-  .card-slot.labeled-view > .labeled-content > .d0-card-body,
+  .card-slot.labeled-view,
   .card-slot,
   .card > .card-body,
   .card > .card-header {

data/assets/style/messaging.scss

@@ -21,7 +21,9 @@
   font-weight: bold;
   font-style: italic;
   text-align: center;
-  margin: 0 0 4px 0;
+  > div {
+    margin: 1em;
+  }
 
   .card-error-msg {
     text-align: left;

data/config/admin.yml

@@ -0,0 +1,30 @@
+configurations:
+  basic:
+    - title
+    - head
+    - credit
+cardtypes:
+  text:
+    - basic
+    - plain_text
+    - html
+    - phrase
+  scripting:
+    - json
+  data:
+    - number
+    - toggle
+    - uri
+views:
+  - name
+  - link
+  - url_link
+  - content
+  - short_content
+  - core
+  - raw
+  - titled
+  - labeled
+  - smart_label
+  - title
+  - title_link

data/config/locales/en.yml

@@ -22,3 +22,4 @@ en:
   format_toggle_yes: "yes"
   format_too_deep: Man, you're too deep.  (Too many levels of nests at a time)
   format_unsupported_view: view (%{view}) not supported for %{cardname}
+  format_mod_description: Format mod

data/data/files/mod_format_script_asset_output/file.js

@@ -57,9 +57,9 @@ i.call(this)}),!1!==this._start(e)&&this._repeat(null,t(e.currentTarget).hasClas
 // decko_jquery.js.coffee
 (function(){jQuery.fn.extend({findCard:function(n){return this.find("[data-card-id='"+n+"']")},isMain:function(){return this.slot().parent("#main")[0]},cardMark:function(){return this.data("cardId")?"~"+this.data("cardId"):this.data("cardName")},isMainOrMainModal:function(){var n;return(n=$(this)).closest(".modal")[0]&&(n=n.slotOrigin("modal")),n&&n.isMain()},notify:function(n,i){var a,t,d;return(t=(d=this.slot(i)).find(".card-notice"))[0]||(t=$('<div class="card-notice"></div>'),(a=d.find(".card-form"))[0]?$(a[0]).append(t):d.append(t)),t.html(n),t.show("blind")}})}).call(this);
 // slot.js.coffee
-(function(){var t,o,s;decko.slot={path:function(t,s){var e;return e=o(s),decko.path(t)+(t.match(/\?/)?"&":"?")+$.param(e)},ready:function(t){return $("document").ready(function(){return $("body").on("decko.slot.ready",".card-slot",function(o,s){return o.stopPropagation(),null!=s?t.call(this,$(this),$(s)):t.call(this,$(this))})})},destroy:function(t){return $("document").ready(function(){return $("body").on("decko.slot.destroy",".card-slot, ._modal-slot",function(o){return o.stopPropagation(),t.call(this,$(this))})})}},jQuery.fn.extend({isSlot:function(){return $(this).hasClass("card-slot")},triggerSlotReady:function(t){return this.isSlot()&&this.trigger("decko.slot.ready",t),this.find(".card-slot").trigger("decko.slot.ready",t)},slot:function(t,o){return null==t&&(t="success"),null==o&&(o="replace"),"modal"===o?this.modalSlot():this._slotSelect("slot-"+t+"-selector")||this._slotSelect("slot-selector")||this.closest(".card-slot")},slotUrl:function(){var t;return t=$(this),decko.slot.path(t.cardMark()+"/"+t.data("slot").view)},slotFind:function(t){switch(t){case"modal-origin":return this.slotOrigin("modal");case"overlay-origin":return this.slotOrigin("overlay");default:return s(this.closest(t),this.closest(".card-slot"),t)}},slotClear:function(){return this.trigger("decko.slot.destroy"),this.empty()},slotOrigin:function(t){var o,s;return s=this.closest("[data-"+t+"-origin-slot-id]").data(t+"-origin-slot-id"),null!=(o=$("[data-slot-id="+s+"]"))[0]?o:decko.warn("couldn't find origin with slot id "+s)},slotReload:function(t){return this.each(function(){return $(this)._slotReloadSingle(t)})},slotUpdate:function(t,o){return o||(o="replace"),this.slotContent(t,o,$(this))},slotContent:function(t,o,s){var e;return"string"==typeof(e=$(t)[0]&&$(t)||t)?this.slot("success",o)._slotFillOrReplace(e,s):(e.hasClass("_overlay")?o="overlay":e.hasClass("_modal")&&(o="modal"),this.slot("success",o)._slotContentFromElement(e,o,s)),e},_slotContentFromElement:function(t,o,s){var e;return"overlay"===o?this.addOverlay(t,s):t.hasClass("_modal-slot")||"modal"===o?t.showAsModal(s):((e=this.data("slot-id"))&&t.attr("data-slot-id",e),this.trigger("decko.slot.destroy"),this._slotFillOrReplace(t,s),decko.contentLoaded(t,s))},_slotFillOrReplace:function(t,o){return this.hasClass("_fixed-slot")?this.html(t):this.replaceWith(t),decko.contentLoaded(this,o)},_slotSelect:function(t){var o,s;if(o=this.data(t))return(s=this.slotFind(o))&&s[0]&&s},_slotReloadSingle:function(t){var o;return o=$(this),null==t&&(t=o.slotUrl()),o.addClass("slotter"),o.data("url",t),o.data("remote",!0),o.attr("href",t),this[0].href=t,$.rails.handleRemote(o)}}),o=function(o){var s,e,l;return e={},null!=(s=$("#main").children(".card-slot").data("cardName"))&&(e.main=s),o&&(o.isMain()&&(e.is_main=!0),null!=(l=o.data("slot"))&&(t(l,e,"slot"),l.type&&(e.type=l.type))),e},t=function(o,s,e){return $.each(o,function(o,l){var r;return r=e+"["+decko.snakeCase(o)+"]","items"===o?t(l,s,r):s[r]=l})},s=function(t,o,s){for(;0===t.length&&o.length>0;)t=$(o).find(s),o=$(o).parent().closest(".card-slot");return 0===t.length?$(s):t}}).call(this);
+(function(){var t,o,s;decko.slot={path:function(t,s,l){var e;return e=o(s),null!=l&&(e.slotter_mode=l),decko.path(t)+(t.match(/\?/)?"&":"?")+$.param(e)},ready:function(t){return $("document").ready(function(){return $("body").on("decko.slot.ready",".card-slot",function(o,s){return o.stopPropagation(),null!=s?t.call(this,$(this),$(s)):t.call(this,$(this))})})},destroy:function(t){return $("document").ready(function(){return $("body").on("decko.slot.destroy",".card-slot, ._modal-slot",function(o){return o.stopPropagation(),t.call(this,$(this))})})}},jQuery.fn.extend({isSlot:function(){return $(this).hasClass("card-slot")},triggerSlotReady:function(t){return this.isSlot()&&this.trigger("decko.slot.ready",t),this.find(".card-slot").trigger("decko.slot.ready",t)},slot:function(t,o){return null==t&&(t="success"),null==o&&(o="replace"),"modal"===o?this.modalSlot():this._slotSelect("slot-"+t+"-selector")||this._slotSelect("slot-selector")||this.closest(".card-slot")},slotUrl:function(){var t;return t=$(this),decko.slot.path(t.cardMark()+"/"+t.data("slot").view)},slotFind:function(t){switch(t){case"modal-origin":return this.slotOrigin("modal");case"overlay-origin":return this.slotOrigin("overlay");default:return s(this.closest(t),this.closest(".card-slot"),t)}},slotClear:function(){return this.trigger("decko.slot.destroy"),this.empty()},slotOrigin:function(t){var o,s;return s=this.closest("[data-"+t+"-origin-slot-id]").data(t+"-origin-slot-id"),(o=$("[data-slot-id="+s+"]")).length>0?o:decko.warn("couldn't find origin with slot id "+s)},slotReload:function(t){return this.each(function(){return $(this)._slotReloadSingle(t)})},slotReloading:function(){},slotLoadingComplete:function(){},slotUpdate:function(t,o){return o||(o="replace"),this.slotContent(t,o,$(this))},slotContent:function(t,o,s){var l;return"string"==typeof(l=$(t).length>0&&$(t)||t)?this.slot("success",o)._slotFillOrReplace(l,s):(l.hasClass("_overlay")?o="overlay":l.hasClass("_modal")&&(o="modal"),this.slot("success",o)._slotContentFromElement(l,o,s)),l},_slotContentFromElement:function(t,o,s){var l;return"overlay"===o?this.addOverlay(t,s):t.hasClass("_modal-slot")||"modal"===o?t.showAsModal(s):((l=this.data("slot-id"))&&t.attr("data-slot-id",l),this.trigger("decko.slot.destroy"),this._slotFillOrReplace(t,s),decko.contentLoaded(t,s))},_slotFillOrReplace:function(t,o){return this.hasClass("_fixed-slot")?this.html(t):this.replaceWith(t),decko.contentLoaded(this,o)},_slotSelect:function(t){var o,s;if(o=this.data(t))return(s=this.slotFind(o))&&s[0]&&s},_slotReloadSingle:function(t){var o;return o=$(this),null==t&&(t=o.slotUrl()),o.addClass("slotter"),o.data("url",t),o.data("remote",!0),o.attr("href",t),this[0].href=t,$.rails.handleRemote(o),o.slotReloading()}}),o=function(o){var s,l,e;return l={},null!=(s=$("#main").children(".card-slot").data("cardName"))&&(l.main=s),o&&(o.isMain()&&(l.is_main=!0),null!=(e=o.data("slot"))&&(t(e,l,"slot"),e.type&&(l.type=e.type))),l},t=function(o,s,l){return $.each(o,function(o,e){var n;return n=l+"["+decko.snakeCase(o)+"]","items"===o?t(e,s,n):s[n]=e})},s=function(t,o,s){for(;0===t.length&&o.length>0;)t=$(o).find(s),o=$(o).parent().closest(".card-slot");return 0===t.length?$(s):t}}).call(this);
 // slotter.js.coffee
-(function(){$(window).ready(function(){return $("body").on("ajax:success",".slotter",function(t,s){return $(this).slotterSuccess(t,s)}),$("body").on("ajax:error",".slotter",function(t,s){return $(this).showErrorResponse(s.status,s.responseText)}),$("body").on("click","button.slotter",function(){return!!$.rails.allowAction($(this))&&$.rails.handleRemote($(this))}),$("body").on("click",'[data-bs-dismiss="overlay"]',function(){return $(this).slotFind(".card-slot._overlay").removeOverlay()}),$("body").on("click","._close-overlay-on-success",function(){return $(this).closeOnSuccess("overlay")}),$("body").on("click","._close-modal-on-success",function(){return $(this).closeOnSuccess("modal")}),$("body").on("click","._close-on-success",function(){return $(this).closeOnSuccess()}),$("body").on("click","._update-origin",function(){return $(this).closest(".slotter").data("slotter-mode","update-origin")}),$("body").on("submit","form.slotter",function(){var t;if((t=$(this)).data("main-success")&&t.isMainOrMainModal())return t.mainSuccess()}),$("body").on("ajax:beforeSend",".slotter",function(t,s,o){return $(this).slotterBeforeSend(o)})}),jQuery.fn.extend({mainSuccess:function(){var t;return t=$(this),$.each(t.data("main-success"),function(s,o){var e,i;return i="[name=success\\["+s+"\\]]",(e=t.find(i))[0]||(e=$('<input type="hidden" name="success['+s+']"/>'),t.append(e)),e.val(o)})},slotterSuccess:function(t,s){var o,e,i;if(this.hasClass("slotter")){if(!t.slotSuccessful)return this.showSuccessResponse(s,this.data("slotter-mode")),this.hasClass("_close-overlay")&&this.removeOverlay(),this.hasClass("_close-modal")&&this.closest(".modal").modal("hide"),this.hasClass("card-paging-link")&&(i=this.slot().offset().top,$("body").scrollTop(i)),this.data("update-foreign-slot")&&(o=this.slotFind(this.data("update-foreign-slot")),e=this.data("update-foreign-slot-url"),o.slotReload(e)),this.data("original-slotter-mode")&&this.attr("data-slotter-mode",this.data("original-slotter-mode")),this.data("original-slot-selector")&&this.attr("data-slot-selector",this.data("original-slot-selector")),t.slotSuccessful=!0}else console.log("warning: slotterSuccess called on non-slotter element "+this)},showSuccessResponse:function(t,s){if(t.redirect)return window.location=t.redirect;if(t.reload)return window.location.reload(!0);switch(s){case"silent-success":break;case"update-modal-origin":return this.updateModalOrigin();case"update-origin":return this.updateOrigin();default:return this.slotUpdate(t,s)}},showErrorResponse:function(t,s){return 403===t?$(s).showAsModal($(this)):900===t?$(s).showAsModal($(this)):(this.notify(s,"error"),409===t?this.slot().find(".current_revision_id").val(this.slot().find(".new-current-revision-id").text()):void 0)},updateModalOrigin:function(){return this.overlaySlot()?this.slotOrigin("overlay").updateOrigin():this.closest("#modal-container")[0]?this.updateOrigin():void 0},updateOrigin:function(){var t,s;if(null!=(s=this.overlaySlot()?"overlay":this.closest("#modal-container")[0]?"modal":void 0))return(t=this.slotOrigin(s))&&null!=t[0]?t.slotReload():void 0},registerAsOrigin:function(t,s){return s.hasClass("_modal-slot")&&(s=s.find(".modal-body")),s.attr("data-"+t+"-origin-slot-id",this.slot().data("slot-id"))},closeOnSuccess:function(t){var s;return s=this.closest(".slotter"),null==t&&(t=this.isInOverlay()?"overlay":"modal"),s.addClass("_close-"+t)},slotterBeforeSend:function(t){if(!t.noSlotParams&&!t.url.match(/home_view/)&&"modal"!==this.data("slotter-mode")&&"override"!==this.data("slotter-mode"))return t.url=decko.slot.path(t.url,this.slot())}})}).call(this);
+(function(){$(window).ready(function(){return $("body").on("ajax:send",".slotter",function(){return $(this).slot().slotReloading()}),$("body").on("ajax:success",".slotter",function(t,o){return $(this).slotterSuccess(t,o)}),$("body").on("ajax:error",".slotter",function(t,o){return $(this).showErrorResponse(o.status,o.responseText)}),$("body").on("ajax:complete",".slotter",function(){return $(this).slot().slotLoadingComplete()}),$("body").on("click","button.slotter",function(){return!!$.rails.allowAction($(this))&&$.rails.handleRemote($(this))}),$("body").on("click",'[data-bs-dismiss="overlay"]',function(){return $(this).slotFind(".card-slot._overlay").removeOverlay()}),$("body").on("click","._close-overlay-on-success",function(){return $(this).closeOnSuccess("overlay")}),$("body").on("click","._close-modal-on-success",function(){return $(this).closeOnSuccess("modal")}),$("body").on("click","._close-on-success",function(){return $(this).closeOnSuccess()}),$("body").on("click","._update-origin",function(){return $(this).closest(".slotter").data("slotter-mode","update-origin")}),$("body").on("submit","form.slotter",function(){var t;if((t=$(this)).data("main-success")&&t.isMainOrMainModal())return t.mainSuccess()}),$("body").on("ajax:beforeSend",".slotter",function(t,o,s){return $(this).slotterBeforeSend(s)}),$("body").on("ajax:beforeSend",".card-slot",function(t){return t.stopPropagation()}),$("body").on("ajax:send",".card-slot",function(t){return t.stopPropagation()})}),jQuery.fn.extend({mainSuccess:function(){var t;return t=$(this),$.each(t.data("main-success"),function(o,s){var e,i;return i="[name=success\\["+o+"\\]]",(e=t.find(i))[0]||(e=$('<input type="hidden" name="success['+o+']"/>'),t.append(e)),e.val(s)})},slotterSuccess:function(t,o){var s,e,i;if(this.hasClass("slotter")){if(!t.slotSuccessful)return this.showSuccessResponse(o,this.data("slotter-mode")),this.hasClass("_close-overlay")&&this.removeOverlay(),this.hasClass("_close-modal")&&this.closest(".modal").modal("hide"),this.hasClass("card-paging-link")&&(i=this.slot().offset().top,$("body").scrollTop(i)),this.data("update-foreign-slot")&&(s=this.slotFind(this.data("update-foreign-slot")),e=this.data("update-foreign-slot-url"),s.slotReload(e)),this.data("original-slotter-mode")&&this.attr("data-slotter-mode",this.data("original-slotter-mode")),this.data("original-slot-selector")&&this.attr("data-slot-selector",this.data("original-slot-selector")),t.slotSuccessful=!0}else console.log("warning: slotterSuccess called on non-slotter element "+this)},showSuccessResponse:function(t,o){if(t.redirect)return window.location=t.redirect;if(t.reload)return window.location.reload(!0);switch(o){case"silent-success":break;case"update-modal-origin":return this.updateModalOrigin();case"update-origin":return this.updateOrigin();default:return this.slotUpdate(t,o)}},showErrorResponse:function(t,o){return 403===t?$(o).showAsModal($(this)):900===t?$(o).showAsModal($(this)):(this.notify(o,"error"),409===t?this.slot().find(".current_revision_id").val(this.slot().find(".new-current-revision-id").text()):void 0)},updateModalOrigin:function(){return this.overlaySlot()?this.slotOrigin("overlay").updateOrigin():this.closest("#modal-container")[0]?this.updateOrigin():void 0},updateOrigin:function(){var t,o;if(null!=(o=this.overlaySlot()?"overlay":this.closest("#modal-container")[0]?"modal":void 0))return(t=this.slotOrigin(o))&&null!=t[0]?t.slotReload():void 0},registerAsOrigin:function(t,o){return o.hasClass("_modal-slot")&&(o=o.find(".modal-body")),o.attr("data-"+t+"-origin-slot-id",this.slot().data("slot-id"))},closeOnSuccess:function(t){var o;return o=this.closest(".slotter"),null==t&&(t=this.isInOverlay()?"overlay":"modal"),o.addClass("_close-"+t)},slotterBeforeSend:function(t){var o;if(o=this.slotterMode(),!t.noSlotParams&&!t.url.match(/home_view/)&&"modal"!==o&&"override"!==o)return t.url=decko.slot.path(t.url,this.slot(),o)},slotterMode:function(){var t;if(null!=(t=this.data("slotter-mode"))&&(!t.match(/origin/)||this.slotOrigin()))return t}})}).call(this);
 // slot_ready.js.coffee
 (function(){decko.slot.ready(function(a){return a.find("card-view-placeholder").each(function(){var a;if(!(a=$(this)).data("loading"))return a.data("loading",!0),$.get(a.data("url"),function(e){return a.replaceWith(e)})}),a.find("._disappear").delay(5e3).animate({height:0},1e3,function(){return $(this).hide()})})}).call(this);
 // clicks_and_hovers.js.coffee

data/lib/card/format/csv_format.rb

@@ -2,11 +2,15 @@
 
 class Card
   class Format
-    class CsvFormat < TextFormat
+    class CsvFormat < Format
       register :csv
 
       def mime_type
-        "text/comma-separated-values"
+        if params[:disposition] == "inline"
+          "text/plain"
+        else
+          "text/comma-separated-values"
+        end
       end
 
       def self.view_caching?

data/set/all/csv.rb

@@ -20,10 +20,10 @@ format :csv do
 
   view :titled do
     voo.items[:view] ||= :row
-    (render_header + render_core).map { |row| CSV.generate_line row }.join
+    (render_header + render_body).map { |row| CSV.generate_line row }.join
   end
 
-  view :core do
+  view :body do
     item_cards.map { |item_card| nest item_card }
   end
 

data/set/all/demo.rb

@@ -12,7 +12,7 @@ format :html do
   end
 
   def view_list
-    %i[content titled labeled bar box open closed content_panel]
+    %i[content titled labeled bar box open closed]
   end
 
   def demo_view
@@ -28,11 +28,15 @@ format :html do
   def view_select
     card_form :get, success: { view: :demo } do
       select_tag :demo_view,
-                 options_for_select(all_views, demo_view),
+                 options_for_select(all_views_from_admin_config, demo_view),
                  class: "_submit-on-select"
     end
   end
 
+  def all_views_from_admin_config
+    card.all_admin_configs_of_category("views").map(&:codename)
+  end
+
   def all_views
     Card::Set::Format::AbstractFormat::ViewDefinition
       .views.slice(*self.class.ancestors).values.map(&:keys).flatten.uniq.sort

data/set/all/html/error.rb

@@ -147,14 +147,14 @@ format :html do
 
   def signin_link
     link_to_card :signin, t(:account_sign_in)&.downcase,
-                 class: "signin-link", slotter: true, path: { view: :open }
+                 class: "signin-link", path: { view: :titled }
   end
 
   def signup_link
     return unless signup_ok?
 
     link_to_card :signup, t(:account_sign_up)&.downcase,
-                 class: "signup-link", slotter: true, path: { action: :new }
+                 class: "signup-link", path: { action: :new }
   end
 
   def signup_ok?

data/set/all/html/frame.rb

@@ -36,14 +36,16 @@ format :html do
     end
   end
 
+  def panel &block
+    wrap_with :div, class: classy("d0-card-frame"), &block
+  end
+
+  private
+
   def frame_and_form action, form_opts={}, &block
     form_opts ||= {}
     frame do
       card_form action, form_opts, &block
     end
   end
-
-  def panel &block
-    wrap_with :div, class: classy("d0-card-frame"), &block
-  end
 end

data/set/all/html/head.rb

@@ -1,9 +1,17 @@
 basket[:head_views] =
   %i[page_title_tag meta_tags favicon_tag
-     head_remote_stylesheets head_stylesheet
+     stylesheet_tags
      universal_edit_button rss_links]
 # TODO: the last two should be in mods
 
+basket[:cache_seed_names] += [
+  %i[all head],
+  %i[all style],
+  %i[all style asset_output],
+  %i[all script],
+  %i[script right content_options]
+]
+
 format do
   view :page_title, unknown: true, perms: :none do
     title_parts = [Card::Rule.global_setting(:title)]
@@ -13,7 +21,7 @@ format do
 end
 
 format :html do
-  view :head, unknown: true, perms: :none do
+  view :head, unknown: true, perms: :none, cache: :yes do
     basket[:head_views].map { |viewname| render viewname }.flatten.compact.join "\n"
   end
 
@@ -27,6 +35,7 @@ format :html do
     nest :favicon, view: :link_tag
   end
 
+  # TODO: move to mod
   view :universal_edit_button, unknown: :blank, denial: :blank, perms: :update do
     return if card.new?
 
@@ -34,61 +43,31 @@ format :html do
                 title: "Edit this page!", href: path(view: :edit)
   end
 
+  # TODO: move to rss mod
+  view :rss_links, unknown: true, perms: :none do
+    render :rss_link_tag if rss_link?
+  end
+
   # these should render a view of the rule card
   # it would then be safe to cache if combined with param handling
   # (but note that machine clearing would need to reset card cache...)
-  view :head_stylesheet, unknown: true, cache: :never, perms: :none do
-    return unless (href = head_stylesheet_path)
-
-    tag("link", href: href, media: "all", rel: "stylesheet", type: "text/css")
+  view :stylesheet_tags, cache: :never, unknown: true, perms: :none do
+    [nest(:style_mods, view: :remote_style_tags), head_stylesheet_path]
   end
 
-  view :head_remote_stylesheets, unknown: true, cache: :never, perms: :none do
-    remote_style_tags
+  def head_stylesheet_path
+    @head_stylesheet_path ||=
+      tag "link", media: "all",
+                  rel: "stylesheet",
+                  type: "text/css",
+                  href: nest(param_or_rule_card(:style), view: :stylesheet_path)
   end
 
   def param_or_rule_card setting
-    if params[setting]
-      Card[params[setting]]
-    else
-      root.card.rule_card setting
-    end
-  end
-
-  def debug_or_machine_path setting, debug_lambda, machine_path_lambda
-    return unless (asset_card = param_or_rule_card setting)
-    debug_path(setting, asset_card, &debug_lambda) ||
-      machine_path_lambda.call(asset_card.asset_output_url)
-  end
-
-  def debug_path setting, asset_card
-    return unless params[:debug] == setting.to_s
-
-    yield asset_card
-  end
-
-  # TODO: move to rss mod
-  view :rss_links, unknown: true, perms: :none do
-    render :rss_link_tag if rss_link?
+    params[setting]&.card || root.card.rule_card(setting)
   end
 
   def rss_link?
     Card.config.rss_enabled && respond_to?(:rss_link_tag)
   end
-
-  def remote_style_tags
-    return unless (asset_card = Card[:style_mods])
-
-    asset_card.item_cards.map do |mod_style_card|
-      nest mod_style_card, view: :remote_include_tags
-    end.select(&:present?)
-  end
-
-  def head_stylesheet_path
-    debug_or_machine_path(
-      :style,
-      ->(style_card) { path mark: style_card.name, item: :import, format: :css },
-      ->(machine_path) { machine_path }
-    )
-  end
 end

data/set/all/html/menu.rb

@@ -1,4 +1,10 @@
 format :html do
+  view :menu_block do
+    wrap_with :div, class: "menu-block position-relative py-2" do
+      [render_menu, " "]
+    end
+  end
+
   view :menu, denial: :blank, unknown: true do
     return "" unless card.known?
     # would be preferable to do this with unknown: :blank, but that fails with view
@@ -6,6 +12,29 @@ format :html do
     wrap_with(:div, class: "card-menu #{menu_link_classes}") { menu_items }
   end
 
+  view :edit_link, unknown: true, denial: :blank do
+    edit_link edit_link_view
+  end
+
+  view :edit_button do
+    view = voo.edit == :inline ? :edit_inline : :edit
+    link_to_view view, "Edit", class: "btn btn-sm btn-outline-primary me-2"
+  end
+
+  view :full_page_link do
+    full_page_link
+  end
+
+  view :board_link, unknown: true do
+    board_link
+  end
+
+  # no caching because help_text view doesn't cache, and we can't have a
+  # stub in the data-content attribute or it will get html escaped.
+  view :help_link, cache: :never, unknown: true do
+    help_link render_help_text, help_title
+  end
+
   def menu_edit_link
     case voo.edit
     when :inline
@@ -36,40 +65,34 @@ format :html do
     end
   end
 
-  view :edit_link, unknown: true, denial: :blank do
-    edit_link edit_link_view
-  end
-
-  view :edit_button do
-    view = voo.edit == :inline ? :edit_inline : :edit
-    link_to_view view, "Edit", class: "btn btn-sm btn-outline-primary me-2"
-  end
-
   def edit_link_view
     :edit
   end
 
-  view :full_page_link do
-    full_page_link
-  end
-
-  view :board_link, unknown: true do
-    board_link
-  end
-
+  # Generates a link to a board with optional parameters.
+  #
+  # @param [String] text The text displayed on the link.
+  # @param [Boolean] in_modal (true) Indicates whether the board
+  #   link should open in a modal.
+  # @param [Boolean] confirm (false) Indicates whether to show a
+  #   confirmation for potential data loss.
+  #
+  # @return [String] The HTML code for the board link.
+  #
+  # @example
+  #   board_link(text: "Advanced", in_modal: true, confirm: true)
   def board_link text: "", in_modal: true, confirm: false
-    opts = { class: "board-link" }
+    opts = {
+      class: "board-link",
+      title: "Advanced",
+      "data-bs-toggle": "tooltip",
+      "data-bs-placement": "bottom"
+    }
     opts["data-slotter-mode"] = "modal-replace" if in_modal
     confirm_edit_loss opts if confirm
     link_to_view :board, "#{board_icon} #{text}", opts
   end
 
-  # no caching because help_text view doesn't cache, and we can't have a
-  # stub in the data-content attribute or it will get html escaped.
-  view :help_link, cache: :never, unknown: true do
-    help_link render_help_text, help_title
-  end
-
   def help_link text=nil, title=nil
     opts = help_popover_opts text, title
     add_class opts, "_card-menu-popover"
@@ -129,9 +152,24 @@ format :html do
                  edit_link_opts(modal: (modal || :lg))
   end
 
-  # @param modal [Symbol] modal size
+  # Generates options hash for an edit link with optional parameters.
+  #
+  # @param [Symbol] modal (nil) The modal class to use for the edit link.
+  #
+  # @return [Hash] The options hash for the edit link.
+  #
+  # @example
+  #   edit_link_opts(modal: "custom-modal")
+  #   #=> { class: 'edit-link', title: 'Edit', 'data-bs-toggle': 'tooltip',
+  #         'data-bs-placement': 'bottom', 'data-slotter-mode': 'modal',
+  #         'data-modal-class': 'modal-custom-modal' }
   def edit_link_opts modal: nil
-    opts = { class: classy("edit-link") }
+    opts = {
+      class: classy("edit-link"),
+      title: "Edit",
+      "data-bs-toggle": "tooltip",
+      "data-bs-placement": "bottom"
+    }
     if modal
       opts[:"data-slotter-mode"] = "modal"
       opts[:"data-modal-class"] = "modal-#{modal}"

data/set/all/html/show.rb

@@ -25,7 +25,15 @@ format :html do
     render! view, args
   end
 
+  def default_page_view
+    default_nest_view
+  end
+
   def show_method
     "show_#{show_layout? ? :with : :without}_page_layout"
   end
+
+  def show_layout?
+    !Env.ajax? || params[:layout]
+  end
 end

data/set/all/html/views.rb

@@ -7,7 +7,7 @@ format :html do
 
   before(:content) { prepare_content_slot }
 
-  view :content do
+  view :content, cache: :yes do
     wrap do
       [
         render_menu(optional: :hide),
@@ -52,7 +52,7 @@ format :html do
     end
   end
 
-  view :titled do
+  view :titled, cache: :yes do
     @content_body = true
     wrap do
       [
@@ -64,10 +64,10 @@ format :html do
   end
 
   # unlike unknown: true, unknown: (same view) can be overridden
-  view :labeled, unknown: :labeled do
+  view :labeled, unknown: :labeled, cache: :yes do
     @content_body = true
     wrap(true, class: "row") do
-      labeled(render_title, wrap_body { "#{render_menu}#{render_labeled_content}" })
+      [labeled(render_title, wrap_body { render_labeled_content }), render_menu]
     end
   end
 
@@ -76,7 +76,7 @@ format :html do
   end
 
   def labeled_field field, item_view=:name, opts={}
-    opts[:title] ||= Card.fetch_name field
+    opts[:title] ||= field.cardname
     field_nest field, opts.merge(view: :labeled,
                                  items: (opts[:items] || {}).merge(view: item_view))
   end

data/set/all/html/wrap.rb

@@ -40,6 +40,7 @@ format :html do
         "card-id": card.id,
         "card-name": slot_cardname,
         "card-type-id": card.type_id,
+        "card-type-name": card.type_name,
         "card-link-name": card.name.url_key,
         "slot-id": SecureRandom.hex(10)
       }

data/set/all/links.rb

@@ -26,9 +26,10 @@ format do
   end
 
   # link to a card other than the current card.
-  # @param cardish [Integer, Symbol, String, Card] a card identifier
-  # @param text [String]
-  # @param opts [Hash]
+  # @param cardish [Integer, Symbol, String, Card]: A card identifier
+  # @param text [String], optional: The text content of the link.
+  # @param opts [Hash], optional: Additional options for the link.
+  # @return [String] HTML markup for the generated link.
   def link_to_card cardish, text=nil, opts={}
     add_to_path opts, mark: Card::Name[cardish]
     link_to text, opts
@@ -79,6 +80,12 @@ format do
     end
   end
 
+  # Adds key-value pairs from a new hash to the 'path' key
+  # in the given options dictionary.
+  # @params opts [dict]: The options dictionary to be modified.
+  # @params new_hash [dict]: The new hash containing
+  #   key-value pairs to be added to the 'path'.
+  # @return [Hash] The value of opts[:path]
   def add_to_path opts, new_hash
     opts[:path] = (opts[:path] || {}).merge new_hash
   end

data/set/all/yaml.rb

@@ -1,6 +1,9 @@
 format :yaml do
   def show view, args={}
-    view ||= :export
     render!(view, args).to_yaml
   end
+
+  view :core do
+    render_pod
+  end
 end

data/set/type/cardtype.rb

@@ -85,3 +85,7 @@ format :html do
     end
   end
 end
+
+def scoping_rule_card
+  Card.fetch([self, :type, :update], new: {})
+end

data/set/type/mod.rb

@@ -0,0 +1,15 @@
+format :html do
+  view :admin do
+    render_core
+  end
+
+  view :bar_right do
+    %w[settings configurations tasks cardtypes scripts styles].filter do |name|
+      card.send("#{name}?")
+    end.join ", "
+  end
+
+  def before_bar
+    voo.show :bar_middle
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-format
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-18 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.106.0
+        version: 1.108.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.106.0
+        version: 1.108.0
 - !ruby/object:Gem::Dependency
   name: card-mod-content
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.18.0
 description: ''
 email:
 - info@decko.org
@@ -65,6 +65,7 @@ files:
 - assets/style/messaging.scss
 - assets/style/misc.scss
 - assets/style/open_and_closed.scss
+- config/admin.yml
 - config/locales/de.yml
 - config/locales/en.yml
 - data/files/credit_image.svg
@@ -123,6 +124,7 @@ files:
 - set/type/cardtype.rb
 - set/type/html.rb
 - set/type/json.rb
+- set/type/mod.rb
 - set/type/number.rb
 - set/type/phrase.rb
 - set/type/plain_text.rb
@@ -205,7 +207,7 @@ files:
 - vendor/jquery_rails/vendor/assets/javascripts/jquery_ujs.js
 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
@@ -222,14 +224,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.7
 signing_key:
 specification_version: 4
 summary: format