card 1.21.0 → 1.91

data/mod/pointer/set/abstract/01_paging.rb

@@ -20,8 +20,7 @@ end
 
 format :html do
   def with_paging path_args={}
-    paging_path_args path_args
-    output [yield(@paging_path_args), _optional_render_paging]
+    output [yield( paging_path_args(path_args)), _optional_render_paging]
   end
 
   view :paging, cache: :never do
@@ -72,7 +71,7 @@ format :html do
   end
 
   def paging_view
-    (voo && voo.home_view) || :content
+    (voo && voo.home_view) || voo.slot_options[:view] || :content
   end
 
   def extra_paging_path_args

data/mod/pointer/set/abstract/02_pointer/edit.rb

@@ -71,6 +71,18 @@ format :html do
     HTML
   end
 
+  view :autocomplete do |args|
+    items = args[:item_list] || card.item_names(context: :raw)
+    items = [""] if items.empty?
+    <<-HTML
+      <div class="pointer-list-editor pointer-list-ul"
+          data-options-card="#{options_card_name}">
+        #{text_field_tag 'pointer_item', items.first,
+                         class: 'pointer-item-text form-control'}
+      </div>
+    HTML
+  end
+
   view :checkbox do |_args|
     options = card.option_names.map do |option_name|
       checked = card.item_names.include?(option_name)
@@ -110,6 +122,7 @@ format :html do
         </li>
       HTML
     end.join("\n")
+    options = "no options" if options.empty?
 
     %(<ul class="pointer-radio-list">#{options}</ul>)
   end

data/mod/prosemirror_editor/lib/javascript/script_prosemirror_config.js.coffee

@@ -1,19 +1,19 @@
-wagn.addEditor(
+decko.addEditor(
   '.prosemirror-editor',
   ->
-    wagn.initProseMirror @[0].id,
+    decko.initProseMirror @[0].id,
   ->
     prosemirrorContent @[0].id
 )
 
-$.extend wagn,
+$.extend decko,
   setProseMirrorConfig: (string) ->
     setter = ->
       try
         $.parseJSON string
       catch
         {}
-    wagn.proseMirrorConfig = setter()
+    decko.proseMirrorConfig = setter()
 
   initProseMirror: (el_id) ->
     conf = {
@@ -21,7 +21,7 @@ $.extend wagn,
       tooltipMenu: false
     }
     hard_conf = { docFormat: "html" }
-    user_conf = if wagn.proseMirrorConfig? then wagn.proseMirrorConfig else {}
+    user_conf = if decko.proseMirrorConfig? then decko.proseMirrorConfig else {}
     $.extend conf, user_conf, hard_conf
     createProseMirror(el_id, conf)
 

data/mod/prosemirror_editor/set/abstract/prosemirror_editor.rb

@@ -1,7 +1,7 @@
 format :html do
   def prosemirror_editor_input
     wrap_with :div, id: unique_id, class: "prosemirror-editor" do
-      hidden_field :content, class: "card-content", value: card.raw_content
+      hidden_field :content, class: "d0-card-content", value: card.raw_content
     end
   end
 end

data/mod/settings/spec/set/right/comment_spec.rb

@@ -31,9 +31,7 @@ describe Card::Set::Right::Comment do
       Card::Auth.as_bot do
         Card.create name: "basicname+*self+*comment",
                     content: "[[Anyone Signed In]]"
-        @c = Card.fetch "basicname"
-        @c.comment = " and more\n  \nsome lines\n\n"
-        @c.save!
+        Card["basicname"].update_attributes! comment: " and more\n  \nsome lines\n\n"
       end
       expect(Card["basicname"].content).to match(%r{\<p\>some lines\</p\>})
     end

data/mod/standard/set/abstract/toolbar_split_button.rb

@@ -11,9 +11,9 @@ format :html do
   end
 
   def toolbar_split_button_link_text name, opts
-    icon = glyphicon opts.delete(:icon)
+    icon = icon_tag opts.delete(:icon)
     icon + content_tag(:span, " #{name}".html_safe,
-                       class: "visible-md visible-lg pull-right")
+                       class: "hidden-xs-down")
   end
 
   def subject

data/mod/standard/set/all/comment.rb

@@ -4,6 +4,7 @@ end
 
 event :add_comment, :prepare_to_store, on: :save, when: :comment do
   Env.session[:comment_author] = comment_author if Env.session
+  return unless comment.present?
   self.content =
     [content, format.comment_with_signature].compact.join "\n<hr\>\n"
 end

data/mod/standard/set/all/error.rb

@@ -131,7 +131,7 @@ format :html do
     return if card.errors.empty?
     voo.title = card.name.blank? ? "Problems" : "Problems with #{card.name}"
     voo.hide! :menu
-    class_up "card-frame", "panel panel-warning"
+    class_up "d0-card-frame", "card card-warning card-inverse"
     class_up "alert", "card-error-msg"
     frame do
       card.errors.map do |attrib, msg|

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

@@ -3,7 +3,7 @@ format :html do
   def class_up klass, classier, force=false
     key = klass.to_s
     return if !force && class_list[key]
-    class_list[key] = classier.to_s
+    class_list[key] = [class_list[key], classier.to_s].compact.join(" ")
   end
 
   def class_down klass, classier

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

@@ -38,16 +38,16 @@ format :html do
   end
 
   view :content do
-    class_up "card-slot", "card-content"
+    class_up "card-slot", "d0-card-content"
     voo.hide :menu
     wrap { [_optional_render_menu, _render_core] }
   end
 
   view :content_panel do
-    class_up "card-slot", "card-content panel panel-default"
+    class_up "card-slot", "d0-card-content card"
     voo.hide :menu
     wrap do
-      wrap_with :div, class: "panel-body" do
+      wrap_with :div, class: "card-block" do
         [_optional_render_menu, _render_core]
       end
     end
@@ -66,7 +66,7 @@ format :html do
   end
 
   view :labeled do
-    class_up "card-body", "closed-content"
+    class_up "d0-card-body", "closed-content"
     @content_body = true
     wrap do
       [
@@ -121,7 +121,7 @@ format :html do
   view :closed do
     voo.show :toggle
     voo.hide! :toolbar
-    class_up "card-body", "closed-content"
+    class_up "d0-card-body", "closed-content"
     @content_body = true
     @toggle_mode = :close
     frame { _optional_render :closed_content }

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

@@ -36,12 +36,12 @@ format :html do
   end
 
   def text_area_input
-    text_area :content, rows: 5, class: "card-content",
+    text_area :content, rows: 5, class: "d0-card-content",
                         "data-card-type-code" => card.type_code
   end
 
   def text_field_input
-    text_field :content, class: "card-content"
+    text_field :content, class: "d0-card-content"
   end
 
   def calendar_input

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

@@ -68,7 +68,7 @@ format :html do
 
   # SAMPLE editor view for override
   # view :editor do
-  #   text_area :content, rows: 5, class: "card-content"
+  #   text_area :content, rows: 5, class: "d0-card-content"
   # end
 
   def content_field_revision_tracking skip_rev_id

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

@@ -5,8 +5,8 @@ format :html do
   end
 
   def main_header
-    wrap_with :div, class: classy("card-header") do
-      wrap_with :div, class: classy("card-header-title") do
+    wrap_with :div, class: classy("d0-card-header") do
+      wrap_with :div, class: classy("d0-card-header-title") do
         header_title_elements
       end
     end
@@ -32,7 +32,7 @@ format :html do
 
   view :toggle do
     verb, adjective, direction = toggle_verb_adjective_direction
-    link_to_view adjective, glyphicon(direction),
+    link_to_view adjective, icon_tag(direction.to_sym),
                  title: "#{verb} #{card.name}",
                  class: "#{verb}-icon toggler slotter nodblclick"
   end
@@ -41,26 +41,18 @@ format :html do
     if @toggle_mode == :close
       %w[open open expand]
     else
-      %w[close closed collapse-down]
+      %w[close closed collapse_down]
     end
   end
 
-  def nav_link_list side
-    wrap_with :ul, class: "nav navbar-nav navbar-#{side}" do
+  view :navbar_links do
+    wrap_with :ul, class: "navbar-nav" do
       item_links.map do |link|
-        wrap_with(:li) { link }
+        wrap_with(:li, class: "nav-item") { link }
       end.join "\n"
     end
   end
 
-  view :navbar_right do
-    nav_link_list :right
-  end
-
-  view :navbar_left do
-    nav_link_list :left
-  end
-
   def show_follow?
     Auth.signed_in? && !card.new_card? && card.followable?
   end

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

@@ -12,7 +12,7 @@ format :html do
 
   view :menu_link do
     css_class =
-      show_view?(:horizontal_menu, :hide) ? "visible-xs" : "show-on-hover"
+      show_view?(:horizontal_menu, :hide) ? "hidden-sm-up" : "_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
@@ -29,7 +29,7 @@ format :html do
   end
 
   def menu_icon
-    glyphicon "cog"
+    material_icon "settings"
   end
 
   view :vertical_menu, cache: :never, tags: :unknown_ok do
@@ -48,14 +48,14 @@ format :html do
   def vertical_menu_item_list
     wrap_with :ul, class: "dropdown-menu", role: "menu" do
       menu_item_list.map do |item|
-        "<li>#{item}</li>"
+        %{<li>#{item}</li>}
       end.join("\n").html_safe
     end
   end
 
   view :horizontal_menu, cache: :never do
-    wrap_with :div, class: "btn-group slotter pull-right card-menu "\
-                             "horizontal-card-menu hidden-xs" do
+    wrap_with :div, class: "btn-group btn-group-sm slotter pull-right card-menu "\
+                             "horizontal-card-menu hidden-xs-down" do
       menu_item_list(class: "btn btn-default").join("\n").html_safe
     end
   end
@@ -77,19 +77,20 @@ format :html do
   end
 
   def menu_follow_link opts
+    add_class opts, "dropdown-item"
     _render_follow_link(icon: true, link_opts: opts)
   end
 
   def menu_page_link opts
-    menu_item "page", "new-window", opts.merge(card: card)
+    menu_item "page", "open_in_new", opts.merge(card: card)
   end
 
   def menu_rules_link opts
-    menu_item "rules", "wrench", opts.merge(view: :edit_rules)
+    menu_item "rules", "build", opts.merge(view: :edit_rules)
   end
 
   def menu_account_link opts
-    menu_item "account", "user", opts.merge(
+    menu_item "account", "person", opts.merge(
       view: :related,
       path: { related: { name: "+#{:account.cardname.key}", view: :edit } }
     )
@@ -97,13 +98,14 @@ format :html do
 
   def menu_more_link opts
     view = voo.home_view || :open
-    menu_item "", "option-horizontal", opts.merge(
+    menu_item "", :option_horizontal, opts.merge(
       view: view, path: { slot: { show: :toolbar } }
     )
   end
 
   def menu_item text, icon, opts={}
-    link_text = "#{glyphicon(icon)}<span class='menu-item-label'>#{text}</span>"
+    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
 

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

@@ -38,13 +38,13 @@ format :html do
   def expanded_close_link
     opts = {}
     opts[:no_nav] = true
-    close_link "hidden-xs pull-right navbar-text"
+    close_link "hidden-xs-down pull-right navbar-text"
   end
 
   def collapsed_close_link
     opts = {}
     opts[:no_nav] = true
-    close_link "pull-right visible-xs navbar-text", opts
+    close_link "pull-right hidden-sm-up navbar-text", opts
   end
 
   def tool_navbar
@@ -164,42 +164,42 @@ format :html do
     css_classes = opts[:no_nav] ? extra_class : nav_css_classes
     wrap_with :div, class: css_classes do
       [
-        toolbar_pin_button,
-        link_to_view(voo.home_view, glyphicon("remove"),
+        # toolbar_pin_button,
+        link_to_view(voo.home_view, icon_tag(:remove),
                      title: "cancel",
-                     class: "btn-toolbar-control btn btn-primary")
+                     class: "btn-toolbar-control toolbar-close ml-3 p-0")
       ]
     end
   end
 
   def toolbar_pin_button
-    button_tag glyphicon("pushpin"),
+    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 " \
+               class: "btn-toolbar-control toolbar-pin hidden-xs-down " \
                       "#{'in' unless toolbar_pinned?}active"
   end
 
   view :toolbar_buttons, cache: :never do
     related_button = _optional_render(:related_button).html_safe
-    wrap_with(:div, class: "btn-group") do
+    wrap_with(:div, class: "btn-group btn-group-sm") do
       [
         _optional_render(:delete_button,
                          optional: (card.ok?(:delete) ? :show : :hide)),
         _optional_render(:refresh_button),
-        content_tag(:div, related_button, class: "hidden-xs pull-left")
+        content_tag(:div, related_button, class: "hidden-xs-down pull-left")
       ]
     end
   end
 
   view :related_button do
-    dropdown_button "", icon: "education", class: "related" do
+    dropdown_button "", icon: :explore, class: "related" do
       [
-        ["children",       "baby-formula", "*children"],
+        ["children",       :baby_formula, "*children"],
         # ["mates",          "bed",          "*mates"],
         # FIXME: optimize and restore
-        ["references out", "log-out",      "*refers_to"],
-        ["references in",  "log-in",       "*referred_to_by"]
+        ["references out", :log_out,      "*refers_to"],
+        ["references in",  :log_in,       "*referred_to_by"]
       ].map do |title, icon, tag|
         menu_item " #{title}", icon, related: tag,
                                      path: { slot: { show: :toolbar,
@@ -211,14 +211,14 @@ 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" if card.accountable?
+    button_args[:class] = "hidden-xs-down" if card.accountable?
     toolbar_button "refresh", icon, button_args
   end
 
   view :delete_button do |_args|
     confirm = "Are you sure you want to delete #{card.name}?"
     success = main? ? "REDIRECT: *previous" : "TEXT: #{card.name} deleted"
-    toolbar_button "delete", "trash",
+    toolbar_button "delete", :trash,
                    path: { action: :delete, success: success },
                    class: "slotter", remote: true, :'data-confirm' => confirm
   end
@@ -231,11 +231,10 @@ format :html do
   end
 
   def toolbar_button_text text, symbol, hide
-    icon = glyphicon symbol
-    hide ||= "hidden-xs hidden-sm hidden-md hidden-lg"
+    hide ||= "hidden-xl-down"
     css_classes = "menu-item-label #{hide}"
     rich_text = wrap_with :span, text.html_safe, class: css_classes
-    icon + rich_text
+    icon_tag(symbol) + rich_text
   end
 
   def autosaved_draft_link opts={}
@@ -256,7 +255,7 @@ format :html do
 
     view "#{viewname}_link" do
       voo.title ||= viewtitle
-      link_to_view viewname, voo.title
+      link_to_view viewname, voo.title, class: "dropdown-item"
     end
   end
 

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

@@ -66,15 +66,15 @@ format :html do
   end
 
   def wrap_body
-    css_classes = ["card-body"]
-    css_classes += ["card-content", card.safe_set_keys] if @content_body
+    css_classes = ["d0-card-body"]
+    css_classes += ["d0-card-content", card.safe_set_keys] if @content_body
     wrap_with :div, class: classy(*css_classes) do
       yield
     end
   end
 
   def panel
-    wrap_with :div, class: classy("card-frame") do
+    wrap_with :div, class: classy("d0-card-frame") do
       yield
     end
   end
@@ -103,17 +103,15 @@ format :html do
   def standard_frame slot=true
     voo.hide :horizontal_menu, :help
     wrap slot do
-      [
-        _optional_render_menu,
         panel do
           [
+            _optional_render_menu,
             _optional_render_header,
             frame_help,
             _optional_render(:flash),
             wrap_body { yield }
           ]
         end
-      ]
     end
   end