From 6f672e5f362d9935658df6fc611144fa60943e81 Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Fri, 11 May 2012 13:49:20 +1200 Subject: [PATCH] MINOR Fixing use of <% control %> with <% with %> or <% loop %> as necessary. --- admin/templates/CMSBreadcrumbs.ss | 6 ++-- admin/templates/CMSTabSet.ss | 13 ++++---- admin/templates/Includes/Editor_toolbar.ss | 14 +++------ .../Includes/LeftAndMain_EditForm.ss | 24 +++++++------- admin/templates/Includes/LeftAndMain_Menu.ss | 10 +++--- .../LeftAndMain_SilverStripeNavigator.ss | 6 ++-- .../templates/Includes/ModelAdmin_Content.ss | 6 ++-- .../Includes/ModelAdmin_ImportSpec.ss | 10 +++--- admin/templates/LeftAndMain.ss | 31 +++++-------------- api/SapphireSoapServer_wsdl.ss | 16 +++++----- core/PaginatedList.php | 4 +-- model/DataDifferencer.php | 6 ++-- templates/ComplexTableField.ss | 24 +++++++------- templates/ComplexTableField_popup.ss | 4 +-- templates/Includes/Form.ss | 8 ++--- .../GridFieldAddExistingAutocompleter.ss | 7 +++-- .../Includes/GridFieldFilterHeader_Row.ss | 6 ++-- .../Includes/GridFieldSortableHeader_Row.ss | 4 +-- templates/Includes/GridField_Item.ss | 10 +++--- templates/Includes/GridField_print.ss | 10 +++--- .../Includes/HtmlEditorField_viewfile.ss | 6 ++-- templates/Includes/TableListField_Item.ss | 10 +++--- .../Includes/TableListField_Item_export.ss | 2 +- .../Includes/TableListField_SelectOptions.ss | 6 ++-- templates/Includes/TableListField_Summary.ss | 6 ++-- templates/RSSFeed.ss | 7 ++--- templates/RelationComplexTableField.ss | 12 +++---- templates/SearchForm.ss | 8 ++--- templates/TableField.ss | 20 ++++++------ templates/TableListField.ss | 24 +++++++------- templates/forms/CheckboxSetField.ss | 4 +-- templates/forms/DropdownField.ss | 6 ++-- templates/forms/OptionsetField.ss | 6 ++-- templates/forms/SelectionGroup.ss | 8 ++--- templates/forms/TabSet.ss | 14 ++++----- templates/forms/ToggleCompositeField.ss | 4 +-- .../templates/SSViewerTestRecursiveInclude.ss | 6 ++-- 37 files changed, 173 insertions(+), 195 deletions(-) diff --git a/admin/templates/CMSBreadcrumbs.ss b/admin/templates/CMSBreadcrumbs.ss index 9e6749c25..77a1cdd42 100644 --- a/admin/templates/CMSBreadcrumbs.ss +++ b/admin/templates/CMSBreadcrumbs.ss @@ -1,9 +1,9 @@
- <% control Breadcrumbs %> + <% loop Breadcrumbs %> <% if Last %> $Title.XML <% else %> $Title.XML/ <% end_if %> - <% end_control %> -
\ No newline at end of file + <% end_loop %> + diff --git a/admin/templates/CMSTabSet.ss b/admin/templates/CMSTabSet.ss index e6e37f932..292e84f8b 100644 --- a/admin/templates/CMSTabSet.ss +++ b/admin/templates/CMSTabSet.ss @@ -1,16 +1,15 @@
- <%-- Tab nav is rendered in CMSEditForm.ss --%> - - <% control Tabs %> + + <% loop Tabs %>
<% if Tabs %> $FieldHolder <% else %> - <% control Fields %> + <% loop Fields %> $FieldHolder - <% end_control %> + <% end_loop %> <% end_if %>
- <% end_control %> -
\ No newline at end of file + <% end_loop %> + diff --git a/admin/templates/Includes/Editor_toolbar.ss b/admin/templates/Includes/Editor_toolbar.ss index bc991b185..773877982 100644 --- a/admin/templates/Includes/Editor_toolbar.ss +++ b/admin/templates/Includes/Editor_toolbar.ss @@ -1,15 +1,11 @@ -<% control EditorToolbar %> +<% with EditorToolbar %>
- -<% control Buttons %> +<% loop Buttons %> <% if Type = button %> $Title @@ -21,15 +17,13 @@ <% else_if Type = break %>
<% end_if %> -<% end_control %> +<% end_loop %>
-
-<% end_control %> +<% end_with %> diff --git a/admin/templates/Includes/LeftAndMain_EditForm.ss b/admin/templates/Includes/LeftAndMain_EditForm.ss index 7f1bfb6c8..a08bea6eb 100644 --- a/admin/templates/Includes/LeftAndMain_EditForm.ss +++ b/admin/templates/Includes/LeftAndMain_EditForm.ss @@ -6,18 +6,18 @@ <% include BackLink_Button %>

- <% control Controller %> + <% with Controller %> <% include CMSSectionIcon %> <% include CMSBreadcrumbs %> - <% end_control %> + <% end_with %>

<% if Fields.hasTabset %> <% with Fields.fieldByName('Root') %>
<% end_with %> @@ -28,9 +28,9 @@ - <% control Controller %> - $EditFormTools - <% end_control %> + <% with Controller %> + $EditFormTools + <% end_with %>
<% if Message %> @@ -41,9 +41,9 @@
<% if Legend %>$Legend<% end_if %> - <% control Fields %> + <% loop Fields %> $FieldHolder - <% end_control %> + <% end_loop %>
@@ -51,9 +51,9 @@
<% if Actions %>
- <% control Actions %> + <% loop Actions %> $Field - <% end_control %> + <% end_loop %> <% if Controller.LinkPreview %> <% _t('LeftAndMain.PreviewButton', 'Preview') %> » @@ -64,4 +64,4 @@
<% if IncludeFormTag %> -<% end_if %> \ No newline at end of file +<% end_if %> diff --git a/admin/templates/Includes/LeftAndMain_Menu.ss b/admin/templates/Includes/LeftAndMain_Menu.ss index 43d02b481..0284d68f5 100644 --- a/admin/templates/Includes/LeftAndMain_Menu.ss +++ b/admin/templates/Includes/LeftAndMain_Menu.ss @@ -9,20 +9,20 @@
<% end_if %> - <% end_control %> + <% end_loop %>
@@ -52,4 +52,4 @@ » « - \ No newline at end of file + diff --git a/admin/templates/Includes/LeftAndMain_SilverStripeNavigator.ss b/admin/templates/Includes/LeftAndMain_SilverStripeNavigator.ss index 3ec525e40..2640cfebe 100644 --- a/admin/templates/Includes/LeftAndMain_SilverStripeNavigator.ss +++ b/admin/templates/Includes/LeftAndMain_SilverStripeNavigator.ss @@ -3,10 +3,10 @@ « <% _t('SilverStripeNavigator.Edit', 'Edit') %> - \ No newline at end of file + diff --git a/admin/templates/Includes/ModelAdmin_Content.ss b/admin/templates/Includes/ModelAdmin_Content.ss index 991705d30..08a165e77 100644 --- a/admin/templates/Includes/ModelAdmin_Content.ss +++ b/admin/templates/Includes/ModelAdmin_Content.ss @@ -13,11 +13,11 @@
@@ -29,4 +29,4 @@ $EditForm - \ No newline at end of file + diff --git a/admin/templates/Includes/ModelAdmin_ImportSpec.ss b/admin/templates/Includes/ModelAdmin_ImportSpec.ss index d79b40bbe..4c21df1e6 100644 --- a/admin/templates/Includes/ModelAdmin_ImportSpec.ss +++ b/admin/templates/Includes/ModelAdmin_ImportSpec.ss @@ -3,19 +3,19 @@

<% sprintf(_t('IMPORTSPECTITLE', 'Specification for %s'),$ModelName) %>

<% _t('IMPORTSPECFIELDS', 'Database columns') %>
- <% control Fields %> + <% loop Fields %>
$Name
$Description
- <% end_control %> + <% end_loop %>
<% _t('IMPORTSPECRELATIONS', 'Relations') %>
- <% control Relations %> + <% loop Relations %>
$Name
$Description
- <% end_control %> + <% end_loop %>
- \ No newline at end of file + diff --git a/admin/templates/LeftAndMain.ss b/admin/templates/LeftAndMain.ss index 4c1ca189c..210c40970 100644 --- a/admin/templates/LeftAndMain.ss +++ b/admin/templates/LeftAndMain.ss @@ -1,41 +1,24 @@ - -<% base_tag %> - - -$Title + + <% base_tag %> + + + $Title - - <% include CMSLoadingScreen %>
- $Menu - $Content - +
-
- + $EditorToolbar - - - diff --git a/api/SapphireSoapServer_wsdl.ss b/api/SapphireSoapServer_wsdl.ss index a0c46b88e..e8e8acffe 100644 --- a/api/SapphireSoapServer_wsdl.ss +++ b/api/SapphireSoapServer_wsdl.ss @@ -4,28 +4,28 @@ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="{$ServiceURL}wsdl" targetNamespace="{$ServiceURL}wsdl"> - <% control Methods %> + <% loop Methods %> - <% control Arguments %> + <% loop Arguments %> - <% end_control %> + <% end_loop %> - <% end_control %> + <% end_loop %> - <% control Methods %> + <% loop Methods %> - <% end_control %> + <% end_loop %> - <% control Methods %> + <% loop Methods %> @@ -35,7 +35,7 @@ targetNamespace="{$ServiceURL}wsdl"> - <% end_control %> + <% end_loop %> diff --git a/core/PaginatedList.php b/core/PaginatedList.php index 195541162..9addc8e48 100644 --- a/core/PaginatedList.php +++ b/core/PaginatedList.php @@ -209,7 +209,7 @@ class PaginatedList extends SS_ListDecorator { * <% if MyPages.NotFirstPage %> * * <% end_if %> - * <% control MyPages.PaginationSummary(4) %> + * <% loop MyPages.PaginationSummary(4) %> * <% if CurrentBool %> * $PageNum * <% else %> @@ -219,7 +219,7 @@ class PaginatedList extends SS_ListDecorator { * ... * <% end_if %> * <% end_if %> - * <% end_control %> + * <% end_loop %> * <% if MyPages.NotLastPage %> * * <% end_if %> diff --git a/model/DataDifferencer.php b/model/DataDifferencer.php index 5ca8cb4c3..490757815 100644 --- a/model/DataDifferencer.php +++ b/model/DataDifferencer.php @@ -13,10 +13,12 @@ * And then it can be used in a number of ways. You can use the ChangedFields() method in a template: * 
  * 

- * <% control Diff.ChangedFields %>
+ * <% with Diff %>
+ * <% loop ChangedFields %>
  *    
$Title

  *    
$Diff

- * <% end_control %>
+ * <% end_loop %>
+ * <% end_with %>
  * 

  *
* diff --git a/templates/ComplexTableField.ss b/templates/ComplexTableField.ss index 7df4cbc64..198186c1b 100644 --- a/templates/ComplexTableField.ss +++ b/templates/ComplexTableField.ss @@ -8,7 +8,7 @@ <% if Markable %> <% end_if %> - <% control Headings %> + <% loop Headings %> <% if IsSortable %> @@ -28,8 +28,8 @@ $Title <% end_if %> - <% end_control %> - <% control Actions %> <% end_control %> + <% end_loop %> + <% loop Actions %> <% end_loop %> @@ -37,10 +37,10 @@ <% if Markable %> <% end_if %> $SummaryTitle - <% control SummaryFields %> + <% loop SummaryFields %> class="$Function"<% end_if %>>$SummaryValue - <% end_control %> - <% control Actions %> <% end_control %> + <% end_loop %> + <% loop Actions %> <% end_loop %> <% end_if %> <% if Can(add) %> @@ -53,29 +53,29 @@ <% sprintf(_t('ADDITEM', 'Add %s', 'Add [name]'),$Title) %> - <% control Actions %> <% end_control %> + <% loop Actions %> <% end_loop %> <% end_if %> <% if Items %> - <% control Items %> + <% loop Items %> <% include TableListField_Item %> - <% end_control %> + <% end_loop %> <% else %> <% if Markable %> <% end_if %> <% _t('NOITEMSFOUND', 'No items found') %> - <% control Actions %> <% end_control %> + <% loop Actions %> <% end_loop %> <% end_if %> <% if Utility %>
- <% control Utility %> + <% loop Utility %> $Title - <% end_control %> + <% end_loop %>
<% end_if %> diff --git a/templates/ComplexTableField_popup.ss b/templates/ComplexTableField_popup.ss index 56c96764e..4e77f6b3f 100644 --- a/templates/ComplexTableField_popup.ss +++ b/templates/ComplexTableField_popup.ss @@ -21,13 +21,13 @@ <% if xdsfdsf %> <% else %> - <% control Paginator.Pages %> + <% loop Paginator.Pages %> <% if active %> $number <% else %> $number <% end_if %> - <% end_control %> + <% end_loop %> <% end_if %> <% if Paginator.NextLink %> diff --git a/templates/Includes/Form.ss b/templates/Includes/Form.ss index f680ee913..8407618fe 100644 --- a/templates/Includes/Form.ss +++ b/templates/Includes/Form.ss @@ -9,17 +9,17 @@
<% if Legend %>$Legend<% end_if %> - <% control Fields %> + <% loop Fields %> $FieldHolder - <% end_control %> + <% end_loop %>
<% if Actions %>
- <% control Actions %> + <% loop Actions %> $Field - <% end_control %> + <% end_loop %>
<% end_if %> <% if IncludeFormTag %> diff --git a/templates/Includes/GridFieldAddExistingAutocompleter.ss b/templates/Includes/GridFieldAddExistingAutocompleter.ss index 21fc9ad93..724ba3b04 100644 --- a/templates/Includes/GridFieldAddExistingAutocompleter.ss +++ b/templates/Includes/GridFieldAddExistingAutocompleter.ss @@ -1,4 +1,5 @@ -
<% control Fields %> +
+ <% loop Fields %> $Field - <% end_control %> -
\ No newline at end of file + <% end_loop %> +
diff --git a/templates/Includes/GridFieldFilterHeader_Row.ss b/templates/Includes/GridFieldFilterHeader_Row.ss index b5e00e095..c3a5bbd49 100644 --- a/templates/Includes/GridFieldFilterHeader_Row.ss +++ b/templates/Includes/GridFieldFilterHeader_Row.ss @@ -1,5 +1,5 @@ - <% control Fields %> + <% loop Fields %> $Field - <% end_control %> - \ No newline at end of file + <% end_loop %> + diff --git a/templates/Includes/GridFieldSortableHeader_Row.ss b/templates/Includes/GridFieldSortableHeader_Row.ss index d1493644c..880606e69 100644 --- a/templates/Includes/GridFieldSortableHeader_Row.ss +++ b/templates/Includes/GridFieldSortableHeader_Row.ss @@ -1,5 +1,5 @@ - <% control Fields %> + <% loop Fields %> $Field - <% end_control %> + <% end_loop %> diff --git a/templates/Includes/GridField_Item.ss b/templates/Includes/GridField_Item.ss index a662b3446..2128f53af 100644 --- a/templates/Includes/GridField_Item.ss +++ b/templates/Includes/GridField_Item.ss @@ -1,12 +1,12 @@ <% if $GridField.ExtraColumnsCount %> - <% control Fields %> + <% loop Fields %> $Value - <% end_control %> + <% end_loop %> <% else %> - <% control Fields %> + <% loop Fields %> class="ss-gridfield-{$FirstLast}"<% end_if %>>$Value - <% end_control %> + <% end_loop %> <% end_if %> - \ No newline at end of file + diff --git a/templates/Includes/GridField_print.ss b/templates/Includes/GridField_print.ss index 20b61155e..df1a9779c 100644 --- a/templates/Includes/GridField_print.ss +++ b/templates/Includes/GridField_print.ss @@ -7,12 +7,12 @@ <% if $Title %>

$Title

<% end_if %> - <% control Header %><% end_control %> + <% loop Header %><% end_loop %> - <% control ItemRows %> - <% control ItemRow %><% end_control %> - <% end_control %> + <% loop ItemRows %> + <% loop ItemRow %><% end_loop %> + <% end_loop %>
$CellString
$CellString
$CellString
$CellString

@@ -22,4 +22,4 @@

- \ No newline at end of file + diff --git a/templates/Includes/HtmlEditorField_viewfile.ss b/templates/Includes/HtmlEditorField_viewfile.ss index ded2dbc83..4075dce47 100644 --- a/templates/Includes/HtmlEditorField_viewfile.ss +++ b/templates/Includes/HtmlEditorField_viewfile.ss @@ -8,9 +8,9 @@
- <% control Fields %> + <% loop Fields %> $FieldHolder - <% end_control %> + <% end_loop %>
- \ No newline at end of file + diff --git a/templates/Includes/TableListField_Item.ss b/templates/Includes/TableListField_Item.ss index e8bf84af2..675b765ec 100644 --- a/templates/Includes/TableListField_Item.ss +++ b/templates/Includes/TableListField_Item.ss @@ -1,9 +1,9 @@ class="$HighlightClasses"<% end_if %>> <% if Markable %>$MarkingCheckbox<% end_if %> - <% control Fields %> + <% loop Fields %> $Value - <% end_control %> - <% control Actions %> + <% end_loop %> + <% loop Actions %> <% if IsAllowed %> title="$TitleText"<% end_if %>> @@ -15,5 +15,5 @@ <% end_if %> - <% end_control %> - \ No newline at end of file + <% end_loop %> + diff --git a/templates/Includes/TableListField_Item_export.ss b/templates/Includes/TableListField_Item_export.ss index 3c7dbbe7a..efa81daae 100644 --- a/templates/Includes/TableListField_Item_export.ss +++ b/templates/Includes/TableListField_Item_export.ss @@ -1 +1 @@ -<% control Fields %>"$Value"<% if Last %>\n<% else %>$CsvSeparator<% end_if %><% end_control %> \ No newline at end of file +<% loop Fields %>"$Value"<% if Last %>\n<% else %>$CsvSeparator<% end_if %><% end_loop %> diff --git a/templates/Includes/TableListField_SelectOptions.ss b/templates/Includes/TableListField_SelectOptions.ss index 75bd563e8..4145f339c 100644 --- a/templates/Includes/TableListField_SelectOptions.ss +++ b/templates/Includes/TableListField_SelectOptions.ss @@ -1,8 +1,8 @@ <% if SelectOptions %> - <% end_if %> \ No newline at end of file + <% end_if %> diff --git a/templates/Includes/TableListField_Summary.ss b/templates/Includes/TableListField_Summary.ss index f42a6820b..08b23a4fe 100644 --- a/templates/Includes/TableListField_Summary.ss +++ b/templates/Includes/TableListField_Summary.ss @@ -1,6 +1,6 @@ <% if Markable %> <% end_if %> $SummaryTitle - <% control SummaryFields %> + <% loop SummaryFields %> $SummaryValue - <% end_control %> - <% if Can(delete) %> <% end_if %> \ No newline at end of file + <% end_loop %> + <% if Can(delete) %> <% end_if %> diff --git a/templates/RSSFeed.ss b/templates/RSSFeed.ss index 2c92b580c..45bcab748 100644 --- a/templates/RSSFeed.ss +++ b/templates/RSSFeed.ss @@ -6,7 +6,7 @@ $Description.XML - <% control Entries %> + <% loop Entries %> $Title.XML $AbsoluteLink @@ -16,7 +16,6 @@ <% if Author %>$Author.XML<% end_if %> $AbsoluteLink - <% end_control %> - + <% end_loop %> - \ No newline at end of file + diff --git a/templates/RelationComplexTableField.ss b/templates/RelationComplexTableField.ss index a8d23ed23..3d6eafd20 100644 --- a/templates/RelationComplexTableField.ss +++ b/templates/RelationComplexTableField.ss @@ -7,9 +7,9 @@ <% if Markable %> <% end_if %> - <% control Headings %> + <% loop Headings %> $Title - <% end_control %> + <% end_loop %> <% if Can(show) %> <% end_if %> <% if Can(edit) %> <% end_if %> <% if Can(delete) %> <% end_if %> @@ -20,9 +20,9 @@ <% if Markable %> <% end_if %> $SummaryTitle - <% control SummaryFields %> + <% loop SummaryFields %> class="$Function"<% end_if %>>  - <% end_control %> + <% end_loop %> <% if Can(show) %> <% end_if %> <% if Can(edit) %> <% end_if %> <% if Can(delete) %> <% end_if %> @@ -44,9 +44,9 @@ <% if Items %> - <% control Items %> + <% loop Items %> <% include TableListField_Item %> - <% end_control %> + <% end_loop %> <% else %> <% if Markable %> <% end_if %> diff --git a/templates/SearchForm.ss b/templates/SearchForm.ss index 6558fdcf0..f3d195d0a 100644 --- a/templates/SearchForm.ss +++ b/templates/SearchForm.ss @@ -1,10 +1,10 @@
- <% control Fields %> + <% loop Fields %> $FieldHolder - <% end_control %> - <% control Actions %> + <% end_loop %> + <% loop Actions %> $Field - <% end_control %> + <% end_loop %>
diff --git a/templates/TableField.ss b/templates/TableField.ss index 61fa6ddc5..0762a3cf3 100644 --- a/templates/TableField.ss +++ b/templates/TableField.ss @@ -9,9 +9,9 @@ - <% control Headings %> + <% loop Headings %> - <% end_control %> + <% end_loop %> <% if Can(delete) %><% end_if %> @@ -20,9 +20,9 @@ <% if HasSummary %> - <% control SummaryFields %> + <% loop SummaryFields %> class="$Function"<% end_if %>>$SummaryValue - <% end_control %> + <% end_loop %> <% if Can(delete) %><% end_if %> @@ -41,15 +41,15 @@ <% if Items %> - <% control Items %> + <% loop Items %> - <% control Fields %> + <% loop Fields %> - <% end_control %> + <% end_loop %> <% if Can(delete) %><% end_if %> - <% end_control %> + <% end_loop %> <% else %> <% if Markable %><% end_if %> @@ -60,9 +60,9 @@
$Title 
$SummaryTitle 
$Field$ExtraData<% _t('DELETE') %>
 
<% if Print %><% else %>
- <% control Utility %> + <% loop Utility %> $Title - <% end_control %> + <% end_loop %>
<% end_if %> <% if Message %> $Message diff --git a/templates/TableListField.ss b/templates/TableListField.ss index 088d074fb..ff662da83 100644 --- a/templates/TableListField.ss +++ b/templates/TableListField.ss @@ -10,13 +10,13 @@ <% if Markable %><% if MarkableTitle %>$MarkableTitle<% else %> <% end_if %><% end_if %> <% if Print %> - <% control Headings %> + <% loop Headings %> $Title - <% end_control %> + <% end_loop %> <% else %> - <% control Headings %> + <% loop Headings %> <% if IsSortable %> @@ -35,7 +35,7 @@ $Title <% end_if %> - <% end_control %> + <% end_loop %> <% end_if %> <% if Can(delete) %> <% end_if %> @@ -51,19 +51,19 @@ <% if HasGroupedItems %> - <% control GroupedItems %> - <% control Items %> + <% loop GroupedItems %> + <% loop Items %> <% include TableListField_Item %> - <% end_control %> + <% end_loop %> <% include TableListField_Summary %> - <% end_control %> + <% end_loop %> <% else %> <% if Items %> - <% control Items %> + <% loop Items %> <% include TableListField_Item %> - <% end_control %> + <% end_loop %> <% else %> <% if Markable %> <% end_if %> @@ -78,8 +78,8 @@ <% if Print %><% else %>
- <% control Utility %> + <% loop Utility %> $Title - <% end_control %> + <% end_loop %>
<% end_if %> diff --git a/templates/forms/CheckboxSetField.ss b/templates/forms/CheckboxSetField.ss index ce252b09b..6de74f359 100644 --- a/templates/forms/CheckboxSetField.ss +++ b/templates/forms/CheckboxSetField.ss @@ -1,11 +1,11 @@
    title="$Description"<% end_if %>> <% if Options.Count %> - <% control Options %> + <% loop Options %>
  • checked="checked"<% end_if %><% if isDisabled %> disabled="disabled"<% end_if %>>
    • - <% end_control %> + <% end_loop %> <% else %>
  • No options available
    • <% end_if %> diff --git a/templates/forms/DropdownField.ss b/templates/forms/DropdownField.ss index a19f46a8e..f7df474e4 100644 --- a/templates/forms/DropdownField.ss +++ b/templates/forms/DropdownField.ss @@ -1,5 +1,5 @@ \ No newline at end of file +<% end_loop %> + diff --git a/templates/forms/OptionsetField.ss b/templates/forms/OptionsetField.ss index 485be8b70..aff9ec636 100644 --- a/templates/forms/OptionsetField.ss +++ b/templates/forms/OptionsetField.ss @@ -1,8 +1,8 @@
      title="$Description"<% end_if %>> - <% control Options %> + <% loop Options %>
    • checked<% end_if %><% if isDisabled %> disabled<% end_if %>>
      • - <% end_control %> -
    \ No newline at end of file + <% end_loop %> +
diff --git a/templates/forms/SelectionGroup.ss b/templates/forms/SelectionGroup.ss index 3c85bf437..dccec5d6f 100644 --- a/templates/forms/SelectionGroup.ss +++ b/templates/forms/SelectionGroup.ss @@ -1,6 +1,6 @@ <% if IsReadonly %>
    - <% control FieldSet %> + <% loop FieldSet %> <% if Selected %> $RadioLabel @@ -8,7 +8,7 @@
<% end_if %> - <% end_control %> + <% end_loop %> <% else %> -
    <% control FieldSet %>{$RadioButton}{$RadioLabel}{$FieldHolder}<% end_control %>
-<% end_if %> \ No newline at end of file +
    <% loop FieldSet %>{$RadioButton}{$RadioLabel}{$FieldHolder}<% end_loop %>
+<% end_if %> diff --git a/templates/forms/TabSet.ss b/templates/forms/TabSet.ss index 733dd6677..79de3d10b 100644 --- a/templates/forms/TabSet.ss +++ b/templates/forms/TabSet.ss @@ -1,19 +1,19 @@
    - <% control Tabs %> + <% loop Tabs %>
  • $Title
    • - <% end_control %> + <% end_loop %>
- <% control Tabs %> + <% loop Tabs %>
<% if Tabs %> $FieldHolder <% else %> - <% control Fields %> + <% loop Fields %> $FieldHolder - <% end_control %> + <% end_loop %> <% end_if %>
- <% end_control %> -
\ No newline at end of file + <% end_loop %> + diff --git a/templates/forms/ToggleCompositeField.ss b/templates/forms/ToggleCompositeField.ss index ae6510939..a83c1d50c 100644 --- a/templates/forms/ToggleCompositeField.ss +++ b/templates/forms/ToggleCompositeField.ss @@ -5,8 +5,8 @@ $Title
- <% control FieldSet %> + <% loop FieldSet %> $FieldHolder - <% end_control %> + <% end_loop %>
diff --git a/tests/templates/SSViewerTestRecursiveInclude.ss b/tests/templates/SSViewerTestRecursiveInclude.ss index e781f09a4..6d83441d2 100644 --- a/tests/templates/SSViewerTestRecursiveInclude.ss +++ b/tests/templates/SSViewerTestRecursiveInclude.ss @@ -1,6 +1,6 @@ $Title <% if Children %> -<% control Children %> +<% loop Children %> <% include SSViewerTestRecursiveInclude %> -<% end_control %> -<% end_if %> \ No newline at end of file +<% end_loop %> +<% end_if %>