diff --git a/admin/templates/CMSBreadcrumbs.ss b/admin/templates/CMSBreadcrumbs.ss index 9ef793482..e0d9f13e5 100644 --- a/admin/templates/CMSBreadcrumbs.ss +++ b/admin/templates/CMSBreadcrumbs.ss @@ -1,15 +1,15 @@

- <% if ToplevelController %> + <% if $ToplevelController %> - <% else_if Controller %> + <% else_if $Controller %> <% else %> <% end_if %> - <% loop Breadcrumbs %> - <% if Last %> + <% loop $Breadcrumbs %> + <% if $Last %> $Title.XML <% else %> $Title.XML diff --git a/admin/templates/CMSProfileController_Content.ss b/admin/templates/CMSProfileController_Content.ss index 1def543a3..d7675888e 100644 --- a/admin/templates/CMSProfileController_Content.ss +++ b/admin/templates/CMSProfileController_Content.ss @@ -1,18 +1,18 @@
- <% with EditForm %> + <% with $EditForm %>
- <% with Controller %> + <% with $Controller %> <% include CMSBreadcrumbs %> <% end_with %>
- <% if Fields.hasTabset %> - <% with Fields.fieldByName('Root') %> + <% if $Fields.hasTabset %> + <% with $Fields.fieldByName('Root') %>
    - <% loop Tabs %> - class="$extraClass"<% end_if %>>$Title + <% loop $Tabs %> + class="$extraClass"<% end_if %>>$Title <% end_loop %>
diff --git a/admin/templates/CMSTabSet.ss b/admin/templates/CMSTabSet.ss index 7a64cfe6f..4e232624c 100644 --- a/admin/templates/CMSTabSet.ss +++ b/admin/templates/CMSTabSet.ss @@ -5,12 +5,12 @@ <%-- e.g. through LeftAndMain_EditForm.ss. --%>
- <% loop Tabs %> - <% if Tabs %> + <% loop $Tabs %> + <% if $Tabs %> $FieldHolder <% else %>
- <% loop Fields %> + <% loop $Fields %> $FieldHolder <% end_loop %>
diff --git a/admin/templates/Includes/BackLink_Button.ss b/admin/templates/Includes/BackLink_Button.ss index cdca8ff0e..d6217a98f 100644 --- a/admin/templates/Includes/BackLink_Button.ss +++ b/admin/templates/Includes/BackLink_Button.ss @@ -1,7 +1,7 @@ -<% if Backlink %> +<% if $Backlink %>
<% _t('BackLink_Button.ss.Back', 'Back') %>
-<% end_if %> \ No newline at end of file +<% end_if %> diff --git a/admin/templates/Includes/CMSSectionIcon.ss b/admin/templates/Includes/CMSSectionIcon.ss index 7402c7f9d..463981c54 100644 --- a/admin/templates/Includes/CMSSectionIcon.ss +++ b/admin/templates/Includes/CMSSectionIcon.ss @@ -1,7 +1,7 @@ -<% if ToplevelController %> +<% if $ToplevelController %> -<% else_if Controller %> +<% else_if $Controller %> <% else %> -<% end_if %> \ No newline at end of file +<% end_if %> diff --git a/admin/templates/Includes/Editor_toolbar.ss b/admin/templates/Includes/Editor_toolbar.ss index 773877982..6a5be7c28 100644 --- a/admin/templates/Includes/Editor_toolbar.ss +++ b/admin/templates/Includes/Editor_toolbar.ss @@ -1,20 +1,20 @@ -<% with EditorToolbar %> +<% with $EditorToolbar %>
- <% loop Fields %> + <% loop $Fields %> <% end_loop %> diff --git a/templates/Includes/GridFieldFooter.ss b/templates/Includes/GridFieldFooter.ss index f4b47d73d..c464d936c 100644 --- a/templates/Includes/GridFieldFooter.ss +++ b/templates/Includes/GridFieldFooter.ss @@ -7,8 +7,8 @@ $NumRecords - <% if Message %> + <% if $Message %>
$Message
<% end_if %> - \ No newline at end of file + diff --git a/templates/Includes/GridFieldItemEditView.ss b/templates/Includes/GridFieldItemEditView.ss index 8a6a025b8..20b780413 100644 --- a/templates/Includes/GridFieldItemEditView.ss +++ b/templates/Includes/GridFieldItemEditView.ss @@ -1,5 +1,5 @@ -<% if Backlink %> +<% if $Backlink %> <% _t('Go back', 'Go back' ) %> <% end_if %> -$ItemEditForm \ No newline at end of file +$ItemEditForm diff --git a/templates/Includes/GridFieldSortableHeader_Row.ss b/templates/Includes/GridFieldSortableHeader_Row.ss index 0197407b7..2b12b728a 100644 --- a/templates/Includes/GridFieldSortableHeader_Row.ss +++ b/templates/Includes/GridFieldSortableHeader_Row.ss @@ -1,5 +1,5 @@ - <% loop Fields %> + <% loop $Fields %> <% end_loop %> diff --git a/templates/Includes/GridFieldToolbarHeader.ss b/templates/Includes/GridFieldToolbarHeader.ss index 27aabb79a..6c94910a3 100644 --- a/templates/Includes/GridFieldToolbarHeader.ss +++ b/templates/Includes/GridFieldToolbarHeader.ss @@ -1,7 +1,7 @@ - \ No newline at end of file + diff --git a/templates/Includes/GridField_FormAction.ss b/templates/Includes/GridField_FormAction.ss index 90e1cf96c..039f1fd34 100644 --- a/templates/Includes/GridField_FormAction.ss +++ b/templates/Includes/GridField_FormAction.ss @@ -1,3 +1,3 @@ \ No newline at end of file + <% if $ButtonContent %>$ButtonContent<% else %>$Title<% end_if %> + diff --git a/templates/Includes/GridField_Item.ss b/templates/Includes/GridField_Item.ss index 2128f53af..ed5a5fe15 100644 --- a/templates/Includes/GridField_Item.ss +++ b/templates/Includes/GridField_Item.ss @@ -1,11 +1,11 @@ <% if $GridField.ExtraColumnsCount %> - <% loop Fields %> + <% loop $Fields %> <% end_loop %> <% else %> - <% loop Fields %> + <% loop $Fields %> <% end_loop %> <% end_if %> diff --git a/templates/Includes/GridField_print.ss b/templates/Includes/GridField_print.ss index 8595007fd..be23e8bba 100644 --- a/templates/Includes/GridField_print.ss +++ b/templates/Includes/GridField_print.ss @@ -7,12 +7,12 @@ <% if $Title %>

$Title

<% end_if %>
-<% loop Buttons %> - <% if Type = button %> +<% loop $Buttons %> + <% if $Type = button %> $Title - <% else_if Type = dropdown %> + <% else_if $Type = dropdown %> - <% else_if Type = separator %> + <% else_if $Type = separator %> | - <% else_if Type = break %> + <% else_if $Type = break %>
<% end_if %> <% end_loop %> diff --git a/admin/templates/Includes/LeftAndMain_EditForm.ss b/admin/templates/Includes/LeftAndMain_EditForm.ss index 1274f741e..3de5007ec 100644 --- a/admin/templates/Includes/LeftAndMain_EditForm.ss +++ b/admin/templates/Includes/LeftAndMain_EditForm.ss @@ -1,19 +1,19 @@ -<% if IncludeFormTag %> +<% if $IncludeFormTag %>
<% end_if %>
<% include BackLink_Button %> - <% with Controller %> + <% with $Controller %> <% include CMSBreadcrumbs %> <% end_with %>
- <% if Fields.hasTabset %> - <% with Fields.fieldByName('Root') %> + <% if $Fields.hasTabset %> + <% with $Fields.fieldByName('Root') %>
    - <% loop Tabs %> - class="$extraClass"<% end_if %>>$Title + <% loop $Tabs %> + class="$extraClass"<% end_if %>>$Title <% end_loop %>
@@ -23,20 +23,20 @@
- <% with Controller %> + <% with $Controller %> $EditFormTools <% end_with %>
- <% if Message %> + <% if $Message %>

$Message

<% else %> <% end_if %>
- <% if Legend %>$Legend<% end_if %> - <% loop Fields %> + <% if $Legend %>$Legend<% end_if %> + <% loop $Fields %> $FieldHolder <% end_loop %>
@@ -44,12 +44,12 @@
- <% if Actions %> + <% if $Actions %>
- <% loop Actions %> + <% loop $Actions %> $Field <% end_loop %> - <% if Controller.LinkPreview %> + <% if $Controller.LinkPreview %> <% _t('LeftAndMain.PreviewButton', 'Preview') %> » @@ -57,6 +57,6 @@
<% end_if %>
-<% if IncludeFormTag %> +<% if $IncludeFormTag %>
<% end_if %> diff --git a/admin/templates/Includes/LeftAndMain_Menu.ss b/admin/templates/Includes/LeftAndMain_Menu.ss index ce11e587e..1f1da0c03 100644 --- a/admin/templates/Includes/LeftAndMain_Menu.ss +++ b/admin/templates/Includes/LeftAndMain_Menu.ss @@ -2,18 +2,18 @@
$Field
- <% if Title %>

$Title

<% end_if %> + <% if $Title %>

$Title

<% end_if %>
\$DefineFragment(toolbar-header-right)
\$DefineFragment(toolbar-header-left)
$Valueclass="ss-gridfield-{$FirstLast}"<% end_if %>>$Value
- <% loop Header %><% end_loop %> + <% loop $Header %><% end_loop %> - <% if ItemRows %> - <% loop ItemRows %> - <% loop ItemRow %><% end_loop %> + <% if $ItemRows %> + <% loop $ItemRows %> + <% loop $ItemRow %><% end_loop %> <% end_loop %> <% else %> diff --git a/templates/Includes/HtmlEditorField_viewfile.ss b/templates/Includes/HtmlEditorField_viewfile.ss index a2bf9f7c2..997fa0e46 100644 --- a/templates/Includes/HtmlEditorField_viewfile.ss +++ b/templates/Includes/HtmlEditorField_viewfile.ss @@ -38,10 +38,10 @@ - <% if Info %>
$Info
<% end_if %> + <% if $Info %>
$Info
<% end_if %>
- <% loop Fields %> + <% loop $Fields %> $FieldHolder <% end_loop %>
diff --git a/templates/Includes/UploadField_FileButtons.ss b/templates/Includes/UploadField_FileButtons.ss index 1f0e920c7..1c14f0823 100644 --- a/templates/Includes/UploadField_FileButtons.ss +++ b/templates/Includes/UploadField_FileButtons.ss @@ -1,4 +1,4 @@ -<% if canEdit %> +<% if $canEdit %> -<% if canDelete %> +<% if $canDelete %> <% end_if %> -<% if UploadField.canAttachExisting %> +<% if $UploadField.canAttachExisting %> <% end_if %> diff --git a/templates/RSSFeed.ss b/templates/RSSFeed.ss index 45bcab748..f4bc1ff97 100644 --- a/templates/RSSFeed.ss +++ b/templates/RSSFeed.ss @@ -6,14 +6,14 @@ $Description.XML - <% loop Entries %> + <% loop $Entries %> $Title.XML $AbsoluteLink - <% if Description %>$Description.AbsoluteLinks.XML<% end_if %> - <% if Date %>$Date.Rfc822 + <% if $Description %>$Description.AbsoluteLinks.XML<% end_if %> + <% if $Date %>$Date.Rfc822 <% else %>$Created.Rfc822<% end_if %> - <% if Author %>$Author.XML<% end_if %> + <% if $Author %>$Author.XML<% end_if %> $AbsoluteLink <% end_loop %> diff --git a/templates/RightLabelledFieldHolder.ss b/templates/RightLabelledFieldHolder.ss index f20e1ccaf..574ab26d4 100644 --- a/templates/RightLabelledFieldHolder.ss +++ b/templates/RightLabelledFieldHolder.ss @@ -1,5 +1,5 @@

$Field - <% if Message %>$Message<% end_if %> -

\ No newline at end of file + <% if $Message %>$Message<% end_if %> +

diff --git a/templates/SearchForm.ss b/templates/SearchForm.ss index c6a525d1e..8b4c9c148 100644 --- a/templates/SearchForm.ss +++ b/templates/SearchForm.ss @@ -1,15 +1,15 @@
- <% if Message %> + <% if $Message %>

$Message

<% else %> <% end_if %>
- <% loop Fields %> - $FieldHolder + <% loop $Fields %> + $FieldHolder <% end_loop %> - <% loop Actions %> - $Field + <% loop $Actions %> + $Field <% end_loop %>
diff --git a/templates/UploadField.ss b/templates/UploadField.ss index 9f9af1e87..ecf70ee30 100644 --- a/templates/UploadField.ss +++ b/templates/UploadField.ss @@ -13,7 +13,7 @@
- <% if Top.isActive %> + <% if $Top.isActive %> $UploadFieldFileButtons <% end_if %>
@@ -25,7 +25,7 @@ <% end_loop %> <% end_if %> -<% if canUpload || canAttachExisting %> +<% if $canUpload || $canAttachExisting %>
<% if canUpload %>
@@ -43,21 +43,21 @@ <% else %> <% _t('UploadField.ATTACHFILE', 'Attach a file') %> <% end_if %> - <% if canPreviewFolder %> + <% if $canPreviewFolder %> (<%t UploadField.UPLOADSINTO 'saves into /{path}' path=$FolderName %>) <% end_if %> - <% if canUpload %> + <% if $canUpload %> <% end_if %> - <% if canAttachExisting %> + <% if $canAttachExisting %> <% end_if %> - <% if canUpload %> + <% if $canUpload %> <% if not $autoUpload %> <% end_if %> diff --git a/templates/forms/CheckboxField_holder.ss b/templates/forms/CheckboxField_holder.ss index 7798acc6e..b70a52e6a 100644 --- a/templates/forms/CheckboxField_holder.ss +++ b/templates/forms/CheckboxField_holder.ss @@ -1,6 +1,6 @@
$Field - <% if Message %>$Message<% end_if %> - <% if Description %>$Description<% end_if %> + <% if $Message %>$Message<% end_if %> + <% if $Description %>$Description<% end_if %>
diff --git a/templates/forms/CheckboxField_holder_small.ss b/templates/forms/CheckboxField_holder_small.ss index 511dbb1be..a4f8d4423 100644 --- a/templates/forms/CheckboxField_holder_small.ss +++ b/templates/forms/CheckboxField_holder_small.ss @@ -1,5 +1,5 @@ $Field <% if $Title %> - -<% end_if %> \ No newline at end of file + +<% end_if %> diff --git a/templates/forms/CheckboxSetField.ss b/templates/forms/CheckboxSetField.ss index cb6a3bb45..49c298da0 100644 --- a/templates/forms/CheckboxSetField.ss +++ b/templates/forms/CheckboxSetField.ss @@ -1,8 +1,8 @@
    - <% if Options.Count %> - <% loop Options %> + <% if $Options.Count %> + <% loop $Options %>
  • - checked="checked"<% end_if %><% if isDisabled %> disabled="disabled"<% end_if %> /> + checked="checked"<% end_if %><% if $isDisabled %> disabled="disabled"<% end_if %> />
    • <% end_loop %> diff --git a/templates/forms/CompositeField.ss b/templates/forms/CompositeField.ss index 452f1c979..9ab9c820e 100644 --- a/templates/forms/CompositeField.ss +++ b/templates/forms/CompositeField.ss @@ -3,8 +3,8 @@ $Legend <% end_if %> - <% loop FieldList %> - <% if ColumnCount %> + <% loop $FieldList %> + <% if $ColumnCount %>
    $Field
    @@ -12,4 +12,4 @@ $Field <% end_if %> <% end_loop %> - \ No newline at end of file + diff --git a/templates/forms/CompositeField_holder.ss b/templates/forms/CompositeField_holder.ss index 83f015f0b..bb3042350 100644 --- a/templates/forms/CompositeField_holder.ss +++ b/templates/forms/CompositeField_holder.ss @@ -3,8 +3,8 @@ $Legend <% end_if %> - <% loop FieldList %> - <% if ColumnCount %> + <% loop $FieldList %> + <% if $ColumnCount %>
    $FieldHolder
    @@ -13,5 +13,5 @@ <% end_if %> <% end_loop %> - <% if Description %>$Description<% end_if %> - \ No newline at end of file + <% if $Description %>$Description<% end_if %> + diff --git a/templates/forms/DropdownField.ss b/templates/forms/DropdownField.ss index 00d654e82..5d5c24d04 100644 --- a/templates/forms/DropdownField.ss +++ b/templates/forms/DropdownField.ss @@ -1,5 +1,5 @@ diff --git a/templates/forms/FieldGroup.ss b/templates/forms/FieldGroup.ss index 21fd1aa43..c9b6eb94a 100644 --- a/templates/forms/FieldGroup.ss +++ b/templates/forms/FieldGroup.ss @@ -1,7 +1,7 @@ -
    id="$ID"<% end_if %>> - <% loop FieldList %> +
    id="$ID"<% end_if %>> + <% loop $FieldList %>
    $SmallFieldHolder
    <% end_loop %> -
    \ No newline at end of file +
    diff --git a/templates/forms/FieldGroup_DefaultFieldHolder.ss b/templates/forms/FieldGroup_DefaultFieldHolder.ss index cb9478322..5a1558e69 100644 --- a/templates/forms/FieldGroup_DefaultFieldHolder.ss +++ b/templates/forms/FieldGroup_DefaultFieldHolder.ss @@ -1,7 +1,7 @@ -
    id="$ID"<% end_if %>> - <% loop FieldList %> +
    id="$ID"<% end_if %>> + <% loop $FieldList %>
    $FieldHolder
    <% end_loop %> -
    \ No newline at end of file +
    diff --git a/templates/forms/FieldGroup_holder.ss b/templates/forms/FieldGroup_holder.ss index 423baae1c..95ab1a153 100644 --- a/templates/forms/FieldGroup_holder.ss +++ b/templates/forms/FieldGroup_holder.ss @@ -1,13 +1,13 @@ -
    id="$Name"<% end_if %> class="field $Type $extraClass"> - <% if Title %><% end_if %> +
    id="$Name"<% end_if %> class="field $Type $extraClass"> + <% if $Title %><% end_if %>
    - <% loop FieldList %> + <% loop $FieldList %>
    $SmallFieldHolder
    <% end_loop %>
    - <% if RightTitle %><% end_if %> - <% if Message %>$Message<% end_if %> -
    \ No newline at end of file + <% if $RightTitle %><% end_if %> + <% if $Message %>$Message<% end_if %> +
    diff --git a/templates/forms/FormAction.ss b/templates/forms/FormAction.ss index fb5cf21ee..16e61fb1c 100644 --- a/templates/forms/FormAction.ss +++ b/templates/forms/FormAction.ss @@ -1,7 +1,7 @@ -<% if UseButtonTag %> +<% if $UseButtonTag %> <% else %> -<% end_if %> \ No newline at end of file +<% end_if %> diff --git a/templates/forms/FormField.ss b/templates/forms/FormField.ss index 73a06489b..8c763daf1 100644 --- a/templates/forms/FormField.ss +++ b/templates/forms/FormField.ss @@ -1,5 +1,5 @@ -<% if isReadonly %> - class="$extraClass"<% end_if %>> +<% if $isReadonly %> + class="$extraClass"<% end_if %>> $Value <% else %> diff --git a/templates/forms/FormField_holder.ss b/templates/forms/FormField_holder.ss index fa23b8595..ef1f917d9 100644 --- a/templates/forms/FormField_holder.ss +++ b/templates/forms/FormField_holder.ss @@ -1,9 +1,9 @@ -
    - <% if Title %><% end_if %> +
    + <% if $Title %><% end_if %>
    $Field
    - <% if RightTitle %><% end_if %> - <% if Message %>$Message<% end_if %> - <% if Description %>$Description<% end_if %> -
    \ No newline at end of file + <% if $RightTitle %><% end_if %> + <% if $Message %>$Message<% end_if %> + <% if $Description %>$Description<% end_if %> +
    diff --git a/templates/forms/FormField_holder_small.ss b/templates/forms/FormField_holder_small.ss index 4360afac5..101a190c5 100644 --- a/templates/forms/FormField_holder_small.ss +++ b/templates/forms/FormField_holder_small.ss @@ -1,11 +1,11 @@
    <% if $RightTitle %> - + <% else_if $LeftTitle %> - + <% else_if $Title %> - + <% end_if %> $Field -
    \ No newline at end of file +
diff --git a/templates/forms/OptionsetField.ss b/templates/forms/OptionsetField.ss index 445e3cd0b..bb8818a6f 100644 --- a/templates/forms/OptionsetField.ss +++ b/templates/forms/OptionsetField.ss @@ -1,7 +1,7 @@
    - <% loop Options %> + <% loop $Options %>
  • - checked<% end_if %><% if isDisabled %> disabled<% end_if %> /> + checked<% end_if %><% if $isDisabled %> disabled<% end_if %> />
    • <% end_loop %> diff --git a/templates/forms/SelectionGroup.ss b/templates/forms/SelectionGroup.ss index dccec5d6f..14737897c 100644 --- a/templates/forms/SelectionGroup.ss +++ b/templates/forms/SelectionGroup.ss @@ -1,14 +1,20 @@ -<% if IsReadonly %> +<% if $IsReadonly %>
      - <% loop FieldSet %> - <% if Selected %> - - $RadioLabel - $FieldHolder - + <% loop $FieldSet %> + <% if $Selected %> + + $RadioLabel + $FieldHolder +
    <% end_if %> <% end_loop %> <% else %> -
      <% loop FieldSet %>{$RadioButton}{$RadioLabel}{$FieldHolder}<% end_loop %>
    +
      + <% loop $FieldSet %> + + {$RadioButton}{$RadioLabel}{$FieldHolder} + + <% end_loop %> +
    <% end_if %> diff --git a/templates/forms/TabSet.ss b/templates/forms/TabSet.ss index 9f1535037..3d748954f 100644 --- a/templates/forms/TabSet.ss +++ b/templates/forms/TabSet.ss @@ -1,16 +1,16 @@
      - <% loop Tabs %> + <% loop $Tabs %>
    • $Title
      • <% end_loop %>
    - <% loop Tabs %> - <% if Tabs %> + <% loop $Tabs %> + <% if $Tabs %> $FieldHolder <% else %>
    - <% loop Fields %> + <% loop $Fields %> $FieldHolder <% end_loop %>
    diff --git a/templates/forms/TreeDropdownField.ss b/templates/forms/TreeDropdownField.ss index 762f65555..016acee33 100644 --- a/templates/forms/TreeDropdownField.ss +++ b/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 Metadata %>data-metadata="$Metadata"<% end_if %>> + <% if $Description %>title="$Description"<% end_if %> + <% if $Metadata %>data-metadata="$Metadata"<% end_if %>> -
    \ No newline at end of file +
$CellString
$CellString
$CellString
$CellString