WordReplacement.tpl cleanup

diff --git a/templates/CRM/Admin/Form/WordReplacements.tpl b/templates/CRM/Admin/Form/WordReplacements.tpl
index 3b22366e73137603da8bb7f7b7f115e9a2ff8c38..214f3a5c785853ca76cf8cb3f3e1683b982ba374 100644 (file)
--- a/templates/CRM/Admin/Form/WordReplacements.tpl
+++ b/templates/CRM/Admin/Form/WordReplacements.tpl
@@ -24,100 +24,92 @@
  +--------------------------------------------------------------------+
 *}
 
-{* add single row *}
+{* template for a single row *}
 {if $soInstance}
-<tr id="string_override_row_{$soInstance}">
-  <td class="even-row checkbox">{$form.enabled.$soInstance.html}</td>
-  <td class="even-row">{$form.old.$soInstance.html}</td>
-  <td class="even-row">{$form.new.$soInstance.html}</td>
-  <td class="even-row checkbox">{$form.cb.$soInstance.html}</td>
-</tr>
+  <tr class="string-override-row row-{$soInstance} {if $soInstance % 2}odd{else}even{/if}-row">
+    <td>{$form.enabled.$soInstance.html}</td>
+    <td>{$form.old.$soInstance.html}</td>
+    <td>{$form.new.$soInstance.html}</td>
+    <td>{$form.cb.$soInstance.html}</td>
+  </tr>
 
 {else}
-{* this template is used for adding/editing string overrides  *}
-<div class="crm-form crm-form-block crm-string_override-form-block">
-<div id="help">
-    {ts}Use <strong>Word Replacements</strong> to change all occurrences of a word or phrase in CiviCRM screens (e.g. replace all occurences of 'Contribution' with 'Donation').{/ts} {help id="id-word_replace"}
-</div>
-  <div class="crm-submit-buttons">
-    {include file="CRM/common/formButtons.tpl" location='top'}
-  </div>
-<table class="form-layout-compressed">
-  <tr>
-      <td>
-            <table>
-        <tr class="columnheader">
-            <td>{ts}Enabled{/ts}</td>
-            <td>{ts}Original{/ts}</td>
-            <td>{ts}Replacement{/ts}</td>
-            <td>{ts}Exact Match{/ts}</td>
-        </tr>
-
-         {section name="numStrings" start=1 step=1 loop=$numStrings+1}
-        {assign var='soInstance' value=$smarty.section.numStrings.index}
+  {* this template is used for adding/editing string overrides  *}
+  <div class="crm-form crm-form-block crm-string_override-form-block">
+    <div id="help">
+      {ts}Use <strong>Word Replacements</strong> to change all occurrences of a word or phrase in CiviCRM screens (e.g. replace all occurences of 'Contribution' with 'Donation').{/ts} {help id="id-word_replace"}
+    </div>
+    <div class="crm-submit-buttons">
+      {include file="CRM/common/formButtons.tpl" location='top'}
+    </div>
+    <table class="form-layout-compressed">
+      <tr>
+        <td>
+          <table>
+            <tr class="columnheader">
+              <td>{ts}Enabled{/ts}</td>
+              <td>{ts}Original{/ts}</td>
+              <td>{ts}Replacement{/ts}</td>
+              <td>{ts}Exact Match{/ts}</td>
+            </tr>
 
-        <tr id="string_override_row_{$soInstance}">
-            <td class="even-row checkbox">{$form.enabled.$soInstance.html}</td>
-              <td class="even-row">{$form.old.$soInstance.html}</td>
-              <td class="even-row">{$form.new.$soInstance.html}</td>
-            <td class="even-row checkbox">{$form.cb.$soInstance.html}</td>
-        </tr>
-
-          {/section}
+            {section name="numStrings" start=1 step=1 loop=$numStrings+1}
+              {include file="CRM/Admin/Form/WordReplacements.tpl" soInstance=$smarty.section.numStrings.index}
+            {/section}
           </table>
-        &nbsp;&nbsp;&nbsp;<a class="action-item crm-hover-button buildStringOverrideRow" href="#"><span class="icon ui-icon-circle-plus"></span> {ts}Add row{/ts}</a>
-         </td>
-  </tr>
-</table>
- <div class="crm-submit-buttons">
-   {include file="CRM/common/formButtons.tpl" location='bottom'}
- </div>
-
-</div>
-{/if}
+          &nbsp;&nbsp;&nbsp;<a class="action-item crm-hover-button buildStringOverrideRow" href="#"><span class="icon ui-icon-circle-plus"></span> {ts}Add row{/ts}</a>
+        </td>
+      </tr>
+    </table>
+    <div class="crm-submit-buttons">
+      {include file="CRM/common/formButtons.tpl" location='bottom'}
+    </div>
 
+  </div>
 {literal}
-<script type="text/javascript">
-CRM.$(function($) {
-  {/literal}
-  {if $stringOverrideInstances}
-     {foreach from=$stringOverrideInstances key="index" item="instance"}
-        buildStringOverrideRow( {$instance} );
-     {/foreach}
-  {/if}
-  {literal}
+  <script type="text/javascript">
+    CRM.$(function($) {
+      {/literal}
+      {if $stringOverrideInstances}
+      {foreach from=$stringOverrideInstances key="index" item="instance"}
+      buildStringOverrideRow( {$instance} );
+      {/foreach}
+      {/if}
+      {literal}
 
-  function buildStringOverrideRow( curInstance ) {
-    var rowId = 'string_override_row_';
+      function buildStringOverrideRow( curInstance ) {
+        var rowId = 'string_override_row_';
 
-    if (curInstance) {
-      if (curInstance <= 10) return;
-      currentInstance = curInstance;
-      previousInstance = currentInstance - 1;
-    } else {
-      var previousInstance = $('[id^="'+ rowId +'"]:last').attr('id').slice(rowId.length);
-      var currentInstance = parseInt(previousInstance) + 1;
-    }
+        if (curInstance) {
+          if (curInstance <= 10) return;
+          currentInstance = curInstance;
+          previousInstance = currentInstance - 1;
+        } else {
+          var previousInstance = $('[id^="'+ rowId +'"]:last').attr('id').slice(rowId.length);
+          var currentInstance = parseInt(previousInstance) + 1;
+        }
 
-    var dataUrl = {/literal}"{crmURL q='snippet=4' h=0}"{literal};
-    dataUrl += "&instance="+currentInstance;
+        var dataUrl = {/literal}"{crmURL q='snippet=4' h=0}"{literal};
+        dataUrl += "&instance="+currentInstance;
 
-    var prevInstRowId = '#string_override_row_' + previousInstance;
+        var prevInstRowId = '#string_override_row_' + previousInstance;
 
-    $.ajax({
-      url: dataUrl,
-      async: false,
-      success: function(html) {
-        $(prevInstRowId).after(html);
-        $('#old_'+currentInstance).TextAreaResizer();
-        $('#new_'+currentInstance).TextAreaResizer();
+        $.ajax({
+          url: dataUrl,
+          async: false,
+          success: function(html) {
+            $(prevInstRowId).after(html);
+            $('#old_'+currentInstance).TextAreaResizer();
+            $('#new_'+currentInstance).TextAreaResizer();
+          }
+        });
       }
+
+      $('.buildStringOverrideRow').click(function(e) {
+        buildStringOverrideRow(false);
+        e.preventDefault();
+      });
     });
-  }
-  
-  $('.buildStringOverrideRow').click(function() {
-    buildStringOverrideRow(false);
-  });
-});
-</script>
+  </script>
 {/literal}
+{/if}