card 1.19.6 → 1.20.0

data/mod/standard/set/all/rich_html/form.rb

@@ -1,41 +1,41 @@
 include_set Abstract::ProsemirrorEditor
 
 format :html do
-  def edit_slot args={}
-    # note: @mode should already be :edit here...
-    if args[:structure] || card.structure ||
-       args[:edit_fields]
-      multi_card_edit_slot args
-    else
-      single_card_edit_slot args
-    end
+  def edit_slot
+    multi_edit? ? multi_card_edit_slot : single_card_edit_slot
   end
 
-  def multi_card_edit_slot args
-    if args[:core_edit] # need better name
-      _render_core args
-    elsif args[:edit_fields]
-      process_edit_fields args[:edit_fields]
-    else
-      process_nested_fields optional_toolbar: :hide,
-                            structure: args[:structure]
-    end
+  def multi_edit?
+    inline_nests_editor? || nests_editor? || # editor configured in voo
+      voo.structure || voo.edit_structure || # structure configured in voo
+      card.structure                         # structure in card rule
+  end
+
+  def multi_card_edit_slot
+    inline_nests_editor? ? _render_core : process_nested_fields
+  end
+
+  def inline_nests_editor?
+    voo.editor == :inline_nests
+  end
+
+  def nests_editor?
+    voo.editor == :nests
   end
 
-  def single_card_edit_slot args
-    field = content_field form, args
-    if [args[:optional_type_formgroup], args[:optional_name_formgroup]]
-       .member? :show
+  def single_card_edit_slot
+    if voo.show?(:type_formgroup) || voo.show?(:name_formgroup)
       # display content field in formgroup for consistency with other fields
-      formgroup "", field, editor: :content
+      formgroup("", editor: :content) { content_field }
     else
-      editor_wrap(:content) { field }
+      editor_wrap(:content) { content_field }
     end
   end
 
-  def process_nested_fields args
-    nested_fields(args).map do |chunk|
-      nest chunk.options.reverse_merge(args)
+  def process_nested_fields
+    nested_fields_for_edit.map do |name, options|
+      options[:hide] = :toolbar
+      nest name, options
     end.join "\n"
   end
 
@@ -63,71 +63,64 @@ format :html do
 
   def card_form action, opts={}
     @form_root = true
-    hidden_args = opts.delete :hidden
-    form_for card, card_form_opts(action, opts) do |form|
+    url, action = card_form_url action
+    html_opts = card_form_html_opts action, opts
+    form_for card, url: url, html: html_opts, remote: true do |form|
       @form = form
-      %(
-        #{hidden_tags hidden_args if hidden_args}
-        #{yield form}
-      )
+      output yield(form)
     end
   end
 
   def form_root_format
-    if @form_root
-      self
-    elsif !@parent
-      nil
-    else
-      @parent.form_root_format
+    if @form_root   then self
+    elsif !@parent  then nil
+    else                 @parent.form_root_format
     end
   end
 
-  def card_form_opts action, html={}
-    url, action = url_from_action(action)
-
-    klasses = Array.wrap(html[:class])
-    klasses << "card-form slotter"
+  def card_form_html_opts action, opts={}
+    klasses = Array.wrap(opts[:class]) << "card-form slotter"
     klasses << "autosave" if action == :update
-    html[:class] = klasses.join " "
+    opts[:class] = klasses.join " "
 
-    html[:recaptcha] ||= "on" if card.recaptcha_on?
-    html.delete :recaptcha if html[:recaptcha] == :off
-
-    { url: url, remote: true, html: html }
+    opts[:recaptcha] ||= "on" if card.recaptcha_on?
+    opts.delete :recaptcha if opts[:recaptcha] == :off
+    opts
   end
 
-  def url_from_action action
+  def card_form_url action
     case action
-    when Symbol
-      [path(action: action), action]
-    when Hash
-      [path(action), action[:action]]
-    when String # deprecated
-      [card_path(action), nil]
+    when Symbol then [path(action: action), action]
+    when Hash   then [path(action), action[:action]]
+      # for when non-action path args are required
     else
-      raise Card::Error, "unsupported card_form action class: #{action.class}"
+      raise Card::Error, "unsupported #card_form_url action: #{action}"
     end
   end
 
   def editor_wrap type=nil
     html_class = "editor"
     html_class << " #{type}-editor" if type
-    content_tag(:div, class: html_class) { yield.html_safe }
+    wrap_with :div, class: html_class do
+      yield
+    end
   end
 
-  def formgroup title, content, opts={}
+  def formgroup title, opts={}, &block
+    label = formgroup_label opts[:editor], title
+    editor_body = editor_wrap opts[:editor], &block
+    help_text = formgroup_help_text opts[:help]
     wrap_with :div, formgroup_div_args(opts[:class]) do
-      %(
-        #{form.label(opts[:editor] || :content, title)}
-        <div>
-          #{editor_wrap(opts[:editor]) { content }}
-          #{formgroup_help_text opts[:help]}
-        </div>
-      )
+      "#{label}<div>#{editor_body} #{help_text}</div>"
     end
   end
 
+  def formgroup_label editor_type, title
+    return if voo && voo.hide?(:title)
+    label_type = editor_type || :content
+    form.label label_type, title
+  end
+
   def formgroup_div_args html_class
     div_args = { class: ["form-group", html_class].compact.join(" ") }
     div_args[:card_id] = card.id if card.real?
@@ -136,10 +129,9 @@ format :html do
   end
 
   def formgroup_help_text text=nil
-    case text
-    when String then _render_help help_class: "help-block", help_text: text
-    when true   then _render_help help_class: "help-block"
-    end
+    class_up "help-text", "help-block"
+    voo.help = text if voo && text.to_s != "true"
+    _optional_render_help
   end
 
   def hidden_tags hash, base=nil
@@ -160,46 +152,49 @@ format :html do
 
   # FIELDSET VIEWS
 
-  view :name_formgroup do |args|
-    formgroup "name", raw(name_field(form)),
-              editor: "name", help: args[:help]
+  view :name_formgroup do
+    formgroup "name", editor: "name" do
+      raw name_field
+    end
+  end
+
+  def wrap_type_formgroup
+    formgroup "type", editor: "type", class: "type-formgroup" do
+      yield
+    end
   end
 
-  view :type_formgroup do |args|
-    field = if args[:variety] == :edit # FIXME: dislike this api -ef
-              type_field class: "type-field edit-type-field"
-            else
-              type_field class: "type-field live-type-field",
-                         href: path(view: :new), "data-remote" => true
-            end
-    formgroup "type", field, editor: "type", class: "type-formgroup"
+  view :type_formgroup do
+    wrap_type_formgroup do
+      type_field class: "type-field edit-type-field"
+    end
   end
 
-  view :button_formgroup do |args|
-    %(<div class="form-group"><div>#{args[:buttons]}</div></div>)
+  def button_formgroup
+    wrap_with :div, class: "form-group" do
+      wrap_with :div, yield
+    end
   end
 
-  view :content_formgroup do |args|
-    raw %(
-      <fieldset class="card-editor editor">
-        #{edit_slot args}
-      </fieldset>
-    )
+  view :content_formgroup, cache: :never do
+    wrap_with :fieldset, edit_slot, class: classy("card-editor", "editor")
   end
 
-  def name_field form=nil, options={}
-    form ||= self.form
-    text_field(:name, {
-      # needed because otherwise gets wrong value if there are updates
-      value: card.name,
-      autocomplete: "off"
-    }.merge(options))
+  def name_field
+    # value needed because otherwise gets wrong value if there are updates
+    text_field :name, value: card.name, autocomplete: "off"
   end
 
   def type_field args={}
     typelist = Auth.createable_types
-    current_type =
-      unless args.delete :no_current_type
+    current_type = type_field_current_value args, typelist
+    options = options_from_collection_for_select typelist, :to_s, :to_s,
+                                                 current_type
+    template.select_tag "card[type]", options, args
+  end
+
+  def type_field_current_value args, typelist
+    return if args.delete :no_current_type
         if !card.new_card? && !typelist.include?(card.type_name)
           # current type should be an option on existing cards,
           # regardless of create perms
@@ -208,38 +203,30 @@ format :html do
         card.type_name_or_default
       end
 
-    options = options_from_collection_for_select typelist, :to_s, :to_s,
-                                                 current_type
-    template.select_tag "card[type]", options, args
+  def content_field skip_rev_id=false
+    [content_field_revision_tracking(skip_rev_id), _render_editor].compact.join
   end
 
-  def content_field form, options={}
-    @form = form
-    @nested = options[:nested]
+  def content_field_revision_tracking skip_rev_id
     card.last_action_id_before_edit = card.last_action_id
-    revision_tracking =
-      if card && !card.new_card? && !options[:skip_rev_id]
+    return if !card || card.new_card? || skip_rev_id
         hidden_field :last_action_id_before_edit, class: "current_revision_id"
-        # hidden_field_tag 'card[last_action_id_before_edit]',
-        # card.last_action_id, class: 'current_revision_id'
-      end
-    %(
-      #{revision_tracking}
-      #{_render_editor options}
-    )
   end
 
   # FIELD VIEWS
 
-  view :edit_in_form, perms: :update, tags: :unknown_ok do |args|
-    eform = form_for_multi
-    content = content_field eform, args.merge(nested: true)
-    content += raw("\n #{eform.hidden_field :type_id}") if card.new_card?
-    opts = { editor: "content", help: true, class: "card-editor" }
-    if card.cardname.junction?
-      opts[:class] += " RIGHT-#{card.cardname.tag_name.safe_key}"
+  view :edit_in_form, cache: :never, perms: :update, tags: :unknown_ok do
+    @form = form_for_multi
+    add_junction_class
+    formgroup fancy_title(voo.title),
+              editor: "content", help: true, class: classy("card-editor") do
+      [content_field, (form.hidden_field(:type_id) if card.new_card?)]
     end
-    formgroup fancy_title(args[:title]), content, opts
+    end
+
+  def add_junction_class
+    return unless card.cardname.junction?
+    class_up "card-editor", "RIGHT-#{card.cardname.tag_name.safe_key}"
   end
 
   # form helpers
@@ -267,25 +254,18 @@ format :html do
   end
 
   def submit_button args={}
-    args.reverse_merge!(
-      situation: "primary",
-      data: {}
-    )
     text = args.delete(:text) || "Submit"
+    args.reverse_merge! situation: "primary", data: {}
     args[:data][:disable_with] ||= args.delete(:disable_with) || "Submitting"
     button_tag text, args
   end
 
   # redirect to *previous if no :href is given
   def cancel_button args={}
-    args.reverse_merge! type: "button"
-    if args[:href]
-      add_class args, "slotter"
-    else
-      add_class args, "redirecter"
-      args[:href] = Card.path_setting("/*previous")
-    end
     text = args.delete(:text) || "Cancel"
+    args[:type] ||= "button"
+    add_class args, (args[:href] ? "slotter" : "redirecter")
+    args[:href] ||= Card.path_setting("/*previous")
     button_tag text, args
   end
 end

data/mod/standard/set/all/rich_html/header.rb

@@ -1,62 +1,80 @@
 format :html do
-  view :header do |args|
-    %(
-      <div class="card-header #{args[:header_class]}">
-        <div class="card-header-title #{args[:title_class]}">
-          #{_optional_render :toggle, args, :hide}
-          #{_optional_render :title, args}
-        </div>
-        #{_optional_render :type_info, args, :hide}
-      </div>
-      #{_optional_render :toolbar, args, :hide}
-    )
+  # TODO: find these a better home.
+  def class_up klass, classier, force=false
+    key = klass.to_s
+    return if !force && class_list[key]
+    class_list[key] = classier.to_s
   end
 
-  def default_header_args args
-    args[:optional_toolbar] ||= :show if @slot_view == :open && toolbar_pinned?
-    if show_view?(:toolbar, args.merge(default_visibility: :hide)) &&
-       card.type_code != :basic
-      args[:optional_type_info] ||= :show
-    end
+  def class_list
+    @class_list ||= {}
+  end
+
+  def classy *classes
+    classes = Array.wrap(classes).flatten
+    [classes, class_list[classes.first]].flatten.compact.join " "
   end
 
-  view :subheader do |args|
-    args[:subheader] ||= toolbar_view_title(@slot_view) || _render_title(args)
-    %(
-      <div class="card-subheader navbar-inverse btn-primary active">
-        #{args[:subheader]}
-        #{autosaved_draft_link if card.drafts.present? && @slot_view == :edit}
-      </div>
-    )
+  view :header do
+    voo.hide :toggle, :toolbar
+    main_header + _optional_render_toolbar
   end
 
-  view :toggle do |args|
-    verb, adjective, direction =
-      if args[:toggle_mode] == :close
-        %w(open open expand)
-      else
-        %w(close closed collapse-down)
+  def main_header
+    wrap_with :div, class: classy("card-header") do
+      wrap_with :div, class: classy("card-header-title") do
+        header_title_elements
       end
+    end
+  end
+
+  def header_title_elements
+    [_optional_render_toggle, _optional_render_title]
+  end
 
+  view :subheader do
+    wrap_with :div, class: "card-subheader navbar-inverse btn-primary active" do
+      [
+        _render_title,
+        (autosaved_draft_link(class: "pull-right") if show_draft_link?)
+      ]
+    end
+    # toolbar_view_title(@slot_view) || _render_title(args)
+  end
+
+  def show_draft_link?
+    card.drafts.present? && @slot_view == :edit
+  end
+
+  view :toggle do
+    verb, adjective, direction = toggle_verb_adjective_direction
     link_to_view adjective, glyphicon(direction),
                  title: "#{verb} #{card.name}",
                  class: "#{verb}-icon toggler slotter nodblclick"
   end
 
-  view :link_list do |args|
-    content_tag :ul, class: args[:class] do
-      item_links(args).map do |al|
-        content_tag :li, raw(al)
+  def toggle_verb_adjective_direction
+    if @toggle_mode == :close
+      %w(open open expand)
+    else
+      %w(close closed collapse-down)
+    end
+  end
+
+  def nav_link_list side
+    wrap_with :ul, class: "nav navbar-nav navbar-#{side}" do
+      item_links.map do |link|
+        wrap_with(:li) { link }
       end.join "\n"
     end
   end
 
-  view :navbar_right do |args|
-    render_link_list args.merge(class: "nav navbar-nav navbar-right")
+  view :navbar_right do
+    nav_link_list :right
   end
 
-  view :navbar_left do |args|
-    render_link_list args.merge(class: "nav navbar-nav navbar-left")
+  view :navbar_left do
+    nav_link_list :left
   end
 
   def show_follow?