Merge branch 'develop' of github.com:DiscipleTools/disciple-tools-theme into develop

Author: corsacca

archive-template.php

@@ -334,6 +334,7 @@ function dt_site_scripts() {
             'empty_custom_filters' => __( 'No filters, create one below', 'disciple_tools' ),
             'empty_list' => __( 'No records found matching your filter.', 'disciple_tools' ),
             'filter_all' => sprintf( _x( 'All %s', 'All records', 'disciple_tools' ), $post_settings['label_plural'] ),
+            'split_by' => __( 'Split By', 'disciple_tools' ),
             'range_start' => __( 'start', 'disciple_tools' ),
             'range_end' => __( 'end', 'disciple_tools' ),
             'all' => __( 'All', 'disciple_tools' ),

dt-assets/build/css/style.min.css

@@ -554,6 +554,13 @@
     if (!list_settings.filters.tabs) {
       return;
     }
+    list_settings.filters.tabs.push({
+      key: 'split_by',
+      label: list_settings.translations.split_by,
+      order: 98, // right before Custom Filters
+    });
+    list_settings.filters.tabs.sort((a, b) => (a.order || 0) - (b.order || 0));
+
     let selected_tab = $('.accordion-item.is-active').data('id');
     let selected_filter = $('.js-list-view:checked').data('id');
     let html = ``;
@@ -565,7 +572,20 @@
           <span class="tab-count-span" data-tab="${window.SHAREDFUNCTIONS.escapeHTML(tab.key)}">
               ${Number.isInteger(tab.count) ? `(${window.SHAREDFUNCTIONS.escapeHTML(tab.count)})` : ``}
           </span>
-        </a>
+        </a>`;
+
+      if (tab.key === 'split_by') {
+        const split_by_content = document
+          .getElementById('template-split-by-filter')
+          .cloneNode(true);
+        html += `
+        <div class="accordion-content" data-tab-content>
+            ${split_by_content.innerHTML}
+        </div>
+        </li>
+        `;
+      } else {
+        html += `
         <div class="accordion-content" data-tab-content>
           <div class="list-views">
             ${list_settings.filters.filters
@@ -589,6 +609,7 @@
         </div>
       </li>
       `;
+      }
     });
     filter_accordions.html(html);
 
@@ -1667,6 +1688,9 @@
       search_query,
       new_filter_labels,
     );
+    if (window.Foundation.MediaQuery.only('small')) {
+      $('#tile-filters').addClass('collapsed');
+    }
   });
 
   $(document).on('click', '.current-filter-label-button', function () {
@@ -2924,27 +2948,19 @@
   });
 
   $('.search-input--desktop').on('keyup', function (e) {
-    clearSearchButton.css({ display: this.value.length ? 'flex' : 'none' });
     if (e.keyCode === 13) {
       $('#search').trigger('click');
     }
   });
 
   $('.search-input--mobile').on('keyup', function (e) {
-    clearSearchButton.css({ display: this.value.length ? 'flex' : 'none' });
     if (e.keyCode === 13) {
       $('#search-mobile').trigger('click');
     }
   });
 
   clearSearchButton.on('click', function () {
     $('.search-input').val('');
-    clearSearchButton.css({ display: 'none' });
-  });
-
-  //toggle show search input on mobile
-  $('#open-search').on('click', function () {
-    $('.hideable-search').toggle();
   });
 
   /***
@@ -4098,7 +4114,7 @@
               html += `
                     <label class="list-view">
                       <input class="js-list-view-split-by" type="radio" name="split_by_list_view" ${option_selected ? 'checked' : ''} value="${window.SHAREDFUNCTIONS.escapeHTML(option_id)}" data-field_id="${window.SHAREDFUNCTIONS.escapeHTML(field_id)}" data-field_option_id="${window.SHAREDFUNCTIONS.escapeHTML(option_id)}" data-field_option_label="${window.SHAREDFUNCTIONS.escapeHTML(option_id_label)}" autocomplete="off">
-                      <span>${window.SHAREDFUNCTIONS.escapeHTML(option_id_label)}</span>
+                      <span class="list-view__text">${window.SHAREDFUNCTIONS.escapeHTML(option_id_label)}</span>
                       <span class="list-view__count js-list-view-count" data-value="${window.SHAREDFUNCTIONS.escapeHTML(option_id)}">${window.SHAREDFUNCTIONS.escapeHTML(result['count'])}</span>
                     </label>
                     `;

dt-assets/functions/enqueue-scripts.php

@@ -203,12 +203,12 @@
 </div>
 
 <!-- MOBILE VIEW TOP LEFT SIDE MENU AREA -->
-<div data-sticky-container class="show-for-small-only">
-    <div data-sticky data-responsive-toggle='top-bar-menu' data-margin-top='0' data-sticky-on='small'>
+<div class="show-for-small-only">
+    <div data-responsive-toggle='top-bar-menu'>
         <?php // hook for nav header above menu bar
         do_action( 'dt_nav_add_before', false ) ?>
 
-        <div class='title-bar hide-on-scroll'>
+        <div class='title-bar'>
             <div class='title-bar-left'>
                 <!-- menu -->
                 <?php if ( !$dt_nav_tabs['admin']['menu']['hidden'] ?? !false ) : ?>
@@ -233,8 +233,8 @@
                 <?php if ( isset( $dt_nav_tabs['admin']['add_new']['hidden'] ) && empty( $dt_nav_tabs['admin']['add_new']['hidden'] ) ) : ?>
                     <div class="has-submenu center-items add-buttons mobile-add-buttons">
                         <button type="button" data-toggle="mobile-add-new-dropdown">
-                            <img title="<?php echo esc_html( $dt_nav_tabs['admin']['add_new']['label'] ?? '' ); ?>" 
-                                 src="<?php echo esc_url( $dt_nav_tabs['admin']['add_new']['icon'] ?? get_template_directory_uri() . '/dt-assets/images/circle-add-green.svg' ); ?>" 
+                            <img title="<?php echo esc_html( $dt_nav_tabs['admin']['add_new']['label'] ?? '' ); ?>"
+                                 src="<?php echo esc_url( $dt_nav_tabs['admin']['add_new']['icon'] ?? get_template_directory_uri() . '/dt-assets/images/circle-add-green.svg' ); ?>"
                                  style="width:24px;">
                         </button>
                         <!--  /* MOBILE add menu */ -->