Merge branch 'develop'

Author: corsacca

archive-template.php

@@ -136,6 +136,7 @@ class="second-bar show-for-small-only center list-actions-bar"><!--  /* MOBILE V
             <a class="button filter-posts-mobile" data-open="filter-modal">
                 <img class="dt-white-icon" style="display: inline-block;" src="<?php echo esc_html( get_template_directory_uri() . '/dt-assets/images/filter.svg?v=2' ) ?>"/>
             </a>
+            <?php do_action( 'archive_template_mobile_action_bar_buttons', $post_type ) ?>
             <a class="button" id="open-search">
                 <img class="dt-white-icon" style="display: inline-block;" src="<?php echo esc_html( get_template_directory_uri() . '/dt-assets/images/search.svg' ) ?>"/>
             </a>
@@ -549,7 +550,7 @@ class="second-bar show-for-small-only center list-actions-bar"><!--  /* MOBILE V
                         });
 
                         ?>
-                        
+
                         <div class="field-selection-ui">
                             <!-- Search input for adding fields -->
                             <div style="margin-bottom: 15px;">
@@ -566,7 +567,7 @@ class="second-bar show-for-small-only center list-actions-bar"><!--  /* MOBILE V
                                             $has_icon = !empty( $field_values['icon'] ) || !empty( $field_values['font-icon'] );
                                             $option_classes = 'field-search-option' . ( $has_icon ? '' : ' no-icon' );
                                             ?>
-                                            <div class="<?php echo esc_attr( $option_classes ); ?> field-search-option-inline" data-field-key="<?php echo esc_attr( $field_key ); ?>" 
+                                            <div class="<?php echo esc_attr( $option_classes ); ?> field-search-option-inline" data-field-key="<?php echo esc_attr( $field_key ); ?>"
                                                  data-field-name="<?php echo esc_attr( strtolower( $field_values['name'] ) ); ?>">
                                                 <?php dt_render_field_icon( $field_values ); ?>
                                                 <span><?php echo esc_html( $field_values['name'] ); ?></span>

dt-assets/build/components/index.es.js

@@ -1,4 +1,4 @@
-import { B as s, C as e, v as D, A as o, D as l, b as i, c as n, e as r, f as c, a as p, u, z as C, g as M, w as T, h as x, i as S, j as d, x as g, k as m, t as B, r as h, l as A, m as L, n as b, o as v, p as f, y as w, q as y, d as F } from "./index-7wgY4N1f.js";
+import { B as s, C as e, v as D, A as o, D as l, b as i, c as n, e as r, f as c, a as p, u, z as C, g as M, w as T, h as x, i as S, j as d, x as g, k as m, t as B, r as h, l as A, m as L, n as b, o as v, p as f, y as w, q as y, d as F } from "./index-BCZ_PsZV.js";
 export {
   s as ApiService,
   e as ComponentService,

dt-assets/build/components/index.js

@@ -118,7 +118,7 @@ class="second-bar" id="second-bar-large">
 
                                             <img class="dt-storage-picture details-bar-picture"
                                                  src="<?php echo esc_html( $picture_thumbnail )?>"
-                                                 alt="<?php esc_attr_e( 'Record Picture', 'disciple_tools' ) ?>"
+                                                 alt="<?php echo esc_attr_x( 'Record Picture', 'the picture of the record', 'disciple_tools' ) ?>"
                                                  style="<?php echo esc_attr( $picture_style ) ?>"
                                                 data-picture_url="<?php echo esc_html( $picture )?>"
                                                 data-picture_large_thumbnail_url="<?php echo esc_html( $picture_large_thumbnail )?>"

dt-assets/build/components/index.umd.cjs

@@ -114,12 +114,12 @@ jQuery(document).ready(function ($) {
 
   function execute_search_query_by_offset(evt, current_section_head) {
     let query = $('.advanced-search-modal-form-input').val();
-    let offset = evt.currentTarget.parentNode.parentNode
+    let offset = evt.target.parentNode.parentNode
       .querySelector(
         '#advanced-search-modal-results-table-row-section-head-hidden-offset',
       )
       .getAttribute('value');
-    let post_type = evt.currentTarget.parentNode.parentNode
+    let post_type = evt.target.parentNode.parentNode
       .querySelector(
         '#advanced-search-modal-results-table-row-section-head-hidden-post-type',
       )
@@ -152,7 +152,7 @@ jQuery(document).ready(function ($) {
           );
 
           // Update section offset value
-          evt.currentTarget.parentNode.parentNode
+          evt.target.parentNode.parentNode
             .querySelector(
               '#advanced-search-modal-results-table-row-section-head-hidden-offset',
             )
@@ -171,7 +171,7 @@ jQuery(document).ready(function ($) {
           });
         } else {
           // Hide more search option when there are no further hits to be returned.
-          evt.currentTarget.style.display = 'none';
+          evt.target.style.display = 'none';
         }
       })
       .catch((error) => {
@@ -263,15 +263,22 @@ jQuery(document).ready(function ($) {
       '<table class="advanced-search-modal-results-table" style="border-spacing: 0px 5px !important; border-collapse: separate;"><tbody>';
     results.forEach(function (result) {
       results_html += '<tr>';
+
       results_html +=
-        '<td class="advanced-search-modal-results-table-section-head-options"><a class="advanced-search-modal-results-table-row-section-head-load-more button hollow">' +
-        window.SHAREDFUNCTIONS.escapeHTML(fetch_more_text) +
-        '</a></td>';
+        '<td class="advanced-search-modal-results-table-section-head-options">';
+      if (result?.remaining_count > 0 || result?.has_more === true) {
+        results_html +=
+          '<a class="advanced-search-modal-results-table-row-section-head-load-more button hollow">' +
+          window.SHAREDFUNCTIONS.escapeHTML(fetch_more_text) +
+          '</a>';
+      }
+      results_html += '</td>';
+
       results_html +=
         '<td class="advanced-search-modal-results-table-section-head-post-type">';
       results_html +=
         '<b>' +
-        window.SHAREDFUNCTIONS.escapeHTML(result['post_type']) +
+        window.SHAREDFUNCTIONS.escapeHTML(result['post_type_label_singular']) +
         '</b></td>';
       results_html +=
         '<input type="hidden" id="advanced-search-modal-results-table-row-section-head-hidden-offset" value="' +

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

@@ -502,8 +502,39 @@ jQuery(document).ready(function ($) {
     });
   });
 
+  /* field type: tags */
+  let tags_field = null;
+  $('dt-tags').on('dt:add-new', (e) => {
+    tags_field = e.detail.field;
+    $('#create-tag-modal').foundation('open');
+    $('.js-create-tag input[name=title]').val(e.detail.value);
+  });
+
+  $('.js-create-tag').on('submit', (e) => {
+    e.preventDefault();
+
+    const tag = $('#new-tag').val();
+    const field = document.querySelector(`#${tags_field}`);
+    if (field) {
+      // select the tag and the change event will handle saving it
+      field._select(tag);
+      field._clearSearch();
+    }
+  });
+
+  // new record from group member list
+  $('.create-new-record').on('click', function () {
+    connection_type = $(this).data('connection-key');
+    $('#create-record-modal').foundation('open');
+    $('.js-create-record .error-text').empty();
+    $('.js-create-record-button').attr('disabled', false).removeClass('alert');
+    $('.reveal-after-record-create').hide();
+    $('.hide-after-record-create').show();
+    $('.js-create-record input[name=title]').val('');
+  });
+
+  /* field type: connection */
   let connection_type = null;
-  // New record off of dt-connection
   $('dt-connection').on('change', (e) => {
     if (e?.detail?.newValue && e.detail.newValue.some((x) => x.isNew)) {
       e.stopImmediatePropagation(); // stop ComponentService listener from firing
@@ -522,7 +553,15 @@ jQuery(document).ready(function ($) {
       $('.js-create-record input[name=title]').val(newPost.label);
     }
   });
-
+  $('dt-connection').on('dt:add-new', (e) => {
+    connection_type = e.detail.field;
+    $('#create-record-modal').foundation('open');
+    $('.js-create-record .error-text').empty();
+    $('.js-create-record-button').attr('disabled', false).removeClass('alert');
+    $('.reveal-after-record-create').hide();
+    $('.hide-after-record-create').show();
+    $('.js-create-record input[name=title]').val(e.detail.value);
+  });
   /* New Record Modal */
   $('.js-create-record').on('submit', function (e) {
     e.preventDefault();
@@ -570,6 +609,7 @@ jQuery(document).ready(function ($) {
               [newRecord],
             )[0],
           );
+          field._clearSearch();
         }
       })
       .catch(function (error) {
@@ -1316,6 +1356,7 @@ function record_updated(updateNeeded) {
  * that make use of them. Leaving them here until we can be sure they can be
  * completely removed.
  */
+
 jQuery(document).ready(function ($) {
   let post_id = window.detailsSettings.post_id;
   let post_type = window.detailsSettings.post_type;

dt-assets/build/js/scripts.min.js

@@ -88,3 +88,19 @@ jQuery(document).ready(function ($) {
     required_parent.find('a').first().addClass('side-menu-item-highlight');
   }
 });
+
+/**
+ * Mobile navigation dropdown functionality
+ */
+jQuery(document).ready(function ($) {
+  // Close mobile add new dropdown when clicking outside
+  $(document).on('click', function (e) {
+    if (
+      !$(e.target).closest(
+        '#mobile-add-new-dropdown, [data-toggle="mobile-add-new-dropdown"]',
+      ).length
+    ) {
+      $('#mobile-add-new-dropdown').foundation('close');
+    }
+  });
+});