card 1.96.8 → 1.97.0

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

@@ -2,59 +2,34 @@ format :html do
   view :flash, cache: :never, tags: :unknown_ok do
     flash_notice = params[:flash] || Env.success.flash
     return "" unless flash_notice.present? && focal?
+
     Array(flash_notice).join "\n"
   end
 
   def frame &block
-    send frame_method, &block
+    standard_frame &block
   end
 
-  def frame_method
-    case
-    when parent && parent.voo.ok_view == :related
-      :related_frame
-    else
-      :standard_frame
+  def standard_frame slot=true
+    with_frame slot do
+      wrap_body { yield } if block_given?
     end
   end
 
-  def standard_frame slot=true
-    voo.hide :horizontal_menu, :help
-    wrap slot do
+  def with_frame slot=true, header=frame_header, slot_opts={}
+    voo.hide :help
+    wrap slot, slot_opts do
       panel do
-        [
-          frame_header,
-          frame_help,
-          _render(:flash),
-          wrap_body { yield }
-        ]
+        [header, frame_help, _render(:flash), (yield if block_given?)]
       end
     end
   end
 
-  def related_frame
-    voo.show :menu
-    class_up "menu-slot", "text-white"
-    wrap do
-      [
-        _render_menu,
-        _render_subheader,
-        frame_help,
-        panel { wrap_body { yield } }
-      ]
-    end
-  end
-
   def frame_header
-    if voo.ok_view == :overlay
-      _render_overlay_header
-    else
-      [_render_menu, _render_header]
-    end
+    _render_header
   end
 
   def frame_help
-    # TODO: address these args
     with_class_up "help-text", "alert alert-info" do
       _render :help
     end
@@ -74,23 +49,4 @@ format :html do
       yield
     end
   end
-
-  # alert_types: 'success', 'info', 'warning', 'danger'
-  def alert alert_type, dismissable=false, disappear=false, args={}
-    classes = ["alert", "alert-#{alert_type}"]
-    classes << "alert-dismissible " if dismissable
-    classes << "_disappear" if disappear
-    args.merge! role: "alert"
-    add_class args, classy(classes)
-    wrap_with :div, args do
-      [(alert_close_button if dismissable), output(yield)]
-    end
-  end
-
-  def alert_close_button
-    wrap_with :button, type: "button", "data-dismiss": "alert",
-                       class: "close", "aria-label": "Close" do
-      wrap_with :span, "&times;", "aria-hidden" => true
-    end
-  end
 end

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

@@ -1,28 +1,26 @@
 format :html do
   view :header do
-    voo.hide :toggle, :toolbar
-    main_header + _render_toolbar.to_s.html_safe
+    voo.hide! :toggle
+    main_header
   end
 
   def main_header
-    header_wrap header_title_elements
+    header_wrap _render_header_title
   end
 
   def header_wrap content=nil
-    haml :header_wrap, content: (block_given? ? yield : output(content))
+    voo&.hide :header_toggle
+    res = haml :header_wrap, content: (block_given? ? yield : output(content))
+    return res #unless voo&.show?(:header_toggle)
+    #content_toggle res
   end
 
-  def header_title_elements
-    [_render_toggle, _render_title]
+  view :header_title do
+    header_title_elements
   end
 
-  view :subheader do
-    wrap_with :div, class: "card-subheader bg-primary text-white" do
-      [
-        _render_title,
-        (autosaved_draft_link(class: "float-right") if show_draft_link?)
-      ]
-    end
+  def header_title_elements
+    [_render_toggle, content_toggle(_render_title)]
   end
 
   def show_draft_link?
@@ -30,10 +28,20 @@ format :html do
   end
 
   view :toggle do
+    content_toggle
+  end
+
+  def content_toggle text=""
+    return if text.nil?
     verb, adjective, direction = toggle_verb_adjective_direction
-    link_to_view adjective, icon_tag(direction.to_sym),
+    text = icon_tag(direction.to_sym) if text.blank?
+    link_to_view adjective, text,
                  title: "#{verb} #{card.name}",
-                 class: "#{verb}-icon toggler slotter nodblclick"
+                 class: "#{verb}-icon toggler nodblclick"
+  end
+
+  def toggle_view
+    @toggle_mode == :close ? :open : :closed
   end
 
   def toggle_verb_adjective_direction
@@ -56,3 +64,5 @@ format :html do
     card.structure && card.template.ok?(:update)
   end
 end
+
+

data/mod/standard/set/all/rich_html/header/header_wrap.haml

@@ -1,3 +1,4 @@
-%div{ class: classy("d0-card-header") }
+%div{ class: [classy("d0-card-header"), "slotter"], href: path(view: toggle_view) }
+  = _render_menu
   %div{ class: classy("d0-card-header-title") }
     = content

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

@@ -0,0 +1,18 @@
+format :html do
+  view :help, tags: :unknown_ok, cache: :never do
+    help_text = voo.help || rule_based_help
+    return "" unless help_text.present?
+
+    wrap_with :div, help_text, class: classy("help-text")
+  end
+
+  def rule_based_help
+    return "" unless (rule_card = card.help_rule_card)
+
+    with_nest_mode :normal do
+      process_content rule_card.content, 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

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

@@ -0,0 +1,59 @@
+format :html do
+  view :type do
+    link_to_card card.type_card, nil, class: "cardtype"
+  end
+
+  view :change do
+    voo.show :title_link
+    voo.hide :menu
+    wrap do
+      [_render_title,
+       _render_menu,
+       _render_last_action]
+    end
+  end
+
+  view :last_action do
+    act = card.last_act
+    return unless act
+
+    action = act.action_on card.id
+    return unless action
+
+    action_verb =
+      case action.action_type
+      when :create then "added"
+      when :delete then "deleted"
+      else
+        link_to_view :history, "edited", class: "last-edited", rel: "nofollow"
+      end
+
+    %(
+      <span class="last-update">
+        #{action_verb} #{_render_acted_at} ago by
+        #{subformat(card.last_actor)._render_link}
+      </span>
+    )
+  end
+
+  view :type_info do
+    return unless show_view?(:toolbar, :hide) && card.type_code != :basic
+
+    wrap_with :span, class: "type-info float-right" do
+      link_to_card card.type_name, nil, class: "navbar-link"
+    end
+  end
+
+  view :overview do
+    %i[bar box 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 open closed labeled titled content content_panel].map do |v|
+      wrap_with :p, [content_tag(:h3, v), render(v, show: :menu)]
+    end.flatten.join ""
+  end
+
+end

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

@@ -0,0 +1,17 @@
+format :html do
+  SIZE_IN_PX = { icon: 16, small: 75, medium: 200, large: 500 }.freeze
+
+  # used to control size of svg
+  view :max_size do
+    if voo.size.is_a?(String) && voo.size.match(/^\d+x\d+\$/)
+      max_size(*voo.size.split("x"))
+    else
+      px = SIZE_IN_PX[voo.size&.to_sym] || 200
+      max_size px, px
+    end
+  end
+
+  def max_size w, h
+    "max-width: #{w}px; max-height: #{h}px"
+  end
+end

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

@@ -1,186 +1,84 @@
 format :html do
-  mattr_accessor :menu_items
-  self.menu_items = %i[edit discuss follow page rules account more]
-
   view :menu, denial: :blank, tags: :unknown_ok do
     return "" if card.unknown?
-    wrap_menu do
-      [
-        _render(:horizontal_menu, optional: :hide),
-        _render_menu_link,
-        modal_slot(card.name.safe_key)
-      ]
-    end
-  end
-
-  def wrap_menu
-    wrap_with :div, class: classy(%w[menu-slot nodblclick]) do
-      yield
+    wrap_with :div, class: "card-menu #{menu_link_classes}" do
+      menu
     end
   end
 
-  view :menu_link do
-    menu_link
-  end
-
-  def menu_link
-    wrap_with :div, class: "vertical-card-menu card-menu #{menu_link_classes}" do
-      wrap_with :div, class: "btn-group slotter card-slot float-right" do
-        link_to_view :vertical_menu, menu_icon, path: menu_link_path_opts
-      end
-    end
-  end
-
-  def menu_link_classes
-    if show_view? :hover_link
-      show_view?(:horizontal_menu, :hide) ? "d-sm-none" : "_show-on-hover"
+  def menu
+    case voo.edit
+    when :content_inline
+      edit_in_place_link
+    when :content_modal
+      edit_in_modal_link
     else
-      ""
+      standard_edit_link
     end
   end
 
-  # this should probably be added in javascript.
-  # the menu link is not a "slotter", because it doesn't replace the whole
-  # slot (it just adds a menu). But it should use the js code that adds slot
-  # information to urls
-  def menu_link_path_opts
-    opts = { slot: { home_view: voo.home_view } }
-    opts[:is_main] = true if main?
-    opts
-  end
-
-  def menu_icon
-    material_icon "settings"
+  view :edit_link, tags: :unknown_ok, denial: :blank do
+    edit_link
   end
 
-  view :vertical_menu, cache: :never, tags: :unknown_ok do
-    wrap_with :ul, class: "btn-group float-right slotter" do
-      [vertical_menu_toggle, vertical_menu_item_list]
-    end
+  view :full_page_link do
+    full_page_link
   end
 
-  def vertical_menu_toggle
-    wrap_with :span, "<a href='#'>#{menu_icon}</a>",
-              class: "open-menu dropdown-toggle",
-              "data-toggle" => "dropdown",
-              "aria-expanded" => "false"
+  def full_page_link
+    link_to_card card, full_page_icon, class: classy("full-page-link")
   end
 
-  def vertical_menu_item_list
-    wrap_with :ul, class: "dropdown-menu dropdown-menu-right", role: "menu" do
-      menu_item_list.map do |item|
-        %(<li>#{item}</li>)
-      end.join("\n").html_safe
-    end
+  def edit_link view=:edit, opts={}
+    link_to_view view, menu_icon, edit_link_opts(opts)
   end
 
-  view :horizontal_menu, cache: :never do
-    wrap_with :div, class: "btn-group btn-group-sm slotter float-right card-menu "\
-                             "horizontal-card-menu d-none d-sm-inline-flex" do
-      menu_item_list(class: "btn btn-outline-secondary").join("\n").html_safe
+  # @param modal [Symbol] modal size
+  def edit_link_opts modal: nil
+    opts = { class: "text-muted" }
+    if modal
+      opts.merge! "data-slotter-mode": "modal", "data-modal-class": "modal-#{modal}"
     end
+    opts
   end
 
-  def menu_item_list link_opts={}
-    menu_items.map do |item|
-      next unless show_menu_item?(item)
-      send "menu_item_#{item}", link_opts
-    end.compact
-  end
-
-  menu_items.each do |item|
-    view "menu_item_#{item}" do
-      send "menu_item_#{item}", {}
+  def wrap_menu
+    wrap_with :div, class: classy(%w[menu-slot nodblclick]) do
+      yield
     end
-  end
-
-  def menu_item_edit opts
-    menu_item "edit", "edit", opts.merge(view: :edit)
-  end
+   end
 
-  def menu_item_discuss opts
-    menu_item "discuss", "comment",
-              opts.merge(related: :discussion.cardname.key)
+  def standard_edit_link
+    edit_link :edit, modal: :full
   end
 
-  def menu_item_follow opts
-    add_class opts, "dropdown-item"
-    follow_link opts, true
+  def edit_in_modal_link
+    edit_link :edit, modal: :large
   end
 
-  def menu_item_page opts
-    menu_item "page", "open_in_new", opts.merge(card: card)
+  def edit_in_place_link
+    edit_link :edit_in_place
   end
 
-  def menu_item_rules opts
-    menu_item "rules", "build", opts.merge(view: :edit_rules)
-  end
-
-  def menu_item_account opts
-    menu_item "account", "person", opts.merge(
-      view: :related,
-      path: { slot: { items: { nest_name: "+#{:account.cardname.key}", view: :edit } } }
-    )
-  end
-
-  def menu_item_more opts
-    view = voo.home_view || :open
-    menu_item "", :option_horizontal, opts.merge(
-      view: view, path: { slot: { show: :toolbar } }
-    )
-  end
-
-  def menu_item text, icon, opts={}
-    link_text = "#{material_icon(icon)}<span class='menu-item-label'>#{text}</span>"
-    add_class opts, "dropdown-item"
-    smart_link_to link_text.html_safe, opts
-  end
-
-  def show_menu_item? item
-    voo&.show?("menu_item_#{item}") && send("show_menu_item_#{item}?")
-  end
-
-  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
+  def menu_link_classes
+    if show_view? :hover_link
+      "_show-on-hover"
+    else
+      ""
+    end
   end
 
-  def show_menu_item_page?
-    card.name.present? && !main?
+  def menu_icon
+    material_icon "edit"
   end
 
-  def show_menu_item_rules?
-    card.virtual?
+  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
-
-  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?
-    return if discussion_card?
-    card.fetch trait: :discussion, skip_modules: true, new: {}
-  end
-
-  def discussion_card?
-    card.junction? && card.name.tag_name.key == :discussion.cardname.key
+    card.ok?(:update) || structure_editable?
   end
 end