From bd4515a947ca0274c327403fa0bc826239d2b7c2 Mon Sep 17 00:00:00 2001
From: Kurund Jalmi <kurund@civicrm.org>
Date: Wed, 10 Jul 2013 00:56:03 +0530
Subject: [PATCH] CRM-12965, UI improvements
---
CRM/Badge/Form/Layout.php | 4 +--
templates/CRM/Badge/Form/Layout.tpl | 45 +++++++++++++----------------
2 files changed, 22 insertions(+), 27 deletions(-)
diff --git a/CRM/Badge/Form/Layout.php b/CRM/Badge/Form/Layout.php
index 9bf2ed2361..d27c8814cd 100644
--- 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 bf698efb38..26cd069ca5 100644
--- 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} {ts}on{/ts} {$form.barcode_alignment.html}</td>
--
GitLab