Merge pull request #2006 from civicrm/4.3

[civicrm-core.git] / templates / CRM / Badge / Form / Layout.tpl

diff --git a/templates/CRM/Badge/Form/Layout.tpl b/templates/CRM/Badge/Form/Layout.tpl
index b56b3414157c2f6e2ab7fe8c39136a9f21f5f689..cd3269b247fbb141fa2583f95602a32f64cc6f44 100644 (file)
--- a/templates/CRM/Badge/Form/Layout.tpl
+++ b/templates/CRM/Badge/Form/Layout.tpl
@@ -1,6 +1,6 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.4                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2013                                |
  +--------------------------------------------------------------------+
@@ -40,12 +40,54 @@
       </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>
         <td>{$form.description.html}</td>
       </tr>
+      <tr class="crm-badge-layout-form-block-image_1">
+        <td class="label">{$form.image_1.label}</td>
+        <td>
+         <table>
+           <tr>
+            <td>{$form.image_1.html}
+             <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 by double clicking on it.{/ts}</span>
+            </td>
+            <td>
+             {$form.width_image_1.html}<br/>{$form.width_image_1.label}
+            </td>
+           <td>
+              {$form.height_image_1.html}</br>{$form.height_image_1.label}
+            </td>
+           </tr>
+         </table> 
+        </td>
+      </tr>
+      <tr class="crm-badge-layout-form-block-image_2">
+        <td class="label">{$form.image_2.label}</td>
+        <td>
+         <table>
+          <tr>
+           <td>{$form.image_2.html}
+            <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 by double clicking on it.{/ts}</span>
+           </td>
+           <td>
+            {$form.width_image_2.html}<br/>{$form.width_image_2.label}
+           </td>
+           <td>
+            {$form.height_image_2.html}<br/>{$form.height_image_2.label}
+           </td>
+          </tr>
+         </table> 
+        </td>
+      </tr>
       <tr class="crm-badge-layout-form-block-elements">
         <td class="label">{ts}Elements{/ts}</td>
         <td>
@@ -55,6 +97,7 @@
               <td>{ts}Label{/ts}</td>
               <td>{ts}Font{/ts}</td>
               <td>{ts}Size{/ts}</td>
+              <td>{ts}Style{/ts}</td>
               <td>{ts}Alignment{/ts}</td>
             </tr>
             {section name='i' start=1 loop=$rowCount}
@@ -64,28 +107,18 @@
                 <td>{$form.token.$rowNumber.html|crmAddClass:twenty}</td>
                 <td>{$form.font_name.$rowNumber.html}</td>
                 <td>{$form.font_size.$rowNumber.html}</td>
+                <td>{$form.font_style.$rowNumber.html}</td>
                 <td>{$form.text_alignment.$rowNumber.html}</td>
               </tr>
             {/section}
           </table>
         </td>
       </tr>
-      <tr class="crm-badge-layout-form-block-attachment">
-        <td colspan="2">
-
-        </td>
-      </tr>
-      <tr class="crm-badge-layout-form-block-image_1">
-        <td class="label">{$form.image_1.label}</td>
-        <td>{$form.image_1.html}<br/><span class="description">{ts}This image will displayed on top left{/ts}</span></td>
-      </tr>
-      <tr class="crm-badge-layout-form-block-image_2">
-        <td class="label">{$form.image_2.label}</td>
-        <td>{$form.image_2.html}<br/><span class="description">{ts}This image will displayed on top right{/ts}</span></td>
-      </tr>
       <tr class="crm-badge-layout-form-block-add_barcode">
         <td class="label">{$form.add_barcode.label}</td>
-        <td>{$form.add_barcode.html}&nbsp;&nbsp;&nbsp;{ts}on{/ts}&nbsp;&nbsp;&nbsp;{$form.barcode_alignment.html}</td>
+        <td>{$form.add_barcode.html}&nbsp;&nbsp;&nbsp;{ts}of type{/ts}&nbsp;&nbsp;&nbsp;
+          {$form.barcode_type.html}&nbsp;&nbsp;&nbsp;{ts}on{/ts}&nbsp;&nbsp;&nbsp;{$form.barcode_alignment.html}
+        </td>
       </tr>
       <tr class="crm-badge-layout-form-block-is_active">
         <td class="label">{$form.is_active.label}</td>