card 1.98.3 → 1.99.0

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

@@ -57,7 +57,7 @@ format do
 end
 
 format :html do
-  def editor
+  def input_type
     :ace_editor
   end
 

data/mod/machines/set/type/css.rb

@@ -50,7 +50,7 @@ format do
 end
 
 format :html do
-  def editor
+  def input_type
     :ace_editor
   end
 

data/mod/media/lib/stylesheets/style_image_box.scss

@@ -0,0 +1,79 @@
+//images
+
+@mixin image-box-size($sizename, $sidelength) {
+  &.#{$sizename} {
+    width: $sidelength;
+    height: $sidelength;
+    min-width: $sidelength;
+    min-height: $sidelength;
+    i {
+      font-size: $sidelength / 2;
+    }
+  }
+}
+
+.image-box {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  width: 94px;
+  height: 94px;
+  min-width: 94px;
+  min-height: 94px;
+
+  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+
+  border: 1px solid #eee;
+  border-radius: 0;
+
+  background-color: #f8f9fa;
+
+  margin-right: 0.5rem;
+  overflow: hidden;
+
+  //text-align: center;
+  @include image-box-size(icon, 16px);
+  @include image-box-size(small, 40px);
+  @include image-box-size(medium, 64px);
+  @include image-box-size(large, 94px);
+  @include image-box-size(xlarge, 150px);
+
+  a, i {
+    width: 100%;
+    text-align: center;
+  }
+  i {
+    color: $text-muted;
+  }
+  &.icon a {
+    line-height: 0;
+    height: 8px;
+  }
+  img {
+    max-width: 100%;
+    max-height: 100%;
+    height: auto;
+  }
+}
+
+@media (max-width: 1260px) {
+  .image-box {
+    @include image-box-size(large, 120px);
+  }
+  .media-body {
+    padding: 6px;
+  }
+}
+
+@include media-breakpoint-down(sm) {
+  .image-box {
+    @include image-box-size(xlarge, 100px);
+    @include image-box-size(large, 80px);
+  }
+  .media-body {
+    padding: 4px;
+  }
+}

data/mod/media/set/self/style_media.rb

@@ -0,0 +1,6 @@
+include_set Abstract::CodeFile
+Self::StyleMods.add_item :style_media
+
+def source_files
+  scss_files [:image_box]
+end

data/mod/media/set/type/image.rb

@@ -0,0 +1,38 @@
+IMAGE_BOX_SIZE_MAP = {
+  icon: :icon, small: :small, medium: :small, large: :medium, xlarge: :medium
+}.freeze
+
+format :html do
+  view :boxed, unknown: true do
+    image_box { |size| render_core size: size }
+  end
+
+  view :boxed_link, unknown: true do
+    image_box { |size| link_to_card image_box_link_target, render_core(size: size) }
+  end
+
+  def image_box
+    voo.size ||= :medium
+    wrap_with :div, title: image_box_title, class: "image-box #{voo.size}" do
+      yield image_box_size
+    end
+  end
+
+  ## METHODS FOR OVERRIDE
+
+  def image_box_size
+    IMAGE_BOX_SIZE_MAP[voo.size.to_sym] || :medium
+  end
+
+  def image_box_card_name
+    card.name.junction? ? card.name.left : card.name
+  end
+
+  def image_box_link_target
+    image_box_card_name
+  end
+
+  def image_box_title
+    image_box_card_name
+  end
+end

data/mod/navbar/set/right/enabled_roles.rb

@@ -34,7 +34,7 @@ format :html do
     super()
   end
 
-  def editor
+  def input_type
     :checkbox
   end
 

data/mod/pointer/lib/javascript/script_pointer_config.js.coffee

@@ -7,6 +7,8 @@ $.extend decko.editorContentFunctionMap,
       pointerContent @find('input:checked').val()
     '.pointer-list-ul': ->
       pointerContent @find('input').map( -> $(this).val() )
+    '.pointer-link-list-ul': ->
+      decko.linkListContent @find('.input-group')
     '.pointer-checkbox-list': ->
       pointerContent @find('input:checked').map( -> $(this).val() )
     '.pointer-select-list': ->
@@ -44,6 +46,17 @@ $.extend decko,
     list = $.map $.makeArray(vals), (v) -> if v then '[[' + v + ']]'
     $.makeArray(list).join "\n"
 
+  linkListContent: (input_groups) ->
+      vals = input_groups.map( ->
+        v = $(this).find('input._reference').val()
+        title = $(this).find('input._title').val()
+        v += "|#{title}" if title.length > 0
+        v
+      )
+      list = $.map $.makeArray(vals), (v) -> if v then '[[' + v + ']]'
+      $.makeArray(list).join "\n"
+
+
 pointerContent = (vals) ->
   decko.pointerContent vals
   # deprecated. backwards compatibility

data/mod/pointer/lib/javascript/script_pointer_list_editor.js.coffee

@@ -1,6 +1,6 @@
 $(window).ready ->
   # add pointer item when clicking on "add another" button
-  $('body').on 'click', '.pointer-item-add', (event)->
+  $('body').on 'click', '._pointer-item-add', (event)->
     decko.addPointerItem this
     event.preventDefault() # Prevent link from following its href
 
@@ -10,6 +10,7 @@ $(window).ready ->
       decko.addPointerItem this
       event.preventDefault() # was triggering extra item in unrelated pointer
 
+  # enable/disable add
   $('body').on 'keyup', '.pointer-item-text', (_event)->
     decko.updateAddItemButton this
 
@@ -26,8 +27,12 @@ decko.slotReady (slot) ->
 
 $.extend decko,
   addPointerItem: (el) ->
+    slot = $(el).slot()
+    slot.trigger "slotDestroy"
     newInput = decko.nextPointerInput decko.lastPointerItem(el)
     newInput.val ''
+
+    slot.trigger "slotReady"
     newInput.focus()
     decko.updateAddItemButton el
     decko.initPointerList newInput
@@ -43,6 +48,6 @@ $.extend decko,
     $(el).closest('.content-editor').find '.pointer-li:last'
 
   updateAddItemButton: (el)->
-    button = $(el).closest('.content-editor').find '.pointer-item-add'
+    button = $(el).closest('.content-editor').find '._pointer-item-add'
     disabled = decko.lastPointerItem(el).find('input').val() == ''
     button.prop 'disabled', disabled

data/mod/pointer/set/abstract/02_pointer/html_views.rb

@@ -21,7 +21,7 @@ format :html do
     pointer_items(paging_args.extract!(:limit, :offset)).join(voo.separator || "\n")
   end
 
-  view :closed_content do
+  view :one_line_content do
     item_view = implicit_item_view
     item_view = item_view == "name" ? "name" : "link"
     wrap_with :div, class: "pointer-list" do
@@ -34,11 +34,11 @@ format :html do
     %(<div class="pointer-item item-#{item_view}">#{rendered}</div>)
   end
 
-  view :editor do
+  view :input do
     _render_hidden_content_field + super()
   end
 
-  def default_editor
+  def default_input_type
     :list
   end
 
@@ -54,7 +54,8 @@ format :html do
     items = items_for_input args[:item_list]
     extra_class = "pointer-list-ul"
     ul_classes = classy "pointer-list-editor", extra_class
-    haml :list_input, items: items, ul_classes: ul_classes
+    haml :list_input, items: items, ul_classes: ul_classes,
+                      options_card: options_card_name
   end
 
   %i[autocomplete checkbox radio select multiselect].each do |editor_view|
@@ -67,11 +68,11 @@ format :html do
   end
 
   def checkbox_input
-    haml :checkbox_input
+    haml :checkbox_input, submit_on_change: @submit_on_change
   end
 
   def radio_input
-    haml :radio_input
+    haml :radio_input, submit_on_change: @submit_on_change
   end
 
   def select_input
@@ -102,6 +103,14 @@ format :html do
 
   def add_item_overlay_link; end
 
+  def one_line_content
+    if count == 1
+      card.item_names.first
+    else
+      short_content
+    end
+  end
+
   private
 
   # currently only used by :list and :autocomplete. could be generalized?

data/mod/pointer/set/abstract/02_pointer/html_views/checkbox_input.haml

@@ -4,6 +4,5 @@
     - checked = card.item_names.include? option_name
     .pointer-checkbox
       = check_box_tag "pointer_checkbox-#{unique_id}", option_name, checked,
-                      id: id, class: "pointer-checkbox-button"
+                      id: id, class: "pointer-checkbox-button #{'_submit-on-change' if submit_on_change}"
       = option_label option_label, id
-      = option_description "checkbox", option_name

data/mod/pointer/set/abstract/02_pointer/html_views/list_input.haml

@@ -1,5 +1,4 @@
 %ul{class: ul_classes}
-  - options_card = options_card_name
   - items.each do |item|
     %li.pointer-li.mb-1
       %span.input-group
@@ -12,6 +11,6 @@
           %button.pointer-item-delete.btn.btn-secondary{ type: "button"}
             = icon_tag :remove
 %span.input-group
-  %button.pointer-item-add.btn.btn-secondary{ type: "submit" }
+  %button._pointer-item-add.btn.btn-secondary{ type: "submit" }
     = icon_tag "add"
     add another

data/mod/pointer/set/abstract/02_pointer/html_views/list_item.haml

@@ -1,3 +1,5 @@
+// TODO: delete me?  Is this file in use?
+
 %li.pointer-li.mb-1
   %span.input-group
     .input-group-prepend.handle

data/mod/pointer/set/abstract/02_pointer/html_views/radio_input.haml

@@ -9,6 +9,5 @@
       - id = "pointer-radio-#{option_name.to_name.key}"
       %li.pointer-radio.radio
         = radio_button_tag input_name, option_name, checked,
-                           id: id, class: "pointer-radio-button"
+                           id: id, class: "pointer-radio-button #{'_submit-on-change' if submit_on_change}"
         = option_label option_label, id
-        = option_description "radio", option_name

data/mod/pointer/set/abstract/02_pointer/options_api.rb

@@ -29,7 +29,7 @@ def option_cards
 end
 
 def options_rule_card
-  rule_card :options
+  rule_card :content_options
 end
 
 def standard_option_names
@@ -65,20 +65,13 @@ format :html do
     %(<label for="#{id}">#{option_label_text option_name}</label>)
   end
 
-  def option_label_text option_name
-    Card.fetch(option_name)&.label || option_name
+  def option_view
+    @option_view ||= card.rule(:content_option_view) || :smart_label
   end
 
-  # @param option_type [String] "checkbox" or "radio"
-  def option_description option_type, option_name
-    return "" unless (description = option_description_core(option_name))
-    %(<div class="#{option_type}-option-description">#{description}</div>)
-  end
+  def option_label_text option_name
+    return option_name unless (option_card = Card.fetch option_name)
 
-  def option_description_core option
-    # DISCUSS: "options label" is an obscure rule. still support?
-    desc_name = card.rule(:options_label) || "description"
-    return unless (desc_card = Card[option, desc_name])
-    nest desc_card, { view: :core }, nest_mode: :normal
+    nest option_card, view: option_view
   end
 end

data/mod/pointer/set/type/link_list.rb

@@ -1,12 +1,12 @@
 include_set Abstract::Pointer
 
-def item_names
-  reference_chunks.map(&:referee_name)
+def all_raw_item_strings content=nil
+  reference_chunks(content).map(&:referee_name)
 end
 
-def item_titles
+def item_titles default_to_name=true
   reference_chunks.map do |chunk|
-    chunk.options[:title] || chunk.referee_name
+    chunk.options[:title] || (default_to_name ? chunk.referee_name : nil)
   end
 end
 
@@ -17,7 +17,24 @@ format do
 end
 
 format :html do
-  def editor
-    :ace_editor
+  def input_type
+    :link_list
+  end
+
+  view :link_list_input, cache: :never do
+    link_list_input
+  end
+
+  def items_for_input items=nil
+    items ||= card.item_names context: :raw
+    items.empty? ? [["", ""]] : items.zip(card.item_titles(false))
+  end
+
+  def link_list_input args={}
+    items = items_for_input args[:item_list]
+    extra_class = "pointer-link-list-ul"
+    ul_classes = classy "pointer-list-editor", extra_class
+    haml :link_list_input, items: items, ul_classes: ul_classes,
+                           options_card: options_card_name
   end
 end

data/mod/pointer/set/type/link_list/link_list_input.haml

@@ -0,0 +1,24 @@
+%ul{class: ul_classes}
+  - items.each do |reference, title|
+    %li.pointer-li.mb-1
+      %span.input-group
+        .input-group-prepend.handle
+          %span.input-group-text
+            = icon_tag :reorder
+        %span.input-group-text.text-muted.group-text-left
+          [[
+        = text_field_tag "pointer_item", reference, class: "_reference pointer-item-text form-control group-text-middle",
+                                               "data-options-card": options_card
+        %span.input-group-text.text-muted.group-text-middle
+          |
+        = text_field_tag "pointer_item_title", title, class: "_title pointer-item-text form-control group-text-middle"
+        %span.input-group-text.text-muted.group-text-right
+          ]]
+        .input-group-append
+          %span.input-group-text.p-0
+            %button.pointer-item-delete.btn.btn-secondary{ type: "button"}
+              = icon_tag :remove
+%span.input-group
+  %button._pointer-item-add.btn.btn-secondary{ type: "submit" }
+    = icon_tag "add"
+    add another

data/mod/pointer/set/type/mirrored_list.rb

@@ -1,7 +1,7 @@
 include_set Abstract::Pointer
 
 event :validate_list_name, :validate, on: :save, changed: :name do
-  errors.add :name, tr(:cardtype_right) if !junction? || !right || right.type_id != CardtypeID
+  errors.add :name, tr(:cardtype_right) unless right&.type_id == CardtypeID
 end
 
 event :validate_list_item_type_change, :validate,

data/mod/pointer/spec/set/abstract/pointer/html_views_spec.rb

@@ -8,7 +8,7 @@ describe Card::Set::Abstract::Pointer do
       pointer
     end
 
-    check_views_for_errors :core, :closed_content, :editor,
+    check_views_for_errors :core, :one_line_content, :input,
                            :list, :autocomplete, :checkbox,
                            :radio, :select, :multiselect
   end
@@ -37,25 +37,27 @@ describe Card::Set::Abstract::Pointer do
     end
 
     it "includes nonexisting card in radio options" do
-      common_html = 'input[class="pointer-radio-button"]' \
-                    '[checked="checked"]' \
-                    '[type="radio"]' \
-                    '[value="nonexistingcardmustnotexistthisistherule"]' \
-                    '[id="pointer-radio-nonexistingcardmustnotexistthisistherule"]'
-      option_html = common_html + '[name="pointer_radio_button-tp"]'
-      assert_view_select pointer.format.render_radio, option_html
-      option_html = common_html + '[name="pointer_radio_button-ip"]'
-      assert_view_select inherit_pointer.format.render_radio, option_html
+      common_with = { type: "radio",
+                      value: "nonexistingcardmustnotexistthisistherule",
+                      id: "pointer-radio-nonexistingcardmustnotexistthisistherule",
+                      checked: "checked" }
+      expect(pointer.format.render_radio)
+        .to have_tag "input.pointer-radio-button",
+                     with: common_with.merge(name: "pointer_radio_button-tp")
+      expect(inherit_pointer.format.render_radio)
+        .to have_tag "input.pointer-radio-button",
+                     with: common_with.merge(name: "pointer_radio_button-ip")
     end
 
     it "includes nonexisting card in checkbox options" do
-      option_html = 'input[class="pointer-checkbox-button"]' \
-                    '[checked="checked"]' \
-                    '[type="checkbox"]' \
-                    '[value="nonexistingcardmustnotexistthisistherule"]' \
-                    '[id="pointer-checkbox-nonexistingcardmustnotexistthisistherule"]'
-      # debug_assert_view_select @pointer.format.render_checkbox, option_html
-      assert_view_select inherit_pointer.format.render_checkbox, option_html
+      expect(inherit_pointer.format.render_checkbox)
+        .to have_tag "input.pointer-checkbox-button",
+                     with: {
+                       type: "checkbox",
+                       value: "nonexistingcardmustnotexistthisistherule",
+                       id: "pointer-checkbox-nonexistingcardmustnotexistthisistherule",
+                       checked: "checked"
+                     }
     end
 
     it "includes nonexisting card in select options" do
@@ -77,7 +79,7 @@ describe Card::Set::Abstract::Pointer do
   describe "list_input" do
     subject do
       pointer = Card.new name: "tp", type: "pointer", content: pointer_content
-      pointer.format._render :editor
+      pointer.format._render :input
     end
 
     let(:pointer_content) { "[[Jane]]\n[[John]]" }