CRM-13611 - Report tab fixes

diff --git a/templates/CRM/Report/Form/Fields.tpl b/templates/CRM/Report/Form/Fields.tpl
index 7f4c2e8000734c5c27a00a1a8b5231c3798c6c09..8b99d06e4c56397f90238e12ca7de34577d87bca 100644 (file)
--- a/templates/CRM/Report/Form/Fields.tpl
+++ b/templates/CRM/Report/Form/Fields.tpl
@@ -44,9 +44,9 @@
               <a title="{ts}Sorting{/ts}" href="#report-tab-order-by-elements">{ts}Sorting{/ts}</a>
             </li>
           {/if}
-          {if $form.options.html}
+          {if $otherOptions}
             <li class="ui-corner-all">
-              <a title="{ts}Options{/ts}" href="#report-tab-other-options">{ts}Options{/ts}</a>
+              <a title="{ts}Display Options{/ts}" href="#report-tab-other-options">{ts}Display{/ts}</a>
             </li>
           {/if}
           {if $filters}
@@ -56,13 +56,13 @@
           {/if}
           {if $instanceForm OR $instanceFormError}
             <li id="tab_settings" class="ui-corner-all">
-              <a title="{ts}Title and Format{/ts}" href="#report-tab-settings">{ts}Title and Format{/ts}</a>
+              <a title="{ts}Title and Format{/ts}" href="#report-tab-format">{ts}Title and Format{/ts}</a>
             </li>
             <li class="ui-corner-all">
               <a title="{ts}Email Delivery{/ts}" href="#report-tab-email">{ts}Email Delivery{/ts}</a>
             </li>
             <li class="ui-corner-all">
-              <a title="{ts}Access{/ts}" href="#report-tab-other">{ts}Access{/ts}</a>
+              <a title="{ts}Access{/ts}" href="#report-tab-access">{ts}Access{/ts}</a>
             </li>
           {/if}
         </ul>

diff --git a/templates/CRM/Report/Form/Instance.tpl b/templates/CRM/Report/Form/Instance.tpl
index 2fcece03bc8085b47d3b1adc35b207b33f2e5236..b4a610e5f4318f3baab7f6c638f1536b25a8e03c 100644 (file)
--- a/templates/CRM/Report/Form/Instance.tpl
+++ b/templates/CRM/Report/Form/Instance.tpl
@@ -23,7 +23,7 @@
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
 *}
-<div id="report-tab-settings" class="civireport-criteria">
+<div id="report-tab-format" class="civireport-criteria">
 <table class="form-layout">
     <tr class="crm-report-instanceForm-form-block-title">
         <td class="report-label" width="20%">{$form.title.label} {help id="id-report_title" file="CRM/Report/Form/Settings.hlp"}</td>
@@ -62,7 +62,7 @@
 </table>
 </div>
 
-<div id="report-tab-other" class="civireport-criteria">
+<div id="report-tab-access" class="civireport-criteria">
 <table class="form-layout">
     <tr class="crm-report-instanceForm-form-block-is_navigation">
   <td class="report-label">{$form.is_navigation.label}</td>