card 1.98.3 → 1.99.0

data/mod/ace_editor/db/migrate_core_cards/{20160805112548_delete_ace_help_card.rb → 20180805112548_delete_ace_help_card.rb}

@@ -3,6 +3,6 @@
 class DeleteAceHelpCard < Card::Migration
   def up
     delete_card "*Ace+*self+*help"
-    update_card "*Ace", type_id: Card::JsonID
+    update_card! "*Ace", type_id: Card::JsonID
   end
 end

data/mod/admin/set/self/debugger.rb

@@ -0,0 +1,3 @@
+def raw_help_text
+  "show more useful error pages"
+end

data/mod/admin/set/self/trash.rb

@@ -25,7 +25,7 @@ format :html do
     return unless (res_id = Env.params[:restore]) &&
                   (res_card = Card[res_id.to_i])
     alert :success, true do
-      wrap_with(:h5, "restored") + subformat(res_card).render_closed
+      wrap_with(:h5, "restored") + subformat(res_card).render_bar
     end
   end
 

data/mod/basic_formats/set/all/all_css.rb

@@ -17,7 +17,7 @@ format :css do
     _render_core
   end
 
-  view :missing do
+  view :unknown do
     major_comment "MISSING Style Card: #{card.name}"
   end
 

data/mod/basic_formats/set/all/all_csv.rb

@@ -26,7 +26,7 @@ format :csv  do
     # strip is because search already joins with newlines
   end
 
-  view :missing do
+  view :unknown do
     ""
   end
 

data/mod/basic_formats/set/all/base.rb

@@ -6,7 +6,7 @@ format do
 
   # NAME VIEWS
 
-  view :name, closed: true, perms: :none do
+  view :name, compact: true, perms: :none do
     name_variant safe_name
   end
 
@@ -18,20 +18,20 @@ format do
     voo.variant ? name.to_name.vary(voo.variant) : name
   end
 
-  view(:key,      closed: true, perms: :none) { card.key }
-  view(:linkname, closed: true, perms: :none) { card.name.url_key }
-  view(:url,      closed: true, perms: :none) { card_url _render_linkname }
+  view(:key,      compact: true, perms: :none) { card.key }
+  view(:linkname, compact: true, perms: :none) { card.name.url_key }
+  view(:url,      compact: true, perms: :none) { card_url _render_linkname }
 
 
-  view :url_link, closed: true, perms: :none do
+  view :url_link, compact: true, perms: :none do
     link_to_resource card_url(_render_linkname)
   end
 
-  view :link, closed: true, perms: :none do
+  view :link, compact: true, perms: :none do
     link_view
   end
 
-  view :nav_link, closed: true, perms: :none do
+  view :nav_link, compact: true, perms: :none do
     link_view class: "nav-link"
   end
 
@@ -47,15 +47,15 @@ format do
   end
 
 
-  view(:codename, closed: true) { card.codename.to_s }
-  view(:id,       closed: true) { card.id            }
-  view(:type,     closed: true) { card.type_name     }
+  view(:codename, compact: true) { card.codename.to_s }
+  view(:id,       compact: true) { card.id            }
+  view(:type,     compact: true) { card.type_name     }
 
   # DATE VIEWS
 
-  view(:created_at, closed: true) { date_view card.created_at }
-  view(:updated_at, closed: true) { date_view card.updated_at }
-  view(:acted_at,   closed: true) { date_view card.acted_at   }
+  view(:created_at, compact: true) { date_view card.created_at }
+  view(:updated_at, compact: true) { date_view card.updated_at }
+  view(:acted_at,   compact: true) { date_view card.acted_at   }
 
   def date_view date
     if voo.variant
@@ -76,7 +76,7 @@ format do
     voo.structure ? Card[voo.structure] : card
   end
 
-  view :core, closed: true do
+  view :core, compact: true do
     process_content _render_raw
   end
 
@@ -88,29 +88,21 @@ format do
     _render_core
   end
 
-  view :closed_content, closed: true do
-    with_nest_mode :closed do
+  view :one_line_content, compact: true do
+    with_nest_mode :compact do
       Card::Content.smart_truncate _render_core
     end
   end
 
-  view :labeled_content, unknown: true do
-    valid_labeled_content { render_core }
-  end
-
-  def valid_labeled_content
-    if card.known?
-      yield
-    else
-      createable { missing_link(fa_icon("plus-square")) }
-    end
+  view :labeled_content, unknown: :mini_unknown do
+    render_core
   end
 
   view :titled_content, unknown: :blank do
     render_core
   end
 
-  view :blank, closed: true, perms: :none do
+  view :blank, compact: true, perms: :none do
     ""
   end
 
@@ -139,39 +131,6 @@ format do
     end.inspect
   end
 
-  # none of the below belongs here!!
-
-  view :template_rule, cache: :never, unknown: true do
-    return "" unless voo.nest_name
-    if voo.nest_name.to_name.field_only?
-      set_card = Card.fetch template_link_set_name
-      subformat(set_card).render_template_link
-    else
-      "{{#{voo.nest_syntax}}}"
-    end
-  end
-
-  def template_link_set_name
-    name = voo.nest_name.to_name
-    if name.absolute?
-      name.trait_name :self
-    elsif (type = on_type_set)
-      [type, name].to_name.trait_name :type_plus_right
-    else
-      name.stripped.gsub(/^\+/, "").to_name.trait_name :right
-    end
-  end
-
-  def on_type_set
-    return unless
-      (tmpl_set_name = parent.card.name.trunk_name) &&
-      (tmpl_set_class_name = tmpl_set_name.tag_name) &&
-      (tmpl_set_class_card = Card[tmpl_set_class_name]) &&
-      (tmpl_set_class_card.codename == :type)
-
-    tmpl_set_name.left_name
-  end
-
   # DEPRECATED
   view :naked do
     Rails.logger.info "DEPRECATED: naked view (used with #{card.name} card)"

data/mod/basic_formats/set/self/head.rb

@@ -12,7 +12,7 @@ format :html do
     end
   end
 
-  view :editor do
+  view :input do
     "Content is can't be edited."
   end
 

data/mod/basic_types/set/type/html.rb

@@ -7,8 +7,8 @@ def diff_args
 end
 
 format do
-  view :closed_content do
-    ""
+  view :one_line_content do
+    raw_one_line_content
   end
 
   def chunk_list
@@ -17,7 +17,11 @@ format do
 end
 
 format :html do
-  def editor
+  def input_type
     :ace_editor
   end
+
+  view :one_line_content, wrap: {} do
+    raw_one_line_content
+  end
 end

data/mod/basic_types/set/type/json.rb

@@ -21,7 +21,7 @@ format :html do
     process_content ::CodeRay.scan(_render_raw, :json).div
   end
 
-  def editor
+  def input_type
     :ace_editor
   end
 

data/mod/basic_types/set/type/plain_text.rb

@@ -1,5 +1,5 @@
 format :html do
-  def editor
+  def input_type
     :text_area
   end
 

data/mod/{standard → basic_types}/spec/set/type/html_spec.rb

@@ -1,19 +1,19 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::Type::Html do
+RSpec.describe Card::Set::Type::Html do
   before do
     Card::Auth.current_id = Card::WagnBotID
   end
 
   it "has special editor" do
-    assert_view_select render_editor("Html"), 'textarea[rows="5"]'
+    assert_view_select render_input("Html"), 'textarea[rows="5"]'
   end
 
-  it "does not render any content in closed view" do
-    rendered = render_card :closed_content,
-                           type: "Html",
+  it "renders no html tags in one_line_content view" do
+    rendered = render_view :one_line_content,
+                           type: "HTML",
                            content: "<strong>Lions and Tigers</strong>"
-    expect(rendered).to eq("")
+    expect(rendered.strip).to eq "Tempo Rary"
   end
 
   it "renders nests" do

data/mod/basic_types/spec/set/type/plain_text_spec.rb

@@ -1,8 +1,8 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::Type::PlainText do
+RSpec.describe Card::Set::Type::PlainText do
   it "has special editor" do
-    assert_view_select render_editor("Plain Text"), 'textarea[rows="5"]'
+    assert_view_select render_input("Plain Text"), 'textarea[rows="5"]'
   end
 
   it "has special content that escapes HTML" do
@@ -15,4 +15,9 @@ describe Card::Set::Type::PlainText do
       with_tag "span.card-title"
     end
   end
+
+  specify "view one_line_content" do
+    rendered = format_subject.render :one_line_content
+    expect(rendered).to have_tag "div.text-muted", /Alpha/
+  end
 end

data/mod/bootstrap/db/migrate_core_cards/20170719163733_update_bootswatch_themes_to_4_beta.rb

@@ -22,9 +22,9 @@ class UpdateBootswatchThemesTo4Beta < Card::Migration::Core
       delete_code_card "style: bootstrap #{n}"
     end
     if Card::Codename.exist? :bootstrap_cards
-      update_card :bootstrap_cards,
-                  name: "style: bootstrap cards",
-                  codename: "style_bootstrap_cards"
+      update_card! :bootstrap_cards,
+                   name: "style: bootstrap cards",
+                   codename: "style_bootstrap_cards"
     end
   end
 

data/mod/bootstrap/db/migrate_core_cards/20180423160231_migrate_customized_bootstrap_skin.rb

@@ -76,7 +76,7 @@ class MigrateCustomizedBootstrapSkin < Card::Migration::Core
     custom_style =
       Card.fetch(OLD_SKIN, "custom theme", "style")&.content || ""
     ensure_card "customized bootstrap style", type_id: Card::ScssID, content: custom_style
-    update_card [NEW_SKIN, :stylesheets],
-                content: "[[customized bootstrap style]]"
+    update_card! [NEW_SKIN, :stylesheets],
+                 content: "[[customized bootstrap style]]"
   end
 end

data/mod/bootstrap/db/migrate_core_cards/20180423170283_add_type_bootswatch_skin.rb

@@ -14,7 +14,7 @@ class AddTypeBootswatchSkin < Card::Migration::Core
 
     ensure_card "Bootswatch skin", type_id: Card::CardtypeID,
                                    codename: "bootswatch_skin"
-    update_card %i[style right options], content: STYLE_INPUT_SEARCH
+    update_card! %i[style right options], content: STYLE_INPUT_SEARCH
     Card::Cache.reset_all
     change_type_of_skins
   end

data/mod/bootstrap/db/migrate_core_cards/lib/skin.rb

@@ -52,7 +52,7 @@ class Skin
   end
 
   def update_scss file_name:, field_name: file_name
-    update_card "#{@skin_name}+#{field_name}", style_args(file_name)
+    update_card! "#{@skin_name}+#{field_name}", style_args(file_name)
   end
 
   def update_css file_name:, field_name: file_name

data/mod/bootstrap/lib/javascript/script_load_select2.js.coffee

@@ -4,18 +4,29 @@ decko.slotReady (slot) ->
   slot.find('select:not(._no-select2)').each (_i) ->
     decko.initSelect2($(this))
 
+decko.slotDestroy (slot) ->
+  slot.find('select:not(._no-select2)').each (_i) ->
+    $(this).deInitSelect2()
+
 $.extend decko,
   initSelect2: (elem) ->
     if elem.length > 1
       decko.initSelect2($(single_el)) for single_el in elem
     else
       opts = { dropdownAutoWidth: "true", containerCssClass: ":all:", width: "auto" }
+
+      elem.attr "id", decko.uniqSelect2Id(elem.attr("id"))
       if elem.hasClass("tags")
         opts.tags = "true"
       if elem.data("minimum-results-for-search")?
         opts.minimumResultsForSearch = elem.data("minimum-results-for-search")
       elem.select2(opts)
 
+  uniqSelect2Id: (id) ->
+    return id unless $("[data-select2-id=" + id + "]").length > 0
+    decko.uniqSelect2Id id + "1"
+
+
 $(window).ready ->
   $('body').on 'select2:select', '._go-to-selected', ->
     val = $(this).val()
@@ -25,21 +36,18 @@ $(window).ready ->
   $('body').on "select2:select", "._submit-on-select", (event) ->
       $(event.target).closest('form').submit()
 
-$.fn.cloneSelect2 = (withDataAndEvents, deepWithDataAndEvents) ->
-  $old = if this.is('select') then this else this.find('select')
-  $old.select2 'destroy'
-  $old.removeAttr "data-select2-id"
-  $cloned = this.clone(withDataAndEvents, deepWithDataAndEvents)
-  decko.initSelect2 $old
-  if $cloned.is('select')
-    decko.initSelect2 $cloned
-  else
-    decko.initSelect2 $cloned.find('select')
-  $cloned
-
-
-#  slot.find('.pointer-multiselect').each (i) ->
-#    load_select2($(this))
-#
-#  slot.find('.pointer-select').each (i) ->
-#    load_select2($(this))
+$.fn.extend
+  cloneSelect2: (withDataAndEvents, deepWithDataAndEvents) ->
+    $old = if this.is('select') then this else this.find('select')
+    $old.deInitSelect2()
+    $cloned = this.clone(withDataAndEvents, deepWithDataAndEvents)
+    decko.initSelect2 $old
+    if $cloned.is('select')
+      decko.initSelect2 $cloned
+    else
+      decko.initSelect2 $cloned.find('select')
+    $cloned
+
+  deInitSelect2: ->
+    this.select2 "destroy"
+    this.removeAttr "data-select2-id"

data/mod/bootstrap/lib/stylesheets/style_bootstrap_cards.scss

@@ -24,7 +24,7 @@ header {
 
 .d0-card-header a {
   color: $body-color;
-  &.edit-link, &.bridge-link {
+  &.edit-link, &.bridge-link, &.help-link {
     color: $text-muted;
   }
 }
@@ -217,6 +217,21 @@ body.mceContentBody {
   }
 }
 
+/*---------- ( Link list )-------------*/
+
+.group-text-middle {
+  border-left: none;
+  border-right: none;
+}
+
+.group-text-left {
+  border-right: none;
+}
+
+.group-text-right {
+  border-left: none;
+}
+
 
 /* CARDTYPE_SPECIFIC ------------------------------*/
 
@@ -368,8 +383,8 @@ body.mceContentBody {
 
 /*----------- Bars and Boxes -------------*/
 
-.expanded-bar, .bar, .box {
-  .missing-view {
+.expanded-bar, .box {
+  .unknown-view {
     // TODO: obviate in ruby with better unknown API
     display: none;
   }

data/mod/bootstrap/set/abstract/bootswatch_theme/html_views.rb

@@ -6,7 +6,7 @@ format :html do
     voo.show! :customize_button, :box_middle
   end
 
-  view :closed_content do
+  view :one_line_content do
     ""
   end
 

data/mod/bootstrap/set/all/bootstrap/helper.rb

@@ -39,10 +39,15 @@ format :html do
     wrap_with :span, content, options
   end
 
-  def popover_link text, title=nil
-    opts = { class: "pl-1 text-muted-link", path: "#", "data-toggle": "popover",
-             "data-trigger": :focus, "data-content": text }
+  def popover_link text, title=nil, link_text=fa_icon("question-circle"), opts={}
+    link_to link_text, popover_opts(text, title, opts)
+  end
+
+  def popover_opts text, title, opts
+    add_class opts, "pl-1 text-muted-link"
+    opts.merge! path: "#", "data-toggle": "popover",
+                "data-trigger": :focus, "data-content": text
     opts["data-title"] = title if title
-    link_to fa_icon("question-circle"), opts
+    opts
   end
 end