CRM-12963 Adding help for badges, changing field label to be consistent w our termino...

----------------------------------------
* CRM-12963: Event Badge Improvements
  http://issues.civicrm.org/jira/browse/CRM-12963

diff --git a/CRM/Badge/Form/Layout.php b/CRM/Badge/Form/Layout.php
index 4d4f2d435c38030f421ac6f70ebbdaad260e7f12..d1b11f50cd313e21edd77bd80e42d1079469e573 100644 (file)
--- a/CRM/Badge/Form/Layout.php
+++ b/CRM/Badge/Form/Layout.php
@@ -76,7 +76,7 @@ class CRM_Badge_Form_Layout extends CRM_Admin_Form {
     $this->add('text', 'title', ts('Title'), CRM_Core_DAO::getAttribute('CRM_Core_DAO_PrintLabel', 'title'), true);
 
     $labelStyle = CRM_Core_BAO_LabelFormat::getList(TRUE, 'name_badge');
-    $this->add('select', 'label_format_name', ts('Label Style'), array('' => ts('- select -')) + $labelStyle, TRUE);
+    $this->add('select', 'label_format_name', ts('Label Format'), array('' => ts('- select -')) + $labelStyle, TRUE);
 
     $this->add('text', 'description', ts('Description'),
       CRM_Core_DAO::getAttribute('CRM_Core_DAO_PrintLabel', 'title'));

diff --git a/templates/CRM/Badge/Form/Layout.tpl b/templates/CRM/Badge/Form/Layout.tpl
index d71163bd8e9165c6941f39fd1eec0ea879f495b1..e0f9c3527e713190537daabd43b5c1598dd7057c 100644 (file)
--- a/templates/CRM/Badge/Form/Layout.tpl
+++ b/templates/CRM/Badge/Form/Layout.tpl
@@ -40,7 +40,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}</td>
+        <td>{$form.label_format_name.html} {help id="id-label_format"}</td>
       </tr>
       <tr class="crm-badge-layout-form-block-description">
         <td class="label">{$form.description.label}</td>
@@ -53,7 +53,7 @@
           <span class="crm-clear-link">
             (<a href="#" class="clear-image" imgname='image_1'>{ts}clear{/ts}</a>)
           </span>
-          <br/><span class="description">{ts}Click above and select a file double clicking on it.{/ts}</span>
+          <br/><span class="description">{ts}Click above and select a file by double clicking on it.{/ts}</span>
         </td>
       </tr>
       <tr class="crm-badge-layout-form-block-image_2">
@@ -63,7 +63,7 @@
           <span class="crm-clear-link">
             (<a href="#" class="clear-image" imgname='image_2'>{ts}clear{/ts}</a>)
           </span>
-          <br/><span class="description">{ts}Click above and select a file double clicking on it.{/ts}</span>
+          <br/><span class="description">{ts}Click above and select a file by double clicking on it.{/ts}</span>
         </td>
       </tr>
       <tr class="crm-badge-layout-form-block-elements">

diff --git a/templates/CRM/Badge/Page/Layout.tpl b/templates/CRM/Badge/Page/Layout.tpl
index 75df9831a28812195687df58c96a5f216d1d3b86..195b9aa89920a0eadda790c2140656d830bd7d40 100644 (file)
--- a/templates/CRM/Badge/Page/Layout.tpl
+++ b/templates/CRM/Badge/Page/Layout.tpl
@@ -69,7 +69,7 @@
       {if $action ne 1 and $action ne 2}
         <div class="action-link">
           <a href="{crmURL q="action=add&reset=1"}" id="newbadge-layout"
-             class="button"><span>&raquo; {ts}New Badge Layout{/ts}</span></a>
+             class="button"><span><div class="icon add-icon"></div> {ts}New Badge Layout{/ts}</span></a>
         </div>
       {/if}
     </div>