CRM-12965, UI improvements

diff --git a/CRM/Badge/Form/Layout.php b/CRM/Badge/Form/Layout.php
index 9bf2ed23615b85b27d169bcd9d1be48e392fdb90..d27c8814cdf3067e5f17b1d8b54730e81dbe4e61 100644 (file)
--- a/CRM/Badge/Form/Layout.php
+++ b/CRM/Badge/Form/Layout.php
@@ -98,9 +98,9 @@ class CRM_Badge_Form_Layout extends CRM_Admin_Form {
     $this->add('select', "barcode_alignment", ts('Alignment'), $textAlignment);
 
     $attributes = array('readonly'=> true);
-    $this->add('text', 'image_1', ts('Image 1'),
+    $this->add('text', 'image_1', ts('Image (top right)'),
       $attributes + CRM_Core_DAO::getAttribute('CRM_Core_DAO_PrintLabel', 'title'));
-    $this->add('text', 'image_2', ts('Image 2'),
+    $this->add('text', 'image_2', ts('Image (top left)'),
       $attributes + CRM_Core_DAO::getAttribute('CRM_Core_DAO_PrintLabel', 'title'));
 
     $this->add('checkbox', 'is_default', ts('Default?'));

diff --git a/templates/CRM/Badge/Form/Layout.tpl b/templates/CRM/Badge/Form/Layout.tpl
index bf698efb3848eee5b772cb217b1efbb2d8735c50..26cd069ca5657a5a528e7f9db107f5ffdf8e5196 100644 (file)
--- a/templates/CRM/Badge/Form/Layout.tpl
+++ b/templates/CRM/Badge/Form/Layout.tpl
@@ -46,6 +46,26 @@
         <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>
+          {$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 double clicking on it.{/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}
+          <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>
+        </td>
+      </tr>
       <tr class="crm-badge-layout-form-block-elements">
         <td class="label">{ts}Elements{/ts}</td>
         <td>
@@ -70,31 +90,6 @@
           </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}
-          <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. 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}
-          <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. 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>