card 1.98.0 → 1.99.1

data/mod/date/vendor/tempusdominus/src/docs/theme/toc.html

@@ -1,3 +1,4 @@
+<script async type="text/javascript" src="//cdn.carbonads.com/carbon.js?serve=CK7DC5QN&placement=eonasdangithubio" id="_carbonads_js"></script>
 <nav class="bd-links" id="docsNavbarContent">
     <div class="bd-toc-item active">
         <ul class="nav bd-sidenav">

data/mod/date/vendor/tempusdominus/src/js/tempusdominus-bootstrap-4.js

@@ -158,12 +158,20 @@ const TempusDominusBootstrap4 = ($ => { // eslint-disable-line no-unused-vars
                 }).append($('<span>').addClass(this._options.icons.today))));
             }
             if (!this._options.sideBySide && this._hasDate() && this._hasTime()) {
+                let title, icon;
+                if (this._options.viewMode === 'times') {
+                    title = this._options.tooltips.selectDate;
+                    icon = this._options.icons.date;
+                } else {
+                    title = this._options.tooltips.selectTime;
+                    icon = this._options.icons.time;
+                }
                 row.push($('<td>').append($('<a>').attr({
                     href: '#',
                     tabindex: '-1',
                     'data-action': 'togglePicker',
-                    'title': this._options.tooltips.selectTime
-                }).append($('<span>').addClass(this._options.icons.time))));
+                    'title': title
+                }).append($('<span>').addClass(icon))));
             }
             if (this._options.buttons.showClear) {
                 row.push($('<td>').append($('<a>').attr({
@@ -219,7 +227,7 @@ const TempusDominusBootstrap4 = ($ => { // eslint-disable-line no-unused-vars
             }
             if (this._hasDate()) {
                 content.append($('<li>').addClass(this._options.collapse && this._hasTime() ? 'collapse' : '')
-                    .addClass((this._options.collapse && this._hasTime() && this._options.viewMode === 'time' ? '' : 'show'))
+                    .addClass((this._options.collapse && this._hasTime() && this._options.viewMode === 'times' ? '' : 'show'))
                     .append(dateView));
             }
             if (this._options.toolbarPlacement === 'default') {
@@ -227,7 +235,7 @@ const TempusDominusBootstrap4 = ($ => { // eslint-disable-line no-unused-vars
             }
             if (this._hasTime()) {
                 content.append($('<li>').addClass(this._options.collapse && this._hasDate() ? 'collapse' : '')
-                    .addClass((this._options.collapse && this._hasDate() && this._options.viewMode === 'time' ? 'show' : ''))
+                    .addClass((this._options.collapse && this._hasDate() && this._options.viewMode === 'times' ? 'show' : ''))
                     .append(timeView));
             }
             if (this._options.toolbarPlacement === 'bottom') {
@@ -394,12 +402,12 @@ const TempusDominusBootstrap4 = ($ => { // eslint-disable-line no-unused-vars
                 yearsViewHeader.eq(2).addClass('disabled');
             }
 
-            html += `<span data-action="selectYear" class="year old">${startYear.year() - 1}</span>`;
+            html += `<span data-action="selectYear" class="year old${!this._isValid(startYear, 'y') ? ' disabled' : ''}">${startYear.year() - 1}</span>`;
             while (!startYear.isAfter(endYear, 'y')) {
                 html += `<span data-action="selectYear" class="year${startYear.isSame(this._getLastPickedDate(), 'y') && !this.unset ? ' active' : ''}${!this._isValid(startYear, 'y') ? ' disabled' : ''}">${startYear.year()}</span>`;
                 startYear.add(1, 'y');
             }
-            html += `<span data-action="selectYear" class="year old">${startYear.year()}</span>`;
+            html += `<span data-action="selectYear" class="year old${!this._isValid(startYear, 'y') ? ' disabled' : ''}">${startYear.year()}</span>`;
 
             yearsView.find('td').html(html);
         }
@@ -635,7 +643,7 @@ const TempusDominusBootstrap4 = ($ => { // eslint-disable-line no-unused-vars
                     {
                         const month = $(e.target).closest('tbody').find('span').index($(e.target));
                         this._viewDate.month(month);
-                        if (this.currentViewMode === DateTimePicker.MinViewModeNumber) {
+                        if (this.currentViewMode === this.MinViewModeNumber) {
                             this._setValue(lastPicked.clone().year(this._viewDate.year()).month(this._viewDate.month()), this._getLastPickedDateIndex());
                             if (!this._options.inline) {
                                 this.hide();
@@ -651,7 +659,7 @@ const TempusDominusBootstrap4 = ($ => { // eslint-disable-line no-unused-vars
                     {
                         const year = parseInt($(e.target).text(), 10) || 0;
                         this._viewDate.year(year);
-                        if (this.currentViewMode === DateTimePicker.MinViewModeNumber) {
+                        if (this.currentViewMode === this.MinViewModeNumber) {
                             this._setValue(lastPicked.clone().year(this._viewDate.year()), this._getLastPickedDateIndex());
                             if (!this._options.inline) {
                                 this.hide();
@@ -667,7 +675,7 @@ const TempusDominusBootstrap4 = ($ => { // eslint-disable-line no-unused-vars
                     {
                         const year = parseInt($(e.target).data('selection'), 10) || 0;
                         this._viewDate.year(year);
-                        if (this.currentViewMode === DateTimePicker.MinViewModeNumber) {
+                        if (this.currentViewMode === this.MinViewModeNumber) {
                             this._setValue(lastPicked.clone().year(this._viewDate.year()), this._getLastPickedDateIndex());
                             if (!this._options.inline) {
                                 this.hide();
@@ -688,8 +696,20 @@ const TempusDominusBootstrap4 = ($ => { // eslint-disable-line no-unused-vars
                         if ($(e.target).is('.new')) {
                             day.add(1, 'M');
                         }
-                        this._setValue(day.date(parseInt($(e.target).text(), 10)), this._getLastPickedDateIndex());
-                        if (!this._hasTime() && !this._options.keepOpen && !this._options.inline) {
+
+                        var selectDate = day.date(parseInt($(e.target).text(), 10)), index = 0;
+                        if (this._options.allowMultidate) {
+                            index = this._datesFormatted.indexOf(selectDate.format('YYYY-MM-DD'));
+                            if (index !== -1) {
+                                this._setValue(null, index); //deselect multidate
+                            } else {
+                                this._setValue(selectDate, this._getLastPickedDateIndex() + 1);
+                            }
+                        } else {
+                            this._setValue(selectDate, this._getLastPickedDateIndex());
+                        }
+
+                        if (!this._hasTime() && !this._options.keepOpen && !this._options.inline && !this._options.allowMultidate) {
                             this.hide();
                         }
                         break;
@@ -1148,7 +1168,7 @@ const TempusDominusBootstrap4 = ($ => { // eslint-disable-line no-unused-vars
         if (!config._options.allowInputToggle) {
             return;
         }
-        TempusDominusBootstrap4._jQueryInterface.call($target, config, event);
+        TempusDominusBootstrap4._jQueryInterface.call($target, 'show', event);
     });
 
     $.fn[DateTimePicker.NAME] = TempusDominusBootstrap4._jQueryInterface;

data/mod/date/vendor/tempusdominus/src/sass/_tempusdominus-bootstrap-4.scss

@@ -88,6 +88,10 @@ $bs-datetimepicker-text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25) !default;
                 right: 7px;
             }
         }
+
+        &.wider {
+            width: 16rem;
+        }
     }
 
     .list-unstyled {

data/mod/date/vendor/tempusdominus/src/sass/tempusdominus-bootstrap-4-build.scss

@@ -1,6 +1,6 @@
 // Import bootstrap variables including default color palette and fonts
-@import "bootstrap/scss/_functions.scss";
-@import "bootstrap/scss/_variables.scss";
+@import "~bootstrap/scss/_functions.scss";
+@import "~bootstrap/scss/_variables.scss";
 
 .sr-only {
   position: absolute;

data/mod/edit/set/all/bridge.rb

@@ -1,5 +1,6 @@
 format :html do
   BRIDGE_TABS = { account_tab: "Account",
+                  guide_tab: "Guide",
                   engage_tab: "Engage",
                   history_tab: "History",
                   related_tab: "Related",
@@ -53,7 +54,9 @@ format :html do
   end
 
   def default_bridge_tab
-    show_account_tab? ? :account_tab : :engage_tab
+    (show_account_tab? && :account_tab) ||
+      (show_guide_tab? && :guide_tab) ||
+      :engage_tab
   end
 
   def breadcrumb_data title, html_class=nil

data/mod/edit/set/all/bridge/account_section.rb

@@ -0,0 +1,16 @@
+format :html do
+  def account_details_items
+    [
+      ["Email and Password", :account,
+       { path: { slot: { hide: %i[help_link bridge_link] } } }],
+      ["Roles", :roles,
+       { path:  { view: :content_with_edit_button } }],
+      ["Notifications", :follow]
+    ]
+  end
+
+  def account_content_items
+    [["Created", :created],
+     ["Edited", :edited]]
+  end
+end

data/mod/edit/set/all/bridge/bridge_pills.rb

@@ -0,0 +1,47 @@
+format :html do
+  BRIDGE_PILL_UL_CLASSES =
+    "nav nav-pills _auto-single-select bridge-pills flex-column".freeze
+
+  BRIDGE_PILL_LI_CLASSES = "nav-item".freeze
+
+  def bridge_pills items
+    list_tag class: BRIDGE_PILL_UL_CLASSES, items: { class: BRIDGE_PILL_LI_CLASSES } do
+      items
+    end
+  end
+
+  def bridge_pill_items data, breadcrumb
+    data.map do |text, field, extra_opts|
+      opts = bridge_pill_item_opts breadcrumb, extra_opts, text
+      mark = opts.delete(:mark) == :absolute ? field : [card, field]
+      link_to_card mark, text, opts
+    end
+  end
+
+  def bridge_pill_item_opts breadcrumb, extra_opts, text
+    opts = bridge_link_opts.merge("data-toggle": "pill")
+    opts.merge! breadcrumb_data(breadcrumb)
+
+    if extra_opts
+      classes = extra_opts.delete :class
+      add_class opts, classes if classes
+      opts.deep_merge! extra_opts
+    end
+    opts["data-cy"] = "#{text.to_name.key}-pill"
+    add_class opts, "nav-link"
+    opts
+  end
+
+  def bridge_pill_sections tab_name
+    wrap_with :ul, class: BRIDGE_PILL_UL_CLASSES do
+      yield.map { |args| bridge_pill_section(tab_name, *args) }
+    end
+  end
+
+  def bridge_pill_section tab_name, title, items
+    wrap_with(:h6, title, class: "ml-1 mt-3") +
+      wrap_each_with(:li, class: BRIDGE_PILL_LI_CLASSES) do
+        bridge_pill_items(items, tab_name)
+      end.html_safe
+  end
+end

data/mod/edit/set/all/bridge/related_section.rb

@@ -0,0 +1,34 @@
+format :html do
+  RELATED_ITEMS =
+    {
+      "by name" => [["children", :children],
+                    ["mates", :mates]],
+      # FIXME: optimize,
+      "by content" => [["links out", :links_to],
+                       ["links in", :linked_to_by],
+                       ["nests", :nests],
+                       ["nested by", :nested_by],
+                       ["references out", :refers_to],
+                       ["references in",  :referred_to_by]]
+      # ["by edit", [["creator", :creator],
+      #              ["editors", :editors],
+      #              ["last edited", :last_edited]]]
+    }.freeze
+
+  def related_by_name_items
+    pills = []
+    if card.name.junction?
+      pills += card.name.ancestors.map { |a| [a, a, { mark: :absolute }] }
+    end
+    pills += RELATED_ITEMS["by name"]
+    pills
+  end
+
+  def related_by_content_items
+    RELATED_ITEMS["by content"]
+  end
+
+  def related_by_type_items
+    [["#{card.type} cards", [card.type, :type, :by_name], mark: :absolute]]
+  end
+end

data/mod/edit/set/all/bridge/tab_views.rb

@@ -1,10 +1,4 @@
 format :html do
-  RELATED_ITEMS = [["children",       :children],
-                   # ["mates",          "bed",          "*mates"],
-                   # FIXME: optimize and restore
-                   ["references out", :refers_to],
-                   ["references in",  :referred_to_by]].freeze
-
   view :engage_tab, wrap: { div: { class: "m-3 mt-4 _engage-tab" } }, cache: :never do
     [render_follow_section, discussion_section].compact
   end
@@ -16,7 +10,11 @@ format :html do
   end
 
   view :related_tab do
-    bridge_pills bridge_pill_items(RELATED_ITEMS, "Related")
+    bridge_pill_sections "Related" do
+      %w[name content type].map do |section_name|
+        ["by #{section_name}", send("related_by_#{section_name}_items")]
+      end
+    end
   end
 
   view :rules_tab, unknown: true do
@@ -27,49 +25,24 @@ format :html do
   end
 
   view :account_tab do
-    bridge_pills bridge_pill_items(account_items, "Account")
+    bridge_pill_sections "Account" do
+      [["Settings", account_details_items],
+       ["Content", account_content_items]]
+    end
   end
 
   view :follow_section, wrap: :slot, cache: :never do
     follow_section
   end
 
+  view :guide_tab, unknown: true do
+    render_guide
+  end
+
   def discussion_section
     return unless show_discussion?
 
     field_nest(:discussion, view: :titled, title: "Discussion", show: :comment_box,
                             hide: [:menu])
   end
-
-  def account_items
-    %i[account roles created edited follow].map do |item|
-      if item == :account
-        [tr(:details), item, { view: :edit, hide: %i[edit_name_row edit_type_row] }]
-      else
-        [tr(item), item]
-      end
-    end
-  end
-
-  def bridge_pills items
-    list_tag class: "nav nav-pills _auto-single-select bridge-pills flex-column",
-             items: { class: "nav-item" } do
-      items
-    end
-  end
-
-  def bridge_pill_items data, breadcrumb
-    data.map do |text, field, extra_opts|
-      opts = bridge_link_opts.merge("data-toggle": "pill")
-      opts.merge! breadcrumb_data(breadcrumb)
-      if extra_opts
-        classes = extra_opts.delete :class
-        add_class opts, classes if classes
-        opts.deep_merge! extra_opts
-      end
-      opts["data-cy"] = "#{text.to_name.key}-pill"
-      add_class opts, "nav-link"
-      link_to_card [card, field], text,  opts
-    end
-  end
 end

data/mod/edit/set/all/bridge/tab_visibility.rb

@@ -10,7 +10,7 @@ format :html do
   def show_account_tab?
     return unless card.real?
 
-    card.account && card.ok?(:update)
+    card.account&.ok?(:update)
   end
 
   def show_engage_tab?
@@ -31,11 +31,15 @@ format :html do
     true
   end
 
+  def show_guide_tab?
+    guide.present?
+  end
+
   def show_discussion?
     d_card = discussion_card
     return unless d_card
 
-    permission_task = d_card.new_card? ? :comment : :read
+    permission_task = d_card.new_card? ? :update : :read
     d_card.ok? permission_task
   end
 

data/mod/edit/set/all/edit_content.rb

@@ -1,16 +1,25 @@
 format :html do
-  view :edit_content_form, wrap: :slot do
+  view :edit_form, wrap: :slot do
+    voo.show :edit_type_row
     with_nest_mode :edit do
       edit_form
     end
   end
 
   def edit_form
+    voo.hide :edit_type_row
     form_opts = edit_form_opts.reverse_merge success: edit_success
     card_form(:update, form_opts) do
       [
         edit_view_hidden,
-        _render_content_formgroup,
+        _render_edit_type_row(home_view: :edit_type_row),
+        # home_view is necessary for cancel to work correctly.
+        # it seems a little strange to have to think about home_view here,
+        # but the issue is that something currently has to happen prior to the
+        # render to get voo.slot_options to have the write home view in
+        # the slot wrap. Id think this would probably best be handled as an
+        # option to #wrap that triggers a new heir voo
+        _render_content_formgroups,
         _render_edit_buttons
       ]
     end
@@ -28,7 +37,7 @@ format :html do
       wrap true do
         [
           frame_help,
-          _render_edit_content_form
+          _render_edit_form
         ]
       end
     end

data/mod/edit/set/all/edit_inline.rb

@@ -5,7 +5,7 @@ format :html do
       card_form :update, success: edit_success do
         [
           edit_view_hidden,
-          _render_content_formgroup,
+          _render_content_formgroups,
           _render_edit_inline_buttons
         ]
       end
@@ -13,11 +13,7 @@ format :html do
   end
 
   view :edit_name_row do
-    edit_row_fixed_width "Name", card.name, :edit_name_form
-  end
-
-  view :edit_type_row do
-    edit_row_fixed_width "Type", link_to_card(card.type), :edit_type_form
+    edit_row_fixed_width "Name", card.name, :name_form
   end
 
   view :edit_inline_buttons do
@@ -28,10 +24,21 @@ format :html do
     end
   end
 
-  def edit_row_fixed_width title, content, edit_view
+  # TODO: better styling for this so that is reusable
+  #  At the moment it is used for the name and type field in the bridge
+  #  (with fixed 50px width for the title column) and
+  #  for password and email for accounts (with fixed 75px width for the title column)
+  #  The view is very similar to labeled but with fixed edit link on the right
+  #  and a fixed width for the labels so that the content column is aligned
+  #  There is also the problem that label and content are not vertically aligned
+  view :edit_row do
+    edit_row_fixed_width render_title, render_core, :edit_inline, 75
+  end
+
+  def edit_row_fixed_width title, content, edit_view, width=50
     class_up "card-slot", "d-flex"
     wrap do
-      ["<label class='w-50px'>#{title}</label>",
+      ["<label class='w-#{width}px'>#{title}</label>",
        content,
        edit_inline_link(edit_view, align: :right)]
     end