From: Kurund Jalmi <kurund@civicrm.org>
Date: Mon, 13 May 2013 16:21:45 +0000 (-0400)
Subject: template cleanup
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=55a66cac42af6525924c8ad93921df23c1402731;p=civicrm-core.git

template cleanup
---

diff --git a/templates/CRM/Campaign/Form/Search/Campaign.tpl b/templates/CRM/Campaign/Form/Search/Campaign.tpl
index 8b547c6992..0d5a0bcc62 100755
--- a/templates/CRM/Campaign/Form/Search/Campaign.tpl
+++ b/templates/CRM/Campaign/Form/Search/Campaign.tpl
@@ -25,253 +25,263 @@
 *}
 
 {if !$hasCampaigns}
-    <div class="messages status no-popup">
-        <div class="icon inform-icon"></div> &nbsp;
-        {ts}No campaigns found.{/ts}
-    </div>
-
-    <div class="action-link">
-         <a href="{crmURL p='civicrm/campaign/add' q='reset=1' h=0 }" class="button"><span><div class="icon add-icon"></div>{ts}Add Campaign{/ts}</span></a>
-    </div>
-
+  <div class="messages status no-popup">
+    <div class="icon inform-icon"></div>
+    &nbsp;
+    {ts}No campaigns found.{/ts}
+  </div>
+  <div class="action-link">
+    <a href="{crmURL p='civicrm/campaign/add' q='reset=1' h=0 }" class="button"><span><div
+          class="icon add-icon"></div>{ts}Add Campaign{/ts}</span></a>
+  </div>
 {elseif $buildSelector}
 
-       {* load campaign selector *}
-
-       {include file="CRM/common/enableDisable.tpl"}
-
-       {literal}
-       <script type="text/javascript">
-       cj( function( ){
-           loadCampaignList( );
-       });
-       </script>
-       {/literal}
-
-       <table id="campaigns">
-           <thead>
-              <tr class="columnheader">
-            <th class="hiddenElement">{ts}Campaign ID{/ts}</th>
-            <th class="hiddenElement">{ts}Campaign Name{/ts}</th>
+{* load campaign selector *}
+
+  {include file="CRM/common/enableDisable.tpl"}
+
+  {literal}
+    <script type="text/javascript">
+      cj(function () {
+        loadCampaignList();
+      });
+    </script>
+  {/literal}
+  <table id="campaigns">
+    <thead>
+    <tr class="columnheader">
+      <th class="hiddenElement">{ts}Campaign ID{/ts}</th>
+      <th class="hiddenElement">{ts}Campaign Name{/ts}</th>
       <th>{ts}Title{/ts}</th>
-                  <th>{ts}Description{/ts}</th>
-                  <th>{ts}Start Date{/ts}</th>
-                  <th>{ts}End Date{/ts}</th>
+      <th>{ts}Description{/ts}</th>
+      <th>{ts}Start Date{/ts}</th>
+      <th>{ts}End Date{/ts}</th>
       <th class="hiddenElement">{ts}Type ID{/ts}</th>
       <th>{ts}Type{/ts}</th>
       <th class="hiddenElement">{ts}Status ID{/ts}</th>
-              <th>{ts}Status{/ts}</th>
+      <th>{ts}Status{/ts}</th>
       <th class="hiddenElement">{ts}Is Active?{/ts}</th>
-              <th>{ts}Active?{/ts}</th>
+      <th>{ts}Active?{/ts}</th>
       <th></th>
-              </tr>
-           </thead>
-           <tbody></tbody>
-       </table>
-
+    </tr>
+    </thead>
+    <tbody></tbody>
+  </table>
 {else}
+  <div class="action-link">
+    <a href="{crmURL p='civicrm/campaign/add' q='reset=1' h=0 }" class="button"><span><div
+          class="icon add-icon"></div>{ts}Add Campaign{/ts}</span></a>
+  </div>
+{* build search form here *}
 
-   <div class="action-link">
-      <a href="{crmURL p='civicrm/campaign/add' q='reset=1' h=0 }" class="button"><span><div class="icon add-icon"></div>{ts}Add Campaign{/ts}</span></a>
-   </div>
-
-    {* build search form here *}
-
-    {* Search form and results for campaigns *}
-    <div class="crm-block crm-form-block crm-search-form-block">
+{* Search form and results for campaigns *}
+  <div class="crm-block crm-form-block crm-search-form-block">
 
     {assign var='searchForm' value="search_form_$searchFor"}
 
-    <div id="{$searchForm}" class="crm-accordion-wrapper crm-campaign_search_form-accordion {if $force and !$buildSelector}collapsed{/if}">
+    <div id="{$searchForm}"
+         class="crm-accordion-wrapper crm-campaign_search_form-accordion {if $force and !$buildSelector}collapsed{/if}">
       <div class="crm-accordion-header">
-          {ts}Search Campaigns{/ts}
-      </div><!-- /.crm-accordion-header -->
+        {ts}Search Campaigns{/ts}
+      </div>
+      <!-- /.crm-accordion-header -->
 
       <div class="crm-accordion-body">
-      {strip}
-        <table class="form-layout-compressed">
-          <tr>
-            <td>{$form.campaign_title.label}<br />
-            {$form.campaign_title.html} &nbsp;
-            </td>
-            <td>
-                {$form.description.label}<br />
-            {$form.description.html|crmAddClass:huge}
-            </td>
-          </tr>
-
-          <tr>
-            <td>{$form.start_date.label}<br />
-              {include file="CRM/common/jcalendar.tpl" elementName=start_date}
-            </td>
-            <td>{$form.end_date.label}<br />
-              {include file="CRM/common/jcalendar.tpl" elementName=end_date}
-            </td>
-          </tr>
-
-          <tr>
-            <td>{$form.campaign_type_id.label}<br />
-              {$form.campaign_type_id.html}
-            </td>
-            <td>{$form.status_id.label}<br />
-              {$form.status_id.html}
-            </td>
-          </tr>
-
-          <tr>
-            <td colspan="2">
-            {if $context eq 'search'}
-              {$form.buttons.html}
-            {else}
-              <a class="searchCampaign button" style="float:left;" href="#" title={ts}Search{/ts} onClick="searchCampaigns( '{$qfKey}' );return false;">{ts}Search{/ts}</a>
-            {/if}
-            </td>
-          </tr>
-        </table>
-      {/strip}
+        {strip}
+          <table class="form-layout-compressed">
+            <tr>
+              <td>{$form.campaign_title.label}<br/>
+                {$form.campaign_title.html} &nbsp;
+              </td>
+              <td>
+                {$form.description.label}<br/>
+                {$form.description.html|crmAddClass:huge}
+              </td>
+            </tr>
+
+            <tr>
+              <td>{$form.start_date.label}<br/>
+                {include file="CRM/common/jcalendar.tpl" elementName=start_date}
+              </td>
+              <td>{$form.end_date.label}<br/>
+                {include file="CRM/common/jcalendar.tpl" elementName=end_date}
+              </td>
+            </tr>
+
+            <tr>
+              <td>{$form.campaign_type_id.label}<br/>
+                {$form.campaign_type_id.html}
+              </td>
+              <td>{$form.status_id.label}<br/>
+                {$form.status_id.html}
+              </td>
+            </tr>
+
+            <tr>
+              <td colspan="2">
+                {if $context eq 'search'}
+                  {$form.buttons.html}
+                {else}
+                  <a class="searchCampaign button" style="float:left;" href="#" title={ts}Search{/ts}
+                     onClick="searchCampaigns( '{$qfKey}' );return false;">{ts}Search{/ts}</a>
+                {/if}
+              </td>
+            </tr>
+          </table>
+        {/strip}
       </div>
     </div>
   </div>
-    {* search form ends here *}
-
-    <div id='campaignList'></div>
-
+{* search form ends here *}
+  <div id='campaignList'></div>
 {/if} {* end of search form build *}
 
 
 {literal}
 <script type="text/javascript">
 
- cj(function() {
+  cj(function () {
     cj().crmAccordions();
- });
-
- {/literal}
- {* load selector when force *}
- {if $force and !$buildSelector}
- {literal}
-   cj( function( ) {
-     searchCampaigns( {/literal}'{$qfKey}'{literal} );
-   });
-
- {/literal}
- {/if}
- {literal}
-
-function searchCampaigns( qfKey )
-{
-      var dataUrl =  {/literal}"{crmURL h=0 q='search=1&snippet=4&type=campaign'}"{literal};
-
-      //lets carry qfKey to retain form session.
-      if ( qfKey ) dataUrl = dataUrl + '&qfKey=' + qfKey;
-
-      cj.get( dataUrl, null, function( campaignList ) {
-        cj( '#campaignList' ).html( campaignList );
-
-        //collapse the search form.
-        var searchFormName = '#search_form_' + {/literal}'{$searchFor}'{literal};
-        cj( searchFormName + '.crm-accordion-wrapper:not(.collapsed)').crmAccordionToggle();
-      }, 'html' );
-}
-
-function loadCampaignList( )
-{
-     var sourceUrl = {/literal}"{crmURL p='civicrm/ajax/rest' h=0 q='snippet=4&className=CRM_Campaign_Page_AJAX&fnName=campaignList' }"{literal};
-
-     //build the search qill.
-     //get the search criteria.
-     var searchParams   = {/literal}{$searchParams}{literal};
-     var campaignTypes  = {/literal}{$campaignTypes}{literal};
-     var campaignStatus = {/literal}{$campaignStatus}{literal};
-     var noRecordFoundMsg  = '{/literal}{ts escape='js'}No matches found for:{/ts}{literal}';
-     noRecordFoundMsg     += '<div class="qill">';
-
-     var count = 0;
-     var searchQill = new Array( );
-     for ( param in searchParams ) {
-        if ( val = cj( '#' + param ).val( ) ) {
-      if ( param == 'status_id' ) val = campaignStatus[val];
-      if ( param == 'campaign_type_id' ) val = campaignTypes[val];
-      searchQill[count++] = searchParams[param] + ' : ' + val;
+  });
+
+  {/literal}
+  {* load selector when force *}
+  {if $force and !$buildSelector}
+  {literal}
+  cj(function () {
+    searchCampaigns({/literal}'{$qfKey}'{literal});
+  });
+
+  {/literal}
+  {/if}
+  {literal}
+
+  function searchCampaigns(qfKey) {
+    var dataUrl = {/literal}"{crmURL h=0 q='search=1&snippet=4&type=campaign'}"{literal};
+
+    //lets carry qfKey to retain form session.
+    if (qfKey) {
+      dataUrl = dataUrl + '&qfKey=' + qfKey;
+    }
+
+    cj.get(dataUrl, null, function (campaignList) {
+      cj('#campaignList').html(campaignList);
+
+      //collapse the search form.
+      var searchFormName = '#search_form_' + {/literal}'{$searchFor}'{literal};
+      cj(searchFormName + '.crm-accordion-wrapper:not(.collapsed)').crmAccordionToggle();
+    }, 'html');
   }
-     }
-     noRecordFoundMsg += searchQill.join( '<span class="font-italic"> ...AND... </span></div><div class="qill">' );
-
-     cj( '#campaigns' ).dataTable({
-             "bFilter"    : false,
-             "bAutoWidth" : false,
-             "bProcessing": false,
-             "bLengthChange": false,
-             "aaSorting": [],
-             "aoColumns":[{sClass:'crm-campaign-id                   hiddenElement' },
-                 {sClass:'crm-campaign-name                 hiddenElement' },
-           {sClass:'crm-campaign-title'                              },
-           {sClass:'crm-campaign-description'                        },
-           {sClass:'crm-campaign-start_date'                         },
-           {sClass:'crm-campaign-end_date'                           },
-           {sClass:'crm-campaign-campaign-type_id     hiddenElement' },
-           {sClass:'crm-campaign-campaign-type'                      },
-           {sClass:'crm-campaign-campaign-status_id   hiddenElement' },
-           {sClass:'crm-campaign-campaign-status'                    },
-           {sClass:'crm-campaign-campaign-is_active   hiddenElement' },
-           {sClass:'crm-campaign-campaign-isAactive'                 },
-           {sClass:'crm-campaign-action',             bSortable:false}
-           ],
-             "sPaginationType": "full_numbers",
-             "sDom"       : 'rt<"crm-datatable-pager-bottom"ip>',
-             "bServerSide": true,
-             "bJQueryUI": true,
-             "sAjaxSource": sourceUrl,
-             "asStripClasses" : [ "odd-row", "even-row" ],
-             "oLanguage":{"sEmptyTable"  : noRecordFoundMsg,
-                          "sZeroRecords" : noRecordFoundMsg },
-             "fnDrawCallback": function() { cj().crmtooltip(); },
-             "fnRowCallback": function( nRow, aData, iDisplayIndex ) {
-         //insert the id for each row for enable/disable.
-         var rowId = 'campaign_row_' + aData[0];
-         cj(nRow).attr( 'id', rowId );
-         //handled disabled rows.
-         var isActive = Boolean(Number(aData[10]));
-         if ( !isActive ) cj(nRow).addClass( 'disabled' );
-
-         //add id for yes/no column.
-         cj(nRow).children().eq(11).attr( 'id', rowId + '_status' );
-
-         return nRow;
-    },
-
-    "fnServerData": function ( sSource, aoData, fnCallback ) {
-      var dataLength = aoData.length;
-
-      var count = 1;
-      var searchCriteria = new Array( );
-
-      //get the search criteria.
-                        var searchParams = {/literal}{$searchParams}{literal};
-                        for ( param in searchParams ) {
+
+  function loadCampaignList() {
+    var sourceUrl = {/literal}"{crmURL p='civicrm/ajax/rest' h=0 q='snippet=4&className=CRM_Campaign_Page_AJAX&fnName=campaignList' }"{literal};
+
+    //build the search qill.
+    //get the search criteria.
+    var searchParams = {/literal}{$searchParams}{literal};
+    var campaignTypes = {/literal}{$campaignTypes}{literal};
+    var campaignStatus = {/literal}{$campaignStatus}{literal};
+    var noRecordFoundMsg = '{/literal}{ts escape='js'}No matches found for:{/ts}{literal}';
+    noRecordFoundMsg += '<div class="qill">';
+
+    var count = 0;
+    var searchQill = new Array();
+    for (param in searchParams) {
+      if (val = cj('#' + param).val()) {
+        if (param == 'status_id') {
+          val = campaignStatus[val];
+        }
+        if (param == 'campaign_type_id') {
+          val = campaignTypes[val];
+        }
+        searchQill[count++] = searchParams[param] + ' : ' + val;
+      }
+    }
+    noRecordFoundMsg += searchQill.join('<span class="font-italic"> ...AND... </span></div><div class="qill">');
+
+    cj('#campaigns').dataTable({
+      "bFilter": false,
+      "bAutoWidth": false,
+      "bProcessing": false,
+      "bLengthChange": false,
+      "aaSorting": [],
+      "aoColumns": [
+        {sClass: 'crm-campaign-id                   hiddenElement' },
+        {sClass: 'crm-campaign-name                 hiddenElement' },
+        {sClass: 'crm-campaign-title'                              },
+        {sClass: 'crm-campaign-description'                        },
+        {sClass: 'crm-campaign-start_date'                         },
+        {sClass: 'crm-campaign-end_date'                           },
+        {sClass: 'crm-campaign-campaign-type_id     hiddenElement' },
+        {sClass: 'crm-campaign-campaign-type'                      },
+        {sClass: 'crm-campaign-campaign-status_id   hiddenElement' },
+        {sClass: 'crm-campaign-campaign-status'                    },
+        {sClass: 'crm-campaign-campaign-is_active   hiddenElement' },
+        {sClass: 'crm-campaign-campaign-isAactive'                 },
+        {sClass: 'crm-campaign-action', bSortable: false}
+      ],
+      "sPaginationType": "full_numbers",
+      "sDom": 'rt<"crm-datatable-pager-bottom"ip>',
+      "bServerSide": true,
+      "bJQueryUI": true,
+      "sAjaxSource": sourceUrl,
+      "asStripClasses": ["odd-row", "even-row"],
+      "oLanguage": {"sEmptyTable": noRecordFoundMsg,
+        "sZeroRecords": noRecordFoundMsg },
+      "fnDrawCallback": function () {
+        cj().crmtooltip();
+      },
+      "fnRowCallback": function (nRow, aData, iDisplayIndex) {
+        //insert the id for each row for enable/disable.
+        var rowId = 'campaign_row_' + aData[0];
+        cj(nRow).attr('id', rowId);
+        //handled disabled rows.
+        var isActive = Boolean(Number(aData[10]));
+        if (!isActive) {
+          cj(nRow).addClass('disabled');
+        }
+
+        //add id for yes/no column.
+        cj(nRow).children().eq(11).attr('id', rowId + '_status');
+
+        return nRow;
+      },
+
+      "fnServerData": function (sSource, aoData, fnCallback) {
+        var dataLength = aoData.length;
+
+        var count = 1;
+        var searchCriteria = new Array();
+
+        //get the search criteria.
+        var searchParams = {/literal}{$searchParams}{literal};
+        for (param in searchParams) {
           fldName = param;
-          if ( param == 'campaign_title' ) fldName = 'title';
-                            if ( val = cj( '#' + param ).val( ) ) {
+          if (param == 'campaign_title') {
+            fldName = 'title';
+          }
+          if (val = cj('#' + param).val()) {
             aoData[dataLength++] = {name: fldName, value: val};
           }
           searchCriteria[count++] = fldName;
-                        }
-
-      //do search for campaigns.
-      aoData[dataLength++] = {name: 'search_for', value: 'campaign'};
-
-      //lets transfer search criteria.
-      aoData[dataLength++] = {name: 'searchCriteria', value:searchCriteria.join(',')};
-
-      cj.ajax( {
-        "dataType": 'json',
-        "type": "POST",
-        "url": sSource,
-        "data": aoData,
-        "success": fnCallback
-      } ); }
-         });
-}
+        }
+
+        //do search for campaigns.
+        aoData[dataLength++] = {name: 'search_for', value: 'campaign'};
+
+        //lets transfer search criteria.
+        aoData[dataLength++] = {name: 'searchCriteria', value: searchCriteria.join(',')};
+
+        cj.ajax({
+          "dataType": 'json',
+          "type": "POST",
+          "url": sSource,
+          "data": aoData,
+          "success": fnCallback
+        });
+      }
+    });
+  }
 
 </script>
 {/literal}