Remove isset checks on isForm

[civicrm-core.git] / templates / CRM / Case / Form / ActivityTab.tpl

diff --git a/templates/CRM/Case/Form/ActivityTab.tpl b/templates/CRM/Case/Form/ActivityTab.tpl
index b489a8037aad828c64601213d3022547b08a801d..2b778bbcc49471472994854a483a37a8f3a3de96 100644 (file)
--- a/templates/CRM/Case/Form/ActivityTab.tpl
+++ b/templates/CRM/Case/Form/ActivityTab.tpl
@@ -9,52 +9,50 @@
 *}
 {*this template is used for activity accordion*}
 {assign var=caseid value=$caseID}
-{if isset($isForm) and $isForm}
+{if $isForm}
   <div class="crm-accordion-wrapper crm-case_activities-accordion  crm-case-activities-block">
     <div class="crm-accordion-header">
       {ts}Activities{/ts}
     </div>
 
-    <div id="activities" class="crm-accordion-body">
-    <div class="crm-accordion-wrapper crm-accordion-inner crm-search_filters-accordion collapsed">
-      <div class="crm-accordion-header">
+    <div id="activities" class="crm-accordion-body padded">
+    <div class="crm-collapsible crm-search_filters-accordion collapsed">
+      <div class="collapsible-title">
         {ts}Search Filters{/ts}
-      </div><!-- /.crm-accordion-header -->
-      <div class="crm-accordion-body">
-        <table class="no-border form-layout-compressed" id="searchOptions">
-          <tr>
-            <td class="crm-case-caseview-form-block-repoter_id"colspan="2"><label for="reporter_id">{ts}Reporter/Role{/ts}</label><br />
-              {$form.reporter_id.html|crmAddClass:twenty}
-            </td>
-            <td class="crm-case-caseview-form-block-status_id"><label for="status_id">{$form.status_id.label}</label><br />
-              {$form.status_id.html}
-            </td>
-          </tr>
-          <tr>
-            <td class="crm-case-caseview-form-block-activity_date_low">
-              {assign var=activitylow  value=activity_date_low_$caseID}
-              {$form.$activitylow.label}<br />
-              {$form.$activitylow.html}
-            </td>
-            <td class="crm-case-caseview-form-block-activity_date_high">
-              {assign var=activityhigh  value=activity_date_high_$caseID}
-              {$form.$activityhigh.label}<br />
-              {$form.$activityhigh.html}
-            </td>
-            <td class="crm-case-caseview-form-block-activity_type_filter_id">
-              {$form.activity_type_filter_id.label}<br />
-              {$form.activity_type_filter_id.html}
+      </div>
+      <table class="no-border form-layout-compressed" id="searchOptions">
+        <tr>
+          <td class="crm-case-caseview-form-block-repoter_id"colspan="2"><label for="reporter_id">{ts}Reporter/Role{/ts}</label><br />
+            {$form.reporter_id.html|crmAddClass:twenty}
+          </td>
+          <td class="crm-case-caseview-form-block-status_id"><label for="status_id">{$form.status_id.label}</label><br />
+            {$form.status_id.html}
+          </td>
+        </tr>
+        <tr>
+          <td class="crm-case-caseview-form-block-activity_date_low">
+            {assign var=activitylow  value=activity_date_low_$caseID}
+            {$form.$activitylow.label}<br />
+            {$form.$activitylow.html}
+          </td>
+          <td class="crm-case-caseview-form-block-activity_date_high">
+            {assign var=activityhigh  value=activity_date_high_$caseID}
+            {$form.$activityhigh.label}<br />
+            {$form.$activityhigh.html}
+          </td>
+          <td class="crm-case-caseview-form-block-activity_type_filter_id">
+            {$form.activity_type_filter_id.label}<br />
+            {$form.activity_type_filter_id.html}
+          </td>
+        </tr>
+        {if !empty($form.activity_deleted)}
+          <tr class="crm-case-caseview-form-block-activity_deleted">
+            <td>
+              {$form.activity_deleted.html}{$form.activity_deleted.label}
             </td>
           </tr>
-          {if $form.activity_deleted}
-            <tr class="crm-case-caseview-form-block-activity_deleted">
-              <td>
-                {$form.activity_deleted.html}{$form.activity_deleted.label}
-              </td>
-            </tr>
-          {/if}
-        </table>
-      </div><!-- /.crm-accordion-body -->
+        {/if}
+      </table>
     </div><!-- /.crm-accordion-wrapper -->
 {/if}
 
@@ -106,7 +104,7 @@
     {/foreach}
   </style>
 
-{if isset($isForm) and $isForm}
+{if $isForm}
     </div><!-- /.crm-accordion-body -->
   </div><!-- /.crm-accordion-wrapper -->
 {/if}