card 1.98.0 → 1.99.1

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, 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?
@@ -116,7 +108,7 @@ format :html do
   def standard_errors heading=nil
     alert "warning", true do
       [
-        (wrap_with(:h4, heading, class: "alert-heading") if heading),
+        (wrap_with(:h4, heading, class: "alert-heading error") if heading),
         error_messages.join("<hr>")
       ]
     end
@@ -129,7 +121,7 @@ format :html do
   end
 
   def standard_error_message attribute, message
-    "<div><strong>#{h attribute.to_s.upcase}:</strong> #{h message}</div>"
+    "<p><strong>#{h attribute.to_s.upcase}:</strong> #{h message}</p>"
   end
 
   def not_found_errors

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

@@ -0,0 +1,51 @@
+def guide_card
+  guide_card = rule_card(:guide)
+  return unless guide_card
+
+  guide_card = guide_card.item_cards.first if guide_card.type_id == Card::PointerID
+  guide_card if guide_card.ok?(:read)
+end
+
+format :html do
+  view :guide, unknown: true, cache: :never, wrap: :slot do
+    guide
+  end
+
+  def guide
+    guide_text = rule_based_guide
+    return "" unless guide_text.present?
+
+    if (rule_card = card.help_rule_card)
+      edit_link = with_nest_mode(:normal) { nest(rule_card, view: :edit_link) }
+      guide_text = "<span class='d-none'>#{edit_link}</span>#{guide_text}"
+    end
+    wrap_with :div, guide_text, class: classy("guide-text")
+  end
+
+  def alert_guide
+    guide_text = guide
+    return "" unless guide_text.present?
+
+    alert(:secondary, true, false, class: "guide") { guide_text }
+  end
+
+  def raw_guide_text
+    false
+  end
+
+  def rule_based_guide
+    if raw_guide_text
+      with_nest_mode :normal do
+        process_content raw_guide_text, chunk_list: :references
+        # render guide text with current card's format
+        # so current card's context is used in guide card nests
+      end
+    elsif card.guide_card
+      with_nest_mode :normal do
+        nest card.guide_card, view: :core
+      end
+    else
+      ""
+    end
+  end
+end

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

@@ -1,13 +1,27 @@
+def help_rule_card
+  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
@@ -15,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,8 +58,13 @@ 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-overlay-on-success",
+    submit_button text: "Save and Close", class: "_close-on-success",
                   "data-cy": "submit-overlay"
   end
 

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

data/mod/standard/set/type/basic.rb

@@ -12,7 +12,7 @@ format :html do
   end
 
   def table_of_contents content
-    return if nest_mode == :closed || !content.present?
+    return if nest_mode == :compact || !content.present?
 
     min = card.rule(:table_of_contents).to_i
     return unless min && min > 0
@@ -32,7 +32,7 @@ format :html do
     content.gsub!(/<(h\d)>(.*?)<\/h\d>/i) do |match|
       if $LAST_MATCH_INFO
         tag, value = $LAST_MATCH_INFO[1, 2]
-        value = ActionView::Base.new.strip_tags(value).strip
+        value = strip_tags(value).strip
         next if value.empty?
         item = { value: value, uri: URI.escape(value) }
         case tag.downcase

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

@@ -4,18 +4,24 @@ def wql_content
   { type_id: id, sort: :name }
 end
 
+def related_sets with_self=false
+  sets = []
+  sets << ["#{name}+*type", Card::Set::Type.label(name)] if known?
+  sets + super
+end
+
 format :html do
-  view :type do
+  view :type, unknown: true do
     link_args = { class: "cardtype" }
     add_class link_args, "no-edit" if card.cards_of_type_exist?
     link_to_card card.type_card, nil, link_args
   end
 
-  view :type_formgroup do
+  def type_formgroup args={}
     if card.cards_of_type_exist?
       wrap_with :div, tr(:cards_exist, cardname: safe_name)
     else
-      super()
+      super
     end
   end
 
@@ -24,13 +30,13 @@ format :html do
   end
 
   view :add_button do
-    add_link "btn btn-outline-secondary"
+    add_link "btn btn-secondary"
   end
 
   def add_link css_class=nil
     voo.title ||= tr(:add_card, cardname: safe_name)
     title = _render_title
-    link_to title, path: _render_add_path, class: css_class
+    link_to title, modal_link_opts(class: css_class, path: _render_add_path)
   end
 
   view :add_url do
@@ -47,7 +53,7 @@ format :html do
         path_args[key] = value
       end
     end
-    path path_args.merge(action: :new, mark: card.name)
+    path path_args.merge(action: :type, mark: card.name, view: :new_in_modal)
   end
 
   # don't cache because it depends on update permission for another card
@@ -59,14 +65,15 @@ format :html do
     Card.fetch(card, :type, :structure, new: {}).ok? :update
   end
 
-  view :configure_button, cache: :never, perms:  ->(fmt) { fmt.can_configure? } do
-    configure_link "btn btn-outline-secondary"
+  view :configure_button, cache: :never, denial: :blank,
+                          perms:  ->(fmt) { fmt.can_configure? } do
+    configure_link "btn btn-secondary"
   end
 
   def configure_link css_class=nil
     return "" unless Card.fetch(card, :type, :structure, new: {}).ok? :update
 
-    voo.title ||= tr(:configure_card, cardname: safe_name)
+    voo.title ||= tr(:configure_card, cardname: safe_name.pluralize)
     title = _render_title
     link_to_card card, title, path: { view: :bridge, bridge: { tab: :rules_tab },
                                       set: Card::Name[safe_name, :type] },
@@ -84,12 +91,19 @@ def create_ok?
   Card.new(type_id: id).ok? :create
 end
 
+def was_cardtype?
+  type_id_before_act == CardtypeID
+end
+
 event :check_for_cards_of_type, after: :validate_delete do
   errors.add :cardtype, tr(:cards_exist, cardname: name) if cards_of_type_exist?
 end
 
-event :check_for_cards_of_type_when_type_changed, :validate, changing: :type do
-  errors.add :cardtype, tr(:error_cant_alter, name: name) if cards_of_type_exist?
+event :check_for_cards_of_type_when_type_changed,
+      :validate, changing: :type, when: :was_cardtype? do
+  if cards_of_type_exist?
+    errors.add :cardtype, tr(:error_cant_alter, name: name_before_act)
+  end
 end
 
 event :validate_cardtype_name, :validate, on: :save, changed: :name do