card 1.97.0.1 → 1.98.0

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

@@ -1,5 +1,5 @@
 format :html do
-  view :flash, cache: :never, tags: :unknown_ok do
+  view :flash, cache: :never, unknown: true, perms: :none do
     flash_notice = params[:flash] || Env.success.flash
     return "" unless flash_notice.present? && focal?
 
@@ -18,9 +18,10 @@ format :html do
 
   def with_frame slot=true, header=frame_header, slot_opts={}
     voo.hide :help
+    add_name_context
     wrap slot, slot_opts do
       panel do
-        [header, frame_help, _render(:flash), (yield if block_given?)]
+        [header, frame_help, render_flash, (yield if block_given?)]
       end
     end
   end

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

@@ -1,5 +1,5 @@
 format :html do
-  view :header do
+  view :header, perms: :none do
     main_header
   end
 
@@ -11,7 +11,7 @@ format :html do
     haml :header_wrap, content: (block_given? ? yield : output(content))
   end
 
-  view :header_title do
+  view :header_title, perms: :none do
     header_title_elements
   end
 
@@ -25,11 +25,11 @@ format :html do
     card.drafts.present? && @slot_view == :edit
   end
 
-  view :title_toggle do
+  view :title_toggle, perms: :none do
     content_toggle(_render_title(hide: :title_link))
   end
 
-  view :icon_toggle do
+  view :icon_toggle, perms: :none do
     direction = @toggle_mode == :close ? :expand : :collapse_down
     content_toggle icon_tag(direction)
   end
@@ -55,14 +55,6 @@ format :html do
       raise(Card::Error, "invalid toggle mode: #{@toggle_mode}")
   end
 
-  view :navbar_links do
-    wrap_with :ul, class: "navbar-nav" do
-      item_links.map do |link|
-        wrap_with(:li, class: "nav-item") { link }
-      end.join "\n"
-    end
-  end
-
   def structure_editable?
     card.structure && card.template.ok?(:update)
   end

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

@@ -1,18 +1,31 @@
 format :html do
-  view :help, tags: :unknown_ok, cache: :never do
+  view :help, unknown: true, cache: :never, wrap: :slot do
     help_text = voo.help || rule_based_help
     return "" unless help_text.present?
 
+    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}"
+    end
     wrap_with :div, help_text, class: classy("help-text")
   end
 
+  view :lead do
+    class_up "card-slot", "lead"
+    _view_content
+  end
+
+  def raw_help_text
+    card.help_rule_card&.content
+  end
+
   def rule_based_help
-    return "" unless (rule_card = card.help_rule_card)
+    return "" unless (help_text = raw_help_text)
 
     with_nest_mode :normal do
-      process_content rule_card.content, chunk_list: :references
+      process_content help_text, chunk_list: :references
       # render help card with current card's format
       # so current card's context is used in help card nests
     end
   end
-end
+end

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

@@ -44,16 +44,41 @@ format :html do
     end
   end
 
-  view :overview do
+  view :view_list do
     %i[bar box info_bar open closed titled labeled content content_panel].map do |v|
       wrap_with :p, [content_tag(:h3, v), render(v, show: :menu)]
     end.flatten.join ""
   end
 
-  view :viewer do
-    %i[bar box info_bar open closed labeled titled content content_panel].map do |v|
-      wrap_with :p, [content_tag(:h3, v), render(v, show: :menu)]
-    end.flatten.join ""
+  view :demo do
+    frame do
+      [
+        view_select,
+        wrap_with(:div, view_demo, class: "demo-slot")
+      ]
+    end
+  end
+
+  def demo_view
+    Env.params[:demo_view] || :core
+  end
+
+  def view_demo
+    wrap(true) do
+      render demo_view
+    end
+  end
+
+  def view_select
+    card_form :get, success: { view: :demo } do
+      select_tag :demo_view, options_for_select(all_views, demo_view),
+                 class: "_submit-on-select"
+    end
   end
 
+  def all_views
+    Card::Set::Format::AbstractFormat::ViewDefinition.views
+                                                     .slice(*self.class.ancestors)
+                                                     .values.map(&:keys).flatten.uniq
+  end
 end

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

@@ -1,15 +1,16 @@
 format :html do
-  view :menu, denial: :blank, tags: :unknown_ok do
+  view :menu, denial: :blank, unknown: true do
     return "" if card.unknown?
+
     wrap_with :div, class: "card-menu #{menu_link_classes}" do
-      menu_link
+      [bridge_link(false), menu_link]
     end
   end
 
   def menu_link
     case voo.edit
     when :inline
-      edit_in_place_link
+      edit_inline_link
     when :full
       edit_in_bridge_link
     else # :standard
@@ -17,16 +18,33 @@ format :html do
     end
   end
 
-  view :edit_link, tags: :unknown_ok, denial: :blank do
-    edit_link
+  view :edit_link, unknown: true, denial: :blank do
+    edit_link :edit, link_text: voo.title
   end
 
   view :full_page_link do
     full_page_link
   end
 
+  view :bridge_link, unknown: true do
+    bridge_link
+  end
+
+  def bridge_link in_modal=true
+    opts = { class: "bridge-link" }
+    if in_modal
+      # add_class opts, "close"
+      opts["data-slotter-mode"] = "modal-replace"
+    end
+    link_to_view :bridge, material_icon(:more_horiz), opts
+  end
+
   def full_page_link
-    link_to_card card, full_page_icon, class: classy("full-page-link")
+    link_to_card full_page_card, full_page_icon, class: classy("full-page-link")
+  end
+
+  def full_page_card
+    card
   end
 
   def edit_in_bridge_link opts={}
@@ -34,14 +52,16 @@ format :html do
   end
 
   def edit_link view=:edit, opts={}
-    link_to_view view, menu_icon, edit_link_opts(opts.reverse_merge(modal: :lg))
+    link_to_view view, opts.delete(:link_text) || menu_icon,
+                 edit_link_opts(opts.reverse_merge(modal: :lg))
   end
 
   # @param modal [Symbol] modal size
   def edit_link_opts modal: nil
     opts = { class: classy("edit-link") }
     if modal
-      opts.merge! "data-slotter-mode": "modal", "data-modal-class": "modal-#{modal}"
+      opts[:"data-slotter-mode"] = "modal"
+      opts[:"data-modal-class"] = "modal-#{modal}"
     end
     opts
   end
@@ -57,10 +77,4 @@ format :html do
   def full_page_icon
     icon_tag :open_in_new
   end
-
-  def show_menu_item_edit?
-    return unless card.real?
-
-    card.ok?(:update) || structure_editable?
-  end
 end

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

@@ -1,6 +1,6 @@
 format :html do
   MODAL_SIZE = { small: "sm", medium: nil, large: "lg", full: "full" }.freeze
-  MODAL_CLOSE_OPTS = { class: "_close-modal", "data-dismiss": "modal",
+  MODAL_CLOSE_OPTS = { "data-dismiss": "modal",
                        "data-cy": "close-modal" }.freeze
 
   wrapper :modal do |opts={}|
@@ -52,17 +52,17 @@ format :html do
     submit_button opts
   end
 
-  view :modal_menu, tags: :unknown_ok, wrap: :modal_menu do
+  view :modal_menu, unknown: true, wrap: :modal_menu do
     [close_modal_window, pop_out_modal_window]
   end
 
   wrapper :modal_menu, :div, class: "modal-menu ml-auto"
 
-  view :modal_title, tags: :unknown_ok do
+  view :modal_title, unknown: true do
     ""
   end
 
-  view :modal_footer, tags: :unknown_ok do
+  view :modal_footer, unknown: true do
     button_tag "Close",
                class: "btn-xs _close-modal float-right",
                "data-dismiss" => "modal"
@@ -72,7 +72,6 @@ format :html do
     modal_link _render_title, size: voo.size
   end
 
-  # @param size [:small, :medium, :large, :full] size of the modal dialog
   def modal_link text=nil, opts={}
     opts = modal_link_opts(opts)
     opts[:path][:layout] ||= :modal

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

@@ -4,7 +4,7 @@ format :html do
                          type: "button" }.freeze
 
   wrapper :overlay do |opts|
-    class_up "card-slot", "_overlay d0-card-overlay bg-white"
+    class_up "card-slot", "_overlay d0-card-overlay bg-body"
     @content_body = true
     voo.hide! :menu
     overlay_frame true, overlay_header(opts[:title]), opts[:slot] do
@@ -12,7 +12,7 @@ format :html do
     end
   end
 
-  view :overlay_header, tags: :unknown_ok do
+  view :overlay_header, unknown: true do
     overlay_header
   end
 
@@ -53,7 +53,7 @@ format :html do
 
   def overlay_header title=nil
     title ||= _render_overlay_title
-    class_up "d0-card-header", "bg-white text-dark"
+    class_up "d0-card-header", "bg-body"
     class_up "d0-card-header-title", "d-flex"
     header_wrap [title, _render_overlay_menu]
   end

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

@@ -28,6 +28,7 @@ format :html do
   def render_with_layout view, layout, args={}
     view_opts = Layout.main_nest_opts(layout, self)
     view ||= view_opts.delete(:view) || default_nest_view
+    view_opts[:home_view] = view
     view_opts[:layout] = layout
     render! view, view_opts.reverse_merge(args)
   end

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

@@ -11,7 +11,7 @@ format :html do
   def show_without_page_layout view, args
     @main = true if params[:is_main] || args[:main]
     args.delete(:layout)
-    view ||= args[:home_view] || :open
+    view ||= args[:home_view] || :open # default_nest_view
     render! view, args
   end
 
@@ -22,7 +22,7 @@ format :html do
   wrapper :html_page do
     <<-HTML.strip_heredoc
       <!DOCTYPE HTML>
-      <html>
+      <html class="h-100">
         <head>
           #{head_content}
         </head>

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

@@ -1,13 +1,24 @@
+format do
+  view :title, closed: true, perms: :none do
+    standard_title
+  end
+
+  def standard_title
+    name_variant title_in_context(voo.title)
+  end
+end
+
 format :html do
   view :title do
-    title = wrapped_title super()
-    title = link_to_card card.name, title if show_view? :title_link, :hide
-    add_name_context
-    title
+    show_view?(:title_link, :hide) ? render_title_link : render_title_no_link
+  end
+
+  view :title_link, closed: true, perms: :none do
+    link_to_card card.name, render_title_no_link
   end
 
-  view :title_link do
-    render_title show: :title_link
+  view :title_no_link, closed: true, perms: :none do
+    wrapped_title standard_title
   end
 
   def title_with_link link_text

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

@@ -72,7 +72,7 @@ format :html do
   end
 
   def debug_slot?
-    params[:debug] == "slot" && !tagged(@current_view, :no_wrap_comments)
+    params[:debug] == "slot"
   end
 
   def debug_slot_wrap

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

@@ -1,3 +1,7 @@
+def ok_to_read
+  true
+end
+
 format :html do
   view :head_content do
     process_content render_raw

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

@@ -1,15 +1,32 @@
 format :html do
   view :open_content do
-    content = _render_core
+    with_table_of_contents _render_core
+  end
+
+  view :titled_content do
+    with_table_of_contents _render_core
+  end
+
+  def with_table_of_contents content
     table_of_contents(content) || content
   end
 
   def table_of_contents content
     return if nest_mode == :closed || !content.present?
+
     min = card.rule(:table_of_contents).to_i
-    # warn "table_of #{name}, #{min}"
     return unless min && min > 0
 
+    toc = toc_items content
+    if toc.flatten.length >= min
+      content.replace(
+        %( <div class="table-of-contents"> <h5>#{tr(:toc)}</h5> ) +
+          make_table_of_contents_list(toc) + "</div>" + content
+      )
+    end
+  end
+
+  def toc_items content
     toc = []
     dep = 1
     content.gsub!(/<(h\d)>(.*?)<\/h\d>/i) do |match|
@@ -23,20 +40,14 @@ format :html do
           item[:depth] = dep = 1
           toc << item
         when "h2"
-          toc << []  if dep == 1
+          toc << [] if dep == 1
           item[:depth] = dep = 2
           toc.last << item
         end
         %(<a name="#{item[:uri]}"></a>#{match})
       end
     end
-
-    if toc.flatten.length >= min
-      content.replace(
-        %( <div class="table-of-contents"> <h5>#{tr(:toc)}</h5> ) +
-          make_table_of_contents_list(toc) + "</div>" + content
-      )
-    end
+    toc
   end
 
   def make_table_of_contents_list items

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

@@ -1,6 +1,6 @@
 include_set Abstract::WqlSearch
 
-def wql_hash
+def wql_content
   { type_id: id, sort: :name }
 end
 
@@ -40,7 +40,7 @@ format :html do
   view :add_path do
     path_args = {}
     if voo.params
-      context = ((@parent && @parent.card) || card).name
+      context = ((@parent&.card) || card).name
       Rack::Utils.parse_nested_query(voo.params).each do |key, value|
         value = value.to_name.absolute(context) if value
         key = key.to_name.absolute(context)
@@ -49,6 +49,29 @@ format :html do
     end
     path path_args.merge(action: :new, mark: card.name)
   end
+
+  # don't cache because it depends on update permission for another card
+  view :configure_link, cache: :never, perms:  ->(fmt) { fmt.can_configure? } do
+    configure_link
+  end
+
+  def can_configure?
+    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"
+  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)
+    title = _render_title
+    link_to_card card, title, path: { view: :bridge, bridge: { tab: :rules_tab },
+                                      set: Card::Name[safe_name, :type] },
+                              class: css_class
+  end
 end
 
 include Basic
@@ -62,19 +85,15 @@ def create_ok?
 end
 
 event :check_for_cards_of_type, after: :validate_delete do
-  if cards_of_type_exist?
-    errors.add :cardtype, tr(:cards_exist, cardname: name)
-  end
+  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
-  if cards_of_type_exist?
-    errors.add :cardtype, tr(:error_cant_alter, name: name)
-  end
+  errors.add :cardtype, tr(:error_cant_alter, name: name) if cards_of_type_exist?
 end
 
 event :validate_cardtype_name, :validate, on: :save, changed: :name do
-  if name =~ %r{[<>/]}
+  if %r{[<>/]}.match?(name)
     errors.add :name, tr(:error_invalid_character_in_cardtype, banned: "<, >, /")
   end
 end