card 1.98.3 → 1.99.0

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

@@ -1,7 +1,3 @@
-def show_comment_box_in_related?
-  false
-end
-
 format :html do
   def prepare_content_slot
     class_up "card-slot", "d0-card-content"
@@ -11,13 +7,36 @@ format :html do
   before(:content) { prepare_content_slot }
 
   view :content do
-    wrap { [_render_menu, _render_core] }
+    voo.hide :edit_button
+    wrap do
+      [_render_menu, _render_core, _render_edit_button(edit: :inline)]
+    end
+  end
+
+  before(:content_with_edit_button) do
+    prepare_content_slot
+  end
+
+  view :content_with_edit_button do
+    wrap do
+      [_render_menu, _render_core, _render_edit_button(edit: :inline)]
+    end
   end
 
   view :short_content, wrap: { div: { class: "text-muted" } } do
     short_content
   end
 
+  view :raw_one_line_content, unknown: :mini_unknown,
+                              wrap: { div: { class: "text-muted" } } do
+    raw_one_line_content
+  end
+
+  view :one_line_content, unknown: :mini_unknown,
+                          wrap: { div: { class: "text-muted" } } do
+    one_line_content
+  end
+
   before(:content_with_title) { prepare_content_slot }
 
   view :content_with_title do
@@ -39,14 +58,14 @@ format :html do
     end
   end
 
-  view :titled, commentable: true do
+  view :titled do
     @content_body = true
     wrap do
       [
         naming { render_header },
         render_flash,
         wrap_body { render_titled_content },
-        render_comment_box
+        render_comment_box(optional: :hide)
       ]
     end
   end
@@ -68,19 +87,18 @@ format :html do
                                  items: (opts[:items] || {}).merge(view: item_view))
   end
 
-  view :open, commentable: true do
+  view :open do
     toggle_logic
     @toggle_mode = :open
     @content_body = true
     frame do
-      [_render_open_content, render_comment_box]
+      [_render_open_content, render_comment_box(optional: :hide)]
     end
   end
 
   view :closed do
-    with_nest_mode :closed do
+    with_nest_mode :compact do
       toggle_logic
-      voo.hide :closed_content
       class_up "d0-card-body", "closed-content"
       @content_body = false
       @toggle_mode = :close
@@ -99,6 +117,18 @@ format :html do
     Card.fetch(set_name)
   end
 
+  def raw_one_line_content
+    cleaned = Card::Content.clean! render_raw, {}
+    cut_with_ellipsis cleaned
+  end
+
+  def one_line_content
+    # TODO: use a version of Card::Content.smart_truncate
+    #       that counts characters instead of clean!
+    cleaned = Card::Content.clean! render_core, {}
+    cut_with_ellipsis cleaned
+  end
+
   # LOCALIZE
   def short_content
     short_content_items || short_content_fields || short_content_from_core

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

@@ -7,33 +7,36 @@ format :html do
     haml :debug_server_error, {}, error_page
   end
 
-  view :message, perms: :none, unknown: true do
-    frame { params[:message] }
+  view :unknown do
+    createable { wrap { unknown_link "#{unknown_icon} #{render_title}" } }
   end
 
-  view :missing do
-    createable do
-      wrap { missing_link("#{fa_icon 'plus-square'} #{_render_title}") }
-    end
+  # icon only, no wrap
+  view :mini_unknown, unknown: true, cache: :never do
+    createable { unknown_link unknown_icon }
   end
 
   def createable
     card.ok?(:create) ? yield : ""
   end
 
-  def missing_link text
+  def unknown_link text
     path_opts = voo.type ? { card: { type: voo.type } } : {}
-    link_to_view :new_in_modal, text, path: path_opts, class: classy("missing-link")
+    link_to_view :new_in_modal, text, path: path_opts, class: classy("unknown-link")
+  end
+
+  def unknown_icon
+    fa_icon "plus-square"
   end
 
-  view :closed_missing, perms: :none do
+  view :compact_missing, perms: :none do
     wrap_with :span, h(title_in_context), class: "faint"
   end
 
   view :conflict, cache: :never do
     actor_link = link_to_card card.last_action.act.actor.name
     class_up "card-slot", "error-view"
-    wrap do # ENGLISH below
+    wrap do # LOCALIZE
       alert "warning" do
         %(
           <strong>Conflict!</strong>
@@ -68,18 +71,7 @@ format :html do
   end
 
   def view_for_unknown view
-    case
-    when main? && ok?(:create) then :new
-    when commentable?(view)    then view
-    else super
-    end
-  end
-
-  def commentable? view
-    return false unless view_setting(:commentable, view) &&
-                        show_view?(:comment_box, :hide)
-
-    ok? :comment
+    main? && ok?(:create) ? :new : super
   end
 
   def show_all_errors?

data/mod/standard/set/all/rich_html/html_views/guide.rb

@@ -40,7 +40,7 @@ format :html do
         # render guide text with current card's format
         # so current card's context is used in guide card nests
       end
-    elsif  card.guide_card
+    elsif card.guide_card
       with_nest_mode :normal do
         nest card.guide_card, view: :core
       end

data/mod/standard/set/all/rich_html/html_views/help.rb

@@ -1,19 +1,27 @@
 def help_rule_card
-  setting = new_card? ? [:add_help, { fallback: :help }] : :help
-  help_card = rule_card(*setting)
+  help_card = rule_card(:help)
   help_card if help_card&.ok?(:read)
 end
 
 format :html do
   view :help, unknown: true, cache: :never, wrap: :slot do
-    help_text = voo.help || rule_based_help
-    return "" unless help_text.present?
+    help = help_text
+    return "" unless help.present?
 
+    wrap_with :div, wrap_help_text(help), class: classy("help-text")
+  end
+
+  view :help_text, unknown: true, cache: :never do
+    wrap_help_text help_text
+  end
+
+  def wrap_help_text text
+    help = text
     if (rule_card = card.help_rule_card)
       edit_link = with_nest_mode(:normal) { nest(rule_card, view: :edit_link) }
-      help_text = "<span class='d-none'>#{edit_link}</span>#{help_text}"
+      help = "<span class='d-none'>#{edit_link}</span>#{text}"
     end
-    wrap_with :div, help_text, class: classy("help-text")
+    help
   end
 
   view :lead do
@@ -21,8 +29,12 @@ format :html do
     _view_content
   end
 
+  def help_text
+    voo.help || rule_based_help
+  end
+
   def raw_help_text
-    card.help_rule_card&.content
+    card.try(:raw_help_text) || card.help_rule_card&.content
   end
 
   def rule_based_help

data/mod/standard/set/all/rich_html/html_views/info.rb

@@ -1,5 +1,5 @@
 format :html do
-  view :type do
+  view :type, unknown: true do
     link_to_card card.type_card, nil, class: "cardtype"
   end
 

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

@@ -3,7 +3,9 @@ format :html do
     return "" if card.unknown?
 
     wrap_with :div, class: "card-menu #{menu_link_classes}" do
-      [bridge_link(false), menu_link]
+      [render_help_link,
+       menu_link,
+       (voo.show?(:bridge_link) ? bridge_link(false) : nil)]
     end
   end
 
@@ -18,8 +20,23 @@ format :html do
     end
   end
 
+  def edit_view
+    case voo.edit
+    when :inline
+      :edit_inline
+    when :full
+      :edit
+    else # :standard
+      edit_link
+    end
+  end
+
   view :edit_link, unknown: true, denial: :blank do
-    edit_link :edit, link_text: voo.title
+    edit_link edit_link_view, link_text: voo.title
+  end
+
+  def edit_link_view
+    :edit
   end
 
   view :full_page_link do
@@ -39,6 +56,37 @@ format :html do
     link_to_view :bridge, material_icon(:more_horiz), opts
   end
 
+  # no caching because help_text view doesn't cache, and we can't have a
+  # stub in the data-content attribute or it will get html escaped.
+  view :help_link, cache: :never, unknown: true do
+    help_link
+  end
+
+  def help_link
+    opts = help_popover_opts
+    add_class opts, "_card-menu-popover"
+    link_to help_icon, opts
+  end
+
+  def help_popover_opts
+    opts = { "data-placement": :left, class: "help-link" }
+    popover_opts render_help_text, help_title, opts
+  end
+
+  def help_icon
+    material_icon("help")
+  end
+
+  def help_title
+    "#{name_parts_links} (#{render_type}) #{full_page_link unless card.simple?}"
+  end
+
+  def name_parts_links
+    card.name.parts.map do |part|
+      link_to_card part
+    end.join Card::Name.joint
+  end
+
   def full_page_link
     link_to_card full_page_card, full_page_icon, class: classy("full-page-link")
   end

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

@@ -22,10 +22,27 @@ format :html do
 
   view :overlay_menu do
     wrap_with :div, class: "btn-group btn-group-sm align-self-start ml-auto" do
-      [slotify_overlay_link, close_overlay_link]
+      [render_overlay_help_link, slotify_overlay_link, close_overlay_link]
     end
   end
 
+  view :overlay_help_link, cache: :never, unknown: true do
+    opts = help_popover_opts
+    add_open_guide_opts opts
+    overlay_menu_link "question-circle", opts
+  end
+
+  def add_open_guide_opts opts
+    return unless card.guide_card
+
+    slot_selector = ".bridge-sidebar > ._overlay-container-placeholder > .card-slot"
+    opts.merge! remote: true,
+                href: path(mark: card, view: :overlay_guide),
+                "data-slot-selector": slot_selector,
+                "data-slotter-mode": "overlay"
+    add_class opts, "slotter"
+  end
+
   def slotify_overlay_link
     overlay_menu_link "external-link-square", card: card
   end
@@ -41,6 +58,11 @@ format :html do
     button_tag link_text, button_opts
   end
 
+  def overlay_delete_button
+    opts = { no_success: true }.merge OVERLAY_CLOSE_OPTS
+    delete_button opts
+  end
+
   def overlay_save_and_close_button
     submit_button text: "Save and Close", class: "_close-on-success",
                   "data-cy": "submit-overlay"

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

@@ -1,5 +1,5 @@
 format do
-  view :title, closed: true, perms: :none do
+  view :title, compact: true, perms: :none do
     standard_title
   end
 
@@ -13,11 +13,11 @@ format :html do
     show_view?(:title_link, :hide) ? render_title_link : render_title_no_link
   end
 
-  view :title_link, closed: true, perms: :none do
+  view :title_link, compact: true, perms: :none do
     link_to_card card.name, render_title_no_link
   end
 
-  view :title_no_link, closed: true, perms: :none do
+  view :title_no_link, compact: true, perms: :none do
     wrapped_title standard_title
   end
 

data/mod/standard/set/right/discussion.rb

@@ -1,3 +1,9 @@
-def show_comment_box_in_related?
-  true
+view :titled, unknown: true do
+  voo.show :comment_box
+  super()
+end
+
+view :open, unknown: true do
+  voo.show :comment_box
+  super()
 end

data/mod/standard/set/right/head.rb

@@ -7,6 +7,10 @@ format :html do
     process_content render_raw
   end
 
+  view :one_line_content do
+    raw_one_line_content
+  end
+
   view :core do
     process_content ::CodeRay.scan(render_raw, :html).div
   end

data/mod/standard/set/right/type_plus_right.rb

@@ -0,0 +1,4 @@
+def related_sets _with_self=false
+  [[name, Card::Set::TypePlusRight.label(name.left)],
+   ["#{name[1]}+*right", Card::Set::Right.label(name[1])]]
+end

data/mod/standard/set/self/cardtype.rb

@@ -0,0 +1,42 @@
+GROUP = {
+  "Text" => %w[RichText PlainText Markdown Phrase HTML],
+  "Data" => %w[Number Toggle Date URI],
+  "Upload" => %w[File Image],
+  "Custom" => [],
+  "Organize" => ["List", "Pointer", "Search", "Link list",
+                 "Mirror List", "Mirrored List"],
+  "Template" => ["Notification template", "Email template", "Twitter template"],
+  "Admin" => ["Cardtype", "User", "Role", "Sign up", "Session", "Set", "Setting"],
+  "Styling" => ["Layout", "Skin", "Bootswatch skin", "Customized bootswatch skin", "CSS", "SCSS"],
+  "Scripting" => %w[JSON JavaScript CoffeeScript]
+}.freeze
+
+#DEFAULT_RULE_GROUPS = ["Text", "Data", "Upload", "Organize - Search"]
+#STRUCTURE_RULE_GROUPS = ["Text", "Organize > Search"]
+
+# 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
+
+format :html do
+  view :grouped_list do
+    GROUP.keys.map do |group|
+      type_list = group == "Custom" ? custom_types : GROUP[group]
+      next if type_list.empty?
+
+      [wrap_with(:h5, group), wrap_with(:p, listing(type_list))]
+    end.flatten.join "\n"
+  end
+
+  def custom_types
+    custom_types = []
+
+    Card.search(type_id: CardtypeID, return: "name").each do |name|
+      next if ::Card::Set::Self::Cardtype::GROUP_MAP[name]
+
+      custom_types << name
+    end
+    custom_types
+  end
+end

data/mod/standard/set/self/sidebar.rb

@@ -0,0 +1,5 @@
+def raw_help_text
+  <<-TEXT
+    Sidebar content of [[Layouts]] with sidebar. [[http://decko.org/sidebar|more]]
+  TEXT
+end