Updated loop/if/with to be more consistent

admin/templates/CMSBreadcrumbs.ss

@@ -1,15 +1,15 @@
 <div class="breadcrumbs-wrapper" data-pjax-fragment="Breadcrumbs">
 	<h2 id="page-title-heading">
-		<% if ToplevelController %>
+		<% if $ToplevelController %>
 			<span class="section-icon icon icon-16 icon-{$ToplevelController.MenuCurrentItem.Code.LowerCase}"></span>
-		<% else_if Controller %>
+		<% else_if $Controller %>
 			<span class="section-icon icon icon-16 icon-{$Controller.MenuCurrentItem.Code.LowerCase}"></span>
 		<% else %>
 			<span class="section-icon icon icon-16 icon-{$MenuCurrentItem.Code.LowerCase}"></span>
 		<% end_if %>
 
-		<% loop Breadcrumbs %>
+		<% loop $Breadcrumbs %>
-			<% if Last %>
+			<% if $Last %>
 				<span class="cms-panel-link crumb last">$Title.XML</span>
 			<% else %>
 				<a class="cms-panel-link crumb" href="$Link">$Title.XML</a>

admin/templates/CMSProfileController_Content.ss

@@ -1,18 +1,18 @@
 <div id="settings-controller-cms-content" class="cms-content center cms-tabset $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content CurrentForm">
 
 	<div class="cms-content-header north">
-		<% with EditForm %>
+		<% with $EditForm %>
 			<div class="cms-content-header-info">				
-				<% with Controller %>
+				<% with $Controller %>
 					<% include CMSBreadcrumbs %>
 				<% end_with %>				
 			</div>
-			<% if Fields.hasTabset %>
+			<% if $Fields.hasTabset %>
-				<% with Fields.fieldByName('Root') %>
+				<% with $Fields.fieldByName('Root') %>
 				<div class="cms-content-header-tabs">
 					<ul class="cms-tabset-nav-primary">
-					<% loop Tabs %>
+					<% loop $Tabs %>
-						<li<% if extraClass %> class="$extraClass"<% end_if %>><a href="#$id">$Title</a></li>
+						<li<% if $extraClass %> class="$extraClass"<% end_if %>><a href="#$id">$Title</a></li>
 					<% end_loop %>
 					</ul>
 				</div>

admin/templates/CMSTabSet.ss

@@ -5,12 +5,12 @@
 <%-- e.g. through LeftAndMain_EditForm.ss. --%>
 
 <div $AttributesHTML>
-	<% loop Tabs %>
+	<% loop $Tabs %>
-		<% if Tabs %>
+		<% if $Tabs %>
 			$FieldHolder
 		<% else %>
 			<div $AttributesHTML>
-				<% loop Fields %>
+				<% loop $Fields %>
 					$FieldHolder
 				<% end_loop %>
 			</div>

admin/templates/Includes/BackLink_Button.ss

@@ -1,7 +1,7 @@
-<% if Backlink %>
+<% if $Backlink %>
 	<div class="cms_backlink">
 		<a class="backlink ss-ui-button cms-panel-link" data-icon="back" href="$Backlink">
 			<% _t('BackLink_Button.ss.Back', 'Back') %>
 		</a>
 	</div>
-<% end_if %>	
+<% end_if %>	

admin/templates/Includes/CMSSectionIcon.ss

@@ -1,7 +1,7 @@
-<% if ToplevelController %>
+<% if $ToplevelController %>
 	<span class="section-icon icon icon-16 icon-{$ToplevelController.MenuCurrentItem.Code.LowerCase}"></span>
-<% else_if Controller %>
+<% else_if $Controller %>
 	<span class="section-icon icon icon-16 icon-{$Controller.MenuCurrentItem.Code.LowerCase}"></span>
 <% else %>
 	<span class="section-icon icon icon-16 icon-{$MenuCurrentItem.Code.LowerCase}"></span>
-<% end_if %>
+<% end_if %>

admin/templates/Includes/Editor_toolbar.ss

@@ -1,20 +1,20 @@
-<% with EditorToolbar %>
+<% with $EditorToolbar %>
 <div class="mceToolbarExternal" id="mce_editor_toolbar">
 <table width="100%" border="0">
 <tbody>
 <tr>
 <td>
 
-<% loop Buttons %>
+<% loop $Buttons %>
-	<% if Type = button %>
+	<% if $Type = button %>
 	<a href="#$Command">
 	<img width="20" height="20" class="mceButtonNormal" title="$Title" alt="$Title" src="$Icon" id="mce_editor_$IDSegment" />
 	</a>
-	<% else_if Type = dropdown %>
+	<% else_if $Type = dropdown %>
 	<select name="$Command" class="mceSelectList" id="mce_editor_$IDSegment">$Options</select>
-	<% else_if Type = separator %>
+	<% else_if $Type = separator %>
 	<img width="1" height="15" class="mceSeparatorLine" src="{$MceRoot}themes/advanced/images/separator.gif" alt="|" />
-	<% else_if Type = break %>
+	<% else_if $Type = break %>
 	<br />
 	<% end_if %>
 <% end_loop %>

admin/templates/Includes/LeftAndMain_EditForm.ss

@@ -1,19 +1,19 @@
-<% if IncludeFormTag %>
+<% if $IncludeFormTag %>
 <form $FormAttributes data-layout-type="border">
 <% end_if %>
 	<div class="cms-content-header north">
 		<div class="cms-content-header-info">
 			<% include BackLink_Button %>			
-			<% with Controller %>
+			<% with $Controller %>
 				<% include CMSBreadcrumbs %>
 			<% end_with %>			
 		</div>
-		<% if Fields.hasTabset %>
+		<% if $Fields.hasTabset %>
-			<% with Fields.fieldByName('Root') %>
+			<% with $Fields.fieldByName('Root') %>
 			<div class="cms-content-header-tabs cms-tabset-nav-primary">
 				<ul>
-				<% loop Tabs %>
+				<% loop $Tabs %>
-					<li<% if extraClass %> class="$extraClass"<% end_if %>><a href="#$id">$Title</a></li>
+					<li<% if $extraClass %> class="$extraClass"<% end_if %>><a href="#$id">$Title</a></li>
 				<% end_loop %>
 				</ul>
 			</div>
@@ -23,20 +23,20 @@
 		<!-- <div class="cms-content-search">...</div> -->
 	</div>
 
-	<% with Controller %>
+	<% with $Controller %>
 		$EditFormTools
 	<% end_with %>
 	
 	<div class="cms-content-fields center <% if not $Fields.hasTabset %>cms-panel-padded<% end_if %>">
-		<% if Message %>
+		<% if $Message %>
 		<p id="{$FormName}_error" class="message $MessageType">$Message</p>
 		<% else %>
 		<p id="{$FormName}_error" class="message $MessageType" style="display: none"></p>
 		<% end_if %>
 
 		<fieldset>
-			<% if Legend %><legend>$Legend</legend><% end_if %> 
+			<% if $Legend %><legend>$Legend</legend><% end_if %> 
-			<% loop Fields %>
+			<% loop $Fields %>
 				$FieldHolder
 			<% end_loop %>
 			<div class="clear"><!-- --></div>
@@ -44,12 +44,12 @@
 	</div>
 
 	<div class="cms-content-actions cms-content-controls south">
-		<% if Actions %>
+		<% if $Actions %>
 		<div class="Actions">
-			<% loop Actions %>
+			<% loop $Actions %>
 				$Field
 			<% end_loop %>
-			<% if Controller.LinkPreview %>
+			<% if $Controller.LinkPreview %>
 			<a href="$Controller.LinkPreview" class="cms-preview-toggle-link ss-ui-button" data-icon="preview">
 				<% _t('LeftAndMain.PreviewButton', 'Preview') %> &raquo;
 			</a>
@@ -57,6 +57,6 @@
 		</div>
 		<% end_if %>
 	</div>
-<% if IncludeFormTag %>
+<% if $IncludeFormTag %>
 </form>
 <% end_if %>

admin/templates/Includes/LeftAndMain_Menu.ss

@@ -2,18 +2,18 @@
 	<div class="cms-logo-header north">
 		<div class="cms-logo">
 			<a href="$ApplicationLink" target="_blank" title="$ApplicationName (Version - $CMSVersion)">
-				$ApplicationName <% if CMSVersion %><abbr class="version">$CMSVersion</abbr><% end_if %>
+				$ApplicationName <% if $CMSVersion %><abbr class="version">$CMSVersion</abbr><% end_if %>
 			</a>
-			<span><% if SiteConfig %>$SiteConfig.Title<% else %>$ApplicationName<% end_if %></span>
+			<span><% if $SiteConfig %>$SiteConfig.Title<% else %>$ApplicationName<% end_if %></span>
 		</div>
 	
 		<div class="cms-login-status">
 			<a href="Security/logout" class="logout-link" title="<% _t('LeftAndMain_Menu.ss.LOGOUT','Log out') %>"><% _t('LeftAndMain_Menu.ss.LOGOUT','Log out') %></a>
-			<% with CurrentMember %>
+			<% with $CurrentMember %>
 				<span>
 					<% _t('LeftAndMain_Menu.ss.Hello','Hi') %>
 					<a href="{$AbsoluteBaseURL}admin/myprofile" class="profile-link">
-						<% if FirstName && Surname %>$FirstName $Surname<% else_if FirstName %>$FirstName<% else %>$Email<% end_if %>
+						<% if $FirstName && $Surname %>$FirstName $Surname<% else_if $FirstName %>$FirstName<% else %>$Email<% end_if %>
 					</a>
 				</span>
 			<% end_with %>
@@ -22,9 +22,9 @@
 		
 	<div class="cms-panel-content center">
 		<ul class="cms-menu-list">
-		<% loop MainMenu %>
+		<% loop $MainMenu %>
-			<li class="$LinkingMode $FirstLast <% if LinkingMode == 'link' %><% else %>opened<% end_if %>" id="Menu-$Code" title="$Title.ATT">
+			<li class="$LinkingMode $FirstLast <% if $LinkingMode == 'link' %><% else %>opened<% end_if %>" id="Menu-$Code" title="$Title.ATT">
-				<a href="$Link" <% if Code == 'Help' %>target="_blank"<% end_if%>>
+				<a href="$Link" <% if $Code == 'Help' %>target="_blank"<% end_if%>>
 					<span class="icon icon-16 icon-{$Code.LowerCase}">&nbsp;</span>
 					<span class="text">$Title</span>
 				</a>

admin/templates/Includes/LeftAndMain_SilverStripeNavigator.ss

@@ -19,13 +19,13 @@
 		</select>
 	</span>
 
-	<% if Items %>
+	<% if $Items %>
-		<% if Items.Count < 5 %>
+		<% if $Items.Count < 5 %>
 			<fieldset id="preview-states" class="cms-preview-states switch-states size_{$Items.Count}"> 			
 				<div class="switch">
-					<% loop Items %>					
+					<% loop $Items %>					
-						<input id="$Title" data-name="$Name" class="state-name $FirstLast" data-link="$Link" name="view" type="radio" <% if isActive %>checked<% end_if %>>
+						<input id="$Title" data-name="$Name" class="state-name $FirstLast" data-link="$Link" name="view" type="radio" <% if $isActive %>checked<% end_if %>>
-						<label for="$Title"<% if isActive %> class="active"<% end_if %>><span>$Title</span></label>
+						<label for="$Title"<% if $isActive %> class="active"<% end_if %>><span>$Title</span></label>
 					<% end_loop %>
 					<span class="slide-button"></span>
 				</div>
@@ -33,8 +33,8 @@
 		<% else %>
 			<span id="preview-state-dropdown" class="cms-preview-states field dropdown">
 				<select title="<% _t('SilverStripeNavigator.PreviewState', 'Preview State') %>" id="preview-states" class="preview-state dropdown nolabel" autocomplete="off" name="preview-state">
-					<% loop Items %>	
+					<% loop $Items %>	
-					<option name="$Name" data-name="$Name" data-link="$Link" class="state-name $FirstLast" value="$Link" <% if isActive %>selected<% end_if %>>
+					<option name="$Name" data-name="$Name" data-link="$Link" class="state-name $FirstLast" value="$Link" <% if $isActive %>selected<% end_if %>>
 						$Title
 					</option>
 					<% end_loop %>	
@@ -42,4 +42,4 @@
 			</span>
 		<% end_if %>
 	<% end_if %>
-</div>
+</div>

admin/templates/Includes/ModelAdmin_Content.ss

@@ -4,7 +4,7 @@
 		<div class="cms-content-header-info">
 			<h2>
 				<% include CMSSectionIcon %>
-				<% if SectionTitle %>
+				<% if $SectionTitle %>
 					$SectionTitle
 				<% else %>
 					<% _t('ModelAdmin.Title', 'Data Models') %>
@@ -14,7 +14,7 @@
 
 		<div class="cms-content-header-tabs cms-tabset-nav-primary ss-ui-tabs-nav">
 			<ul>
-			<% loop ManagedModelTabs %>
+			<% loop $ManagedModelTabs %>
 				<li class="tab-$ClassName $LinkOrCurrent<% if $LinkOrCurrent == 'current' %> ui-tabs-active<% end_if %>">
 					<a href="$Link" class="cms-panel-link" title="Form_EditForm">$Title</a>
 				</li>

admin/templates/Includes/ModelAdmin_ImportSpec.ss

@@ -3,7 +3,7 @@
 	<div class="details" id="SpecDetailsFor{$ModelName}">
 	<h4><% sprintf(_t('ModelAdmin_ImportSpec.ss.IMPORTSPECTITLE', 'Specification for %s'),$ModelName) %></h4>
 		<h5><% _t('ModelAdmin_ImportSpec.ss.IMPORTSPECFIELDS', 'Database columns') %></h5>
-		<% loop Fields %>
+		<% loop $Fields %>
 		<dl>
 			<dt><em>$Name</em></dt>
 			<dd>$Description</dd>
@@ -11,7 +11,7 @@
 		<% end_loop %>
 
 		<h5><% _t('ModelAdmin_ImportSpec.ss.IMPORTSPECRELATIONS', 'Relations') %></h5>
-		<% loop Relations %>
+		<% loop $Relations %>
 		<dl>
 			<dt><em>$Name</em></dt>
 			<dd>$Description</dd>

admin/templates/Includes/ModelAdmin_Tools.ss

@@ -3,7 +3,7 @@
 		<h3 class="cms-panel-header"><% _t('ModelAdmin_Tools.ss.FILTER', 'Filter') %></h3>
 		$SearchForm
 
-		<% if ImportForm %>
+		<% if $ImportForm %>
 			<h3 class="cms-panel-header"><% _t('ModelAdmin_Tools.ss.IMPORT', 'Import') %></h3>
 			$ImportForm
 		<% end_if %>

admin/templates/ModelSidebar.ss

@@ -1,7 +1,7 @@
 <h3><% _t('ModelSidebar.ss.SEARCHLISTINGS','Search') %></h3>
 $SearchForm
 
-<% if ImportForm %>
+<% if $ImportForm %>
 	<h3><% _t('ModelSidebar.ss.IMPORT_TAB_HEADER', 'Import') %></h3>
 	$ImportForm
-<% end_if %>
+<% end_if %>

templates/Image_iframe.ss

@@ -8,17 +8,17 @@
 
 	<body>
 		<div class="mainblock" style="width: 290px;">
-			<% if UseSimpleForm %>
+			<% if $UseSimpleForm %>
 			$EditImageSimpleForm
 			<% else %>
 			$EditImageForm
 			<% end_if %>
 		</div>
 		
-		<% if Image.ID %>
+		<% if $Image.ID %>
 		<div class="mainblock" >
 			$Image.CMSThumbnail
-			<% if DeleteImageForm %>
+			<% if $DeleteImageForm %>
 				$DeleteImageForm
 			<% end_if %>
 		</div>
@@ -26,4 +26,4 @@
 		
 	</body>
 
-</html>
+</html>

templates/Includes/Form.ss

@@ -1,27 +1,27 @@
-<% if IncludeFormTag %>
+<% if $IncludeFormTag %>
 <form $AttributesHTML>
 <% end_if %>
-	<% if Message %>
+	<% if $Message %>
 	<p id="{$FormName}_error" class="message $MessageType">$Message</p>
 	<% else %>
 	<p id="{$FormName}_error" class="message $MessageType" style="display: none"></p>
 	<% end_if %>
 	
 	<fieldset>
-		<% if Legend %><legend>$Legend</legend><% end_if %> 
+		<% if $Legend %><legend>$Legend</legend><% end_if %> 
-		<% loop Fields %>
+		<% loop $Fields %>
 			$FieldHolder
 		<% end_loop %>
 		<div class="clear"><!-- --></div>
 	</fieldset>
 
-	<% if Actions %>
+	<% if $Actions %>
 	<div class="Actions">
-		<% loop Actions %>
+		<% loop $Actions %>
 			$Field
 		<% end_loop %>
 	</div>
 	<% end_if %>
-<% if IncludeFormTag %>
+<% if $IncludeFormTag %>
 </form>
 <% end_if %>

templates/Includes/GridFieldAddExistingAutocompleter.ss

@@ -1,5 +1,5 @@
 <div class="add-existing-autocompleter">
-	<% loop Fields %>
+	<% loop $Fields %>
 	<span>$Field</span>
 	<% end_loop %>
 </div>

templates/Includes/GridFieldFilterHeader_Row.ss

@@ -1,5 +1,5 @@
 <tr class="filter-header" style="display:none;">
-	<% loop Fields %>
+	<% loop $Fields %>
 	<th class="extra">$Field</th>
 	<% end_loop %>
 </tr>

templates/Includes/GridFieldFooter.ss

@@ -7,8 +7,8 @@
 			$NumRecords
 		</span>
 
-		<% if Message %>
+		<% if $Message %>
 		<div class="datagrid-footer-message">$Message</div>
 		<% end_if %>
 	</td>
-</tr>
+</tr>

templates/Includes/GridFieldItemEditView.ss

@@ -1,5 +1,5 @@
-<% if Backlink %>
+<% if $Backlink %>
 	<a href="$Backlink"><% _t('Go back', 'Go back' ) %></a>
 <% end_if %>
 
-$ItemEditForm
+$ItemEditForm

templates/Includes/GridFieldSortableHeader_Row.ss

@@ -1,5 +1,5 @@
 <tr class="sortable-header">
-	<% loop Fields %>
+	<% loop $Fields %>
 		<th class="main col-$getName">$Field</th>
 	<% end_loop %>
 </tr>

templates/Includes/GridFieldToolbarHeader.ss

@@ -1,7 +1,7 @@
 <tr class="title">
 	<th colspan="$ColumnCount">
-		<% if Title %><h2>$Title</h2><% end_if %>
+		<% if $Title %><h2>$Title</h2><% end_if %>
 		<div class="right">\$DefineFragment(toolbar-header-right)</div>
 		<div class="left">\$DefineFragment(toolbar-header-left)</div>
 	</th>
-</tr>
+</tr>

templates/Includes/GridField_FormAction.ss

@@ -1,3 +1,3 @@
 <button $AttributesHTML>
-	<% if ButtonContent %>$ButtonContent<% else %>$Title<% end_if %>
+	<% if $ButtonContent %>$ButtonContent<% else %>$Title<% end_if %>
-</button>
+</button>

templates/Includes/GridField_Item.ss

@@ -1,11 +1,11 @@
 <tr class="ss-gridfield-item ss-gridfield-{$EvenOdd} $FirstLast" data-id="$ID">
 	<% if $GridField.ExtraColumnsCount %>
-		<% loop Fields %>
+		<% loop $Fields %>
 			<td>$Value</td>
 		<% end_loop %>
 		<td colspan="$GridField.ExtraColumnsCount" class="ss-gridfield-last"></td>
 	<% else %>
-		<% loop Fields %>
+		<% loop $Fields %>
 			<td <% if FirstLast %>class="ss-gridfield-{$FirstLast}"<% end_if %>>$Value</td>
 		<% end_loop %>
 	<% end_if %>

templates/Includes/GridField_print.ss

@@ -7,12 +7,12 @@
 		<% if $Title %><h3>$Title</h3><% end_if %>
 		<table>
 			<thead>
-				<tr><% loop Header %><th>$CellString</th><% end_loop %></tr>
+				<tr><% loop $Header %><th>$CellString</th><% end_loop %></tr>
 			</thead>
 			<tbody>
-				<% if ItemRows %>
+				<% if $ItemRows %>
-				<% loop ItemRows %>
+				<% loop $ItemRows %>
-					<tr><% loop ItemRow %><td>$CellString</td><% end_loop %></tr>
+					<tr><% loop $ItemRow %><td>$CellString</td><% end_loop %></tr>
 				<% end_loop %>
 				<% else %>
 					<tr>

templates/Includes/HtmlEditorField_viewfile.ss

@@ -38,10 +38,10 @@
 				</div>
 			</div>
 		</div>
-		<% if Info %><div class="info">$Info</div><% end_if %>
+		<% if $Info %><div class="info">$Info</div><% end_if %>
 		<div class="details ss-uploadfield-item-editform loading">
 			<fieldset>
-				<% loop Fields %>
+				<% loop $Fields %>
 					$FieldHolder
 				<% end_loop %>
 			</fieldset>

templates/Includes/UploadField_FileButtons.ss

@@ -1,4 +1,4 @@
-<% if canEdit %>
+<% if $canEdit %>
 	<button class="ss-uploadfield-item-edit ss-ui-button ui-corner-all" title="<% _t('UploadField.EDITINFO', 'Edit this file') %>" data-icon="pencil">
 	<% _t('UploadField.EDIT', 'Edit') %>
 	<span class="toggle-details">
@@ -8,10 +8,10 @@
 <% end_if %>
 <button class="ss-uploadfield-item-remove ss-ui-button ui-corner-all" title="<% _t('UploadField.REMOVEINFO', 'Remove this file from here, but do not delete it from the file store') %>" data-icon="plug-disconnect-prohibition">
 <% _t('UploadField.REMOVE', 'Remove') %></button>
-<% if canDelete %>
+<% if $canDelete %>
 	<button data-href="$UploadFieldDeleteLink" class="ss-uploadfield-item-delete ss-ui-button ui-corner-all" title="<% _t('UploadField.DELETEINFO', 'Permanently delete this file from the file store') %>" data-icon="minus-circle"><% _t('UploadField.DELETE', 'Delete from files') %></button>
 <% end_if %>
-<% if UploadField.canAttachExisting %>
+<% if $UploadField.canAttachExisting %>
 	<button class="ss-uploadfield-item-choose-another ss-uploadfield-fromfiles ss-ui-button ui-corner-all" title="<% _t('UploadField.CHOOSEANOTHERINFO', 'Replace this file with another one from the file store') %>" data-icon="network-cloud">
 	<% _t('UploadField.CHOOSEANOTHERFILE', 'Choose another file') %></button>
 <% end_if %>

templates/RSSFeed.ss

@@ -6,14 +6,14 @@
 		<atom:link href="$Link" rel="self" type="application/rss+xml" />
 		<description>$Description.XML</description>
 
-		<% loop Entries %>
+		<% loop $Entries %>
 		<item>
 			<title>$Title.XML</title>
 			<link>$AbsoluteLink</link>
-			<% if Description %><description>$Description.AbsoluteLinks.XML</description><% end_if %>
+			<% if $Description %><description>$Description.AbsoluteLinks.XML</description><% end_if %>
-			<% if Date %><pubDate>$Date.Rfc822</pubDate>
+			<% if $Date %><pubDate>$Date.Rfc822</pubDate>
 			<% else %><pubDate>$Created.Rfc822</pubDate><% end_if %>
-			<% if Author %><dc:creator>$Author.XML</dc:creator><% end_if %>
+			<% if $Author %><dc:creator>$Author.XML</dc:creator><% end_if %>
 			<guid>$AbsoluteLink</guid>
 		</item>
 		<% end_loop %>

templates/RightLabelledFieldHolder.ss

@@ -1,5 +1,5 @@
 <p id="$Name" class="field $Type">
 	$Field
 	<label class="right" for="$id">$Title</label>
-	<% if Message %><span class="message $MessageType">$Message</span><% end_if %>
+	<% if $Message %><span class="message $MessageType">$Message</span><% end_if %>
-</p>
+</p>

templates/SearchForm.ss

@@ -1,15 +1,15 @@
 <form $FormAttributes>
-	<% if Message %>
+	<% if $Message %>
 	<p id="{$FormName}_error" class="message $MessageType">$Message</p>
 	<% else %>
 	<p id="{$FormName}_error" class="message $MessageType" style="display: none"></p>
 	<% end_if %>
 	<fieldset>
-		<% loop Fields %>
+		<% loop $Fields %>
-			$FieldHolder
+		$FieldHolder
 		<% end_loop %>
-		<% loop Actions %>
+		<% loop $Actions %>
-			$Field
+		$Field
 		<% end_loop %>
 	</fieldset>
 </form>

templates/UploadField.ss

@@ -13,7 +13,7 @@
 						<div class="clear"><!-- --></div>
 					</label>
 					<div class="ss-uploadfield-item-actions">
-						<% if Top.isActive %>
+						<% if $Top.isActive %>
 							$UploadFieldFileButtons
 						<% end_if %>
 					</div>
@@ -25,7 +25,7 @@
 		<% end_loop %>
 	<% end_if %>
 </ul>
-<% if canUpload || canAttachExisting %>
+<% if $canUpload || $canAttachExisting %>
 	<div class="ss-uploadfield-item ss-uploadfield-addfile<% if $CustomisedItems %> borderTop<% end_if %>">
 		<% if canUpload %>
 		<div class="ss-uploadfield-item-preview ss-uploadfield-dropzone ui-corner-all">
@@ -43,21 +43,21 @@
 				<% else %>
 					<b><% _t('UploadField.ATTACHFILE', 'Attach a file') %></b>
 				<% end_if %>
-				<% if canPreviewFolder %>
+				<% if $canPreviewFolder %>
 					<small>(<%t UploadField.UPLOADSINTO 'saves into /{path}' path=$FolderName %>)</small>
 				<% end_if %>
 			</label>
-			<% if canUpload %>
+			<% if $canUpload %>
 				<label class="ss-uploadfield-fromcomputer ss-ui-button ui-corner-all" title="<% _t('UploadField.FROMCOMPUTERINFO', 'Upload from your computer') %>" data-icon="drive-upload">
 					<% _t('UploadField.FROMCOMPUTER', 'From your computer') %>
 					<input id="$id" name="{$Name}[Uploads][]" class="$extraClass ss-uploadfield-fromcomputer-fileinput" data-config="$configString" type="file"<% if $multiple %> multiple="multiple"<% end_if %> />
 				</label>
 			<% end_if %>
 
-			<% if canAttachExisting %>
+			<% if $canAttachExisting %>
 				<button class="ss-uploadfield-fromfiles ss-ui-button ui-corner-all" title="<% _t('UploadField.FROMCOMPUTERINFO', 'Select from files') %>" data-icon="network-cloud"><% _t('UploadField.FROMFILES', 'From files') %></button>
 			<% end_if %>
-			<% if canUpload %>
+			<% if $canUpload %>
 				<% if not $autoUpload %>
 					<button class="ss-uploadfield-startall ss-ui-button ui-corner-all" data-icon="navigation"><% _t('UploadField.STARTALL', 'Start all') %></button>
 				<% end_if %>

templates/forms/CheckboxField_holder.ss

@@ -1,6 +1,6 @@
 <div id="$Name" class="field<% if extraClass %> $extraClass<% end_if %>">
 	$Field
 	<label class="right" for="$ID">$Title</label>
-	<% if Message %><span class="message $MessageType">$Message</span><% end_if %>
+	<% if $Message %><span class="message $MessageType">$Message</span><% end_if %>
-	<% if Description %><span class="description">$Description</span><% end_if %>
+	<% if $Description %><span class="description">$Description</span><% end_if %>
 </div>

templates/forms/CheckboxField_holder_small.ss

@@ -1,5 +1,5 @@
 $Field
 
 <% if $Title %>
-	<label class="checkboxfield-small" <% if ID %>for="$ID"<% end_if %>>$Title</label>
+	<label class="checkboxfield-small" <% if $ID %>for="$ID"<% end_if %>>$Title</label>
-<% end_if %>
+<% end_if %>

templates/forms/CheckboxSetField.ss

@@ -1,8 +1,8 @@
 <ul id="$ID" class="$extraClass">
-	<% if Options.Count %>
+	<% if $Options.Count %>
-		<% loop 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 %> />
+				<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_loop %>

templates/forms/CompositeField.ss

@@ -3,8 +3,8 @@
 		<legend>$Legend</legend>
 	<% end_if %>
 	
-	<% loop FieldList %>
+	<% loop $FieldList %>
-		<% if ColumnCount %>
+		<% if $ColumnCount %>
 			<div class="column-{$ColumnCount} $FirstLast">
 				$Field
 			</div>
@@ -12,4 +12,4 @@
 			$Field
 		<% end_if %>
 	<% end_loop %>
-</$Tag>
+</$Tag>

templates/forms/CompositeField_holder.ss

@@ -3,8 +3,8 @@
 		<legend>$Legend</legend>
 	<% end_if %>
 	
-	<% loop FieldList %>
+	<% loop $FieldList %>
-		<% if ColumnCount %>
+		<% if $ColumnCount %>
 			<div class="column-{$ColumnCount} $FirstLast">
 				$FieldHolder
 			</div>
@@ -13,5 +13,5 @@
 		<% end_if %>
 	<% end_loop %>
 
-	<% if Description %><span class="description">$Description</span><% end_if %>
+	<% if $Description %><span class="description">$Description</span><% end_if %>
-</$Tag>
+</$Tag>

templates/forms/DropdownField.ss

@@ -1,5 +1,5 @@
 <select $AttributesHTML>
-<% loop Options %>
+<% loop $Options %>
-	<option value="$Value.XML"<% if Selected %> selected="selected"<% end_if %><% if Disabled %> disabled="disabled"<% end_if %>>$Title.XML</option>
+	<option value="$Value.XML"<% if $Selected %> selected="selected"<% end_if %><% if $Disabled %> disabled="disabled"<% end_if %>>$Title.XML</option>
 <% end_loop %>
 </select>

templates/forms/FieldGroup.ss

@@ -1,7 +1,7 @@
-<div class="<% if extraClass %>$extraClass<% else %>fieldgroup<% end_if %><% if Zebra %> fieldgroup-zebra<% end_if %>" <% if ID %>id="$ID"<% end_if %>>
+<div class="<% if $extraClass %>$extraClass<% else %>fieldgroup<% end_if %><% if $Zebra %> fieldgroup-zebra<% end_if %>" <% if $ID %>id="$ID"<% end_if %>>
-	<% loop FieldList %>
+	<% loop $FieldList %>
 		<div class="fieldgroup-field $FirstLast $EvenOdd">
 			$SmallFieldHolder
 		</div>
 	<% end_loop %>
-</div>
+</div>

templates/forms/FieldGroup_DefaultFieldHolder.ss

@@ -1,7 +1,7 @@
-<div class="<% if extraClass %>$extraClass<% else %>fieldgroup<% end_if %><% if Zebra %> fieldgroup-zebra<% end_if %>" <% if ID %>id="$ID"<% end_if %>>
+<div class="<% if $extraClass %>$extraClass<% else %>fieldgroup<% end_if %><% if $Zebra %> fieldgroup-zebra<% end_if %>" <% if ID %>id="$ID"<% end_if %>>
-	<% loop FieldList %>
+	<% loop $FieldList %>
 		<div class="fieldgroup-field $FirstLast $EvenOdd">
 			$FieldHolder
 		</div>
 	<% end_loop %>
-</div>
+</div>

templates/forms/FieldGroup_holder.ss

@@ -1,13 +1,13 @@
-<div <% if Name %>id="$Name"<% end_if %> class="field $Type $extraClass">
+<div <% if $Name %>id="$Name"<% end_if %> class="field $Type $extraClass">
-	<% if Title %><label class="left">$Title</label><% end_if %>
+	<% if $Title %><label class="left">$Title</label><% end_if %>
 	
 	<div class="middleColumn fieldgroup <% if Zebra %>fieldgroup-$Zebra<% end_if %>">
-		<% loop FieldList %>
+		<% loop $FieldList %>
 			<div class="fieldgroup-field $FirstLast $EvenOdd">
 				$SmallFieldHolder
 			</div>
 		<% end_loop %>
 	</div>
-	<% if RightTitle %><label class="right">$RightTitle</label><% end_if %>
+	<% if $RightTitle %><label class="right">$RightTitle</label><% end_if %>
-	<% if Message %><span class="message $MessageType">$Message</span><% end_if %>
+	<% if $Message %><span class="message $MessageType">$Message</span><% end_if %>
-</div>
+</div>

templates/forms/FormAction.ss

@@ -1,7 +1,7 @@
-<% if UseButtonTag %>
+<% if $UseButtonTag %>
 	<button $AttributesHTML>
-		<% if ButtonContent %>$ButtonContent<% else %>$Title<% end_if %>
+		<% if $ButtonContent %>$ButtonContent<% else %>$Title<% end_if %>
 	</button>
 <% else %>
 	<input $AttributesHTML />
-<% end_if %>
+<% end_if %>

templates/forms/FormField.ss

@@ -1,5 +1,5 @@
-<% if isReadonly %>
+<% if $isReadonly %>
-	<span id="$ID"<% if extraClass %> class="$extraClass"<% end_if %>>
+	<span id="$ID"<% if $extraClass %> class="$extraClass"<% end_if %>>
 		$Value
 	</span>
 <% else %>

templates/forms/FormField_holder.ss

@@ -1,9 +1,9 @@
-<div id="$Name" class="field<% if extraClass %> $extraClass<% end_if %>">
+<div id="$Name" class="field<% if $extraClass %> $extraClass<% end_if %>">
-	<% if Title %><label class="left" for="$ID">$Title</label><% end_if %>
+	<% if $Title %><label class="left" for="$ID">$Title</label><% end_if %>
 	<div class="middleColumn">
 		$Field
 	</div>
-	<% if RightTitle %><label class="right" for="$ID">$RightTitle</label><% end_if %>
+	<% if $RightTitle %><label class="right" for="$ID">$RightTitle</label><% end_if %>
-	<% if Message %><span class="message $MessageType">$Message</span><% end_if %>
+	<% if $Message %><span class="message $MessageType">$Message</span><% end_if %>
-	<% if Description %><span class="description">$Description</span><% end_if %>
+	<% if $Description %><span class="description">$Description</span><% end_if %>
-</div>
+</div>

templates/forms/FormField_holder_small.ss

@@ -1,11 +1,11 @@
 <div class="fieldholder-small">
 	<% if $RightTitle %>
-		<label class="right fieldholder-small-label" <% if ID %>for="$ID"<% end_if %>>$RightTitle</label>
+		<label class="right fieldholder-small-label" <% if $ID %>for="$ID"<% end_if %>>$RightTitle</label>
 	<% else_if $LeftTitle %>
-		<label class="left fieldholder-small-label" <% if ID %>for="$ID"<% end_if %>>$LeftTitle</label>
+		<label class="left fieldholder-small-label" <% if $ID %>for="$ID"<% end_if %>>$LeftTitle</label>
 	<% else_if $Title %>
-		<label class="fieldholder-small-label" <% if ID %>for="$ID"<% end_if %>>$Title</label>
+		<label class="fieldholder-small-label" <% if $ID %>for="$ID"<% end_if %>>$Title</label>
 	<% end_if %>
 	
 	$Field
-</div>
+</div>

templates/forms/OptionsetField.ss

@@ -1,7 +1,7 @@
 <ul id="$ID" class="$extraClass">
-	<% loop 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 %> />
+			<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_loop %>

templates/forms/SelectionGroup.ss

@@ -1,14 +1,20 @@
-<% if IsReadonly %>
+<% if $IsReadonly %>
 	<ul class="SelectionGroup<% if extraClass %> $extraClass<% end_if %>">
-	<% loop FieldSet %>
+	<% loop $FieldSet %>
-	<% if Selected %>
+	<% if $Selected %>
-	<li$Selected>
+		<li$Selected>
-		$RadioLabel
+			$RadioLabel
-		$FieldHolder
+			$FieldHolder
-	</li>
+		</li>
 	</ul>
 	<% end_if %>
 	<% end_loop %>
 <% else %>
-	<ul class="SelectionGroup<% if extraClass %> $extraClass<% end_if %>"><% loop FieldSet %><li$Selected>{$RadioButton}{$RadioLabel}{$FieldHolder}</li><% end_loop %></ul>
+	<ul class="SelectionGroup<% if extraClass %> $extraClass<% end_if %>">
+	<% loop $FieldSet %>
+		<li$Selected>
+			{$RadioButton}{$RadioLabel}{$FieldHolder}
+		</li>
+	<% end_loop %>
+	</ul>
 <% end_if %>

templates/forms/TabSet.ss

@@ -1,16 +1,16 @@
 <div $getAttributesHTML("class") class="ss-tabset $extraClass">
 	<ul>
-	<% loop Tabs %>
+	<% loop $Tabs %>
 		<li class="$FirstLast $MiddleString $extraClass"><a href="#$id" id="tab-$id">$Title</a></li>
 	<% end_loop %>
 	</ul>
 
-	<% loop Tabs %>
+	<% loop $Tabs %>
-		<% if Tabs %>
+		<% if $Tabs %>
 			$FieldHolder
 		<% else %>
 			<div $AttributesHTML>
-				<% loop Fields %>
+				<% loop $Fields %>
 					$FieldHolder
 				<% end_loop %>
 			</div>

templates/forms/TreeDropdownField.ss

@@ -2,7 +2,7 @@
      class="TreeDropdownField single<% if extraClass %> $extraClass<% end_if %><% if ShowSearch %> searchable<% end_if %>"
      data-url-tree="$Link(tree)"
      data-title="$TitleURLEncoded"
-     <% if Description %>title="$Description"<% end_if %>
+     <% if $Description %>title="$Description"<% end_if %>
-     <% if Metadata %>data-metadata="$Metadata"<% end_if %>>
+     <% if $Metadata %>data-metadata="$Metadata"<% end_if %>>
 	<input id="$ID" type="hidden" name="$Name" value="$Value" />
-</div>
+</div>