From fe06c0fb27bc61585abacb32a484f1eea05e0c7e Mon Sep 17 00:00:00 2001
From: Kurund Jalmi <kurund@civicrm.org>
Date: Wed, 29 May 2013 15:04:12 +0530
Subject: [PATCH] more template cleanup

---
 .../CRM/Contact/Page/View/CustomData.tpl      |  30 +--
 templates/CRM/Custom/Page/CustomDataView.tpl  | 211 +++++++++---------
 2 files changed, 126 insertions(+), 115 deletions(-)

diff --git a/templates/CRM/Contact/Page/View/CustomData.tpl b/templates/CRM/Contact/Page/View/CustomData.tpl
index 33df73b93d..55bb87034e 100644
--- a/templates/CRM/Contact/Page/View/CustomData.tpl
+++ b/templates/CRM/Contact/Page/View/CustomData.tpl
@@ -25,30 +25,30 @@
 *}
 {* template for custom data *}
 {if $action eq 0 or $action eq 1 or $action eq 2 or $recordActivity}
-    {include file="CRM/Contact/Form/CustomData.tpl" mainEdit=$mainEditForm}
+  {include file="CRM/Contact/Form/CustomData.tpl" mainEdit=$mainEditForm}
 {/if}
 
 {strip}
-    {if $action eq 16 or $action eq 4} {* Browse or View actions *}
-        <div class="form-item">
-            {include file="CRM/Custom/Page/CustomDataView.tpl"}            
-        </div>
-    {/if}
+  {if $action eq 16 or $action eq 4} {* Browse or View actions *}
+    <div class="form-item">
+      {include file="CRM/Custom/Page/CustomDataView.tpl"}
+    </div>
+  {/if}
 {/strip}
- 
+
 {if $mainEditForm}
-<script type="text/javascript"> 
-    var showBlocks1 = new Array({$showBlocks1}); 
-    var hideBlocks1 = new Array({$hideBlocks1}); 
- 
-    on_load_init_blocks( showBlocks1, hideBlocks1 ); 
-</script>
+  <script type="text/javascript">
+    var showBlocks1 = new Array({$showBlocks1});
+    var hideBlocks1 = new Array({$hideBlocks1});
+
+    on_load_init_blocks(showBlocks1, hideBlocks1);
+  </script>
 {else}
-<script type="text/javascript">
+  <script type="text/javascript">
     var showBlocks = new Array({$showBlocks});
     var hideBlocks = new Array({$hideBlocks});
 
     {* hide and display the appropriate blocks as directed by the php code *}
-    on_load_init_blocks( showBlocks, hideBlocks );
+    on_load_init_blocks(showBlocks, hideBlocks);
   </script>
 {/if}
diff --git a/templates/CRM/Custom/Page/CustomDataView.tpl b/templates/CRM/Custom/Page/CustomDataView.tpl
index 06e994cd7e..81cd70ede8 100644
--- a/templates/CRM/Custom/Page/CustomDataView.tpl
+++ b/templates/CRM/Custom/Page/CustomDataView.tpl
@@ -26,124 +26,135 @@
 {* Custom Data view mode*}
 {assign var="showEdit" value=1}
 {foreach from=$viewCustomData item=customValues key=customGroupId}
-    {foreach from=$customValues item=cd_edit key=cvID}
-  <table class="no-border">
+  {foreach from=$customValues item=cd_edit key=cvID}
+    <table class="no-border">
       {assign var='index' value=$groupId|cat:"_$cvID"}
-        {if $editOwnCustomData or ($showEdit and $editCustomData and $groupId)}
-    <tr>
-        <td>
-      <a href="{crmURL p="civicrm/contact/view/cd/edit" q="tableId=`$contactId`&cid=`$contactId`&groupID=`$groupId`&action=update&reset=1"}" class="button" style="margin-left: 6px;"><span><div class="icon edit-icon"></div>{ts 1=$cd_edit.title}Edit %1{/ts}</span></a><br/><br/>
-        </td>
-    </tr>
+      {if $editOwnCustomData or ($showEdit and $editCustomData and $groupId)}
+        <tr>
+          <td>
+            <a
+              href="{crmURL p="civicrm/contact/view/cd/edit" q="tableId=`$contactId`&cid=`$contactId`&groupID=`$groupId`&action=update&reset=1"}"
+              class="button" style="margin-left: 6px;"><span><div
+                  class="icon edit-icon"></div>{ts 1=$cd_edit.title}Edit %1{/ts}</span></a><br/><br/>
+          </td>
+        </tr>
       {/if}
       {assign var="showEdit" value=0}
       <tr id="statusmessg_{$index}" class="hiddenElement">
-    <td><span class="success-status"></span></td>
+        <td><span class="success-status"></span></td>
       </tr>
       <tr>
-    <td id="{$cd_edit.name}_{$index}" class="section-shown form-item">
-        <div class="crm-accordion-wrapper {if $cd_edit.collapse_display eq 0 or $skipTitle} {else}collapsed{/if}">
-        {if !$skipTitle}
-             <div class="crm-accordion-header">
-            {$cd_edit.title}
-             </div>
-        {/if}
-            <div class="crm-accordion-body">
-          {if $groupId and $cvID and $editCustomData}
-          <div class="crm-submit-buttons">
-      <a href="#" onclick="showDelete( {$cvID}, '{$cd_edit.name}_{$index}', {$customGroupId}, {$contactId} ); return false;" class="button delete-button" title="{ts 1=$cd_edit.title}Delete this %1 record{/ts}">
-       <span><div class="icon delete-icon"></div>{ts}Delete{/ts}</span>
-            </a>
-            </div>
+        <td id="{$cd_edit.name}_{$index}" class="section-shown form-item">
+          <div class="crm-accordion-wrapper {if $cd_edit.collapse_display eq 0 or $skipTitle} {else}collapsed{/if}">
+            {if !$skipTitle}
+              <div class="crm-accordion-header">
+                {$cd_edit.title}
+              </div>
             {/if}
-      {foreach from=$cd_edit.fields item=element key=field_id}
-          <table class="crm-info-panel">
-        <tr>
-            {if $element.options_per_line != 0}
-          <td class="label">{$element.field_title}</td>
-          <td class="html-adjust">
-              {* sort by fails for option per line. Added a variable to iterate through the element array*}
-              {foreach from=$element.field_value item=val}
-            {$val}<br/>
-              {/foreach}
-          </td>
-            {else}
-          <td class="label">{$element.field_title}</td>
-          {if $element.field_type == 'File'}
-              {if $element.field_value.displayURL}
-            <td class="html-adjust"><a href="#" onclick="imagePopUp('{$element.field_value.imageURL}'); return false;" ><img src="{$element.field_value.displayURL}" height = "100" width="100"></a></td>
-              {else}
-            <td class="html-adjust"><a href="{$element.field_value.fileURL}">{$element.field_value.fileName}</a></td>
-              {/if}
-          {else}
-            {if $element.field_data_type == 'Money'}
-              {if $element.field_type == 'Text'}
-                <td class="html-adjust">{$element.field_value|crmMoney}</td>
-               {else}
-                 <td class="html-adjust">{$element.field_value}</td>
-               {/if}
-             {else}
-               <td class="html-adjust">
-               {if $element.contact_ref_id}
-                 <a href='{crmURL p="civicrm/contact/view" q="reset=1&cid=`$element.contact_ref_id`"}'>
-               {/if}
-                 {if $element.field_data_type == 'Memo'}
-                   {$element.field_value|nl2br}
-                 {else}
-                   {$element.field_value}
-                 {/if}
-               {if $element.contact_ref_id}
+            <div class="crm-accordion-body">
+              {if $groupId and $cvID and $editCustomData}
+                <div class="crm-submit-buttons">
+                  <a href="#"
+                     onclick="showDelete( {$cvID}, '{$cd_edit.name}_{$index}', {$customGroupId}, {$contactId} ); return false;"
+                     class="button delete-button" title="{ts 1=$cd_edit.title}Delete this %1 record{/ts}">
+                    <span><div class="icon delete-icon"></div>{ts}Delete{/ts}</span>
                   </a>
-               {/if}
-                </td>
-             {/if}
-          {/if}
-            {/if}
-        </tr>
-          </table>
-      {/foreach}
-      </div> <!-- end of body -->
-      <div class="clear"></div>
-     </div> <!-- end of main accordian -->
-    </td>
+                </div>
+              {/if}
+              {foreach from=$cd_edit.fields item=element key=field_id}
+                <table class="crm-info-panel">
+                  <tr>
+                    {if $element.options_per_line != 0}
+                      <td class="label">{$element.field_title}</td>
+                      <td class="html-adjust">
+                        {* sort by fails for option per line. Added a variable to iterate through the element array*}
+                        {foreach from=$element.field_value item=val}
+                          {$val}
+                          <br/>
+                        {/foreach}
+                      </td>
+                    {else}
+                      <td class="label">{$element.field_title}</td>
+                      {if $element.field_type == 'File'}
+                        {if $element.field_value.displayURL}
+                          <td class="html-adjust"><a href="#"
+                                                     onclick="imagePopUp('{$element.field_value.imageURL}'); return false;"><img
+                                src="{$element.field_value.displayURL}" height="100" width="100"></a></td>
+                        {else}
+                          <td class="html-adjust"><a
+                              href="{$element.field_value.fileURL}">{$element.field_value.fileName}</a></td>
+                        {/if}
+                      {else}
+                        {if $element.field_data_type == 'Money'}
+                          {if $element.field_type == 'Text'}
+                            <td class="html-adjust">{$element.field_value|crmMoney}</td>
+                          {else}
+                            <td class="html-adjust">{$element.field_value}</td>
+                          {/if}
+                        {else}
+                          <td class="html-adjust">
+                            {if $element.contact_ref_id}
+                            <a href='{crmURL p="civicrm/contact/view" q="reset=1&cid=`$element.contact_ref_id`"}'>
+                              {/if}
+                              {if $element.field_data_type == 'Memo'}
+                                {$element.field_value|nl2br}
+                              {else}
+                                {$element.field_value}
+                              {/if}
+                              {if $element.contact_ref_id}
+                            </a>
+                            {/if}
+                          </td>
+                        {/if}
+                      {/if}
+                    {/if}
+                  </tr>
+                </table>
+              {/foreach}
+            </div>
+            <!-- end of body -->
+            <div class="clear"></div>
+          </div>
+          <!-- end of main accordian -->
+        </td>
       </tr>
-  </table>
-    {/foreach}
+    </table>
+  {/foreach}
 {/foreach}
-    {literal}
+{literal}
   <script type="text/javascript">
-  cj(function() {
-        cj().crmAccordions();
-        });
+    cj(function () {
+      cj().crmAccordions();
+    });
   </script>
-    {/literal}
+{/literal}
 {*currently delete is available only for tab custom data*}
 {if $groupId}
-<script type="text/javascript">
+  <script type="text/javascript">
     {literal}
-    function hideStatus( valueID, groupID ) {
-        cj( '#statusmessg_'  + groupID + '_' + valueID ).hide( );
+    function hideStatus(valueID, groupID) {
+      cj('#statusmessg_' + groupID + '_' + valueID).hide();
     }
-    function showDelete( valueID, elementID, groupID, contactID ) {
-        var confirmMsg = '{/literal}{ts escape='js'}Are you sure you want to delete this record?{/ts}{literal} &nbsp; <a href="#" onclick="deleteCustomValue( ' + valueID + ',\'' + elementID + '\',' + groupID + ',' + contactID + ' ); return false;" style="text-decoration: underline;">{/literal}{ts escape='js'}Yes{/ts}{literal}</a>&nbsp;&nbsp;&nbsp;<a href="#" onclick="hideStatus( ' + valueID + ', ' +  groupID + ' ); return false;" style="text-decoration: underline;">{/literal}{ts escape='js'}No{/ts}{literal}</a>';
-        cj( 'tr#statusmessg_' + groupID + '_' + valueID ).show( ).children().find('span').html( confirmMsg );
+    function showDelete(valueID, elementID, groupID, contactID) {
+      var confirmMsg = '{/literal}{ts escape='js'}Are you sure you want to delete this record?{/ts}{literal} &nbsp; <a href="#" onclick="deleteCustomValue( ' + valueID + ',\'' + elementID + '\',' + groupID + ',' + contactID + ' ); return false;" style="text-decoration: underline;">{/literal}{ts escape='js'}Yes{/ts}{literal}</a>&nbsp;&nbsp;&nbsp;<a href="#" onclick="hideStatus( ' + valueID + ', ' + groupID + ' ); return false;" style="text-decoration: underline;">{/literal}{ts escape='js'}No{/ts}{literal}</a>';
+      cj('tr#statusmessg_' + groupID + '_' + valueID).show().children().find('span').html(confirmMsg);
     }
-    function deleteCustomValue( valueID, elementID, groupID, contactID ) {
-        var postUrl = {/literal}"{crmURL p='civicrm/ajax/customvalue' h=0 }"{literal};
-        cj.ajax({
-          type: "POST",
-          data:  "valueID=" + valueID + "&groupID=" + groupID +"&contactId=" + contactID + "&key={/literal}{crmKey name='civicrm/ajax/customvalue'}{literal}",
-          url: postUrl,
-          success: function(html){
-            cj('#'+ elementID).hide();
-            hideStatus(valueID, groupID);
-            CRM.alert('', '{/literal}{ts escape="js"}Record Deleted{/ts}{literal}', 'success');
-            var element = cj( '.ui-tabs-nav #tab_custom_' + groupID + ' a' );
-            cj(element).html(cj(element).attr('title') + ' ('+ html+') ');
-          }
-        });
+    function deleteCustomValue(valueID, elementID, groupID, contactID) {
+      var postUrl = {/literal}"{crmURL p='civicrm/ajax/customvalue' h=0 }"{literal};
+      cj.ajax({
+        type: "POST",
+        data: "valueID=" + valueID + "&groupID=" + groupID + "&contactId=" + contactID + "&key={/literal}{crmKey name='civicrm/ajax/customvalue'}{literal}",
+        url: postUrl,
+        success: function (html) {
+          cj('#' + elementID).hide();
+          hideStatus(valueID, groupID);
+          CRM.alert('', '{/literal}{ts escape="js"}Record Deleted{/ts}{literal}', 'success');
+          var element = cj('.ui-tabs-nav #tab_custom_' + groupID + ' a');
+          cj(element).html(cj(element).attr('title') + ' (' + html + ') ');
+        }
+      });
     }
     {/literal}
-</script>
+  </script>
 {/if}
 
-- 
2.25.1