From 937508e098c8111f1f2b22721ef38728834d8715 Mon Sep 17 00:00:00 2001
From: larssandergreen <lars@wildsight.ca>
Date: Sun, 23 Jul 2023 08:17:29 -0600
Subject: [PATCH] Link between Label Page Formats and Address Settings

---
 templates/CRM/Admin/Form/Preferences/Address.tpl | 5 ++++-
 templates/CRM/Admin/Page/LabelFormats.tpl        | 4 +++-
 templates/CRM/Badge/{Page => Form}/Layout.hlp    | 8 +++-----
 templates/CRM/Badge/Form/Layout.tpl              | 2 +-
 templates/CRM/Contact/Form/Task/Label.hlp        | 4 ++--
 5 files changed, 13 insertions(+), 10 deletions(-)
 rename templates/CRM/Badge/{Page => Form}/Layout.hlp (57%)

diff --git a/templates/CRM/Admin/Form/Preferences/Address.tpl b/templates/CRM/Admin/Form/Preferences/Address.tpl
index d04d3e122f..399e54ecc1 100644
--- a/templates/CRM/Admin/Form/Preferences/Address.tpl
+++ b/templates/CRM/Admin/Form/Preferences/Address.tpl
@@ -18,7 +18,10 @@
                 {help id="id-token-text" tplFile=$tplFile file="CRM/Contact/Form/Task/Email.hlp"}
               </div>
                 {$form.mailing_format.html|crmAddClass:huge12}<br />
-                <span class="description">{ts}Content and format for mailing labels.{/ts}</span>
+                <span class="description">{ts}Content and format for mailing labels.{/ts}<br />
+                  {capture assign=labelFormats}href="{crmURL p='civicrm/admin/labelFormats' q='reset=1'}"{/capture}
+                  {ts 1=$labelFormats}You can change the size and layout of labels at <a %1>Label Page Formats</a>.{/ts}
+                </span>
             </td>
         </tr>
          <tr class="crm-preferences-address-form-block-hideCountryMailingLabels">
diff --git a/templates/CRM/Admin/Page/LabelFormats.tpl b/templates/CRM/Admin/Page/LabelFormats.tpl
index 4fceb44fa8..ad6fb4c735 100644
--- a/templates/CRM/Admin/Page/LabelFormats.tpl
+++ b/templates/CRM/Admin/Page/LabelFormats.tpl
@@ -26,7 +26,9 @@
 *}
 {* this template is for configuring label formats *}
 <div class="help">
-  {ts}You can configure one or more Label Formats for your CiviCRM installation. Label Formats are used when creating mailing labels.{/ts}
+  {ts}You can configure one or more Label Formats for your CiviCRM installation. Label Formats are used when creating mailing labels.{/ts}<br />
+  {capture assign=addressSettings}href="{crmURL p='civicrm/admin/setting/preferences/address' q='reset=1'}"{/capture}
+  {ts 1=$addressSettings}You can change which fields are printed on each label in <a %1>Address Settings</a>.{/ts}
 </div>
 {if $action eq 1 or $action eq 2 or $action eq 8 or $action eq 16384}
   {include file="CRM/Admin/Form/LabelFormats.tpl"}
diff --git a/templates/CRM/Badge/Page/Layout.hlp b/templates/CRM/Badge/Form/Layout.hlp
similarity index 57%
rename from templates/CRM/Badge/Page/Layout.hlp
rename to templates/CRM/Badge/Form/Layout.hlp
index ded446b88a..65864fdb3b 100644
--- a/templates/CRM/Badge/Page/Layout.hlp
+++ b/templates/CRM/Badge/Form/Layout.hlp
@@ -7,12 +7,10 @@
  | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
 *}
-{htxt id="id-label_format-text"}
+{htxt id="id-label_format-title"}
   {ts}Label Formats{/ts}
 {/htxt}
 {htxt id="id-label_format"}
-  {capture assign=labelURL}{crmURL p='civicrm/admin/labelFormats' q='reset=1&action=browse'}{/capture}
-  <p>
-    {ts 1=$labelURL}Select a pre-defined name badge label format from the list. Label formats control paper size and page configuration (e.g. 2 labels per row, 4 per column). New label formats may require additional programming to produce expected results for event badges.{/ts}
-  </p>
+  {capture assign=labelURL}href="{crmURL p='civicrm/admin/labelFormats' q='reset=1&action=browse'}"{/capture}
+  {ts 1=$labelURL}Select a pre-defined name badge label format from the list. <a %1>Label formats</a> control paper size and page configuration (e.g. 2 labels per row, 4 per column). New label formats may require additional programming to produce expected results for event badges.{/ts}
 {/htxt}
diff --git a/templates/CRM/Badge/Form/Layout.tpl b/templates/CRM/Badge/Form/Layout.tpl
index b3a9a2febe..82758da9e6 100644
--- a/templates/CRM/Badge/Form/Layout.tpl
+++ b/templates/CRM/Badge/Form/Layout.tpl
@@ -23,7 +23,7 @@
       </tr>
       <tr class="crm-badge-layout-form-block-label_format_name">
         <td class="label">{$form.label_format_name.label}</td>
-        <td>{$form.label_format_name.html} {help id="id-label_format"}</td>
+        <td>{$form.label_format_name.html} {help id="id-label_format" file="CRM/Badge/Form/Layout.hlp"}</td>
       </tr>
       <tr class="crm-badge-layout-form-block-description">
         <td class="label">{$form.description.label}</td>
diff --git a/templates/CRM/Contact/Form/Task/Label.hlp b/templates/CRM/Contact/Form/Task/Label.hlp
index 15e81a19cf..63d3d8a037 100644
--- a/templates/CRM/Contact/Form/Task/Label.hlp
+++ b/templates/CRM/Contact/Form/Task/Label.hlp
@@ -29,6 +29,6 @@
 {/htxt}
 {htxt id="id-select-label"}
   <p>{ts}Select a label format from the dropdown list.{/ts}</p>
-  {capture assign="mailingLabelURL"}{crmURL p="civicrm/admin/labelFormats" q="reset=1"}{/capture}
-  <p>{ts 1=$mailingLabelURL}Go to <strong><a href="%1">Administer CiviCRM &raquo; Communications &raquo; Label Formats</a></strong> to add or edit labels or set the default label format.{/ts}</p>
+  {capture assign="mailingLabelURL"}href="{crmURL p='civicrm/admin/labelFormats' q='reset=1'}"{/capture}
+  <p>{ts 1=$mailingLabelURL}Go to <strong><a %1>Administer CiviCRM &raquo; Communications &raquo; Label Page Formats</a></strong> to add or edit labels or set the default label format.{/ts}</p>
 {/htxt}
-- 
2.25.1