card 1.20.4 → 1.21.0

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

@@ -21,12 +21,12 @@ format :html do
   end
 
   FIELD_HELPERS =
-    %w(
+    %w[
       hidden_field color_field date_field datetime_field datetime_local_field
       email_field month_field number_field password_field phone_field
       range_field search_field telephone_field text_area text_field time_field
       url_field week_field file_field label check_box radio_button
-    ).freeze
+    ].freeze
 
   FIELD_HELPERS.each do |method_name|
     define_method(method_name) do |*args|

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

@@ -10,7 +10,7 @@ format :html do
     label = formgroup_label opts[:editor], title
     editor_body = editor_wrap opts[:editor], &block
     help_text = formgroup_help_text opts[:help]
-    "#{label}<div>#{editor_body} #{help_text}</div>"
+    "#{label}<div>#{help_text} #{editor_body}</div>"
   end
 
   def formgroup_label editor_type, title
@@ -27,6 +27,7 @@ format :html do
   end
 
   def formgroup_help_text text=nil
+    return "" if text == false
     class_up "help-text", "help-block"
     voo.help = text if voo && text.to_s != "true"
     _optional_render_help

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

@@ -1,29 +1,4 @@
 format :html do
-  # TODO: find these a better home.
-  def class_up klass, classier, force=false
-    key = klass.to_s
-    return if !force && class_list[key]
-    class_list[key] = classier.to_s
-  end
-
-  # don't use in the given block the additional class that
-  # was added to `klass`
-  def without_upped_class klass
-    tmp_class = class_list.delete klass
-    result = yield tmp_class
-    class_list[klass] = tmp_class
-    result
-  end
-
-  def class_list
-    @class_list ||= {}
-  end
-
-  def classy *classes
-    classes = Array.wrap(classes).flatten
-    [classes, class_list[classes.first]].flatten.compact.join " "
-  end
-
   view :header do
     voo.hide :toggle, :toolbar
     main_header + _optional_render_toolbar
@@ -64,9 +39,9 @@ format :html do
 
   def toggle_verb_adjective_direction
     if @toggle_mode == :close
-      %w(open open expand)
+      %w[open open expand]
     else
-      %w(close closed collapse-down)
+      %w[close closed collapse-down]
     end
   end
 

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

@@ -61,7 +61,7 @@ format :html do
   end
 
   def menu_item_list link_opts={}
-    [:edit, :discuss, :follow, :page, :rules, :account, :more].map do |item|
+    %i[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

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

@@ -2,7 +2,7 @@ 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
+    frame_and_form :create, new_form_opts do
       [
         new_view_hidden,
         new_view_name,
@@ -13,6 +13,10 @@ format :html do
     end
   end
 
+  def new_form_opts
+    { "main-success" => "REDIRECT" }
+  end
+
   def new_view_title
     output(
       "New",

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

@@ -1,8 +1,8 @@
-format :html do
+include_set Abstract::ToolbarSplitButton
 
+format :html do
   TOOLBAR_TITLE = {
     edit: "content",             edit_name: "name",      edit_type: "type",
-
     edit_structure: "structure", edit_nests: "nests",    history: "history",
     common_rules: "common",      recent_rules: "recent", grouped_rules: "all",
     edit_nest_rules: "nests"
@@ -59,9 +59,9 @@ format :html do
   def toolbar_split_buttons
     wrap_with :form, class: "pull-left navbar-text" do
       [
-        (account_split_button if card.accountable?),
-        activity_split_button,
-        rules_split_button,
+        account_split_button,
+        toolbar_button_card(:activity),
+        toolbar_button_card(:rules),
         edit_split_button
       ]
     end
@@ -116,50 +116,6 @@ format :html do
     end
   end
 
-  def activity_split_button
-    toolbar_split_button "activity", view: :history, icon: :time do
-      {
-        history: (_render_history_link if card.history?),
-        discussion: link_to_related(:discussion, "discuss"),
-        follow:  _render_follow_link,
-        editors: link_to_related(:editors, "editors")
-      }
-    end
-  end
-
-  def rules_split_button
-    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
-    toolbar_split_button("rules", view: :edit_rules, icon: :list) { button_hash }
-  end
-
-  def nest_rules_link button_hash
-    return # FIXME: remove when reinstating edit_nest_rules
-    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
-    link_to_view :edit_nest_rules, text,
-                 path: { rule_view: :field_related_rules }
-  end
-
-  def edit_rules_link text, rule_view
-    link_to_view :edit_rules, text,
-                 path: { rule_view: rule_view }
-  end
-
   def edit_split_button
     toolbar_split_button "edit", view: :edit, icon: :edit do
       {
@@ -177,6 +133,7 @@ format :html do
   end
 
   def account_split_button
+    return "" unless card.accountable?
     toolbar_split_button "account", related: :account, icon: :user do
       {
         account: link_to_related(:account, "details", path: { view: :edit }),
@@ -188,21 +145,18 @@ format :html do
     end
   end
 
-  def toolbar_split_button name, button_link_opts
-    status = active_toolbar_button == name ? "active" : ""
-    html_class = "visible-md visible-lg pull-right"
-    icon = button_link_opts.delete(:icon)
-    name_content = " #{name}"
-    name = icon ? glyphicon(icon) : ""
-    name += content_tag(:span, name_content.html_safe, class: html_class)
-    button_link = button_link name, button_link_opts.merge(class: status)
-    split_button(button_link, active_toolbar_item) { yield }
+  def toolbar_button_card name
+    button_codename = "#{name}_toolbar_button".to_sym
+    return "" unless button_card = Card[button_codename]
+    with_nest_mode :normal do
+      nest button_card, view: :core
+    end
   end
 
   def related_codename related_card
     return nil unless related_card
     tag_card = Card.quick_fetch related_card.cardname.right
-    tag_card && tag_card.codename.to_sym
+    tag_card && tag_card.codename && tag_card.codename.to_sym
   end
 
   def close_link extra_class, opts={}
@@ -248,7 +202,8 @@ format :html do
         ["references in",  "log-in",       "*referred_to_by"]
       ].map do |title, icon, tag|
         menu_item " #{title}", icon, related: tag,
-                                     path: { slot: { show: :toolbar } }
+                                     path: { slot: { show: :toolbar,
+                                                     hide: :menu } }
       end
     end
   end

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

@@ -100,9 +100,9 @@ format :html do
     parent && parent.voo.ok_view == :related
   end
 
-  def standard_frame
+  def standard_frame slot=true
     voo.hide :horizontal_menu, :help
-    wrap do
+    wrap slot do
       [
         _optional_render_menu,
         panel do
@@ -119,10 +119,13 @@ format :html do
 
   def frame_help
     # TODO: address these args
-    _optional_render :help, help_class: "alert alert-info"
+    with_class_up "help-text", "alert alert-info" do
+      _optional_render :help
+    end
   end
 
   def frame_and_form action, form_opts={}
+    form_opts ||= {}
     frame do
       card_form action, form_opts do
         output yield

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

@@ -1,7 +1,7 @@
 view :raw do |_args|
   # .strftime('%A, %B %d, %Y %I:%M %p %Z')
-  card.left.new_card? ? "" : I18n.localize(card.left.created_at,
-                                           format: :card_dayofwk_min_tz)
+  return "" if !(left = card.left) || left.new_card?
+  I18n.localize(left.created_at, format: :card_dayofwk_min_tz)
 end
 
 view :core, :raw

data/mod/standard/set/rstar/rules_editor.rb

@@ -14,7 +14,7 @@ format :html do
   end
 
   def open_rule_wrap rule_view
-    rule_view_class = rule_view.to_s.tr '_', '-'
+    rule_view_class = rule_view.to_s.tr "_", "-"
     wrap_with :tr, class: "card-slot open-rule #{rule_view_class}" do
       wrap_with(:td, class: "rule-cell", colspan: 3) { yield }
     end
@@ -47,7 +47,10 @@ format :html do
     return "No Current Rule" if card.new_card?
 
     voo.items[:view] ||= :link
-    show_rule_set(card.rule_set) + _render_core
+    output [
+      show_rule_set(card.rule_set),
+      _render_core
+    ]
   end
 
   def show_rule_set set
@@ -60,7 +63,7 @@ format :html do
     return "not a rule" unless card.is_rule?
     rule_card = find_existing_rule_card
     wrap_closed_rule rule_card do
-      [:setting, :content, :set].map do |cell|
+      %i[setting content set].map do |cell|
         send "closed_rule_#{cell}_cell", rule_card
       end
     end
@@ -151,7 +154,7 @@ format :html do
 
     card_form action_args, class: "card-rule-form" do |_form|
       [hidden_tags(success: @edit_rule_success),
-       editor,
+       rule_editor,
        edit_rule_buttons].join
     end
   end
@@ -202,7 +205,7 @@ format :html do
                   href: path(view: cancel_view, success: false)
   end
 
-  def editor
+  def rule_editor
     wrap_with(:div, class: "card-editor") do
       [rules_type_formgroup,
        rule_content_formgroup,
@@ -270,7 +273,7 @@ format :html do
   end
 
   def narrower_rule_warning narrower_rules, state, set_name
-    return unless state.in? [:current, :overwritten]
+    return unless state.in? %i[current overwritten]
     narrower_rules << Card.fetch(set_name).uncapitalized_label
     return unless state == :overwritten
     narrower_rule_warning_message narrower_rules
@@ -349,7 +352,7 @@ format :html do
   end
 
   view :edit_single_rule, tags: :unknown_ok, cache: :never do
-    frame() { render_edit_rule }
+    frame { render_edit_rule }
   end
 
   private

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

@@ -0,0 +1,14 @@
+include_set Abstract::ToolbarSplitButton
+
+format :html do
+  view :core do
+    subject.toolbar_split_button "activity", view: :history, icon: :time do
+      {
+        history: (subject._render_history_link if card.history?),
+        discussion: subject.link_to_related(:discussion, "discuss"),
+        follow:  subject._render_follow_link,
+        editors: subject.link_to_related(:editors, "editors")
+      }
+    end
+  end
+end

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

@@ -19,7 +19,6 @@ format :html do
     end
   end
 
-
   view :recent_acts, cache: :never do
     acts = Act.all_viewable.order(id: :desc)
               .page(page_from_params).per(ACTS_PER_PAGE)
@@ -29,7 +28,13 @@ format :html do
   def act_paging
     acts = Act.all_viewable.order(id: :desc).page(page_from_params).per(ACTS_PER_PAGE)
     wrap_with :span, class: "slotter" do
-      paginate acts, remote: true, theme: 'twitter-bootstrap-3'
+      paginate acts, remote: true, theme: "twitter-bootstrap-3"
     end
   end
 end
+
+format :rss do
+  def feed_item_description_view
+    :blank
+  end
+end

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

@@ -0,0 +1,42 @@
+include_set Abstract::ToolbarSplitButton
+
+format :html do
+  view :core do
+    subject.toolbar_split_button("rules", view: :edit_rules, icon: :list) do
+      dropdown_items
+    end
+  end
+
+  def dropdown_items
+    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
+    button_hash
+  end
+
+  def nest_rules_link button_hash
+    return # FIXME: remove when reinstating edit_nest_rules
+    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_rules_link text, rule_view
+    subject.link_to_view :edit_rules, text,
+                         path: { rule_view: rule_view }
+  end
+
+  def edit_nest_rules_link text
+    subject.link_to_view :edit_nest_rules, text,
+                         path: { rule_view: :field_related_rules }
+  end
+end

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

@@ -42,12 +42,25 @@ format :html do
   end
 
   view :title, cache: :never do
-    vars = root.search_params[:vars]
-    if vars && vars[:keyword]
-      voo.title = %(Search results for: <span class="search-keyword">)\
-                         "#{vars[:keyword]}</span>"
-    end
-    super()
+    return super() unless (keyword = search_keyword) &&
+                          (title = keyword_search_title(keyword))
+    voo.title = title
+  end
+
+  def keyword_search_title keyword
+    %(Search results for: <span class="search-keyword">#{keyword}</span>)
+  end
+
+  def search_keyword
+    (vars = search_vars) && vars[:keyword]
+  end
+
+  def search_vars
+    root.respond_to?(:search_params) ? root.search_params[:vars] : search_params[:vars]
+  end
+
+  def wql_search?
+    card.keyword_contains_wql? vars: search_vars
   end
 end
 

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

@@ -41,12 +41,12 @@ format :html do
 
   def make_table_of_contents_list items
     list = items.map do |i|
-             if i.is_a?(Array)
-               make_table_of_contents_list(i)
-             else
-               %(<li><a href="##{i[:uri]}"> #{i[:value]}</a></li>)
-             end
-           end.join("\n")
+      if i.is_a?(Array)
+        make_table_of_contents_list(i)
+      else
+        %(<li><a href="##{i[:uri]}"> #{i[:value]}</a></li>)
+      end
+    end.join("\n")
     "<ol>" + list + "</ol>"
   end
 end