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 eaa07091a3ca98bd2a65e30fbd0d9e220e9c7eb1..cd3269b247fbb141fa2583f95602a32f64cc6f44 100644 (file)
--- a/templates/CRM/Badge/Form/Layout.tpl
+++ b/templates/CRM/Badge/Form/Layout.tpl
@@ -49,21 +49,43 @@
       <tr class="crm-badge-layout-form-block-image_1">
         <td class="label">{$form.image_1.label}</td>
         <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>
+         <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>
-          {$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>
+         <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">