more fixes for label configuration, added used for radio for mailing label and name...

diff --git a/CRM/Admin/Form/LabelFormats.php b/CRM/Admin/Form/LabelFormats.php
index f5152af07470fc6a9e28f3ab53bd64d69eba79f6..33606cfb2aa4e9f3c57d6fb42c382ffb26248e8b 100644 (file)
--- a/CRM/Admin/Form/LabelFormats.php
+++ b/CRM/Admin/Form/LabelFormats.php
@@ -87,6 +87,18 @@ class CRM_Admin_Form_LabelFormats extends CRM_Admin_Form {
     $this->add('text', 'label', ts('Name'), $attributes['label'] + $disabled, $required);
     $this->add('text', 'description', ts('Description'), array('size' => CRM_Utils_Type::HUGE));
     $this->add('checkbox', 'is_default', ts('Is this Label Format the default?'));
+
+    $options = array(
+      'label_format' => ts('Mailing Label'),
+      'name_badge'   => ts('Name Badge'),
+    );
+
+    $labelType = $this->addRadio('label_type', ts('Used For'), $options, null, '  ');
+
+    if ($this->_action != CRM_Core_Action::ADD) {
+      $labelType->freeze();
+    }
+
     $this->add('select', 'paper_size', ts('Sheet Size'),
       array(
         0 => ts('- default -')
@@ -156,6 +168,8 @@ class CRM_Admin_Form_LabelFormats extends CRM_Admin_Form {
       $defaults['italic'] = (stripos($defaults['font-style'], 'I') !== FALSE);
       unset($defaults['font-style']);
     }
+
+    $defaults['label_type'] = $this->_group;
     return $defaults;
   }
 
@@ -220,7 +234,7 @@ class CRM_Admin_Form_LabelFormats extends CRM_Admin_Form {
     $values['font-style'] = $style;
 
     $bao = new CRM_Core_BAO_LabelFormat();
-    $bao->saveLabelFormat($values, $this->_id, $this->_group);
+    $bao->saveLabelFormat($values, $this->_id, $values['label_type']);
 
     $status = ts('Your new Label Format titled <strong>%1</strong> has been saved.', array(1 => $values['label']));
     if ($this->_action & CRM_Core_Action::UPDATE) {

diff --git a/templates/CRM/Admin/Form/LabelFormats.tpl b/templates/CRM/Admin/Form/LabelFormats.tpl
index 61b64f0970c64448419859c6ce32fc8f22c4f0e4..561687e39f5e0699198161b3fd273adadf7f6dc8 100644 (file)
--- a/templates/CRM/Admin/Form/LabelFormats.tpl
+++ b/templates/CRM/Admin/Form/LabelFormats.tpl
@@ -26,146 +26,187 @@
 *}
 {* This template is used for adding/configuring Label Formats.  *}
 <div class="crm-block crm-form-block crm-labelFormat-form-block">
-{if $action eq 8}
-  <div class="messages status no-popup">
+  {if $action eq 8}
+    <div class="messages status no-popup">
       <div class="icon inform-icon"></div>
-        {ts 1=$formatName}WARNING: You are about to delete the Label Format titled <strong>%1</strong>.{/ts} {ts}Do you want to continue?{/ts}
-  </div>
-{elseif $action eq 16384}
-  <div class="messages status no-popup">
+      {ts 1=$formatName}WARNING: You are about to delete the Label Format titled
+        <strong>%1</strong>
+        .{/ts} {ts}Do you want to continue?{/ts}
+    </div>
+  {elseif $action eq 16384}
+    <div class="messages status no-popup">
       <div class="icon inform-icon"></div>
-        {ts 1=$formatName}Are you sure you would like to make a copy of the Label Format titled <strong>%1</strong>?{/ts}
-  </div>
-{else}
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-  <table class="form-layout-compressed">
-    <tr class="crm-labelFormat-form-block-name">
-        <td class="right">{$form.label.label}</td><td colspan="3">{$form.label.html}</td>
-    </tr>
-    <tr class="crm-labelFormat-form-block-description">
-        <td class="right">{$form.description.label}</td><td colspan="3">{$form.description.html}</td>
-    </tr>
-    <tr class="crm-labelFormat-form-block-is_default">
-        <td>&nbsp;</td><td colspan="3">{$form.is_default.html}&nbsp;{$form.is_default.label}</td>
-    </tr>
-    <tr>
-        <td class="right">{$form.paper_size.label}</td><td>{$form.paper_size.html}</td>
-        <td class="right">{$form.font_name.label}</td><td>{$form.font_name.html}</td>
-    </tr>
-    <tr>
-        <td class="right">{$form.orientation.label}</td><td>{$form.orientation.html}</td>
-        <td class="right">{$form.font_size.label}</td><td>{$form.font_size.html}</td>
-    </tr>
-    <tr>
-        <td class="right">{$form.metric.label}</td><td>{$form.metric.html}</td>
-        <td class="right">{$form.font_style.label}</td><td>{$form.bold.html}&nbsp;{$form.bold.label}&nbsp;&nbsp;{$form.italic.html}&nbsp;{$form.italic.label}</td>
-    </tr>
-    <tr>
-        <td class="right">{$form.paper_dimensions.html}</td><td colspan="3" id="paper_dimensions">&nbsp;</td>
-    </tr>
-    <tr>
-        <td class="right">{$form.NX.label}</td><td>{$form.NX.html}</td>
-        <td class="right">{$form.NY.label}</td><td>{$form.NY.html}</td>
-    </tr>
-    <tr>
-        <td class="right">{$form.lMargin.label}</td><td>{$form.lMargin.html}</td>
-        <td class="right">{$form.tMargin.label}</td><td>{$form.tMargin.html}</td>
-    </tr>
-    <tr>
-        <td class="right">{$form.width.label}</td><td>{$form.width.html}</td>
-        <td class="right">{$form.height.label}</td><td>{$form.height.html}</td>
-    </tr>
-    <tr>
-        <td class="right">{$form.SpaceX.label}</td><td>{$form.SpaceX.html}<br /><span class="description">{ts}Space between labels.{/ts}</span></td>
-        <td class="right">{$form.SpaceY.label}</td><td>{$form.SpaceY.html}<br /><span class="description">{ts}Space between labels.{/ts}</span></td>
-    </tr>
-    <tr>
-        <td class="right">{$form.lPadding.label}</td><td>{$form.lPadding.html}<br /><span class="description">{ts}Pad inside each label.{/ts}</span></td>
-        <td class="right">{$form.tPadding.label}</td><td>{$form.tPadding.html}<br /><span class="description">{ts}Pad inside each label.{/ts}</span></td>
-    </tr>
-    <tr class="crm-labelFormat-form-block-weight">
-        <td class="right">{$form.weight.label}</td><td colspan="3">{$form.weight.html}<br />
-        <span class="description">{ts}Weight controls the order in which Label Formats are displayed <br />in selection lists. Enter a positive or negative integer. Lower numbers <br />are displayed ahead of higher numbers.{/ts}</span>
-    </tr>
-  </table>
-{/if}
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
+      {ts 1=$formatName}Are you sure you would like to make a copy of the Label Format titled<strong>%1</strong>?{/ts}
+    </div>
+  {else}
+    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
+    <table class="form-layout-compressed">
+      <tr class="crm-labelFormat-form-block-name">
+        <td class="right">{$form.label.label}</td>
+        <td colspan="3">{$form.label.html}</td>
+      </tr>
+      <tr class="crm-labelFormat-form-block-description">
+        <td class="right">{$form.description.label}</td>
+        <td colspan="3">{$form.description.html}</td>
+      </tr>
+      <tr class="crm-labelFormat-form-block-is_default">
+        <td>&nbsp;</td>
+        <td colspan="3">{$form.is_default.html}&nbsp;{$form.is_default.label}</td>
+      </tr>
+      <tr class="crm-labelFormat-form-block-label_type">
+        <td class="right">{$form.label_type.label}</td>
+        <td colspan="3">{$form.label_type.html}</td>
+      </tr>
+      <tr>
+        <td class="right">{$form.paper_size.label}</td>
+        <td>{$form.paper_size.html}</td>
+        <td class="right">{$form.font_name.label}</td>
+        <td>{$form.font_name.html}</td>
+      </tr>
+      <tr>
+        <td class="right">{$form.orientation.label}</td>
+        <td>{$form.orientation.html}</td>
+        <td class="right">{$form.font_size.label}</td>
+        <td>{$form.font_size.html}</td>
+      </tr>
+      <tr>
+        <td class="right">{$form.metric.label}</td>
+        <td>{$form.metric.html}</td>
+        <td class="right">{$form.font_style.label}</td>
+        <td>{$form.bold.html}&nbsp;{$form.bold.label}&nbsp;&nbsp;{$form.italic.html}&nbsp;{$form.italic.label}</td>
+      </tr>
+      <tr>
+        <td class="right">{$form.paper_dimensions.html}</td>
+        <td colspan="3" id="paper_dimensions">&nbsp;</td>
+      </tr>
+      <tr>
+        <td class="right">{$form.NX.label}</td>
+        <td>{$form.NX.html}</td>
+        <td class="right">{$form.NY.label}</td>
+        <td>{$form.NY.html}</td>
+      </tr>
+      <tr>
+        <td class="right">{$form.lMargin.label}</td>
+        <td>{$form.lMargin.html}</td>
+        <td class="right">{$form.tMargin.label}</td>
+        <td>{$form.tMargin.html}</td>
+      </tr>
+      <tr>
+        <td class="right">{$form.width.label}</td>
+        <td>{$form.width.html}</td>
+        <td class="right">{$form.height.label}</td>
+        <td>{$form.height.html}</td>
+      </tr>
+      <tr>
+        <td class="right">{$form.SpaceX.label}</td>
+        <td>{$form.SpaceX.html}<br/><span class="description">{ts}Space between labels.{/ts}</span></td>
+        <td class="right">{$form.SpaceY.label}</td>
+        <td>{$form.SpaceY.html}<br/><span class="description">{ts}Space between labels.{/ts}</span></td>
+      </tr>
+      <tr>
+        <td class="right">{$form.lPadding.label}</td>
+        <td>{$form.lPadding.html}<br/><span class="description">{ts}Pad inside each label.{/ts}</span></td>
+        <td class="right">{$form.tPadding.label}</td>
+        <td>{$form.tPadding.html}<br/><span class="description">{ts}Pad inside each label.{/ts}</span></td>
+      </tr>
+      <tr class="crm-labelFormat-form-block-weight">
+        <td class="right">{$form.weight.label}</td>
+        <td colspan="3">{$form.weight.html}<br/>
+          <span class="description">{ts}Weight controls the order in which Label Formats are displayed
+              <br/>
+              in selection lists. Enter a positive or negative integer. Lower numbers
+              <br/>
+              are displayed ahead of higher numbers.{/ts}</span>
+      </tr>
+    </table>
+  {/if}
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
 {if $action neq 8}
 {literal}
-<script type="text/javascript" >
-var currentWidth;
-var currentHeight;
-var currentMetric = document.getElementById('metric').value;
-selectPaper( document.getElementById('paper_size').value );
+  <script type="text/javascript">
+    var currentWidth;
+    var currentHeight;
+    var currentMetric = document.getElementById('metric').value;
+    selectPaper(document.getElementById('paper_size').value);
 
-function selectPaper( val )
-{
-    dataUrl = {/literal}"{crmURL p='civicrm/ajax/paperSize' h=0 }"{literal};
-    cj.post( dataUrl, {paperSizeName: val}, function( data ) {
-        cj("#paper_size").val( data.name );
+    function selectPaper(val) {
+      dataUrl = {/literal}"{crmURL p='civicrm/ajax/paperSize' h=0 }"{literal};
+      cj.post(dataUrl, {paperSizeName: val}, function (data) {
+        cj("#paper_size").val(data.name);
         metric = document.getElementById('metric').value;
-        currentWidth = convertMetric( data.width, data.metric, metric );
-        currentHeight = convertMetric( data.height, data.metric, metric );
-        updatePaperDimensions( );
-    }, 'json');
-}
+        currentWidth = convertMetric(data.width, data.metric, metric);
+        currentHeight = convertMetric(data.height, data.metric, metric);
+        updatePaperDimensions();
+      }, 'json');
+    }
 
-function selectMetric( metric )
-{
-    convertField( 'tMargin', currentMetric, metric );
-    convertField( 'lMargin', currentMetric, metric );
-    convertField( 'width', currentMetric, metric );
-    convertField( 'height', currentMetric, metric );
-    convertField( 'SpaceX', currentMetric, metric );
-    convertField( 'SpaceY', currentMetric, metric );
-    convertField( 'lPadding', currentMetric, metric );
-    convertField( 'tPadding', currentMetric, metric );
-    currentWidth = convertMetric( currentWidth, currentMetric, metric );
-    currentHeight = convertMetric( currentHeight, currentMetric, metric );
-    updatePaperDimensions( );
-}
+    function selectMetric(metric) {
+      convertField('tMargin', currentMetric, metric);
+      convertField('lMargin', currentMetric, metric);
+      convertField('width', currentMetric, metric);
+      convertField('height', currentMetric, metric);
+      convertField('SpaceX', currentMetric, metric);
+      convertField('SpaceY', currentMetric, metric);
+      convertField('lPadding', currentMetric, metric);
+      convertField('tPadding', currentMetric, metric);
+      currentWidth = convertMetric(currentWidth, currentMetric, metric);
+      currentHeight = convertMetric(currentHeight, currentMetric, metric);
+      updatePaperDimensions();
+    }
 
-function updatePaperDimensions( )
-{
-    metric = document.getElementById('metric').value;
-    width = new String( currentWidth.toFixed( 2 ) );
-    height = new String( currentHeight.toFixed( 2 ) );
-    if ( document.getElementById('orientation').value == 'landscape' ) {
-        width = new String( currentHeight.toFixed( 2 ) );
-        height = new String( currentWidth.toFixed( 2 ) );
+    function updatePaperDimensions() {
+      metric = document.getElementById('metric').value;
+      width = new String(currentWidth.toFixed(2));
+      height = new String(currentHeight.toFixed(2));
+      if (document.getElementById('orientation').value == 'landscape') {
+        width = new String(currentHeight.toFixed(2));
+        height = new String(currentWidth.toFixed(2));
+      }
+      document.getElementById('paper_dimensions').innerHTML = parseFloat(width) + ' ' + metric + ' x ' + parseFloat(height) + ' ' + metric;
+      currentMetric = metric;
     }
-    document.getElementById('paper_dimensions').innerHTML = parseFloat( width ) + ' ' + metric + ' x ' + parseFloat( height ) + ' ' + metric;
-    currentMetric = metric;
-}
 
-function convertField( id, from, to )
-{
-    val = document.getElementById( id ).value;
-    if ( val == '' || isNaN( val ) ) return;
-    val = convertMetric( val, from, to );
-    val = new String( val.toFixed( 3 ) );
-    document.getElementById( id ).value = parseFloat( val );
-}
+    function convertField(id, from, to) {
+      val = document.getElementById(id).value;
+      if (val == '' || isNaN(val)) {
+        return;
+      }
+      val = convertMetric(val, from, to);
+      val = new String(val.toFixed(3));
+      document.getElementById(id).value = parseFloat(val);
+    }
 
-function convertMetric( value, from, to ) {
-    switch( from + to ) {
-        case 'incm': return value * 2.54;
-        case 'inmm': return value * 25.4;
-        case 'inpt': return value * 72;
-        case 'cmin': return value / 2.54;
-        case 'cmmm': return value * 10;
-        case 'cmpt': return value * 72 / 2.54;
-        case 'mmin': return value / 25.4;
-        case 'mmcm': return value / 10;
-        case 'mmpt': return value * 72 / 25.4;
-        case 'ptin': return value / 72;
-        case 'ptcm': return value * 2.54 / 72;
-        case 'ptmm': return value * 25.4 / 72;
+    function convertMetric(value, from, to) {
+      switch (from + to) {
+        case 'incm':
+          return value * 2.54;
+        case 'inmm':
+          return value * 25.4;
+        case 'inpt':
+          return value * 72;
+        case 'cmin':
+          return value / 2.54;
+        case 'cmmm':
+          return value * 10;
+        case 'cmpt':
+          return value * 72 / 2.54;
+        case 'mmin':
+          return value / 25.4;
+        case 'mmcm':
+          return value / 10;
+        case 'mmpt':
+          return value * 72 / 25.4;
+        case 'ptin':
+          return value / 72;
+        case 'ptcm':
+          return value * 2.54 / 72;
+        case 'ptmm':
+          return value * 25.4 / 72;
+      }
+      return value;
     }
-    return value;
-}
 
-</script>
+  </script>
 {/literal}
 {/if}
\ No newline at end of file