Merge branch 'main' of https://github.com/jakevdwerf/jvb

Jake Vanderwerf

2026-01-02 b5abd615697146beeca6dba4acd057d049554a30

 inc/helpers/renderFields.php

@@ -316,17 +316,34 @@
    $out = ($label === '') ? '' : '<h2 class="inline">'.$label.'</h2>';
    $out .= '<ul class="term-list '.jvbNoBase($terms[array_key_first($terms)]->taxonomy).'">';
    foreach ($terms as $term) {
        $out .= '<li>
            <a href="'.get_term_link($term->term_id, $term->taxonomy).'" title="'.$term->name.'">'.
                $term->name.
            '</a>
        </li>';
        $out .= '<li>'.jvbGetTermLink($term).'</li>';
    }
    $out .= '</ul>';

    return $out;
}

function jvbGetTermLink(int|WP_Term $term, string $taxonomy = ''):string
{
   if (is_int($term)){
      $term = get_term($term, jvbCheckBase($taxonomy));
      if (is_wp_error($term)) {
         return '';
      }
   }
   $cache = CacheManager::for($term->taxonomy);
   $key = $term->term_id.'-link';
   return $cache->remember(
      $key,
      function() use ($term) {
         return '<a href="'.get_term_link($term->term_id, $term->taxonomy).'" title="'.$term->name.'">'.
         $term->name.
         '</a>';
      }
   );
}


add_action('wp_footer', 'jvbOutputImageTemplates');

function jvbOutputImageTemplates() {
@@ -344,7 +361,7 @@
            </div>
            <div class="summary">
               <div class="result">
                  <h4></h4>
                  <h3></h3>
                  <p></p>
               </div>
            </div>
@@ -367,15 +384,15 @@
            <div class="group-header">
               <div class="selected">
                  <div class="field">
                     <input type="checkbox" id="select-all-group" name="select-all-group">
                     <label for="select-all-group">
                     <input type="checkbox" id="select-all" name="select-all" data-selects="item-grid" data-select-all>
                     <label for="select-all">
                        Select All In Group
                     </label>
                  </div>
                  <div class="info" hidden>
                  </div>
               </div>
               <div class="group-actions">
               <div class="selection-actions">
                  <button type="button" data-action="add-to-group" title="Add selected uploads to this group">
                     <?= jvbIcon('plus-square') ?>
                     Add Here
@@ -393,8 +410,8 @@
               <div class="fields"></div>
            </details>
            <div class="group-content col">
               <p class="hint count"></p>
               <div class="item-grid group"></div>
               <p class="hint group-count"></p>
            </div>
         </div>

@@ -460,10 +477,10 @@
            <div class="wrap">
               <div class="restore-message">
                  <h4>Looks like we left things hanging</h4>
                  <p class="restore-details"></p>
                  <p class="details"></p>
                  <p class="hint">If you'd rather start over, you can clear this information.</p>
               </div>
               <div class="restore-actions">
               <div class="selection-actions">
                  <div class="selected">
                     <div class="field">
                        <input type="checkbox" id="select-all-restore" name="select-all-restore">
@@ -475,6 +492,10 @@
                     </div>
                  </div>
                  <div class="m-actions row nowrap">
                     <button type="button" data-action="restore-all">
                        <?= jvbIcon('infinity') ?>
                        Restore All
                     </button>
                     <button type="button" data-action="restore">
                        <?= jvbIcon('arrow-counter-clockwise') ?>
                        Restore Selected
@@ -489,10 +510,10 @@
         </dialog>
      </template>
      <template class="restoreField">
         <div class="restore-field">
            <h3></h3>
         <details class="restore-field">
            <summary><h3><a></a></h3></summary>
            <div class="item-grid restore"></div>
         </div>
         </details>
      </template>

      <template class="startOverConfirmation">