X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=templates%2FCRM%2FBadge%2FForm%2FLayout.tpl;h=3570b6661123214db1e32613de5328cc5fe5197c;hb=609df1edc4c196675e846ae3210911b54a42c3fd;hp=1fcebd8bf64966a7617d7db71a4b98ff15c00eb1;hpb=9c2e4fb9824d9913d19a7f7e24ada6093a409461;p=civicrm-core.git

diff --git a/templates/CRM/Badge/Form/Layout.tpl b/templates/CRM/Badge/Form/Layout.tpl
index 1fcebd8bf6..3570b66611 100644
--- a/templates/CRM/Badge/Form/Layout.tpl
+++ b/templates/CRM/Badge/Form/Layout.tpl
@@ -1,8 +1,8 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -49,21 +49,63 @@
       <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}
+               <a href="#" class="crm-hover-button clear-image" title="{ts}Clear{/ts}"><span class="icon close-icon"></span></a>
+             <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}
+              <a href="#" class="crm-hover-button clear-image" title="{ts}Clear{/ts}"><span class="icon close-icon"></span></a>
+            <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-participant_image">
+        <td class="label">{$form.show_participant_image.label}</td>
+        <td>
+         <table>
+           <tr>
+            <td>{$form.show_participant_image.html}
+             <br/>
+             <span class="description">{ts}Select this option if you want to use a contact's image on their name badge.{/ts}</span>
+            </td>
+            <td>
+             {$form.width_participant_image.html}<br/>{$form.width_participant_image.label}
+            </td>
+           <td>
+              {$form.height_participant_image.html}</br>{$form.height_participant_image.label}
+            </td>
+           <td>
+              {$form.alignment_participant_image.html}</br>{$form.alignment_participant_image.label}
+            </td>
+           </tr>
+         </table> 
         </td>
       </tr>
       <tr class="crm-badge-layout-form-block-elements">
@@ -75,6 +117,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}
@@ -84,6 +127,7 @@
                 <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}