Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

MINOR Fixing use of <% control %> with <% with %> or <% loop %> as ne…

…cessary.
  • Loading branch information...
commit 6f672e5f362d9935658df6fc611144fa60943e81 1 parent 1e6a526
@halkyon halkyon authored
Showing with 173 additions and 195 deletions.
  1. +3 −3 admin/templates/CMSBreadcrumbs.ss
  2. +6 −7 admin/templates/CMSTabSet.ss
  3. +4 −10 admin/templates/Includes/Editor_toolbar.ss
  4. +12 −12 admin/templates/Includes/LeftAndMain_EditForm.ss
  5. +5 −5 admin/templates/Includes/LeftAndMain_Menu.ss
  6. +3 −3 admin/templates/Includes/LeftAndMain_SilverStripeNavigator.ss
  7. +3 −3 admin/templates/Includes/ModelAdmin_Content.ss
  8. +5 −5 admin/templates/Includes/ModelAdmin_ImportSpec.ss
  9. +7 −24 admin/templates/LeftAndMain.ss
  10. +8 −8 api/SapphireSoapServer_wsdl.ss
  11. +2 −2 core/PaginatedList.php
  12. +4 −2 model/DataDifferencer.php
  13. +12 −12 templates/ComplexTableField.ss
  14. +2 −2 templates/ComplexTableField_popup.ss
  15. +4 −4 templates/Includes/Form.ss
  16. +4 −3 templates/Includes/GridFieldAddExistingAutocompleter.ss
  17. +3 −3 templates/Includes/GridFieldFilterHeader_Row.ss
  18. +2 −2 templates/Includes/GridFieldSortableHeader_Row.ss
  19. +5 −5 templates/Includes/GridField_Item.ss
  20. +5 −5 templates/Includes/GridField_print.ss
  21. +3 −3 templates/Includes/HtmlEditorField_viewfile.ss
  22. +5 −5 templates/Includes/TableListField_Item.ss
  23. +1 −1  templates/Includes/TableListField_Item_export.ss
  24. +3 −3 templates/Includes/TableListField_SelectOptions.ss
  25. +3 −3 templates/Includes/TableListField_Summary.ss
  26. +3 −4 templates/RSSFeed.ss
  27. +6 −6 templates/RelationComplexTableField.ss
  28. +4 −4 templates/SearchForm.ss
  29. +10 −10 templates/TableField.ss
  30. +12 −12 templates/TableListField.ss
  31. +2 −2 templates/forms/CheckboxSetField.ss
  32. +3 −3 templates/forms/DropdownField.ss
  33. +3 −3 templates/forms/OptionsetField.ss
  34. +4 −4 templates/forms/SelectionGroup.ss
  35. +7 −7 templates/forms/TabSet.ss
  36. +2 −2 templates/forms/ToggleCompositeField.ss
  37. +3 −3 tests/templates/SSViewerTestRecursiveInclude.ss
View
6 admin/templates/CMSBreadcrumbs.ss
@@ -1,9 +1,9 @@
<div class="breadcrumbs-wrapper">
- <% control Breadcrumbs %>
+ <% loop Breadcrumbs %>
<% if Last %>
<span class="cms-panel-link crumb">$Title.XML</span>
<% else %>
<a class="cms-panel-link crumb" href="$Link">$Title.XML</a>/
<% end_if %>
- <% end_control %>
-</div>
+ <% end_loop %>
+</div>
View
13 admin/templates/CMSTabSet.ss
@@ -1,16 +1,15 @@
<div id="$id">
-
<%-- Tab nav is rendered in CMSEditForm.ss --%>
-
- <% control Tabs %>
+
+ <% loop Tabs %>
<div $AttributesHTML>
<% if Tabs %>
$FieldHolder
<% else %>
- <% control Fields %>
+ <% loop Fields %>
$FieldHolder
- <% end_control %>
+ <% end_loop %>
<% end_if %>
</div>
- <% end_control %>
-</div>
+ <% end_loop %>
+</div>
View
14 admin/templates/Includes/Editor_toolbar.ss
@@ -1,15 +1,11 @@
-<% control EditorToolbar %>
+<% with EditorToolbar %>
<div class="mceToolbarExternal" id="mce_editor_toolbar">
<table width="100%" border="0">
<tbody>
<tr>
<td>
-<!--
-<a title="Jump to tool buttons - Alt+Q, Jump to editor - Alt-Z, Jump to element path - Alt-X" accesskey="q" href="#">
-</a>
--->
-<% control Buttons %>
+<% loop Buttons %>
<% if Type = button %>
<a href="#$Command">
<img width="20" height="20" class="mceButtonNormal" title="$Title" alt="$Title" src="$Icon" id="mce_editor_$IDSegment" />
@@ -21,15 +17,13 @@
<% else_if Type = break %>
<br />
<% end_if %>
-<% end_control %>
+<% end_loop %>
<br />
-<!--<a onfocus="tinyMCE.getInstanceById('mce_editor_0').getWin().focus();" accesskey="z" href="#">
-</a>-->
</td>
</tr>
</tbody>
</table>
</div>
-<% end_control %>
+<% end_with %>
View
24 admin/templates/Includes/LeftAndMain_EditForm.ss
@@ -6,18 +6,18 @@
<% include BackLink_Button %>
<h2 id="page-title-heading">
- <% control Controller %>
+ <% with Controller %>
<% include CMSSectionIcon %>
<% include CMSBreadcrumbs %>
- <% end_control %>
+ <% end_with %>
</h2>
<% if Fields.hasTabset %>
<% with Fields.fieldByName('Root') %>
<div class="cms-content-header-tabs">
<ul>
- <% control Tabs %>
+ <% loop Tabs %>
<li<% if extraClass %> class="$extraClass"<% end_if %>><a href="#$id">$Title</a></li>
- <% end_control %>
+ <% end_loop %>
</ul>
</div>
<% end_with %>
@@ -28,9 +28,9 @@
</div>
</div>
- <% control Controller %>
- $EditFormTools
- <% end_control %>
+ <% with Controller %>
+ $EditFormTools
+ <% end_with %>
<div class="cms-content-fields center cms-panel-padded">
<% if Message %>
@@ -41,9 +41,9 @@
<fieldset>
<% if Legend %><legend>$Legend</legend><% end_if %>
- <% control Fields %>
+ <% loop Fields %>
$FieldHolder
- <% end_control %>
+ <% end_loop %>
<div class="clear"><!-- --></div>
</fieldset>
</div>
@@ -51,9 +51,9 @@
<div class="cms-content-actions south">
<% if Actions %>
<div class="Actions">
- <% control Actions %>
+ <% loop Actions %>
$Field
- <% end_control %>
+ <% end_loop %>
<% if Controller.LinkPreview %>
<a href="$Controller.LinkPreview" class="cms-preview-toggle-link ss-ui-button" data-icon="preview">
<% _t('LeftAndMain.PreviewButton', 'Preview') %> &raquo;
@@ -64,4 +64,4 @@
</div>
<% if IncludeFormTag %>
</form>
-<% end_if %>
+<% end_if %>
View
10 admin/templates/Includes/LeftAndMain_Menu.ss
@@ -9,20 +9,20 @@
<div class="cms-login-status">
<a href="Security/logout" class="logout-link" title="<% _t('LOGOUT','Log out') %>"><% _t('LOGOUT','Log out') %></a>
- <% control CurrentMember %>
+ <% with CurrentMember %>
<span>
<% _t('Hello','Hi') %>
<a href="{$AbsoluteBaseURL}admin/myprofile" class="profile-link ss-ui-dialog-link" data-popupclass="edit-profile-popup">
<% if FirstName && Surname %>$FirstName $Surname<% else_if FirstName %>$FirstName<% else %>$Email<% end_if %>
</a>
</span>
- <% end_control %>
+ <% end_with %>
</div>
</div>
<div class="cms-panel-content center">
<ul class="cms-menu-list">
- <% control MainMenu %>
+ <% loop MainMenu %>
<li class="$LinkingMode $FirstLast <% if LinkingMode == 'link' %><% else %>opened<% end_if %>" id="Menu-$Code">
<a href="$Link" <% if Code == 'Help' %>target="_blank"<% end_if%>>
<span class="icon icon-16 icon-{$Code.LowerCase}">&nbsp;</span>
@@ -44,7 +44,7 @@
</ul>
<% end_if %>
</li>
- <% end_control %>
+ <% end_loop %>
</ul>
</div>
@@ -52,4 +52,4 @@
<a class="toggle-expand" href="#"><span>&raquo;</span></a>
<a class="toggle-collapse" href="#"><span>&laquo;</span></a>
</div>
-</div>
+</div>
View
6 admin/templates/Includes/LeftAndMain_SilverStripeNavigator.ss
@@ -3,10 +3,10 @@
&laquo; <% _t('SilverStripeNavigator.Edit', 'Edit') %>
</a>
<ul class="cms-preview-states">
- <% control Items %>
+ <% loop Items %>
<li class="<% if isActive %> active<% end_if %>">$HTML
<% if Watermark %><span class="cms-preview-watermark">$Watermark</span><% end_if %>
</li>
- <% end_control %>
+ <% end_loop %>
</ul>
-</div>
+</div>
View
6 admin/templates/Includes/ModelAdmin_Content.ss
@@ -13,11 +13,11 @@
<div class="cms-content-header-tabs ss-ui-tabs-nav">
<ul>
- <% control ManagedModelTabs %>
+ <% loop ManagedModelTabs %>
<li class="tab-$ClassName $LinkOrCurrent">
<a href="$Link" class="cms-panel-link">$Title</a>
</li>
- <% end_control %>
+ <% end_loop %>
</ul>
</div>
@@ -29,4 +29,4 @@
$EditForm
</div>
-</div>
+</div>
View
10 admin/templates/Includes/ModelAdmin_ImportSpec.ss
@@ -3,19 +3,19 @@
<div class="details" id="SpecDetailsFor{$ModelName}">
<h4><% sprintf(_t('IMPORTSPECTITLE', 'Specification for %s'),$ModelName) %></h4>
<h5><% _t('IMPORTSPECFIELDS', 'Database columns') %></h5>
- <% control Fields %>
+ <% loop Fields %>
<dl>
<dt><em>$Name</em></dt>
<dd>$Description</dd>
</dl>
- <% end_control %>
+ <% end_loop %>
<h5><% _t('IMPORTSPECRELATIONS', 'Relations') %></h5>
- <% control Relations %>
+ <% loop Relations %>
<dl>
<dt><em>$Name</em></dt>
<dd>$Description</dd>
</dl>
- <% end_control %>
+ <% end_loop %>
</div>
-</div>
+</div>
View
31 admin/templates/LeftAndMain.ss
@@ -1,41 +1,24 @@
<!DOCTYPE html>
<html>
-<head>
-<% base_tag %>
-<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-<meta name="viewport" content="width=720, maximum-scale=1.0" />
-<title>$Title</title>
+ <head>
+ <% base_tag %>
+ <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+ <meta name="viewport" content="width=720, maximum-scale=1.0" />
+ <title>$Title</title>
</head>
-
<body class="loading cms" lang="$Locale.RFC1766" data-frameworkpath="$ModulePath(framework)">
-
<% include CMSLoadingScreen %>
<div class="cms-container center" data-layout-type="border">
-
$Menu
-
$Content
-
+
<div class="cms-preview east <% if IsPreviewExpanded %>is-expanded<% else %>is-collapsed<% end_if %>" data-layout-type="border">
<iframe src="about:blank" class="center" name="cms-preview-iframe"></iframe>
<div class="cms-preview-controls south"></div>
</div>
-
</div>
-
+
$EditorToolbar
-
- <!-- <div class="ss-cms-bottom-bar">
- <div class="holder">
- <div id="switchView" class="bottomTabs">
- <% if ShowSwitchView %>
- <div class="blank"> <% _t('VIEWPAGEIN','Page view:') %> </div>
- <span id="SwitchView">$SwitchView</span>
- <% end_if %>
- </div>
- </div>
- </div> -->
-
</body>
</html>
View
16 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 %>
<message name="{$Name}Request" targetNamespace="$CurrentPage.TargetNamespace">
- <% control Arguments %>
+ <% loop Arguments %>
<part name="$Name" type="$Type"/>
- <% end_control %>
+ <% end_loop %>
</message>
<message name="{$Name}Response" targetNamespace="$CurrentPage.TargetNamespace">
<part name="{$Name}Return" type="$ReturnType" />
</message>
- <% end_control %>
+ <% end_loop %>
<portType name="SapphireSOAP_methodsPortType">
- <% control Methods %>
+ <% loop Methods %>
<operation name="$Name">
<input message="tns:{$Name}Request"/>
<output message="tns:{$Name}Response"/>
</operation>
- <% end_control %>
+ <% end_loop %>
</portType>
<binding name="SapphireSOAP_methodsBinding" type="tns:SapphireSOAP_methodsPortType">
<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
- <% control Methods %>
+ <% loop Methods %>
<operation name="$Name">
<soap:operation soapAction="$CurrentPage.ServiceURL?method=$Name" style="rpc"/>
<input>
@@ -35,7 +35,7 @@ targetNamespace="{$ServiceURL}wsdl">
<soap:body use="encoded" namespace="$CurrentPage.TargetNamespace" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
</output>
</operation>
- <% end_control %>
+ <% end_loop %>
</binding>
<service name="SapphireSOAP_methods">
<port name="SapphireSOAP_methodsPort" binding="tns:SapphireSOAP_methodsBinding">
View
4 core/PaginatedList.php
@@ -209,7 +209,7 @@ public function Pages($max = null) {
* <% if MyPages.NotFirstPage %>
* <a class="prev" href="$MyPages.PrevLink">Prev</a>
* <% end_if %>
- * <% control MyPages.PaginationSummary(4) %>
+ * <% loop MyPages.PaginationSummary(4) %>
* <% if CurrentBool %>
* $PageNum
* <% else %>
@@ -219,7 +219,7 @@ public function Pages($max = null) {
* ...
* <% end_if %>
* <% end_if %>
- * <% end_control %>
+ * <% end_loop %>
* <% if MyPages.NotLastPage %>
* <a class="next" href="$MyPages.NextLink">Next</a>
* <% end_if %>
View
6 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:
* <pre>
* <dl class="diff">
- * <% control Diff.ChangedFields %>
+ * <% with Diff %>
+ * <% loop ChangedFields %>
* <dt>$Title</dt>
* <dd>$Diff</dd>
- * <% end_control %>
+ * <% end_loop %>
+ * <% end_with %>
* </dl>
* </pre>
*
View
24 templates/ComplexTableField.ss
@@ -8,7 +8,7 @@
<thead>
<tr>
<% if Markable %><th width="18">&nbsp;</th><% end_if %>
- <% control Headings %>
+ <% loop Headings %>
<th class="$Name">
<% if IsSortable %>
<span class="sortTitle">
@@ -28,8 +28,8 @@
$Title
<% end_if %>
</th>
- <% end_control %>
- <% control Actions %><th width="18">&nbsp;</th><% end_control %>
+ <% end_loop %>
+ <% loop Actions %><th width="18">&nbsp;</th><% end_loop %>
</tr>
</thead>
<tfoot>
@@ -37,10 +37,10 @@
<tr class="summary">
<% if Markable %><th width="18">&nbsp;</th><% end_if %>
<td><i>$SummaryTitle</i></td>
- <% control SummaryFields %>
+ <% loop SummaryFields %>
<td<% if Function %> class="$Function"<% end_if %>>$SummaryValue</td>
- <% end_control %>
- <% control Actions %><td width="18">&nbsp;</td><% end_control %>
+ <% end_loop %>
+ <% loop Actions %><td width="18">&nbsp;</td><% end_loop %>
</tr>
<% end_if %>
<% if Can(add) %>
@@ -53,29 +53,29 @@
<% sprintf(_t('ADDITEM', 'Add %s', 'Add [name]'),$Title) %>
</a>
</td>
- <% control Actions %><td width="18">&nbsp;</td><% end_control %>
+ <% loop Actions %><td width="18">&nbsp;</td><% end_loop %>
</tr>
<% end_if %>
</tfoot>
<tbody>
<% if Items %>
- <% control Items %>
+ <% loop Items %>
<% include TableListField_Item %>
- <% end_control %>
+ <% end_loop %>
<% else %>
<tr class="notfound">
<% if Markable %><th width="18">&nbsp;</th><% end_if %>
<td colspan="$Headings.Count"><i><% _t('NOITEMSFOUND', 'No items found') %></i></td>
- <% control Actions %><td width="18">&nbsp;</td><% end_control %>
+ <% loop Actions %><td width="18">&nbsp;</td><% end_loop %>
</tr>
<% end_if %>
</tbody>
</table>
<% if Utility %>
<div class="utility">
- <% control Utility %>
+ <% loop Utility %>
<span class="item"><a href="$Link" target="_blank">$Title</a></span>
- <% end_control %>
+ <% end_loop %>
</div>
<% end_if %>
</div>
View
4 templates/ComplexTableField_popup.ss
@@ -21,13 +21,13 @@
<% if xdsfdsf %>
<% else %>
<td>
- <% control Paginator.Pages %>
+ <% loop Paginator.Pages %>
<% if active %>
<a href="$link">$number</a>
<% else %>
<span>$number</span>
<% end_if %>
- <% end_control %>
+ <% end_loop %>
</td>
<% end_if %>
<% if Paginator.NextLink %>
View
8 templates/Includes/Form.ss
@@ -9,17 +9,17 @@
<fieldset>
<% if Legend %><legend>$Legend</legend><% end_if %>
- <% control Fields %>
+ <% loop Fields %>
$FieldHolder
- <% end_control %>
+ <% end_loop %>
<div class="clear"><!-- --></div>
</fieldset>
<% if Actions %>
<div class="Actions">
- <% control Actions %>
+ <% loop Actions %>
$Field
- <% end_control %>
+ <% end_loop %>
</div>
<% end_if %>
<% if IncludeFormTag %>
View
7 templates/Includes/GridFieldAddExistingAutocompleter.ss
@@ -1,4 +1,5 @@
-<div class="add-existing-autocompleter"><% control Fields %>
+<div class="add-existing-autocompleter">
+ <% loop Fields %>
<span>$Field</span>
- <% end_control %>
-</div>
+ <% end_loop %>
+</div>
View
6 templates/Includes/GridFieldFilterHeader_Row.ss
@@ -1,5 +1,5 @@
<tr class="filter-header">
- <% control Fields %>
+ <% loop Fields %>
<th class="extra"><span>$Field</span></th>
- <% end_control %>
-</tr>
+ <% end_loop %>
+</tr>
View
4 templates/Includes/GridFieldSortableHeader_Row.ss
@@ -1,5 +1,5 @@
<tr class="sortable-header">
- <% control Fields %>
+ <% loop Fields %>
<th class="main col-$getName"><span>$Field</span></th>
- <% end_control %>
+ <% end_loop %>
</tr>
View
10 templates/Includes/GridField_Item.ss
@@ -1,12 +1,12 @@
<tr class="ss-gridfield-item ss-gridfield-{$EvenOdd} $FirstLast" data-id="$ID">
<% if $GridField.ExtraColumnsCount %>
- <% control Fields %>
+ <% loop Fields %>
<td>$Value</td>
- <% end_control %>
+ <% end_loop %>
<td colspan="$GridField.ExtraColumnsCount" class="ss-gridfield-last"></td>
<% else %>
- <% control Fields %>
+ <% loop Fields %>
<td <% if FirstLast %>class="ss-gridfield-{$FirstLast}"<% end_if %>>$Value</td>
- <% end_control %>
+ <% end_loop %>
<% end_if %>
-</tr>
+</tr>
View
10 templates/Includes/GridField_print.ss
@@ -7,12 +7,12 @@
<% if $Title %><h3>$Title</h3><% end_if %>
<table>
<thead>
- <tr><% control Header %><th>$CellString</th><% end_control %></tr>
+ <tr><% loop Header %><th>$CellString</th><% end_loop %></tr>
</thead>
<tbody>
- <% control ItemRows %>
- <tr><% control ItemRow %><td>$CellString</td><% end_control %></tr>
- <% end_control %>
+ <% loop ItemRows %>
+ <tr><% loop ItemRow %><td>$CellString</td><% end_loop %></tr>
+ <% end_loop %>
</tbody>
</table>
<p>
@@ -22,4 +22,4 @@
</p>
</body>
-</html>
+</html>
View
6 templates/Includes/HtmlEditorField_viewfile.ss
@@ -8,9 +8,9 @@
</div>
<div class="details">
<fieldset>
- <% control Fields %>
+ <% loop Fields %>
$FieldHolder
- <% end_control %>
+ <% end_loop %>
</fieldset>
</div>
-</div>
+</div>
View
10 templates/Includes/TableListField_Item.ss
@@ -1,9 +1,9 @@
<tr id="record-$Parent.id-$ID"<% if HighlightClasses %> class="$HighlightClasses"<% end_if %>>
<% if Markable %><td width="16" class="$SelectOptionClasses">$MarkingCheckbox</td><% end_if %>
- <% control Fields %>
+ <% loop Fields %>
<td class="field-$Title.HTMLATT $FirstLast $Name">$Value</td>
- <% end_control %>
- <% control Actions %>
+ <% end_loop %>
+ <% loop Actions %>
<td width="16" class="action">
<% if IsAllowed %>
<a class="$Class" href="$Link"<% if TitleText %> title="$TitleText"<% end_if %>>
@@ -15,5 +15,5 @@
</span>
<% end_if %>
</td>
- <% end_control %>
-</tr>
+ <% end_loop %>
+</tr>
View
2  templates/Includes/TableListField_Item_export.ss
@@ -1 +1 @@
-<% control Fields %>"$Value"<% if Last %>\n<% else %>$CsvSeparator<% end_if %><% end_control %>
+<% loop Fields %>"$Value"<% if Last %>\n<% else %>$CsvSeparator<% end_if %><% end_loop %>
View
6 templates/Includes/TableListField_SelectOptions.ss
@@ -1,8 +1,8 @@
<% if SelectOptions %>
<ul class="selectOptions">
<li><% _t('TableListField.SELECT', 'Select:') %></li>
- <% control SelectOptions %>
+ <% loop SelectOptions %>
<li><a rel="$Key" href="#" title="$Key">$Value</a></li>
- <% end_control %>
+ <% end_loop %>
</ul>
- <% end_if %>
+ <% end_if %>
View
6 templates/Includes/TableListField_Summary.ss
@@ -1,6 +1,6 @@
<% if Markable %><th width="16">&nbsp;</th><% end_if %>
<th><i>$SummaryTitle</i></th>
- <% control SummaryFields %>
+ <% loop SummaryFields %>
<th class="field-$Name.HTMLATT<% if Function %> $Function<% end_if %>">$SummaryValue</th>
- <% end_control %>
- <% if Can(delete) %><th width="18">&nbsp;</th><% end_if %>
+ <% end_loop %>
+ <% if Can(delete) %><th width="18">&nbsp;</th><% end_if %>
View
7 templates/RSSFeed.ss
@@ -6,7 +6,7 @@
<atom:link href="$Link" rel="self" type="application/rss+xml" />
<description>$Description.XML</description>
- <% control Entries %>
+ <% loop Entries %>
<item>
<title>$Title.XML</title>
<link>$AbsoluteLink</link>
@@ -16,7 +16,6 @@
<% if Author %><dc:creator>$Author.XML</dc:creator><% end_if %>
<guid>$AbsoluteLink</guid>
</item>
- <% end_control %>
-
+ <% end_loop %>
</channel>
-</rss>
+</rss>
View
12 templates/RelationComplexTableField.ss
@@ -7,9 +7,9 @@
<thead>
<tr>
<% if Markable %><th width="18">&nbsp;</th><% end_if %>
- <% control Headings %>
+ <% loop Headings %>
<th class="$Name">$Title</th>
- <% end_control %>
+ <% end_loop %>
<% if Can(show) %><th width="18">&nbsp;</th><% end_if %>
<% if Can(edit) %><th width="18">&nbsp;</th><% end_if %>
<% if Can(delete) %><th width="18">&nbsp;</th><% end_if %>
@@ -20,9 +20,9 @@
<tr class="summary">
<% if Markable %><th width="18">&nbsp;</th><% end_if %>
<td><i>$SummaryTitle</i></td>
- <% control SummaryFields %>
+ <% loop SummaryFields %>
<td<% if Function %> class="$Function"<% end_if %>>&nbsp;</td>
- <% end_control %>
+ <% end_loop %>
<% if Can(show) %><td width="18">&nbsp;</td><% end_if %>
<% if Can(edit) %><td width="18">&nbsp;</td><% end_if %>
<% if Can(delete) %><td width="18">&nbsp;</td><% end_if %>
@@ -44,9 +44,9 @@
</tfoot>
<tbody>
<% if Items %>
- <% control Items %>
+ <% loop Items %>
<% include TableListField_Item %>
- <% end_control %>
+ <% end_loop %>
<% else %>
<tr class="notfound">
<% if Markable %><th width="18">&nbsp;</th><% end_if %>
View
8 templates/SearchForm.ss
@@ -1,10 +1,10 @@
<form $FormAttributes>
<fieldset>
- <% control Fields %>
+ <% loop Fields %>
$FieldHolder
- <% end_control %>
- <% control Actions %>
+ <% end_loop %>
+ <% loop Actions %>
$Field
- <% end_control %>
+ <% end_loop %>
</fieldset>
</form>
View
20 templates/TableField.ss
@@ -9,9 +9,9 @@
<table class="data">
<thead>
<tr>
- <% control Headings %>
+ <% loop Headings %>
<th class="$Name $Class" scope="col">$Title</th>
- <% end_control %>
+ <% end_loop %>
<th style="display: none"></th>
<% if Can(delete) %><th width="18">&nbsp;</th><% end_if %>
</tr>
@@ -20,9 +20,9 @@
<% if HasSummary %>
<tr class="summary">
<td><i>$SummaryTitle</i></td>
- <% control SummaryFields %>
+ <% loop SummaryFields %>
<td<% if Function %> class="$Function"<% end_if %>>$SummaryValue</td>
- <% end_control %>
+ <% end_loop %>
<th style="display: none"></th>
<% if Can(delete) %><td width="18">&nbsp;</td><% end_if %>
</tr>
@@ -41,15 +41,15 @@
</tfoot>
<tbody>
<% if Items %>
- <% control Items %>
+ <% loop Items %>
<tr id="record-$Parent.id-$ID" class="row<% if HighlightClasses %> $HighlightClasses<% end_if %>">
- <% control Fields %>
+ <% loop Fields %>
<td class="$FieldClass $extraClass $ClassName $Title tablecolumn">$Field</td>
- <% end_control %>
+ <% end_loop %>
<td style="display: none">$ExtraData</td>
<% if Can(delete) %><td width="18"><a class="deletelink" href="$DeleteLink" title="<% _t('DELETEROW') %>"><img src="$ModulePath(framework)/images/delete.gif" alt="<% _t('DELETE') %>" /></a></td><% end_if %>
</tr>
- <% end_control %>
+ <% end_loop %>
<% else %>
<tr class="notfound">
<% if Markable %><th width="18">&nbsp;</th><% end_if %>
@@ -60,9 +60,9 @@
</tbody>
</table>
<% if Print %><% else %><div class="utility">
- <% control Utility %>
+ <% loop Utility %>
<span class="item"><a href="$Link">$Title</a></span>
- <% end_control %>
+ <% end_loop %>
</div><% end_if %>
<% if Message %>
<span class="message $MessageType">$Message</span>
View
24 templates/TableListField.ss
@@ -10,13 +10,13 @@
<tr>
<% if Markable %><th width="16"><% if MarkableTitle %>$MarkableTitle<% else %>&nbsp;<% end_if %></th><% end_if %>
<% if Print %>
- <% control Headings %>
+ <% loop Headings %>
<th class="$Name">
$Title
</th>
- <% end_control %>
+ <% end_loop %>
<% else %>
- <% control Headings %>
+ <% loop Headings %>
<th class="$Name">
<% if IsSortable %>
<span class="sortTitle">
@@ -35,7 +35,7 @@
<span>$Title</span>
<% end_if %>
</th>
- <% end_control %>
+ <% end_loop %>
<% end_if %>
<% if Can(delete) %><th width="18">&nbsp;</th><% end_if %>
</tr>
@@ -51,19 +51,19 @@
<tbody>
<% if HasGroupedItems %>
- <% control GroupedItems %>
- <% control Items %>
+ <% loop GroupedItems %>
+ <% loop Items %>
<% include TableListField_Item %>
- <% end_control %>
+ <% end_loop %>
<tr class="summary partialSummary">
<% include TableListField_Summary %>
</tr>
- <% end_control %>
+ <% end_loop %>
<% else %>
<% if Items %>
- <% control Items %>
+ <% loop Items %>
<% include TableListField_Item %>
- <% end_control %>
+ <% end_loop %>
<% else %>
<tr class="notfound">
<% if Markable %><th width="18">&nbsp;</th><% end_if %>
@@ -78,8 +78,8 @@
</tbody>
</table>
<% if Print %><% else %><div class="utility">
- <% control Utility %>
+ <% loop Utility %>
<span class="item"><a href="$Link">$Title</a></span>
- <% end_control %>
+ <% end_loop %>
</div><% end_if %>
</div>
View
4 templates/forms/CheckboxSetField.ss
@@ -1,11 +1,11 @@
<ul id="$ID" class="$extraClass"<% if Description %> title="$Description"<% end_if %>>
<% if Options.Count %>
- <% control Options %>
+ <% loop Options %>
<li class="$Class">
<input id="$ID" class="checkbox" name="$Name" type="checkbox" value="$Value"<% if isChecked %> checked="checked"<% end_if %><% if isDisabled %> disabled="disabled"<% end_if %>>
<label for="$ID">$Title</label>
</li>
- <% end_control %>
+ <% end_loop %>
<% else %>
<li>No options available</li>
<% end_if %>
View
6 templates/forms/DropdownField.ss
@@ -1,5 +1,5 @@
<select $AttributesHTML>
-<% control Options %>
+<% loop Options %>
<option value="$Value"<% if Selected %> selected="selected"<% end_if %><% if Disabled %> disabled="disabled"<% end_if %>>$Title</option>
-<% end_control %>
-</select>
+<% end_loop %>
+</select>
View
6 templates/forms/OptionsetField.ss
@@ -1,8 +1,8 @@
<ul id="$ID" class="$extraClass"<% if Description %> title="$Description"<% end_if %>>
- <% control Options %>
+ <% loop Options %>
<li class="$Class">
<input id="$ID" class="radio" name="$Name" type="radio" value="$Value"<% if isChecked %> checked<% end_if %><% if isDisabled %> disabled<% end_if %>>
<label for="$ID">$Title</label>
</li>
- <% end_control %>
-</ul>
+ <% end_loop %>
+</ul>
View
8 templates/forms/SelectionGroup.ss
@@ -1,6 +1,6 @@
<% if IsReadonly %>
<ul class="SelectionGroup<% if extraClass %> $extraClass<% end_if %>">
- <% control FieldSet %>
+ <% loop FieldSet %>
<% if Selected %>
<li$Selected>
$RadioLabel
@@ -8,7 +8,7 @@
</li>
</ul>
<% end_if %>
- <% end_control %>
+ <% end_loop %>
<% else %>
- <ul class="SelectionGroup<% if extraClass %> $extraClass<% end_if %>"><% control FieldSet %><li$Selected>{$RadioButton}{$RadioLabel}{$FieldHolder}</li><% end_control %></ul>
-<% end_if %>
+ <ul class="SelectionGroup<% if extraClass %> $extraClass<% end_if %>"><% loop FieldSet %><li$Selected>{$RadioButton}{$RadioLabel}{$FieldHolder}</li><% end_loop %></ul>
+<% end_if %>
View
14 templates/forms/TabSet.ss
@@ -1,19 +1,19 @@
<div $AttributesHTML>
<ul>
- <% control Tabs %>
+ <% loop Tabs %>
<li class="$FirstLast $MiddleString $extraClass"><a href="#$id" id="tab-$id">$Title</a></li>
- <% end_control %>
+ <% end_loop %>
</ul>
- <% control Tabs %>
+ <% loop Tabs %>
<div $AttributesHTML>
<% if Tabs %>
$FieldHolder
<% else %>
- <% control Fields %>
+ <% loop Fields %>
$FieldHolder
- <% end_control %>
+ <% end_loop %>
<% end_if %>
</div>
- <% end_control %>
-</div>
+ <% end_loop %>
+</div>
View
4 templates/forms/ToggleCompositeField.ss
@@ -5,8 +5,8 @@
$Title
</h$HeadingLevel>
<div class="contentMore">
- <% control FieldSet %>
+ <% loop FieldSet %>
$FieldHolder
- <% end_control %>
+ <% end_loop %>
</div>
</div>
View
6 tests/templates/SSViewerTestRecursiveInclude.ss
@@ -1,6 +1,6 @@
$Title
<% if Children %>
-<% control Children %>
+<% loop Children %>
<% include SSViewerTestRecursiveInclude %>
-<% end_control %>
-<% end_if %>
+<% end_loop %>
+<% end_if %>
Please sign in to comment.
Something went wrong with that request. Please try again.