move instance.tpl to tabs as it presents tabs

diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php
index 4d74ac00fea16325851ccd1d5e3aaa0197e7517a..8d14bae5d8ad8839686f5552bdcc62fa47cfd5d1 100644 (file)
--- a/CRM/Report/Form.php
+++ b/CRM/Report/Form.php
@@ -1299,7 +1299,7 @@ class CRM_Report_Form extends CRM_Core_Form {
       $this->tabs['OrderBy'] = array(
         'title' => ts('Sorting'),
         'tpl' => 'OrderBy',
-        'div_label' => 'order-by',
+        'div_label' => 'order-by-elements',
       );
     }
 

diff --git a/templates/CRM/Report/Form/Fields.tpl b/templates/CRM/Report/Form/Fields.tpl
index 49c7043b5c0aa84b28629ac908a90337244e0201..1d18cdac3de53be514a8d3f07ad1cb30fbae527e 100644 (file)
--- a/templates/CRM/Report/Form/Fields.tpl
+++ b/templates/CRM/Report/Form/Fields.tpl
@@ -52,7 +52,7 @@
 
         {*settings*}
         {if $instanceForm OR $instanceFormError}
-          {include file="CRM/Report/Form/Instance.tpl"}
+          {include file="CRM/Report/Form/Tabs/Instance.tpl"}
         {/if}
       </div> {* end mainTabContainer *}
 

diff --git a/templates/CRM/Report/Form/Instance.tpl b/templates/CRM/Report/Form/Tabs/Instance.tpl
similarity index 94%
rename from templates/CRM/Report/Form/Instance.tpl
rename to templates/CRM/Report/Form/Tabs/Instance.tpl
index c900617219535350b3aa392561656af1ea8188aa..3d965fd0453d42a4bec57391207feb5c10dd64cf 100644 (file)
--- a/templates/CRM/Report/Form/Instance.tpl
+++ b/templates/CRM/Report/Form/Tabs/Instance.tpl
@@ -26,7 +26,7 @@
 <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>
+      <td class="report-label" width="20%">{$form.title.label} {help id="id-report_title" file="CRM/Report/Form/Tabs/Settings.hlp"}</td>
       <td >{$form.title.html}</td>
     </tr>
     <tr class="crm-report-instanceForm-form-block-description">
@@ -34,7 +34,7 @@
       <td>{$form.description.html}</td>
     </tr>
     <tr class="crm-report-instanceForm-form-block-report_header">
-      <td class="report-label" width="20%">{$form.report_header.label}{help id="id-report_header" file="CRM/Report/Form/Settings.hlp"}</td>
+      <td class="report-label" width="20%">{$form.report_header.label}{help id="id-report_header" file="CRM/Report/Form/Tabs/Settings.hlp"}</td>
       <td>{$form.report_header.html}</td>
     </tr>
     <tr class="crm-report-instanceForm-form-block-report_footer">
@@ -45,7 +45,7 @@
 </div>
 
 <div id="report-tab-email" class="civireport-criteria">
-  <h3 class="email-delivery-settings-title">{ts}Email Delivery Settings{/ts} {help id="id-email_settings" file="CRM/Report/Form/Settings.hlp"}</h3>
+  <h3 class="email-delivery-settings-title">{ts}Email Delivery Settings{/ts} {help id="id-email_settings" file="CRM/Report/Form/Tabs/Settings.hlp"}</h3>
   <table class="form-layout email-delivery-settings-fields">
     <tr class="crm-report-instanceForm-form-block-email_subject">
       <td class="report-label" width="20%">{$form.email_subject.label}</td>
@@ -80,7 +80,7 @@
     </tr>
     {if $config->userFramework neq 'Joomla'}
       <tr class="crm-report-instanceForm-form-block-permission">
-        <td class="report-label" width="20%">{$form.permission.label} {help id="id-report_perms" file="CRM/Report/Form/Settings.hlp"}</td>
+        <td class="report-label" width="20%">{$form.permission.label} {help id="id-report_perms" file="CRM/Report/Form/Tabs/Settings.hlp"}</td>
         <td>{$form.permission.html|crmAddClass:huge}</td>
       </tr>
       <tr class="crm-report-instanceForm-form-block-role">
@@ -89,19 +89,19 @@
       </tr>
     {/if}
     <tr class="crm-report-instanceForm-form-block-isReserved">
-      <td class="report-label">{$form.is_reserved.label} {help id="id-is_reserved" file="CRM/Report/Form/Settings.hlp"}</td>
+      <td class="report-label">{$form.is_reserved.label} {help id="id-is_reserved" file="CRM/Report/Form/Tabs/Settings.hlp"}</td>
       <td>{$form.is_reserved.html}
         <span class="description">{ts}If reserved, only users with 'administer reserved reports' permission can modify this report instance.{/ts}</span>
       </td>
     </tr>
     <tr class="crm-report-instanceForm-form-block-addToDashboard">
-      <td class="report-label">{$form.addToDashboard.label} {help id="id-dash_avail" file="CRM/Report/Form/Settings.hlp"}</td>
+      <td class="report-label">{$form.addToDashboard.label} {help id="id-dash_avail" file="CRM/Report/Form/Tabs/Settings.hlp"}</td>
       <td>{$form.addToDashboard.html}
         <span class="description">{ts}Users with appropriate permissions can add this report to their dashboard.{/ts}</span>
       </td>
     </tr>
     <tr id ="limit_result" class="crm-report-instanceForm-form-block-limitUser">
-      <td class="report-label">{$form.row_count.label} {help id="id-dash_limit" file="CRM/Report/Form/Settings.hlp"}</td>
+      <td class="report-label">{$form.row_count.label} {help id="id-dash_limit" file="CRM/Report/Form/Tabs/Settings.hlp"}</td>
       <td>{$form.row_count.html}</td>
     </tr>
   </table>

diff --git a/templates/CRM/Report/Form/Settings.hlp b/templates/CRM/Report/Form/Tabs/Settings.hlp
similarity index 100%
rename from templates/CRM/Report/Form/Settings.hlp
rename to templates/CRM/Report/Form/Tabs/Settings.hlp