card 1.98.3 → 1.99.0

data/mod/edit/set/all/edit_type.rb

@@ -1,20 +1,5 @@
 format :html do
-  GROUP = {
-    "Content" => %w[RichText PlainText Phrase Date Number Toggle Markdown File Image URI],
-    "Custom" => [],
-    "Organize" => ["Cardtype", "Search", "List", "Link list", "Pointer",
-                   "Mirror list", "Mirrored list"],
-    "Admin" => ["Layout", "Skin", "User", "Role",
-                "Notification template", "Email template", "Twitter template"],
-    "Code" => %w[HTML Json CSS SCSS JavaScript CoffeeScript]
-  }.freeze
-
-  # group for each cardtype: { "RichText => "Content", "Layout" => "Admin", ... }
-  GROUP_MAP = GROUP.each_with_object({}) do |(cat, types), h|
-    types.each { |t| h[t] = cat }
-  end
-
-    view :edit_type, cache: :never, perms: :update do
+  view :edit_type, cache: :never, perms: :update do
     frame do
       _render_edit_type_form
     end
@@ -37,10 +22,13 @@ format :html do
   end
 
   view :bridge_type_formgroup, unknown: true, wrap: :slot do
-    type_formgroup href: path(mark: card.id, view: :edit_content_form, type_reload: true, slot: { show: :type_form }),
+    type_formgroup href: path(mark: card.id,
+                              view: :edit_form,
+                              assign: true,
+                              slot: { show: :type_form }),
                    class: "live-type-field slotter",
                    'data-remote': true,
-                   'data-slot-selector': ".card-slot.edit_content_form-view"
+                   'data-slot-selector': ".card-slot.edit_form-view"
   end
 
   view :type_formgroup do
@@ -55,7 +43,7 @@ format :html do
   end
 
   def wrap_type_formgroup
-    formgroup "Type", editor: "type", class: "type-formgroup", help: false do
+    formgroup "Type", input: "type", class: "type-formgroup", help: false do
       output [yield, hidden_field_tag(:assign, true)]
     end
   end
@@ -63,8 +51,18 @@ format :html do
   def type_field args={}
     typelist = Auth.createable_types
     current_type = type_field_current_value args, typelist
-    options = grouped_options_for_select grouped_types(current_type), current_type
-    template.select_tag "card[type]", options, args
+    template.select_tag "card[type]", type_field_options(current_type),
+                        args.merge("data-select2-id": "#{unique_id}-#{Time.now.to_i}")
+  end
+
+  def type_field_options current_type
+    types = grouped_types(current_type)
+
+    if types.size == 1
+      options_for_select types.flatten[1], current_type
+    else
+      grouped_options_for_select types, current_type
+    end
   end
 
   def grouped_types current_type
@@ -72,10 +70,10 @@ format :html do
     allowed = ::Set.new Auth.createable_types
     allowed << current_type if current_type
 
-    GROUP.each_pair do |name, items|
+    visible_cardtype_groups.each_pair do |name, items|
       if name == "Custom"
         Auth.createable_types.each do |type|
-          groups["Custom"] << type unless GROUP_MAP[type]
+          groups["Custom"] << type unless ::Card::Set::Self::Cardtype::GROUP_MAP[type]
         end
       else
         items.each do |i|
@@ -86,6 +84,10 @@ format :html do
     groups
   end
 
+  def visible_cardtype_groups
+    ::Card::Set::Self::Cardtype::GROUP
+  end
+
   def type_field_current_value args, typelist
     return if args.delete :no_current_type
 

data/mod/edit/set/all/editing.rb

@@ -2,6 +2,7 @@ format :html do
   ###---( TOP_LEVEL (used by menu) NEW / EDIT VIEWS )
   view :bridge, perms: :update, unknown: true, cache: :never, wrap: :bridge do
     with_nest_mode :edit do
+      add_name_context
       voo.show :help
       wrap true, breadcrumb_data("Editing", "edit") do
         bridge_parts
@@ -9,8 +10,11 @@ format :html do
     end
   end
 
+  view :cardboard, :bridge
+
   def bridge_parts
     voo.show! :edit_type_row
+
     [
       frame_help,
       _render_edit_name_row(home_view: :edit_name_row),
@@ -20,7 +24,7 @@ format :html do
       # render to get voo.slot_options to have the write home view in
       # the slot wrap. I think this would probably best be handled as an
       # option to #wrap that triggers a new heir voo
-      _render_edit_content_form
+      _render_edit_form
     ]
   end
 

data/mod/edit/set/all/editor.rb

@@ -6,34 +6,47 @@ Self::InputOptions.add_to_basket :options, "text area"
 Self::InputOptions.add_to_basket :options, "text field"
 
 format :html do
-  def editor
-    (c = card.rule(:input)) && c.gsub(/[\[\]]/, "").tr(" ", "_")
+  def input_type
+    voo.input_type.present? ? voo.input_type : input_type_from_rule
   end
 
-  def editor_method editor_type
-    "#{editor_type}_input"
+  def input_type_from_rule
+    card.rule(:input_type)&.gsub(/[\[\]]/, "")&.tr(" ", "_")
   end
 
-  def editor_defined_by_card
-    return unless (editor_card = Card[editor])
+  def input_method input_type
+    "#{input_type}_input"
+  end
+
+  # core view of card is input
+  def input_defined_by_card
+    with_card input_type do |input_card|
+      nest input_card, view: :core
+    end
+  end
+
+  # move somewhere more accessible?
+  def with_card mark
+    return nil unless (card = Card[mark])
 
-    nest editor_card, view: :core
+    yield card
+  rescue Card::Error::CodenameNotFound
+    nil
   end
 
-  view :editor, unknown: true do
-    try(editor_method(editor)) ||
-      editor_defined_by_card ||
-      send(editor_method(default_editor))
+  view :input, unknown: true do
+    try(input_method(input_type)) ||
+      input_defined_by_card ||
+      send(input_method(default_input_type))
   end
 
-  def default_editor
+  def default_input_type
     :rich_text
   end
 
   # overridden by mods that provide rich text editors
   def rich_text_input
-    default_editor = Cardio.config.rich_text_editor || :tinymce
-    send "#{default_editor}_editor_input"
+    send "#{Cardio.config.rich_text_editor || :tinymce}_editor_input"
   end
 
   def text_area_input
@@ -42,6 +55,6 @@ format :html do
   end
 
   def text_field_input
-    text_field :content, class: "d0-card-content"
+    text_field :content, class: classy("d0-card-content")
   end
 end

data/mod/edit/set/all/form.rb

@@ -1,21 +1,40 @@
 format :html do
   # FIELDSET VIEWS
-  view :content_formgroup, cache: :never do
+
+  # sometimes multiple card formgroups, sometimes just one
+  view :content_formgroups, cache: :never do
     wrap_with :fieldset, edit_slot, class: classy("card-editor", "editor")
   end
 
   view :name_formgroup do
-    formgroup "name", editor: "name", help: false do
+    formgroup "Name", input: "name", help: false do
       raw name_field
     end
   end
 
+  # single card content formgroup, labeled with "Content"
+  view :content_formgroup, unknown: true, cache: :never do
+    wrap_content_formgroup { content_field }
+  end
+
   view :edit_in_form, cache: :never, perms: :update, unknown: true do
     reset_form
     @in_multi_card_editor = true
     edit_slot
   end
 
+  view :conflict_tracker, cache: :never, unknown: true do
+    return unless card&.real?
+
+    card.last_action_id_before_edit = card.last_action_id
+    hidden_field :last_action_id_before_edit, class: "current_revision_id"
+  end
+
+  def wrap_content_formgroup
+    formgroup("Content", input: :content, help: false,
+                         class: classy("card-editor")) { yield }
+  end
+
   def button_formgroup
     wrap_with :div, class: classy("form-group") do
       wrap_with :div, yield
@@ -27,26 +46,19 @@ format :html do
     text_field :name, value: card.name, autocomplete: "off"
   end
 
-  def content_field skip_rev_id=false
+  def content_field
     with_nest_mode :normal do
       # by changing nest mode to normal, we ensure that editors (eg image
       # previews) can render core views.
-      output [content_field_revision_tracking(skip_rev_id), _render_editor]
+      output [_render_conflict_tracker, _render_input]
     end
   end
 
   # SAMPLE editor view for override
-  # view :editor do
+  # view :input do
   #   text_area :content, rows: 5, class: "d0-card-content"
   # end
 
-  def content_field_revision_tracking skip_rev_id
-    card.last_action_id_before_edit = card.last_action_id
-    return if !card || card.new_card? || skip_rev_id
-
-    hidden_field :last_action_id_before_edit, class: "current_revision_id"
-  end
-
   def edit_slot
     case
     when inline_nests_editor?  then _render_core
@@ -59,7 +71,7 @@ format :html do
   # test: render nests within a normal rendering of the card's content?
   # (as opposed to a standardized form)
   def inline_nests_editor?
-    voo.editor == :inline_nests
+    voo.input_type == :inline_nests
   end
 
   # test: are we opening a new multi-card form?
@@ -81,8 +93,7 @@ format :html do
 
   def single_card_edit_field
     if voo.show?(:type_formgroup) || voo.show?(:name_formgroup)
-      # display content field in formgroup for consistency with other fields
-      formgroup("Content", editor: :content, help: false) { content_field }
+      _render_content_formgroup # use formgroup for consistency
     else
       editor_wrap(:content) { content_field }
     end
@@ -91,17 +102,27 @@ format :html do
   def editor_in_multi_card
     add_junction_class
     formgroup render_title,
-              editor: "content", help: true, class: classy("card-editor") do
+              input: "content", help: true, class: classy("card-editor") do
       [content_field, (form.hidden_field(:type_id) if card.new_card?)]
     end
   end
 
   def multi_card_edit fields_only=false
-    nested_cards_for_edit(fields_only).map do |name, options|
+    nested_cards = nested_cards_for_edit(fields_only)
+    return structure_link if nested_cards.empty?
+
+    nested_cards.map do |name, options|
       nest name, options || {}
     end.join "\n"
   end
 
+  def structure_link
+    # LOCALIZE
+    structured = link_to_card card.structure_rule_card, "structured"
+    "<label>Content</label>"\
+    "<p><em>Uneditable; content is #{structured} without nests</em></p>"
+  end
+
   # @param [Hash|Array] fields either an array with field names and/or field
   # cards or a hash with the fields as keys and a hash with nest options as
   # values

data/mod/edit/set/all/form_buttons.rb

@@ -29,10 +29,18 @@ format :html do
     cancel_button args
   end
 
-  def edit_cancel_button
+  def modal_cancel_button
     modal_close_button "Cancel", situation: "secondary", class: "btn-sm"
   end
 
+  def edit_cancel_button
+    modal_cancel_button
+  end
+
+  def new_cancel_button
+    modal_cancel_button
+  end
+
   def delete_button opts={}
     link_to "Delete", delete_button_opts(opts)
   end
@@ -40,7 +48,8 @@ format :html do
   def delete_button_opts opts={}
     add_class opts,  "slotter btn btn-outline-danger ml-auto btn-sm"
     opts["data-confirm"] = delete_confirm opts
-    opts[:path] = { action: :delete, success: delete_success(opts) }
+    opts[:path] = { action: :delete }
+    opts[:path][:success] = delete_success(opts) unless opts.delete(:no_success)
     opts[:remote] = true
     opts
   end

data/mod/edit/set/all/formgroup.rb

@@ -1,5 +1,5 @@
 format :html do
-  # a formgroup has a label, an editor and help text
+  # a formgroup has a label, an input and help text
   def formgroup title, opts={}, &block
     wrap_with :div, formgroup_div_args(opts[:class]) do
       formgroup_body title, opts, &block
@@ -7,16 +7,16 @@ format :html do
   end
 
   def formgroup_body title, opts, &block
-    label = formgroup_label opts[:editor], title
-    editor_body = editor_wrap opts[:editor], &block
+    label = formgroup_label opts[:input], title
+    editor_body = editor_wrap opts[:input], &block
     help_text = formgroup_help_text opts[:help]
     "#{label}<div>#{help_text} #{editor_body}</div>"
   end
 
-  def formgroup_label editor_type, title
+  def formgroup_label input, title
     return if voo&.hide?(:title) || title.blank?
 
-    label_type = editor_type || :content
+    label_type = input || :content
     form.label label_type, title
   end
 

data/mod/edit/set/all/nest_editor.rb

@@ -4,17 +4,20 @@ format :html do
   # TODO: connect to Card::View::Options
   # (that way a mod can add an option that becomes available to nests)
 
-  view :nest_editor, cache: :never, template: :haml,
+  view :nest_editor, cache: :never, unknown: true, template: :haml,
                      wrap: { slot: { class: "_overlay d0-card-overlay card nodblclick" } } do
     @nest_editor_mode = :overlay
   end
 
-  view :modal_nest_editor, cache: :never, wrap: { slot: { class: "nodblclick" } } do
+  view :modal_nest_editor, cache: :never, unknown: true,
+                           wrap: { slot: { class: "nodblclick" } } do
     modal_nest_editor
   end
 
   def nest_editor_tabs
-    static_tabs({ rules: nest_rules_tab, options: haml_partial(:options) },
+    static_tabs({ rules: nest_rules_tab,
+                  options: haml_partial(:options),
+                  help: haml_partial(:help) },
                 :options, "tabs")
   end
 
@@ -29,7 +32,7 @@ format :html do
     if edit_nest.name.blank?
       content_tag :div, "", class: "card-slot" # placeholder
     else
-      nest([edit_nest.name, :right], view: :nest_rules)
+      nest(set_name_for_nest_rules, view: :nest_rules)
     end
   end
 
@@ -50,6 +53,19 @@ format :html do
     @edit_nest ||= NestParser.new params[:edit_nest], default_nest_view, default_item_view
   end
 
+  def left_type_for_nest_editor_set_selection
+    card.type_name
+  end
+
+  def set_name_for_nest_rules
+    nest_name = edit_nest.name
+    if left_type_for_nest_editor_set_selection
+      [left_type_for_nest_editor_set_selection, nest_name, :type_plus_right]
+    else
+      [nest_name, :right]
+    end
+  end
+
   def tinymce_id
     params[:tinymce_id]
   end

data/mod/edit/set/all/nest_editor/_help.haml

@@ -0,0 +1,7 @@
+.m-2
+  Nest one card in another.
+  %p
+    This panel will help you:
+    %ul
+      %li create/edit the nest syntax.
+      %li set rules that apply to nested cards

data/mod/edit/set/all/nest_editor/nest_editor.haml

@@ -1,4 +1,4 @@
-%div
+%div._nest-editor
   .nest-header.d-flex.ml-2
     %h5.mt-1 Nest
     .ml-auto
@@ -11,7 +11,8 @@
           .input-group-prepend._field-indicator
             .input-group-text.text-muted
               +
-          = text_field_tag "nest_name", edit_nest.name, class: "form-control _nest-name"
+          = text_field_tag "nest_name", edit_nest.name, class: "form-control _nest-name",
+                           "data-left-type" => left_type_for_nest_editor_set_selection
 
       .col-3
         = check_box_tag :field, "field", edit_nest.field?,

data/mod/edit/set/all/new.rb

@@ -11,25 +11,19 @@ format :html do
 
   view :new_in_modal, perms: :create, unknown: true, cache: :never,
                       wrap: { modal: { footer: "", size: :edit_modal_size,
-                                       title: :render_title,
+                                       title: :new_in_modal_title,
                                        menu: :new_modal_menu } } do
     _render_new_content_form
   end
 
   def create_form
-    buttons = new_form_opts.delete(:buttons) || _render_new_buttons
-    form_opts = new_form_opts.reverse_merge(success: new_success)
+    form_opts = new_in_modal_form_opts.reverse_merge(success: new_in_modal_success)
+    buttons = form_opts.delete(:buttons) || _render_new_buttons
 
     voo.title ||= new_view_title if new_name_prompt?
     voo.show :help
     card_form(:create, form_opts) do
-      [
-        new_view_hidden,
-        new_view_name,
-        new_view_type,
-        _render_content_formgroup,
-        buttons
-      ]
+      create_form_with_alert_guide buttons
     end
   end
 
@@ -51,24 +45,33 @@ format :html do
       voo.title ||= new_view_title if new_name_prompt?
       voo.show :help
       frame_and_form :create, form_opts do
-        wrap_with :div, class: "d-flex justify-content-between" do
-          [(wrap_with(:div, class: "w-100") do
-            [
-              new_view_hidden,
-              new_view_name,
-              new_view_type,
-              _render_content_formgroup,
-              buttons
-            ]
-          end),
-           alert_guide]
-        end
+        create_form_with_alert_guide buttons
       end
     end
   end
 
+  def create_form_with_alert_guide buttons
+    wrap_with :div, class: "d-flex justify-content-between" do
+      [(wrap_with(:div, class: "w-100") do
+        [
+          new_view_hidden,
+          new_view_name,
+          new_view_type,
+          _render_content_formgroups,
+          buttons
+        ]
+      end),
+       alert_guide]
+    end
+  end
+
   def new_view_hidden; end
 
+  def new_in_modal_form_opts
+    { "data-slot-selector": "modal-origin", "data-slot-error-selector": ".card-slot",
+      buttons: _render_new_in_modal_buttons }
+  end
+
   def new_form_opts
     { "main-success" => "REDIRECT" }
   end
@@ -80,10 +83,16 @@ format :html do
     )
   end
 
+  def new_in_modal_title
+    new_name_prompt? ? new_view_title : render_title
+  end
+
   def new_success
     card.rule(:thanks) || "_self"
   end
 
+  def new_in_modal_success; end
+
   # NAME HANDLING
 
   def new_view_name
@@ -155,12 +164,20 @@ format :html do
     end
   end
 
+  view :new_in_modal_buttons do
+    button_formgroup do
+      wrap_with "div", class: "d-flex" do
+        [standard_save_and_close_button(text: "Submit"), modal_cancel_button]
+      end
+    end
+  end
+
   # path to redirect to after canceling a new form
   def cancel_button_new_args
     href = case
            when main?          then path_to_previous
            when voo&.home_view then path(view: voo.home_view)
-           else                     path(view: :missing)
+           else                     path(view: :unknown)
            end
     { href: href }
   end