From b69e578b2e6c0c8d9aaec50e4042f6e500acc3d5 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Thu, 11 Dec 2014 13:32:44 -0500 Subject: [PATCH] Report tpl whitespace cleanup --- templates/CRM/Report/Form.tpl | 66 ++-- templates/CRM/Report/Form/Actions.tpl | 136 +++---- templates/CRM/Report/Form/Criteria.tpl | 398 ++++++++++----------- templates/CRM/Report/Form/ErrorMessage.tpl | 6 +- templates/CRM/Report/Form/Fields.tpl | 56 +-- templates/CRM/Report/Form/Instance.tpl | 106 +++--- templates/CRM/Report/Form/Register.tpl | 102 +++--- templates/CRM/Report/Form/Statistics.tpl | 72 ++-- templates/CRM/Report/Page/InstanceList.tpl | 98 ++--- templates/CRM/Report/Page/List.tpl | 88 ++--- templates/CRM/Report/Page/Options.tpl | 86 ++--- templates/CRM/Report/Page/TemplateList.tpl | 76 ++-- 12 files changed, 643 insertions(+), 647 deletions(-) diff --git a/templates/CRM/Report/Form.tpl b/templates/CRM/Report/Form.tpl index 6460ef5b49..a8a3f923e7 100644 --- a/templates/CRM/Report/Form.tpl +++ b/templates/CRM/Report/Form.tpl @@ -27,44 +27,44 @@ {include file="CRM/common/crmeditable.tpl"} {/if} {* this div is being used to apply special css *} - {if $section eq 1} -
- {*include the graph*} - {include file="CRM/Report/Form/Layout/Graph.tpl"} -
- {elseif $section eq 2} -
- {*include the table layout*} - {include file="CRM/Report/Form/Layout/Table.tpl"} +{if $section eq 1} +
+ {*include the graph*} + {include file="CRM/Report/Form/Layout/Graph.tpl"} +
+{elseif $section eq 2} +
+ {*include the table layout*} + {include file="CRM/Report/Form/Layout/Table.tpl"}
- {else} - {if $criteriaForm OR $instanceForm OR $instanceFormError} +{else} + {if $criteriaForm OR $instanceForm OR $instanceFormError}
- {include file="CRM/Report/Form/Fields.tpl"} + {include file="CRM/Report/Form/Fields.tpl"}
- {/if} + {/if} -
- {*include actions*} - {include file="CRM/Report/Form/Actions.tpl"} +
+ {*include actions*} + {include file="CRM/Report/Form/Actions.tpl"} - {*Statistics at the Top of the page*} - {include file="CRM/Report/Form/Statistics.tpl" top=true} + {*Statistics at the Top of the page*} + {include file="CRM/Report/Form/Statistics.tpl" top=true} - {*include the graph*} - {include file="CRM/Report/Form/Layout/Graph.tpl"} + {*include the graph*} + {include file="CRM/Report/Form/Layout/Graph.tpl"} - {*include the table layout*} - {include file="CRM/Report/Form/Layout/Table.tpl"} -
- {*Statistics at the bottom of the page*} - {include file="CRM/Report/Form/Statistics.tpl" bottom=true} + {*include the table layout*} + {include file="CRM/Report/Form/Layout/Table.tpl"} +
+ {*Statistics at the bottom of the page*} + {include file="CRM/Report/Form/Statistics.tpl" bottom=true} - {include file="CRM/Report/Form/ErrorMessage.tpl"} -
- {/if} - {if $outputMode == 'print'} - - {/if} + {include file="CRM/Report/Form/ErrorMessage.tpl"} +
+{/if} +{if $outputMode == 'print'} + +{/if} diff --git a/templates/CRM/Report/Form/Actions.tpl b/templates/CRM/Report/Form/Actions.tpl index 7a8a89a9b5..ef56ae60db 100644 --- a/templates/CRM/Report/Form/Actions.tpl +++ b/templates/CRM/Report/Form/Actions.tpl @@ -25,81 +25,81 @@ *} {if !$printOnly} {* NO print section starts *} - {* build the print pdf buttons *} - {if $rows} -
- {assign var=print value="_qf_"|cat:$form.formName|cat:"_submit_print"} - {assign var=pdf value="_qf_"|cat:$form.formName|cat:"_submit_pdf"} - {assign var=csv value="_qf_"|cat:$form.formName|cat:"_submit_csv"} - {assign var=group value="_qf_"|cat:$form.formName|cat:"_submit_group"} - {assign var=chart value="_qf_"|cat:$form.formName|cat:"_submit_chart"} - - - - - -
- - - - - - {if $instanceUrl} - - {/if} - -
{$form.$print.html}  {$form.$pdf.html}  {$form.$csv.html}    » {ts}Existing report(s) from this template{/ts}
- 		- - {if $chartSupported} - - - - - {/if} - {if $form.groups} - - - - {/if} -
{$form.charts.html|crmAddClass:big}{$form.$chart.html}
- {$form.groups.html}{$form.$group.html} - -
-
-
- {/if} + {* build the print pdf buttons *} + {if $rows} +
+ {assign var=print value="_qf_"|cat:$form.formName|cat:"_submit_print"} + {assign var=pdf value="_qf_"|cat:$form.formName|cat:"_submit_pdf"} + {assign var=csv value="_qf_"|cat:$form.formName|cat:"_submit_csv"} + {assign var=group value="_qf_"|cat:$form.formName|cat:"_submit_group"} + {assign var=chart value="_qf_"|cat:$form.formName|cat:"_submit_chart"} + + + + + +
+ + + + + + {if $instanceUrl} + + {/if} + +
{$form.$print.html}  {$form.$pdf.html}  {$form.$csv.html}    » {ts}Existing report(s) from this template{/ts}
+ 		+ + {if $chartSupported} + + + + + {/if} + {if $form.groups} + + + + {/if} +
{$form.charts.html|crmAddClass:big}{$form.$chart.html}
+ {$form.groups.html}{$form.$group.html} + +
+
+
+ {/if} - {literal} - - {/literal} + +{/literal} {/if} {* NO print section ends *} diff --git a/templates/CRM/Report/Form/Criteria.tpl b/templates/CRM/Report/Form/Criteria.tpl index 235aadca96..bd3428a780 100644 --- a/templates/CRM/Report/Form/Criteria.tpl +++ b/templates/CRM/Report/Form/Criteria.tpl @@ -24,200 +24,200 @@ +--------------------------------------------------------------------+ *} {* Report form criteria section *} - {if $colGroups} +{if $colGroups}
- {foreach from=$colGroups item=grpFields key=dnc} - {assign var="count" value="0"} - {* Wrap custom field sets in collapsed accordion pane. *} - {if $grpFields.group_title} - - {/if} - {/foreach} -
- {/if} + {foreach from=$colGroups item=grpFields key=dnc} + {assign var="count" value="0"} + {* Wrap custom field sets in collapsed accordion pane. *} + {if $grpFields.group_title} + + {/if} + {/foreach} +
+{/if} - {if $groupByElements} -
- {assign var="count" value="0"} - - - {foreach from=$groupByElements item=gbElem key=dnc} - {assign var="count" value=`$count+1`} - - {if $count is div by 4} - - {/if} - {/foreach} - {if $count is not div by 4} - - {/if} - -
- {$form.group_bys[$gbElem].html} - {if $form.group_bys_freq[$gbElem].html}:
-   {$form.group_bys_freq[$gbElem].label} {$form.group_bys_freq[$gbElem].html} - {/if} -
-
- {/if} +{if $groupByElements} +
+ {assign var="count" value="0"} + + + {foreach from=$groupByElements item=gbElem key=dnc} + {assign var="count" value=`$count+1`} + + {if $count is div by 4} + + {/if} + {/foreach} + {if $count is not div by 4} + + {/if} + +
+ {$form.group_bys[$gbElem].html} + {if $form.group_bys_freq[$gbElem].html}:
+   {$form.group_bys_freq[$gbElem].label} {$form.group_bys_freq[$gbElem].html} + {/if} +
+
+{/if} - {if $orderByOptions} -
- - +{if $orderByOptions} +
+
+ - + - {section name=rowLoop start=1 loop=6} - {assign var=index value=$smarty.section.rowLoop.index} - - - - - - - - {/section} -
  {ts}Column{/ts} {ts}Order{/ts} {ts}Section Header / Group By{/ts} {ts}Page Break{/ts}
- {if $index GT 1} - {ts}hide field or section{/ts} - {/if} - {$form.order_bys.$index.column.html} {$form.order_bys.$index.order.html} {$form.order_bys.$index.section.html} {$form.order_bys.$index.pageBreak.html}
- - -
- {/if} + {/literal} + + +{/if} - {if $otherOptions} -
- - {assign var="optionCount" value=0} - - {foreach from=$otherOptions item=optionField key=optionName} - {assign var="optionCount" value=`$optionCount+1`} - - {if $optionCount is div by 2} - - {/if} - {/foreach} - {if $optionCount is not div by 2} - - {/if} - -
{if $form.$optionName.label}{$form.$optionName.label} {/if}{$form.$optionName.html}
-
- {/if} +{if $otherOptions} +
+ + {assign var="optionCount" value=0} + + {foreach from=$otherOptions item=optionField key=optionName} + {assign var="optionCount" value=`$optionCount+1`} + + {if $optionCount is div by 2} + + {/if} + {/foreach} + {if $optionCount is not div by 2} + + {/if} + +
{if $form.$optionName.label}{$form.$optionName.label} {/if}{$form.$optionName.html}
+
+{/if} - {if $filters} -
- - {assign var="counter" value=1} - {foreach from=$filters item=table key=tableName} - {assign var="filterCount" value=$table|@count} - {* Wrap custom field sets in collapsed accordion pane. *} - {if $colGroups.$tableName.group_title and $filterCount gte 1} - {* we should close table that contains other filter elements before we start building custom group accordian *} - {if $counter eq 1} -
- {assign var="counter" value=0} +{if $filters} +
+ + {assign var="counter" value=1} + {foreach from=$filters item=table key=tableName} + {assign var="filterCount" value=$table|@count} + {* Wrap custom field sets in collapsed accordion pane. *} + {if $colGroups.$tableName.group_title and $filterCount gte 1} + {* we should close table that contains other filter elements before we start building custom group accordian *} + {if $counter eq 1} +
+ {assign var="counter" value=0} + {/if} + - {assign var=closed value=1"} {*-- ie table tags are closed-- *} + {foreach from=$table item=field key=fieldName} + {assign var=fieldOp value=$fieldName|cat:"_op"} + {assign var=filterVal value=$fieldName|cat:"_value"} + {assign var=filterMin value=$fieldName|cat:"_min"} + {assign var=filterMax value=$fieldName|cat:"_max"} + {if $field.operatorType & 4} + + {$field.title} + {include file="CRM/Core/DateRange.tpl" fieldName=$fieldName from='_from' to='_to'} + + {elseif $form.$fieldOp.html} + + {$field.title} + {$form.$fieldOp.html} + + {$form.$filterVal.label} {$form.$filterVal.html} + {$form.$filterMin.label} {$form.$filterMin.html}  {$form.$filterMax.label} {$form.$filterMax.html} + + + {/if} + {/foreach} + {if $colGroups.$tableName.group_title} + +
+
+ {assign var=closed value=1"} {*-- ie table tags are closed-- *} {else} {assign var=closed value=0"} {*-- ie table tags are not closed-- *} {/if} @@ -228,11 +228,11 @@ {/if} {literal} - - {/literal} + +{/literal} diff --git a/templates/CRM/Report/Form/ErrorMessage.tpl b/templates/CRM/Report/Form/ErrorMessage.tpl index bf77f08d98..946f8c3883 100644 --- a/templates/CRM/Report/Form/ErrorMessage.tpl +++ b/templates/CRM/Report/Form/ErrorMessage.tpl @@ -24,7 +24,7 @@ +--------------------------------------------------------------------+ *} {if $outputMode eq 'html' && !$rows} -
-
  {ts}None found.{/ts} -
+
+
  {ts}None found.{/ts} +
{/if} diff --git a/templates/CRM/Report/Form/Fields.tpl b/templates/CRM/Report/Form/Fields.tpl index b1c3db36fa..b310654480 100644 --- a/templates/CRM/Report/Form/Fields.tpl +++ b/templates/CRM/Report/Form/Fields.tpl @@ -24,8 +24,8 @@ +--------------------------------------------------------------------+ *} {if !$printOnly} {* NO print section starts *} -{if $criteriaForm} -
{* criteria section starts *} + {if $criteriaForm} +
{* criteria section starts *}
{*tab navigation bar*}
    @@ -76,35 +76,35 @@ {/if}
{* end mainTabContainer *} - {assign var=save value="_qf_"|cat:$form.formName|cat:"_submit_save"} - {assign var=next value="_qf_"|cat:$form.formName|cat:"_submit_next"} -
- {$form.buttons.html} - {if $instanceForm} - {$form.$save.html} - {/if} - {if $mode neq 'template' && $form.$next} - {$form.$next.html} - {/if} -
-
{* criteria section ends *} - {/if} + {assign var=save value="_qf_"|cat:$form.formName|cat:"_submit_save"} + {assign var=next value="_qf_"|cat:$form.formName|cat:"_submit_next"} +
+ {$form.buttons.html} + {if $instanceForm} + {$form.$save.html} + {/if} + {if $mode neq 'template' && $form.$next} + {$form.$next.html} + {/if} +
+
{* criteria section ends *} + {/if} {literal} - + {/literal} {/if} {* NO print section ends *} diff --git a/templates/CRM/Report/Form/Instance.tpl b/templates/CRM/Report/Form/Instance.tpl index b4a610e5f4..a1918805bc 100644 --- a/templates/CRM/Report/Form/Instance.tpl +++ b/templates/CRM/Report/Form/Instance.tpl @@ -24,69 +24,69 @@ +--------------------------------------------------------------------+ *}
- +
- - + + - - + + - - + + - - + + -
{$form.title.label} {help id="id-report_title" file="CRM/Report/Form/Settings.hlp"}{$form.title.html}{$form.title.label} {help id="id-report_title" file="CRM/Report/Form/Settings.hlp"}{$form.title.html}
{$form.description.label}{$form.description.html}{$form.description.label}{$form.description.html}
{$form.report_header.label}{help id="id-report_header" file="CRM/Report/Form/Settings.hlp"}{$form.report_header.html}{$form.report_header.label}{help id="id-report_header" file="CRM/Report/Form/Settings.hlp"}{$form.report_header.html}
{$form.report_footer.label}{$form.report_footer.html}{$form.report_footer.label}{$form.report_footer.html}
+
- - + + - - + + - - + + - +
- +
- - + + - - + + {if $config->userFramework neq 'Joomla'} - - - - - - - - + + + + + + + + {/if} @@ -104,7 +104,7 @@ -
{$form.is_navigation.label}{$form.is_navigation.html}
- {ts}All report instances are automatically included in the Report Listing page. Check this box to also add this report to the navigation menu.{/ts} - 		{$form.is_navigation.label}{$form.is_navigation.html}
+ {ts}All report instances are automatically included in the Report Listing page. Check this box to also add this report to the navigation menu.{/ts} +
{$form.drilldown_id.label} {$form.drilldown_id.html}
{$form.permission.label} {help id="id-report_perms" file="CRM/Report/Form/Settings.hlp"}{$form.permission.html|crmAddClass:huge}
{$form.grouprole.label}{$form.grouprole.html|crmAddClass:huge}
{$form.permission.label} {help id="id-report_perms" file="CRM/Report/Form/Settings.hlp"}{$form.permission.html|crmAddClass:huge}
{$form.grouprole.label}{$form.grouprole.html|crmAddClass:huge}
{$form.is_reserved.label} {help id="id-is_reserved" file="CRM/Report/Form/Settings.hlp"}{$form.row_count.label} {help id="id-dash_limit" file="CRM/Report/Form/Settings.hlp"} {$form.row_count.html}
+
{include file="CRM/common/showHideByFieldValue.tpl" @@ -125,33 +125,29 @@ } {if $is_navigation} - + {/if} {literal} {/literal} diff --git a/templates/CRM/Report/Form/Register.tpl b/templates/CRM/Report/Form/Register.tpl index f3b81278a2..1269f5133c 100644 --- a/templates/CRM/Report/Form/Register.tpl +++ b/templates/CRM/Report/Form/Register.tpl @@ -31,67 +31,67 @@

{ts}New Report Template{/ts}

{/if}
-{if $action eq 8} - + {if $action eq 8} +
- - + + - + -{else} + {else}
{include file="CRM/common/formButtons.tpl" location="top"}
-
{include file="CRM/common/formButtons.tpl" location="top"}
+
+
-
  - {ts}WARNING: Deleting this option will result in the loss of all Report related records which use the option. This may mean the loss of a substantial amount of data, and the action cannot be undone. Do you want to continue?{/ts} +
  + {ts}WARNING: Deleting this option will result in the loss of all Report related records which use the option. This may mean the loss of a substantial amount of data, and the action cannot be undone. Do you want to continue?{/ts}
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -{/if} - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {/if} + - +
{include file="CRM/common/formButtons.tpl" location="top"}
-
{$form.label.label}{$form.label.html}
{ts}Report title appear in the display screen.{/ts} -
{$form.description.label}{$form.description.html}
{ts}Report description appear in the display screen.{/ts} -
{$form.value.label}{$form.value.html}
{ts}Report Url must be like "contribute/summary"{/ts} -
{$form.name.label}{$form.name.html}
{ts}Report Class must be present before adding the report here, e.g. 'CRM_Report_Form_Contribute_Summary'{/ts} -
{$form.weight.label}{$form.weight.html}
{$form.component_id.label}{$form.component_id.html}
{ts}Specify the Report if it is belongs to any component like "CiviContribute"{/ts} -
{$form.is_active.label}{$form.is_active.html}
{include file="CRM/common/formButtons.tpl" location="top"}
+
{$form.label.label}{$form.label.html}
{ts}Report title appear in the display screen.{/ts} +
{$form.description.label}{$form.description.html}
{ts}Report description appear in the display screen.{/ts} +
{$form.value.label}{$form.value.html}
{ts}Report Url must be like "contribute/summary"{/ts} +
{$form.name.label}{$form.name.html}
{ts}Report Class must be present before adding the report here, e.g. 'CRM_Report_Form_Contribute_Summary'{/ts} +
{$form.weight.label}{$form.weight.html}
{$form.component_id.label}{$form.component_id.html}
{ts}Specify the Report if it is belongs to any component like "CiviContribute"{/ts} +
{$form.is_active.label}{$form.is_active.html}
{include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/Report/Form/Statistics.tpl b/templates/CRM/Report/Form/Statistics.tpl index 95663383da..ff6b6c3ea8 100644 --- a/templates/CRM/Report/Form/Statistics.tpl +++ b/templates/CRM/Report/Form/Statistics.tpl @@ -24,44 +24,44 @@ +--------------------------------------------------------------------+ *} {if $top} - {if $printOnly} -

{$reportTitle}

-
{$reportDate}
- {/if} - {if $statistics and $outputMode} - - {foreach from=$statistics.groups item=row} - - - - - {/foreach} - {foreach from=$statistics.filters item=row} - - - - - {/foreach} -
{$row.title}{$row.value}
{$row.title}{$row.value}
- {/if} + {if $printOnly} +

{$reportTitle}

+
{$reportDate}
+ {/if} + {if $statistics and $outputMode} + + {foreach from=$statistics.groups item=row} + + + + + {/foreach} + {foreach from=$statistics.filters item=row} + + + + + {/foreach} +
{$row.title}{$row.value}
{$row.title}{$row.value}
+ {/if} {/if} {if $bottom and $rows and $statistics} - - {foreach from=$statistics.counts item=row} - - - + + {/foreach} +
{$row.title} - {if $row.type eq 1024} - {$row.value|crmMoney} - {elseif $row.type eq 2} - {$row.value} - {else} - {$row.value|crmNumberFormat} - {/if} + + {foreach from=$statistics.counts item=row} + + + - - {/foreach} -
{$row.title} + {if $row.type eq 1024} + {$row.value|crmMoney} + {elseif $row.type eq 2} + {$row.value} + {else} + {$row.value|crmNumberFormat} + {/if} -
+
{/if} diff --git a/templates/CRM/Report/Page/InstanceList.tpl b/templates/CRM/Report/Page/InstanceList.tpl index 6fcf2ac966..091d7fee59 100644 --- a/templates/CRM/Report/Page/InstanceList.tpl +++ b/templates/CRM/Report/Page/InstanceList.tpl @@ -24,61 +24,61 @@ +--------------------------------------------------------------------+ *} {strip} -
- {if $templateUrl} -
{$newButton} - {/if} - {if $reportUrl} - {ts}View All Reports{/ts} - {/if} -
-{if $list} -
-{counter start=0 skip=1 print=false} -{foreach from=$list item=rows key=report} -
-
- {if $title}{$title}{elseif $report EQ 'Contribute'}{ts}Contribution Reports{/ts}{else}{$report} {ts}Reports{/ts}{/if} -
-
-
- - {foreach from=$rows item=row} - - - - {if $row.deleteUrl} - - {/if} - - {/foreach} -
» {$row.title}{$row.description}{ts}Delete{/ts}
+
+ {if $templateUrl} +
{$newButton} + {/if} + {if $reportUrl} + {ts}View All Reports{/ts} + {/if}
-
-
-{/foreach} -
+ {if $list} +
+ {counter start=0 skip=1 print=false} + {foreach from=$list item=rows key=report} +
+
+ {if $title}{$title}{elseif $report EQ 'Contribute'}{ts}Contribution Reports{/ts}{else}{$report} {ts}Reports{/ts}{/if} +
+
+
+ + {foreach from=$rows item=row} + + + + {if $row.deleteUrl} + + {/if} + + {/foreach} +
» {$row.title}{$row.description}{ts}Delete{/ts}
+
+
+
+ {/foreach} +
-
- {if $templateUrl} -
{$newButton} - {/if} - {if $reportUrl} - {ts}View All Reports{/ts} - {/if} -
+
+ {if $templateUrl} +
{$newButton} + {/if} + {if $reportUrl} + {ts}View All Reports{/ts} + {/if} +
-{else} -
-
-
  + {else} +
+
+
  {ts 1=$compName}No %1 reports have been created.{/ts}   {if $templateUrl} - {ts 1=$templateUrl}You can create reports by selecting from the list of report templates here.{/ts} + {ts 1=$templateUrl}You can create reports by selecting from the list of report templates here.{/ts} {else} - {ts}Contact your site administrator for help creating reports.{/ts} + {ts}Contact your site administrator for help creating reports.{/ts} {/if} +
-
-{/if} + {/if} {/strip} diff --git a/templates/CRM/Report/Page/List.tpl b/templates/CRM/Report/Page/List.tpl index 4ba7bce435..d2650a1b26 100644 --- a/templates/CRM/Report/Page/List.tpl +++ b/templates/CRM/Report/Page/List.tpl @@ -24,57 +24,57 @@ +--------------------------------------------------------------------+ *} {strip} -
- {ts}Template List{/ts} - {if $list} - {foreach from=$list item=rows key=report} -
-
- +
+ {ts}Template List{/ts} + {if $list} + {foreach from=$list item=rows key=report} +
+
+
- - -
{if $report}{$report}{else}Contact{/if} Reports
-
- + + +
{/foreach} - {else} -
-
  {ts}There are currently no Reports.{/ts} -
- {/if} - + {else} +
+
  {ts}There are currently no Reports.{/ts} +
+ {/if} + {/strip} {literal} - + {/literal} diff --git a/templates/CRM/Report/Page/Options.tpl b/templates/CRM/Report/Page/Options.tpl index ec693677e2..f799dd6993 100644 --- a/templates/CRM/Report/Page/Options.tpl +++ b/templates/CRM/Report/Page/Options.tpl @@ -24,63 +24,63 @@ +--------------------------------------------------------------------+ *}
- {ts 1=$GName}The existing option choices for %1 group are listed below. You can add, edit or delete them from this screen.{/ts} + {ts 1=$GName}The existing option choices for %1 group are listed below. You can add, edit or delete them from this screen.{/ts}
{if $action ne 1 and $action ne 2} -
- » {ts 1=$GName}Register New %1{/ts} -
-
+
+ » {ts 1=$GName}Register New %1{/ts} +
+
{/if} {if $rows} -
- {strip} - {* handle enable/disable actions*} - {include file="CRM/common/enableDisableApi.tpl"} - {include file="CRM/common/crmeditable.tpl"} - - - - - - - - {if $showIsDefault} +
+ {strip} + {* handle enable/disable actions*} + {include file="CRM/common/enableDisableApi.tpl"} + {include file="CRM/common/crmeditable.tpl"} +
{ts}Label{/ts}{ts}URL{/ts}{ts}Description{/ts}{ts}Order{/ts}
+ + + + + + + {if $showIsDefault} - {/if} - - - - - - + {/if} + + + + + + - {foreach from=$rows item=row} - - + {foreach from=$rows item=row} + + {if $showIsDefault} - + {/if} - - + + - - {/foreach} + + {/foreach}
{ts}Label{/ts}{ts}URL{/ts}{ts}Description{/ts}{ts}Order{/ts}{ts}Default{/ts}{ts}Reserved{/ts}{ts}Enabled?{/ts}{ts}Component{/ts}
{ts}Reserved{/ts}{ts}Enabled?{/ts}{ts}Component{/ts}
{$row.label}
{$row.label} {$row.value} {$row.description} {$row.weight}{$row.default_value}{$row.default_value}{if $row.is_reserved eq 1}{ts}Yes{/ts} {else} {ts}No{/ts} {/if}{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}{$row.component_name}{if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}{$row.component_name} {$row.action}
- {/strip} + {/strip} - {if $action ne 1 and $action ne 2} -
- » {ts 1=$GName}Register New %1{/ts} -
- {/if} -
+ {if $action ne 1 and $action ne 2} +
+ » {ts 1=$GName}Register New %1{/ts} +
+ {/if} +
{else} -
- {ts}status{/ts}  {ts 1=$newReport}There are no option values entered. You can add one.{/ts} -
+
+ {ts}status{/ts}  {ts 1=$newReport}There are no option values entered. You can add one.{/ts} +
{/if} diff --git a/templates/CRM/Report/Page/TemplateList.tpl b/templates/CRM/Report/Page/TemplateList.tpl index 3952ae88b1..014f43ff5f 100644 --- a/templates/CRM/Report/Page/TemplateList.tpl +++ b/templates/CRM/Report/Page/TemplateList.tpl @@ -24,45 +24,45 @@ +--------------------------------------------------------------------+ *}
-
-{ts}Create reports for your users from any of the report templates listed below. Click on a template title to get started. Click Existing Report(s) to see any reports that have already been created from that template.{/ts} -
-{strip} -{if $list} -{counter start=0 skip=1 print=false} - {foreach from=$list item=rows key=report} -
-
- {if $report}{if $report EQ 'Contribute'}{ts}Contribution{/ts}{else}{$report}{/if}{else}Contact{/if} Report Templates -
-
-
- - {foreach from=$rows item=row} - - - - - {/foreach} -
- » {$row.title} - {if $row.instanceUrl} - - {/if} - - {$row.description} -
+
+ {ts}Create reports for your users from any of the report templates listed below. Click on a template title to get started. Click Existing Report(s) to see any reports that have already been created from that template.{/ts}
-
-
-{/foreach} -{else} -
+ {strip} + {if $list} + {counter start=0 skip=1 print=false} + {foreach from=$list item=rows key=report} +
+
+ {if $report}{if $report EQ 'Contribute'}{ts}Contribution{/ts}{else}{$report}{/if}{else}Contact{/if} Report Templates +
+
+
+ + {foreach from=$rows item=row} + + + + + {/foreach} +
+ » {$row.title} + {if $row.instanceUrl} + + {/if} + + {$row.description} +
+
+
+
+ {/foreach} + {else} +
  {ts}There are currently no Report Templates.{/ts} -
-{/if} -{/strip} +
+ {/if} + {/strip}
-- 2.25.1