card 1.97.0.1 → 1.98.0

data/mod/machines/lib/javascript/{decko_overlay.js.coffee → decko/overlay.js.coffee}

@@ -24,8 +24,10 @@ jQuery.fn.extend
       @before overlay
 
     $slotter.registerAsOrigin("overlay", overlay)
+    decko.contentLoaded(overlay, $slotter)
 
   replaceOverlay: (overlay) ->
+    @overlaySlot().trigger "slotDestroy"
     @overlaySlot().replaceWith overlay
     $(".bridge-sidebar .tab-pane:not(.active) .bridge-pills > .nav-item > .nav-link.active").removeClass("active")
 
@@ -33,6 +35,7 @@ jQuery.fn.extend
       @overlaySlot().removeOverlaySlot()
 
   removeOverlaySlot: () ->
+    @trigger "slotDestroy"
     if @siblings().length == 1
       bottomlay = $(@siblings()[0])
       if bottomlay.hasClass("_bottomlay-slot")

data/mod/machines/lib/javascript/{decko_slot.js.coffee → decko/slot.js.coffee}

@@ -1,6 +1,10 @@
 $.extend decko,
   # returns full path with slot parameters
   slotPath: (path, slot)->
+    params = decko.slotData(slot)
+    decko.path(path) + ( (if path.match /\?/ then '&' else '?') + $.param(params) )
+
+  slotData: (slot) ->
     xtra = {}
     main = $('#main').children('.card-slot').data 'cardName'
     xtra['main'] = main if main?
@@ -8,8 +12,21 @@ $.extend decko,
       xtra['is_main'] = true if slot.isMain()
       slotdata = slot.data 'slot'
       decko.slotParams slotdata, xtra, 'slot' if slotdata?
+    xtra
+
+  slotEditView: (slot) ->
+    data = decko.slotData(slot)
+    switch data["slot[edit]"]
+      when "inline" then "edit_inline"
+      when "full"   then "bridge"
+      else "edit"
 
-    decko.path(path) + ( (if path.match /\?/ then '&' else '?') + $.param(xtra) )
+  slotEditLink: (slot) ->
+    edit_links =
+      slot.find(".edit-link").filter (i, el) ->
+        $(el).slot().data('slotId') == slot.data('slotId')
+
+    if edit_links[0] then $(edit_links[0]) else false
 
   slotParams: (raw, processed, prefix)->
     $.each raw, (key, value)->
@@ -19,6 +36,13 @@ $.extend decko,
       else
         processed[cgiKey] = value
 
+  contentLoaded: (el, slotter)->
+    decko.initializeEditors(el)
+    notice = slotter.attr('notify-success')
+    if notice?
+      el.notify notice, "success"
+    el.triggerSlotReady(slotter)
+
   slotReady: (func)->
     $('document').ready ->
       $('body').on 'slotReady', '.card-slot', (e, slotter) ->
@@ -28,6 +52,12 @@ $.extend decko,
         else
           func.call this, $(this)
 
+  slotDestroy: (func)->
+    $('document').ready ->
+      $('body').on 'slotDestroy', '.card-slot, ._modal-slot', (e) ->
+        e.stopPropagation()
+        func.call this, $(this)
+
 jQuery.fn.extend
   slot: (status="success", mode="replace") ->
     if mode == "modal"
@@ -122,9 +152,8 @@ jQuery.fn.extend
       slot_id = @data("slot-id")
       el.attr("data-slot-id", slot_id) if slot_id
       @replaceWith el
-
-    el.triggerSlotReady($slotter)
+      decko.contentLoaded(el, $slotter)
 
   triggerSlotReady: (slotter) ->
-    @trigger "slotReady", slotter
+    @trigger "slotReady", slotter if @isSlot()
     @find(".card-slot").trigger "slotReady", slotter

data/mod/machines/lib/javascript/decko/slot_ready.js.coffee

@@ -0,0 +1,11 @@
+decko.slotReady (slot) ->
+  slot.find('._disappear').delay(5000).animate(
+    height: 0, 1000, -> $(this).hide())
+
+  if slot.hasClass("_refresh-timer")
+    setTimeout(
+      -> slot.reloadSlot(slot.data("refresh-url")),
+      2000
+    )
+
+

data/mod/machines/lib/javascript/{decko_slotter.js.coffee → decko/slotter.js.coffee}

@@ -111,6 +111,9 @@ jQuery.fn.extend
 
     return if event.slotSuccessful
 
+    if @data("reload")
+      window.locacation.reload(true)
+
     if @data("update-origin")
       @updateOrigin()
 
@@ -140,13 +143,14 @@ jQuery.fn.extend
       @updateOrigin()
     else if data.redirect
       window.location = data.redirect
+    else if data.reload
+      window.location.reload(true)
     else
       @updateSlot data, mode
 
   showErrorResponse: (status, result) ->
     if status == 403 #permission denied
       $(result).showAsModal $(this)
-      #@setSlotContent result
     else if status == 900
       $(result).showAsModal $(this)
     else
@@ -169,30 +173,19 @@ jQuery.fn.extend
     if origin && origin[0]?
       origin.reloadSlot()
 
-
   registerAsOrigin: (type, slot) ->
     if slot.hasClass("_modal-slot")
       slot = slot.find(".modal-body .card-slot")
     slot.attr("data-#{type}-origin-slot-id", @closest(".card-slot").data("slot-id"))
-    #@closest(".card-slot").addClass("_#{type}-origin")
 
   updateSlot: (data, mode) ->
-    notice = @attr('notify-success')
     mode ||= "replace"
-    newslot = @setSlotContent data, mode, $(this)
-
-    if newslot.jquery # sometimes response is plaintext
-      decko.initializeEditors newslot
-      if notice?
-        newslot.notify notice, "success"
+    @setSlotContent data, mode, $(this)
 
   # close modal or overlay
   closeOnSuccess: (type) ->
     slotter = @closest('.slotter')
     slotter.addClass "_close-#{type}"
-#    unless trigger.hasClass("_update-origin") or slotter.data("slotter-mode") == "update-origin"
-#      slotter.data("slotter-mode", "replace")
-
 
   slotterBeforeSend: (opt) ->
     return if opt.skip_before_send
@@ -207,7 +200,6 @@ jQuery.fn.extend
         @uploadWithBlueimp(data, opt)
         false
 
-
   uploadWithBlueimp: (data, opt) ->
     input = @find '.file-upload'
     if input[1]

data/mod/machines/lib/stylesheets/style_cards.scss

@@ -211,6 +211,29 @@ $d-yellow-1: #ffd;
   }
 }
 
+.titled-view > .d0-card-header {
+  border-bottom: 1px solid $border-color;
+  padding-bottom: 0.1em;
+  margin-bottom: 1em;
+
+  > .d0-card-header-title > .card-title {
+    font-size: $h1-font-size;
+    color: $headings-color;
+  }
+}
+
+.d0-card-content {
+  .d0-card-header > .d0-card-header-title > .card-title {
+    font-size: $h2-font-size;
+    color: $headings-color;
+  }
+  .bar-bottom .d0-card-header > .d0-card-header-title > .card-title {
+    font-size: $h3-font-size;
+    color: $headings-color;
+  }
+}
+
+
 /* -- file upload -- */
 .fileupload-buttonbar .btn, .fileupload-buttonbar .toggle {
   margin-bottom: 5px;
@@ -448,16 +471,19 @@ textarea {
   }
 }
 
-// .search-checkbox-item {
-//   .checkbox-side {
-//     width: 32px;
-//     padding: 10px;
-//   }
-//
-//   .item-view-side {
-//     max-width: 550px;
-//   }
-// }
+._filtering ._filterable {
+  cursor: pointer;
+  &:hover {
+    background-color: #fafafa;
+  }
+}
+._filter-link {
+  cursor: pointer;
+}
+
+.search-checkbox-item .checkbox-side {
+  width: 32px;
+}
 
 .new-account-link {
   text-align: center;
@@ -564,11 +590,27 @@ ul.action-list {
   }
   li:before {
     font-family: 'Material Icons';
+    font-weight: normal;
+    font-style: normal;
+    display: inline-block;
+    line-height: 1;
+    text-transform: none;
+    letter-spacing: normal;
+    word-wrap: normal;
+    white-space: nowrap;
+    direction: ltr;
+    -webkit-font-smoothing: antialiased;
+    text-rendering: optimizeLegibility;
+    -moz-osx-font-smoothing: grayscale;
+    font-feature-settings: 'liga';
+
+
     float: left;
     margin-top: 8px;
     margin-left: -2rem;
     font-size: 120%;
     padding-left: 4px;
+    max-height: 30px;
   }
 
   li.update:before {
@@ -695,8 +737,6 @@ ul.action-list {
 }
 .setting-rules th,
 .set-rules th {
-  background: #aaa;
-  color: $gray-300;
   padding: 5px 0;
 }
 .setting-rules th,
@@ -706,10 +746,7 @@ ul.action-list {
   text-align: left;
   padding: 2px 5px;
 }
-.set-rules th,
-.set-rules td.rule-cell {
-  border-bottom: 1px solid $gray-300;
-}
+
 .setting-klass,
 .rule-setting {
   font-weight: bold;
@@ -718,7 +755,6 @@ td.rule-setting {
   width: 30%;
 }
 .rule-set {
-  color: $gray-600;
   white-space: nowrap;
 }
 
@@ -790,12 +826,8 @@ tr.missing-rule > td {
 .show-rule .rule-set {
   margin-bottom: 10px;
 }
-.klass-row {
-  background: $gray-300;
-  border-top: 1px solid $gray-400;
-}
+
 tr.rule-changeover td {
-  border-top: 1px solid $gray-300;
   padding-top: 5px;
 }
 td.rule-anchor {
@@ -933,7 +965,7 @@ a.external-link,
   width: 50px;
 }
 
-a.edit-link {
+a.bridge-link, a.edit-link {
   color: $text-muted;
 }
 
@@ -956,15 +988,19 @@ a.edit-link {
   }
 }
 
-$bridge-line-color: $gray-300;
+$bridge-line-color: $border-color;
 
 .bridge-sidebar {
-  background-color: $gray-100;
+  background-color: darken($body-bg, 15%);
   padding-left: 0;
   padding-right: 0;
   min-height: calc(100vh - 90px);
 }
 
+.bg-body {
+  background-color: $body-bg !important;
+}
+
 .bridge-main {
   border-right: 1px solid $bridge-line-color;
   padding-left: 0;
@@ -1053,7 +1089,7 @@ $bridge-line-color: $gray-300;
 
 .overlay-container {
     height: 100%;
-    overflow: hidden;
+    overflow: auto;
 }
 
 .help-text.rule-instruction > div p:last-child {
@@ -1159,3 +1195,50 @@ $bridge-line-color: $gray-300;
 .act-summary {
   min-width: 27px;
 }
+
+footer .separator {
+  padding-left: 2px;
+  padding-right: 2px;
+}
+
+body.right-sidebar, body.left-sidebar, body.two-sidebar {
+  article, #primary {
+    margin: 0 1% 3em 1%;
+    float: left;
+    width: 67%;
+  }
+
+  aside, #secondary {
+    margin: 0 1% 3em 1%;
+    float: right;
+    width: 28%;
+  }
+
+  footer {
+    clear:both;
+    text-align: center;
+    padding: 1em;
+  }
+}
+
+@media print {
+  article, #primary {
+    width: 100%;
+    float: none;
+    margin: 0;
+  }
+
+  aside, #secondary, footer {
+    display: none;
+  }
+}
+
+.RIGHT-Xenabled_role.edit_inline-view .pointer-checkbox-list {
+  #pointer-checkbox-anyone_signed_in, #pointer-checkbox-eagle {
+    display: none;
+  }
+}
+
+.edit_inline-view.RIGHT-Xenabled_role .card-editor {
+  padding-bottom: 0;
+}

data/mod/machines/set/abstract/machine.rb

@@ -120,7 +120,7 @@ class << self
   def define_machine_events host_class
     event_suffix = host_class.name.tr ":", "_"
     event_name = "reset_machine_output_#{event_suffix}".to_sym
-    host_class.event event_name, after: :expire_related, on: :save do
+    host_class.event event_name, after: :expire_related, changed: :content, on: :save do
       reset_machine_output
     end
   end
@@ -138,7 +138,7 @@ def run_machine joint="\n"
 end
 
 def direct_machine_input? input_card
-  !input_card.is_a?(Card::Set::Type::Pointer) ||
+  !input_card.collection? ||
     input_card.respond_to?(:machine_input)
 end
 
@@ -166,7 +166,7 @@ def make_machine_output_coded mod=:machines
   Card::Auth.as_bot do
     ENV["STORE_CODED_FILES"] = "true"
     machine_output_card.update! storage_type: :coded, mod: mod,
-                                           codename: machine_output_codename
+                                codename: machine_output_codename
     ENV["STORE_CODED_FILES"] = nil
   end
 end

data/mod/machines/set/abstract/skin_box.rb

@@ -5,8 +5,7 @@ format :html do
     super()
   end
 
-  view :box_bottom, template: :haml do
-  end
+  view :box_bottom, template: :haml
 
   view :customize_button, cache: :never do
     customize_button

data/mod/machines/set/right/machine_output.rb

@@ -2,6 +2,10 @@ def followable?
   false
 end
 
+def ok_to_read
+  left.ok_to_read
+end
+
 def history?
   false
 end

data/mod/machines/set/self/script_decko.rb

@@ -0,0 +1,11 @@
+include_set Abstract::CodeFile
+
+def source_files
+  %w[mod editor name_editor autosave doubleclick layout navbox upload
+     slot modal overlay recaptcha slotter bridge
+     nest_editor nest_editor_rules nest_editor_options nest_editor_name
+     components decko follow card_menu slot_ready
+     filter filter_links filter_items].map do |n|
+    "decko/#{n}.js.coffee"
+  end
+end