card 1.92.2 → 1.93.0

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

@@ -21,14 +21,14 @@ format :html do
     args[:view] = view if view
     @main = false
     @main_opts = args
-    render :layout, title: params[:layout]
+    render! :layout, title: params[:layout]
     # FIXME: using title because it's a standard view option.  hack!
   end
 
   def show_without_layout view, args
     @main = true if params[:is_main] || args[:main]
     view ||= args[:home_view] || :open
-    render view, args
+    render! view, args
   end
 
   view :layout, perms: :none, cache: :never do
@@ -40,15 +40,15 @@ format :html do
   view :content do
     class_up "card-slot", "d0-card-content"
     voo.hide :menu
-    wrap { [_optional_render_menu, _render_core] }
+    wrap { [_render_menu, _render_core] }
   end
 
   view :content_panel do
     class_up "card-slot", "d0-card-content card"
     voo.hide :menu
     wrap do
-      wrap_with :div, class: "card-block" do
-        [_optional_render_menu, _render_core]
+      wrap_with :div, class: "card-body" do
+        [_render_menu, _render_core]
       end
     end
   end
@@ -57,10 +57,10 @@ format :html do
     @content_body = true
     wrap do
       [
-        _optional_render_menu,
+        _render_menu,
         _render_header,
         wrap_body { _render_core },
-        optional_render_comment_box
+        render_comment_box
       ]
     end
   end
@@ -70,7 +70,7 @@ format :html do
     @content_body = true
     wrap do
       [
-        _optional_render_menu,
+        _render_menu,
         wrap_with(:label, _render_title),
         wrap_body do
           _render_closed_content
@@ -90,12 +90,12 @@ format :html do
 
   view :title_link do |args|
     title_text = args[:title_ready] || pov_name(voo.title)
-    link_to_card card.cardname, title_text
+    link_to_card card.name, title_text
   end
 
   view :type_info do
     return unless show_view?(:toolbar, :hide) && card.type_code != :basic
-    wrap_with :span, class: "type-info pull-right" do
+    wrap_with :span, class: "type-info float-right" do
       link_to_card card.type_name, nil, class: "navbar-link"
     end
   end
@@ -105,12 +105,12 @@ format :html do
     voo.viz :toggle, (main? ? :hide : :show)
     @content_body = true
     frame do
-      [_render_open_content, optional_render_comment_box]
+      [_render_open_content, render_comment_box]
     end
   end
 
   # view :anchor, perms: :none, tags: :unknown_ok do |args|
-  #   %{ <a id="#{card.cardname.url_key}" name="#{card.cardname.url_key}"></a> }
+  #   %{ <a id="#{card.name.url_key}" name="#{card.name.url_key}"></a> }
   # end
 
   view :type do |args|
@@ -125,7 +125,7 @@ format :html do
       class_up "d0-card-body", "closed-content"
       @content_body = true
       @toggle_mode = :close
-      frame { _optional_render :closed_content }
+      frame { _render :closed_content }
     end
   end
 
@@ -133,9 +133,9 @@ format :html do
     voo.show :title_link
     voo.hide :menu
     wrap do
-      [_optional_render_title,
-       _optional_render_menu,
-       _optional_render_last_action]
+      [_render_title,
+       _render_menu,
+       _render_last_action]
     end
   end
 
@@ -186,7 +186,7 @@ format :html do
   def related_card_from_options options
     related_card = options.delete :card
     return related_card if related_card
-    related_name = options.delete(:name).to_name.absolute_name card.cardname
+    related_name = options.delete(:name).to_name.absolute_name card.name
     Card.fetch related_name, new: {}
   end
 

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

@@ -6,8 +6,8 @@ format :html do
       frame_and_form :update, edit_form_opts do
         [
           edit_view_hidden,
-          _optional_render_content_formgroup,
-          _optional_render_edit_buttons
+          _render_content_formgroup,
+          _render_edit_buttons
         ]
       end
     end
@@ -41,7 +41,7 @@ format :html do
     frame_and_form({ action: :update, id: card.id },
                    "main-success" => "REDIRECT") do
       [hidden_edit_name_fields,
-       _optional_render_name_formgroup,
+       _render_name_formgroup,
        rename_confirmation_alert,
        edit_name_buttons]
     end

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

@@ -30,7 +30,7 @@ format :html do
     :rich_text
   end
 
-  # overriden by mods that provide rich text editors
+  # overridden by mods that provide rich text editors
   def rich_text_input
     prosemirror_editor_input
   end

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

@@ -241,7 +241,7 @@ format :html do
   # FIELD VIEWS
 
   def add_junction_class
-    return unless card.cardname.junction?
-    class_up "card-editor", "RIGHT-#{card.cardname.tag_name.safe_key}"
+    return unless card.name.junction?
+    class_up "card-editor", "RIGHT-#{card.name.tag_name.safe_key}"
   end
 end

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

@@ -30,6 +30,6 @@ format :html do
     return "" if text == false
     class_up "help-text", "help-block"
     voo.help = text if voo && text.to_s != "true"
-    _optional_render_help
+    _render_help
   end
 end

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

@@ -1,7 +1,7 @@
 format :html do
   view :header do
     voo.hide :toggle, :toolbar
-    main_header + _optional_render_toolbar.to_s.html_safe
+    main_header + _render_toolbar.to_s.html_safe
   end
 
   def main_header
@@ -13,14 +13,14 @@ format :html do
   end
 
   def header_title_elements
-    [_optional_render_toggle, _optional_render_title]
+    [_render_toggle, _render_title]
   end
 
   view :subheader do
     wrap_with :div, class: "card-subheader navbar-inverse btn-primary active" do
       [
         _render_title,
-        (autosaved_draft_link(class: "pull-right") if show_draft_link?)
+        (autosaved_draft_link(class: "float-right") if show_draft_link?)
       ]
     end
     # toolbar_view_title(@slot_view) || _render_title(args)

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

@@ -5,17 +5,17 @@ format :html do
       [
         _render(:horizontal_menu, optional: :hide),
         _render_menu_link,
-        _render_modal_slot(modal_id: card.cardname.safe_key)
+        _render_modal_slot(modal_id: card.name.safe_key)
       ]
     end
   end
 
   view :menu_link do
     css_class =
-      show_view?(:horizontal_menu, :hide) ? "hidden-sm-up" : "_show-on-hover"
+      show_view?(:horizontal_menu, :hide) ? "d-sm-none" : "_show-on-hover"
 
     wrap_with :div, class: "vertical-card-menu card-menu #{css_class}" do
-      wrap_with :div, class: "btn-group slotter card-slot pull-right" do
+      wrap_with :div, class: "btn-group slotter card-slot float-right" do
         link_to_view :vertical_menu, menu_icon, path: menu_path_opts
       end
     end
@@ -33,7 +33,7 @@ format :html do
   end
 
   view :vertical_menu, cache: :never, tags: :unknown_ok do
-    wrap_with :ul, class: "btn-group pull-right slotter" do
+    wrap_with :ul, class: "btn-group float-right slotter" do
       [vertical_menu_toggle, vertical_menu_item_list]
     end
   end
@@ -54,8 +54,8 @@ format :html do
   end
 
   view :horizontal_menu, cache: :never do
-    wrap_with :div, class: "btn-group btn-group-sm slotter pull-right card-menu "\
-                             "horizontal-card-menu hidden-xs-down" 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-default").join("\n").html_safe
     end
   end
@@ -150,6 +150,6 @@ format :html do
   end
 
   def discussion_card?
-    card.junction? && card.cardname.tag_name.key == :discussion.cardname.key
+    card.junction? && card.name.tag_name.key == :discussion.cardname.key
   end
 end

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

@@ -31,18 +31,18 @@ format :html do
     wrap_with :div, class: "modal-menu" do
       [
         link_to(glyphicon("remove"),
-                path: "", class: "close-modal pull-right close",
+                path: "", class: "close-modal float-right close",
                 "data-dismiss" => "modal"),
         link_to(glyphicon("new-window"),
                 path: popout_params,
-                class: "pop-out-modal pull-right close ")
+                class: "pop-out-modal float-right close ")
       ]
     end
   end
 
   view :modal_footer, tags: :unknown_ok do
     button_tag "Close",
-               class: "btn-xs close-modal pull-right",
+               class: "btn-xs close-modal float-right",
                "data-dismiss" => "modal"
   end
 end

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

@@ -8,8 +8,8 @@ format :html do
           new_view_hidden,
           new_view_name,
           new_view_type,
-          _optional_render_content_formgroup,
-          _optional_render_new_buttons
+          _render_content_formgroup,
+          _render_new_buttons
         ]
       end
     end
@@ -42,7 +42,7 @@ format :html do
   end
 
   def new_name_formgroup
-    output _optional_render_name_formgroup,
+    output _render_name_formgroup,
            hidden_field_tag("name_prompt", true)
   end
 

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

@@ -38,17 +38,17 @@ format :html do
   def expanded_close_link
     opts = {}
     opts[:no_nav] = true
-    close_link "hidden-xs-down pull-right navbar-text"
+    close_link "d-none d-sm-inline float-right navbar-text"
   end
 
   def collapsed_close_link
     opts = {}
     opts[:no_nav] = true
-    close_link "pull-right hidden-sm-up navbar-text", opts
+    close_link "float-right d-sm-none navbar-text", opts
   end
 
   def tool_navbar
-    navbar "toolbar-#{card.cardname.safe_key}-#{voo.home_view}",
+    navbar "toolbar-#{card.name.safe_key}-#{voo.home_view}",
            toggle_align: :left, class: "slotter toolbar",
            navbar_type: "inverse",
            no_collapse: true do
@@ -57,7 +57,7 @@ format :html do
   end
 
   def toolbar_split_buttons
-    wrap_with :form, class: "pull-left navbar-text" do
+    wrap_with :form, class: "float-left navbar-text" do
       [
         account_split_button,
         toolbar_button_card(:activity),
@@ -68,9 +68,9 @@ format :html do
   end
 
   def toolbar_simple_buttons
-    wrap_with :form, class: "pull-right navbar-text" do
+    wrap_with :form, class: "float-right navbar-text" do
       wrap_with :div do
-        _optional_render :toolbar_buttons
+        _render :toolbar_buttons
       end
     end
   end
@@ -155,7 +155,7 @@ format :html do
 
   def related_codename related_card
     return nil unless related_card
-    tag_card = Card.quick_fetch related_card.cardname.right
+    tag_card = Card.quick_fetch related_card.name.right
     tag_card && tag_card.codename
   end
 
@@ -176,18 +176,18 @@ format :html do
     button_tag icon_tag(:pushpin).html_safe,
                situation: :primary, remote: true,
                title: "#{'un' if toolbar_pinned?}pin",
-               class: "btn-toolbar-control toolbar-pin hidden-xs-down " \
+               class: "btn-toolbar-control toolbar-pin d-none d-sm-inline " \
                       "#{'in' unless toolbar_pinned?}active"
   end
 
   view :toolbar_buttons, cache: :never do
-    related_button = _optional_render(:related_button).html_safe
+    related_button = _render(:related_button).html_safe
     wrap_with(:div, class: "btn-group btn-group-sm") do
       [
-        _optional_render(:delete_button,
+        _render(:delete_button,
                          optional: (card.ok?(:delete) ? :show : :hide)),
-        _optional_render(:refresh_button),
-        content_tag(:div, related_button, class: "hidden-xs-down pull-left")
+        _render(:refresh_button),
+        content_tag(:div, related_button, class: "d-none d-sm-inline float-left")
       ]
     end
   end
@@ -211,7 +211,9 @@ format :html do
   view :refresh_button do |_args|
     icon = main? ? "refresh" : "new-window"
     button_args = { card: card,  path: { slot: { show: :toolbar } } }
-    button_args[:class] = "hidden-xs-down" if card.accountable?
+    button_args[:class] = "d-none d-sm-inline
+
+" if card.accountable?
     toolbar_button "refresh", icon, button_args
   end
 
@@ -231,7 +233,7 @@ format :html do
   end
 
   def toolbar_button_text text, symbol, hide
-    hide ||= "hidden-xl-down"
+    hide ||= "d-none"
     css_classes = "menu-item-label #{hide}"
     rich_text = wrap_with :span, text.html_safe, class: css_classes
     icon_tag(symbol) + rich_text

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

@@ -6,7 +6,7 @@ format :html do
   def wrap slot=true
     @slot_view = @current_view
     debug_slot do
-      wrap_with :div, yield, id: card.cardname.url_key,
+      wrap_with :div, yield, id: card.name.url_key,
                              class: wrap_classes(slot),
                              data:  wrap_data
     end
@@ -15,7 +15,7 @@ format :html do
   def haml_wrap slot=true
     @slot_view = @current_view
     debug_slot do
-      haml_tag :div, id: card.cardname.url_key,
+      haml_tag :div, id: card.name.url_key,
                      class: wrap_classes(slot),
                      data:  wrap_data do
         yield
@@ -84,7 +84,7 @@ format :html do
     wrap do
       [
         _render_menu,
-        _optional_render_subheader,
+        _render_subheader,
         frame_help,
         panel { wrap_body { yield } }
       ]
@@ -105,10 +105,10 @@ format :html do
     wrap slot do
         panel do
           [
-            _optional_render_menu,
-            _optional_render_header,
+            _render_menu,
+            _render_header,
             frame_help,
-            _optional_render(:flash),
+            _render(:flash),
             wrap_body { yield }
           ]
         end
@@ -118,7 +118,7 @@ format :html do
   def frame_help
     # TODO: address these args
     with_class_up "help-text", "alert alert-info" do
-      _optional_render :help
+      _render :help
     end
   end
 

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

@@ -1,7 +1,7 @@
 event :save_recently_edited_settings, :integrate,
       on: :save, when: proc { |c| c.is_rule? } do
   if (recent = Card[:recent_settings])
-    recent.insert_item 0, cardname.right
+    recent.insert_item 0, name.right
     recent.save
   end
 end
@@ -12,9 +12,9 @@ end
 
 def rule_set_name
   if is_preference?
-    cardname.trunk_name.trunk_name
+    name.trunk_name.trunk_name
   else
-    cardname.trunk_name
+    name.trunk_name
   end
 end
 
@@ -27,7 +27,7 @@ def rule_set
 end
 
 def rule_setting_name
-  cardname.tag
+  name.tag
 end
 
 def rule_setting_title
@@ -43,7 +43,7 @@ def rule_user_setting_name
 end
 
 def rule_user_name
-  is_preference? ? cardname.trunk_name.tag : nil
+  is_preference? ? name.trunk_name.tag : nil
 end
 
 def rule_user