card 1.19.6 → 1.20.0

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

@@ -1,106 +1,103 @@
 format :html do
-  view :menu, denial: :blank, tags: :unknown_ok do |args|
-    return _render_template_closer if args[:menu_hack] == :template_closer
+  view :menu, denial: :blank, tags: :unknown_ok do
     return "" if card.unknown?
     wrap_with :div, class: "menu-slot nodblclick" do
       [
-        _optional_render(:horizontal_menu, args, :hide),
-        _render_menu_link(args),
-        _render_modal_slot(args.merge(modal_id: card.cardname.safe_key))
+        _render(:horizontal_menu, optional: :hide),
+        _render_menu_link,
+        _render_modal_slot(modal_id: card.cardname.safe_key)
       ]
     end
   end
 
-  view :menu_link do |args|
-    menu_icon = glyphicon args[:menu_icon]
-    path_opts = { slot: { home_view: args[:home_view] } }
-    path_opts[:is_main] = true if main?
+  view :menu_link do
     css_class =
-      if show_view?(:horizontal_menu,
-                    args.merge(default_visibility: :hide, optional: true))
-        "visible-xs"
-      else
-        "show-on-hover"
-      end
+      show_view?(:horizontal_menu, :hide) ? "visible-xs" : "show-on-hover"
+
     wrap_with :div, class: "vertical-card-menu card-menu #{css_class}" do
-      content_tag :div, class: "btn-group slotter card-slot pull-right" do
-        link_to_view(:vertical_menu, menu_icon, path: path_opts).html_safe
+      wrap_with :div, class: "btn-group slotter card-slot pull-right" do
+        link_to_view(:vertical_menu, menu_icon, path: menu_path_opts).html_safe
       end
     end
   end
 
-  view :vertical_menu, tags: :unknown_ok do |args|
-    items = menu_item_list(args).map do |item|
-              "<li class='#{args[:item_class]}'>#{item}</li>"
-            end.join "\n"
+  def menu_path_opts
+    opts = { slot: { home_view: (voo.home_view || @slot_view),
+                     name_context: context_names_to_params } }
+    opts[:is_main] = true if main?
+    opts
+  end
+
+  def menu_icon
+    glyphicon "cog"
+  end
+
+  view :vertical_menu, tags: :unknown_ok do
     wrap_with :ul, class: "btn-group pull-right slotter" do
-      [
-        content_tag(:span,
-                    "<a href='#'>#{glyphicon args[:menu_icon]}</a>".html_safe,
-                    class: "open-menu dropdown-toggle",
-                    "data-toggle" => "dropdown", "aria-expanded" => "false"),
-        content_tag(:ul, items.html_safe, class: "dropdown-menu", role: "menu")
-      ]
+      [vertical_menu_toggle, vertical_menu_item_list]
     end
   end
 
-  view :horizontal_menu do |args|
-    content_tag :div, class: "btn-group slotter pull-right card-menu "\
-                             "horizontal-card-menu hidden-xs" do
-      list_opts = args.merge(link_opts: { class: "btn btn-default" })
-      menu_item_list(list_opts).join("\n").html_safe
+  def vertical_menu_toggle
+    wrap_with :span, "<a href='#'>#{menu_icon}</a>".html_safe,
+                class: "open-menu dropdown-toggle",
+                "data-toggle" => "dropdown",
+                "aria-expanded" => "false"
+  end
+
+  def vertical_menu_item_list
+    wrap_with :ul, class: "dropdown-menu", role: "menu" do
+      menu_item_list.map do |item|
+        "<li>#{item}</li>"
+      end.join("\n").html_safe
     end
   end
 
-  def menu_item_list args
-    menu_items = []
-    menu_items << menu_edit_link(args)    if args[:show_menu_item][:edit]
-    menu_items << menu_discuss_link(args) if args[:show_menu_item][:discuss]
-    menu_items << menu_follow_link(args)  if args[:show_menu_item][:follow]
-    menu_items << menu_page_link(args)    if args[:show_menu_item][:page]
-    menu_items << menu_rules_link(args)   if args[:show_menu_item][:rules]
-    menu_items << menu_account_link(args) if args[:show_menu_item][:account]
-    menu_items << menu_more_link(args)    if args[:show_menu_item][:more]
-    menu_items
+  view :horizontal_menu do
+    wrap_with :div, class: "btn-group slotter pull-right card-menu "\
+                             "horizontal-card-menu hidden-xs" do
+      menu_item_list(class: "btn btn-default").join("\n").html_safe
+    end
   end
 
-  def menu_link_opts old, new
-    opts = old[:link_opts] || {}
-    opts.merge new
+  def menu_item_list link_opts={}
+    [:edit, :discuss, :follow, :page, :rules, :account, :more].map do |item|
+      next unless send "show_menu_item_#{item}?"
+      send "menu_#{item}_link", link_opts
+    end.compact
   end
 
-  def menu_edit_link args
-    menu_item "edit", "edit", menu_link_opts(args, view: :edit)
+  def menu_edit_link opts
+    menu_item "edit", "edit", opts.merge(view: :edit, path: menu_path_opts)
   end
 
-  def menu_discuss_link args
-    opts = menu_link_opts args, related: Card[:discussion].key
-    menu_item "discuss", "comment", opts
+  def menu_discuss_link opts
+    menu_item "discuss", "comment", opts.merge(related: Card[:discussion].key)
   end
 
-  def menu_follow_link args
-    _render_follow_link(args.merge(icon: true))
+  def menu_follow_link opts
+    _render_follow_link(icon: true, link_opts: opts)
   end
 
-  def menu_page_link args
-    menu_item "page", "new-window", menu_link_opts(args, card: card)
+  def menu_page_link opts
+    menu_item "page", "new-window", opts.merge(card: card)
   end
 
-  def menu_rules_link args
-    menu_item "rules", "wrench", menu_link_opts(args, view: :options)
+  def menu_rules_link opts
+    menu_item "rules", "wrench", opts.merge(view: :options)
   end
 
-  def menu_account_link args
-    menu_item "account", "user", menu_link_opts(
-      args, view: :related,
-            path: { related: { name: "+*account", view: :edit } }
+  def menu_account_link opts
+    menu_item "account", "user", opts.merge(
+      view: :related,
+      path: { related: { name: "+*account", view: :edit } }
     )
   end
 
-  def menu_more_link args
-    view = args[:home_view] || :open
-    menu_item "", "option-horizontal", menu_link_opts(
-      args, path: { view: view, slot: { show: :toolbar } }
+  def menu_more_link opts
+    view = voo.home_view || :open
+    menu_item "", "option-horizontal", opts.merge(
+      view: view, path: { slot: { show: :toolbar } }
     )
   end
 
@@ -109,41 +106,44 @@ format :html do
     smart_link_to link_text.html_safe, opts
   end
 
-  def default_menu_link_args args
-    args[:menu_icon] ||= "cog"
+  def show_menu_item_discuss?
+    discussion_card = menu_discussion_card
+    return unless discussion_card
+    permission_task = discussion_card.new_card? ? :comment : :read
+    discussion_card.ok? permission_task
   end
 
-  def default_vertical_menu_args args
-    default_menu_link_args args
-    args.merge! show_menu_item: show_menu_items
+  def show_menu_item_page?
+    card.name.present? && !main?
   end
 
-  def default_horizontal_menu_args args
-    args.merge! show_menu_item: show_menu_items
+  def show_menu_item_rules?
+    card.virtual?
   end
 
-  def show_menu_items
-    disc_tagname = Card.quick_fetch(:discussion).cardname
-    disc_card =
-      unless card.new_card? || card.junction? &&
-                               card.cardname.tag_name.key == disc_tagname.key
-        Card.fetch "#{card.name}+#{disc_tagname}", skip_modules: true, new: {}
-      end
+  def show_menu_item_edit?
+    return unless card.real?
+    card.ok?(:update) || structure_editable?
+  end
 
-    res = {
-      discuss: disc_card &&
-               disc_card.ok?(disc_card.new_card? ? :comment : :read),
-      page:    card.name.present? && !main?,
-      rules:   card.virtual?
-    }
-    if card.real?
-      res.merge!(
-        edit:      card.ok?(:update) || structure_editable?,
-        account:   card.account && card.ok?(:update),
-        follow:    show_follow?,
-        more:      true
-      )
-    end
-    res
+  def show_menu_item_account?
+    return unless card.real?
+    card.account && card.ok?(:update)
+  end
+
+  def show_menu_item_follow?
+    return unless card.real?
+    show_follow?
+  end
+
+  def show_menu_item_more?
+    card.real?
+  end
+
+  def menu_discussion_card
+    return if card.new_card?
+    disc_tagname = Card.quick_fetch(:discussion).cardname
+    return if card.junction? && card.cardname.tag_name.key == disc_tagname.key
+    card.fetch trait: :discussion, skip_modules: true, new: {}
   end
 end

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

@@ -15,7 +15,7 @@ format :html do
     add_class dialog_args, args[:dialog_class]
     wrap_with(:div, class: "modal fade", role: "dialog", id: id) do
       wrap_with(:div, dialog_args) do
-        content_tag :div, class: "modal-content" do
+        wrap_with :div, class: "modal-content" do
           ""
         end
       end
@@ -40,14 +40,9 @@ format :html do
     end
   end
 
-  view :modal_footer, tags: :unknown_ok do |args|
-    args[:buttons] || ""
-  end
-
-  def default_modal_footer_args args
-    args[:buttons] ||=
-      button_tag "Close",
-                 class: "btn-xs close-modal pull-right",
-                 "data-dismiss" => "modal"
+  view :modal_footer, tags: :unknown_ok do
+    button_tag "Close",
+               class: "btn-xs close-modal pull-right",
+               "data-dismiss" => "modal"
   end
 end

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

@@ -0,0 +1,103 @@
+format :html do
+  view :new, perms: :create, tags: :unknown_ok, cache: :never do
+    voo.title ||= new_view_title if new_name_prompt?
+    voo.show :help
+    frame_and_form :create, "main-success" => "REDIRECT" do
+      [
+        new_view_hidden,
+        new_view_name,
+        new_view_type,
+        _optional_render_content_formgroup,
+        _optional_render_new_buttons
+      ]
+    end
+  end
+
+  def new_view_title
+    output(
+      "New",
+      (card.type_name unless card.type_id == Card.default_type_id)
+    )
+  end
+
+  def new_view_hidden
+    target = card.rule(:thanks) || "_self"
+    hidden_field_tag "success", target
+  end
+
+  # NAME HANDLING
+
+  def new_view_name
+    if new_name_prompt?
+      new_name_formgroup
+    elsif !autoname?
+      hidden_field_tag "card[name]", card.name
+    end
+  end
+
+  def new_name_formgroup
+    output _optional_render_name_formgroup,
+           hidden_field_tag("name_prompt", true)
+  end
+
+  def new_name_prompt?
+    voo.visible? :name_formgroup do
+      needs_name? || params[:name_prompt]
+    end
+  end
+
+  def autoname?
+    @autoname.nil? ? (@autoname = card.rule_card :autoname).present? : @autoname
+  end
+
+  def needs_name?
+    card.name.blank? && !autoname?
+  end
+
+  # TYPE HANDLING
+
+  def new_view_type
+    if new_type_prompt?
+      _render_new_type_formgroup
+    else
+      hidden_field_tag "card[type_id]", card.type_id
+    end
+  end
+
+  def new_type_prompt?
+    voo.visible? :new_type_formgroup do
+      !new_type_preset? && new_type_prompt_context? && new_type_permitted?
+    end
+  end
+
+  def new_type_preset?
+    params[:type] || voo.type
+  end
+
+  def new_type_prompt_context?
+    main? || card.simple? || card.is_template?
+  end
+
+  def new_type_permitted?
+    Card.new(type_id: card.type_id).ok? :create
+  end
+
+  view :new_type_formgroup do
+    wrap_type_formgroup do
+      type_field class: "type-field live-type-field",
+                 href: path(view: :new),
+                 "data-remote" => true
+    end
+  end
+
+  view :new_buttons do
+    cancel_path = !main? && path(view: :missing)
+    button_formgroup do
+      [standard_create_button, standard_cancel_button(cancel_path)]
+    end
+  end
+
+  def standard_create_button
+    submit_button class: "submit-button create-submit-button"
+  end
+end

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

@@ -5,7 +5,7 @@ format :html do
 
   view :toolbar do |args|
     collapsed = close_link(args.merge(class: "pull-right visible-xs"))
-    navbar "toolbar-#{card.cardname.safe_key}-#{args[:home_view]}",
+    navbar "toolbar-#{card.cardname.safe_key}-#{voo.home_view}",
            toggle_align: :left, class: "slotter toolbar",
            navbar_type: "inverse",
            collapsed_content: collapsed do
@@ -20,7 +20,7 @@ format :html do
           ]
         end),
         (wrap_with(:form, class: "navbar-form navbar-right") do
-          content_tag :div, class: "form-group" do
+          wrap_with :div, class: "form-group" do
             _optional_render(:toolbar_buttons, args, :show)
           end
         end)
@@ -29,7 +29,7 @@ format :html do
   end
 
   def default_toolbar_args args
-    args[:nested_fields] = nested_fields(args)
+    args[:nested_fields] = nested_fields
     args[:active_toolbar_button] ||= active_toolbar_button @slot_view, args
   end
 
@@ -86,32 +86,41 @@ format :html do
   end
 
   def rules_split_button args
-    recent = smart_link_to "recent",   view: :edit_rules,
-                                       slot: { rule_view: :recent_rules }
-    common = smart_link_to "common",   view: :edit_rules,
-                                       slot: { rule_view: :common_rules }
-    group  = smart_link_to "by group", view: :edit_rules,
-                                       slot: { rule_view: :grouped_rules }
-    all    = smart_link_to "by name",  view: :edit_rules,
-                                       slot: { rule_view: :all_rules }
-    nests  = smart_link_to "nests",    view: :edit_nest_rules,
-                                       slot: { rule_view: :field_related_rules }
-    toolbar_split_button "rules", { view: :edit_rules }, args do
-      {
-        common_rules:    common,
-        grouped_rules:   group,
-        all_rules:       all,
-        separator:       (separator if args[:nested_fields].present?),
-        recent_rules:    (recent if recently_edited_settings?),
-        edit_nest_rules: (nests if args[:nested_fields].present?)
-      }
-    end
+    button_hash = {
+      common_rules:  edit_rules_link("common",   :common_rules),
+      grouped_rules: edit_rules_link("by group", :grouped_rules),
+      all_rules:     edit_rules_link("by name",  :all_rules)
+    }
+    recently_edited_rules_link button_hash
+    nest_rules_link button_hash, args[:nested_fields]
+    toolbar_split_button("rules", { view: :edit_rules }, args) { button_hash }
+  end
+
+  def nest_rules_link button_hash, nested_fields
+    return unless nested_fields.present?
+    button_hash[:separator] = separator
+    button_hash[:edit_nest_rules] = edit_nest_rules_link "nests"
+  end
+
+  def recently_edited_rules_link button_hash
+    return unless recently_edited_settings?
+    button_hash[:recent_rules] = edit_rules_link "recent", :recent_rules
+  end
+
+  def edit_nest_rules_link text
+    smart_link_to text, view: :edit_nest_rules,
+                        path: { slot: { rule_view: :field_related_rules } }
+  end
+
+  def edit_rules_link text, rule_view
+    smart_link_to text, view: :edit_rules,
+                        path: { slot: { rule_view: rule_view } }
   end
 
   def edit_split_button args
     toolbar_split_button "edit", { view: :edit }, args do
       {
-        edit:       _render_edit_content_link(args),
+        edit:       _render_edit_link(args),
         edit_nests: (_render_edit_nests_link if nests_editable?(args)),
         structure:  (_render_edit_structure_link if structure_editable?),
         edit_name:  _render_edit_name_link,
@@ -186,8 +195,7 @@ format :html do
       [
         _optional_render(:delete_button,  args, show_or_hide_delete),
         _optional_render(:refresh_button, args, :show),
-        _optional_render(:related_button, args, :show),
-        _optional_render(:history_button, args, :hide)
+        _optional_render(:related_button, args, :show)
       ]
     end
   end
@@ -242,62 +250,34 @@ format :html do
     icon = glyphicon symbol
     hide ||= "hidden-xs hidden-sm hidden-md hidden-lg"
     css_classes = "menu-item-label #{hide}"
-    rich_text = content_tag :span, text.html_safe, class: css_classes
+    rich_text = wrap_with :span, text.html_safe, class: css_classes
     icon + rich_text
   end
 
-  def autosaved_draft_link
-    link_to_view :edit, "autosaved draft",
-                 path: { edit_draft: true, slot: { show: :toolbar } },
-                 class: "navbar-link slotter pull-right"
-  end
-
-  def default_edit_content_link_args args
-    args[:title] ||= "content"
-  end
-
-  view :edit_content_link do |args|
-    toolbar_view_link :edit, args
+  def autosaved_draft_link opts={}
+    text = opts.delete(:text) || "autosaved draft"
+    opts[:path] = { edit_draft: true, slot: { show: :toolbar } }
+    add_class opts, "navbar-link slotter"
+    link_to_view :edit, text, opts
   end
 
-  def default_edit_name_link_args args
-    args[:title] ||= "name"
-  end
-  view :edit_name_link do |args|
-    toolbar_view_link :edit_name, args
-  end
-
-  def default_edit_type_link_args args
-    args[:title] ||= "type"
-  end
-
-  view :edit_type_link do |args|
-    toolbar_view_link :edit_type, args
-  end
-
-  view :edit_structure_link do |_args|
-    link_to_view :edit_structure, "structure"
-  end
+  {
+    edit:           "content",
+    edit_name:      "name",
+    edit_type:      "type",
+    edit_nests:     "nests",
+    edit_structure: "structure",
+    history:        "history"
+  }.each do |viewname, viewtitle|
 
-  def default_history_link_args args
-    args[:title] ||= "history"
-  end
-
-  view :history_link do |args|
-    toolbar_view_link :history, args
-  end
-
-  def default_edit_nests_link_args args
-    args[:title] ||= "nests"
-  end
-
-  view :edit_nests_link do |args|
-    toolbar_view_link :edit_nests, args
+    view "#{viewname}_link" do
+      voo.title ||= viewtitle
+      toolbar_view_link viewname
+    end
   end
 
-  def toolbar_view_link view, args
-    text = args.delete(:title)
-    link_to_view view, text, args
+  def toolbar_view_link view
+    link_to_view view, voo.title
   end
 
   def recently_edited_settings?