card 1.98.0 → 1.98.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/tab_views.rb

@@ -34,6 +34,10 @@ format :html do
     follow_section
   end
 
+  view :guide_tab, unknown: true do
+    render_guide
+  end
+
   def discussion_section
     return unless show_discussion?
 

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

@@ -31,6 +31,10 @@ format :html do
     true
   end
 
+  def show_guide_tab?
+    guide.present?
+  end
+
   def show_discussion?
     d_card = discussion_card
     return unless d_card

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

@@ -1,15 +1,24 @@
 format :html do
   view :edit_content_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_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_formgroup,
         _render_edit_buttons
       ]

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

@@ -16,10 +16,6 @@ format :html 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
-  end
-
   view :edit_inline_buttons do
     button_formgroup do
       wrap_with "div", class: "d-flex" do

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

@@ -1,28 +1,99 @@
 format :html do
-  view :edit_type, cache: :never, perms: :update do
+  GROUP = {
+    "Content" => %w[RichText PlainText Phrase Date Number Toggle Markdown File Image URI],
+    "Custom" => [],
+    "Organize" => ["Cardtype", "Search", "List", "Link list", "Pointer",
+                   "Mirror list", "Mirrored list"],
+    "Admin" => ["Layout", "Skin", "User", "Role",
+                "Notification template", "Email template", "Twitter template"],
+    "Code" => %w[HTML Json CSS SCSS JavaScript CoffeeScript]
+  }.freeze
+
+  # group for each cardtype: { "RichText => "Content", "Layout" => "Admin", ... }
+  GROUP_MAP = GROUP.each_with_object({}) do |(cat, types), h|
+    types.each { |t| h[t] = cat }
+  end
+
+    view :edit_type, cache: :never, perms: :update do
     frame do
       _render_edit_type_form
     end
   end
 
   view :edit_type_form, cache: :never, perms: :update, wrap: :slot do
-    card_form :update, "data-update-foreign-slot": ".card-slot.edit_content_form-view",
-                       "data-update-origin": "true",
-                       success: edit_type_success do
-      [_render_type_formgroup,
-       edit_type_buttons]
+    card_form :update, success: edit_type_success do
+      [type_formgroup, render_new_buttons]
     end
   end
 
   def edit_type_success
-    # because the content editor can change with a type change
-    # we have to reload the whole edit view
-    { view: :edit_type_row }
+    { view: :core }
+  end
+
+  view :edit_type_row do
+    return _render_bridge_type_formgroup if voo.visible?(:type_form) { false }
+
+    edit_row_fixed_width "Type", link_to_card(card.type), :bridge_type_formgroup
   end
 
-  def edit_type_buttons
-    button_formgroup do
-      standard_cancel_button
+  view :bridge_type_formgroup, unknown: true, wrap: :slot do
+    type_formgroup href: path(mark: card.id, view: :edit_content_form, type_reload: true, slot: { show: :type_form }),
+                   class: "live-type-field slotter",
+                   'data-remote': true,
+                   'data-slot-selector': ".card-slot.edit_content_form-view"
+  end
+
+  view :type_formgroup do
+    type_formgroup
+  end
+
+  def type_formgroup args={}
+    add_class args, "type-field"
+    wrap_type_formgroup do
+      type_field args
+    end
+  end
+
+  def wrap_type_formgroup
+    formgroup "Type", editor: "type", class: "type-formgroup", help: false do
+      output [yield, hidden_field_tag(:assign, true)]
+    end
+  end
+
+  def type_field args={}
+    typelist = Auth.createable_types
+    current_type = type_field_current_value args, typelist
+    options = grouped_options_for_select grouped_types(current_type), current_type
+    template.select_tag "card[type]", options, args
+  end
+
+  def grouped_types current_type
+    groups = Hash.new { |h, k| h[k] = [] }
+    allowed = ::Set.new Auth.createable_types
+    allowed << current_type if current_type
+
+    GROUP.each_pair do |name, items|
+      if name == "Custom"
+        Auth.createable_types.each do |type|
+          groups["Custom"] << type unless GROUP_MAP[type]
+        end
+      else
+        items.each do |i|
+          groups[name] << i if allowed.include?(i)
+        end
+      end
+    end
+    groups
+  end
+
+  def type_field_current_value args, typelist
+    return if args.delete :no_current_type
+
+    if !card.new_card? && !typelist.include?(card.type_name)
+      # current type should be an option on existing cards,
+      # regardless of create perms
+      typelist.push(card.type_name).sort!
     end
+    card.type_name_or_default
   end
 end

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

@@ -10,16 +10,16 @@ format :html do
   end
 
   def bridge_parts
+    voo.show! :edit_type_row
     [
+      frame_help,
       _render_edit_name_row(home_view: :edit_name_row),
-      _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. I think this would probably best be handled as an
       # option to #wrap that triggers a new heir voo
-      frame_help,
       _render_edit_content_form
     ]
   end

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

@@ -10,24 +10,12 @@ format :html do
     end
   end
 
-  view :type_formgroup do
-    wrap_type_formgroup do
-      type_field class: "type-field edit-type-field"
-    end
-  end
-
   view :edit_in_form, cache: :never, perms: :update, unknown: true do
     reset_form
     @in_multi_card_editor = true
     edit_slot
   end
 
-  def wrap_type_formgroup
-    formgroup "type", editor: "type", class: "type-formgroup", help: false do
-      yield
-    end
-  end
-
   def button_formgroup
     wrap_with :div, class: classy("form-group") do
       wrap_with :div, yield
@@ -39,55 +27,6 @@ format :html do
     text_field :name, value: card.name, autocomplete: "off"
   end
 
-  def type_field args={}
-    typelist = Auth.createable_types
-    current_type = type_field_current_value args, typelist
-    options = grouped_options_for_select grouped_types(current_type), current_type
-    template.select_tag "card[type]", options, args
-  end
-
-  GROUP = {
-    "Content" => %w[RichText PlainText Phrase Date Number Toggle Markdown File Image URI],
-    "Custom" => [],
-    "Organize" => ["Cardtype", "Search", "List", "Link list", "Pointer",
-                   "Mirror list", "Mirrored list"],
-    "Admin" => ["Layout", "Skin", "User", "Role",
-                "Notification template", "Email template", "Twitter template" ],
-    "Code" => ["HTML", "Json", "CSS", "SCSS", "JavaScript", "CoffeeScript"]
-  }.freeze
-
-  # group for each cardtype: { "RichText => "Content", "Layout" => "Admin", ... }
-  GROUP_MAP = GROUP.each_with_object({}) do |(cat, types), h|
-                types.each { |t| h[t] = cat }
-              end
-
-  def grouped_types current_type
-    groups = Hash.new { |h, k| h[k] = [] }
-    allowed = ::Set.new Auth.createable_types
-    allowed << current_type if current_type
-
-    GROUP.each_pair do |name, items|
-      items.each do |i|
-        groups[name] << i if allowed.include?(i)
-      end
-    end
-    Auth.createable_types.each do |type|
-      groups["Custom"] << type unless GROUP_MAP[type]
-    end
-    groups
-  end
-
-  def type_field_current_value args, typelist
-    return if args.delete :no_current_type
-
-    if !card.new_card? && !typelist.include?(card.type_name)
-      # current type should be an option on existing cards,
-      # regardless of create perms
-      typelist.push(card.type_name).sort!
-    end
-    card.type_name_or_default
-  end
-
   def content_field skip_rev_id=false
     with_nest_mode :normal do
       # by changing nest mode to normal, we ensure that editors (eg image
@@ -143,7 +82,7 @@ format :html do
   def single_card_edit_field
     if voo.show?(:type_formgroup) || voo.show?(:name_formgroup)
       # display content field in formgroup for consistency with other fields
-      formgroup("content", editor: :content, help: false) { content_field }
+      formgroup("Content", editor: :content, help: false) { content_field }
     else
       editor_wrap(:content) { content_field }
     end

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

@@ -17,7 +17,7 @@ format :html do
   def standard_save_and_close_button opts={}
     close = opts.delete(:close) || :modal
     text = opts[:text] || "Save and Close"
-    add_class opts, "submit-button btn-sm mr-3 _close-#{close}-on-success"
+    add_class opts, "submit-button btn-sm mr-3 _close-on-success"
     add_class opts, "_update-origin" unless opts[:no_origin_update]
     opts.reverse_merge! text: text, "data-cy": "submit-#{close}"