From 376d77177143fa63ed9ca32d2c33786ca1cafa34 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Thu, 29 Oct 2015 16:12:29 +1300
Subject: [PATCH] 3.2 compatibility
---
templates/forms/CheckboxField_holder.ss | 2 +-
templates/forms/FormField_holder.ss | 2 +-
templates/forms/SelectionGroup.ss | 18 +++++++++---------
templates/forms/TabSet.ss | 19 -------------------
templates/forms/TextField.ss | 2 +-
templates/forms/TextareaField.ss | 2 +-
templates/forms/TreeDropdownField.ss | 8 --------
7 files changed, 13 insertions(+), 40 deletions(-)
delete mode 100644 templates/forms/TabSet.ss
delete mode 100644 templates/forms/TreeDropdownField.ss
diff --git a/templates/forms/CheckboxField_holder.ss b/templates/forms/CheckboxField_holder.ss
index 31dc314..772295e 100644
--- a/templates/forms/CheckboxField_holder.ss
+++ b/templates/forms/CheckboxField_holder.ss
@@ -1,4 +1,4 @@
-<div id="$Name" class="field<% if extraClass %> $extraClass<% end_if %>">
+<div id="$HolderID" class="field<% if extraClass %> $extraClass<% end_if %>">
<% if Message %><span class="message $MessageType" id="$ID-message">$Message</span><% end_if %>
<label class="checkbox" for="$ID">
$Field
diff --git a/templates/forms/FormField_holder.ss b/templates/forms/FormField_holder.ss
index 71cab15..7664847 100644
--- a/templates/forms/FormField_holder.ss
+++ b/templates/forms/FormField_holder.ss
@@ -1,4 +1,4 @@
-<div id="$Name" class="control-group field<% if extraClass %> $extraClass<% end_if %>">
+<div id="$HolderID" class="control-group field<% if extraClass %> $extraClass<% end_if %>">
<% if Title %>
<label class="left" for="$ID">
<% if Message %><span class="message $MessageType">$Message</span><% end_if %>
diff --git a/templates/forms/SelectionGroup.ss b/templates/forms/SelectionGroup.ss
index dccec5d..d3fee4a 100644
--- a/templates/forms/SelectionGroup.ss
+++ b/templates/forms/SelectionGroup.ss
@@ -1,14 +1,14 @@
-<% if IsReadonly %>
+<% if $IsReadonly %>
<ul class="SelectionGroup<% if extraClass %> $extraClass<% end_if %>">
- <% loop FieldSet %>
- <% if Selected %>
- <li$Selected>
- $RadioLabel
- $FieldHolder
- </li>
- </ul>
- <% end_if %>
+ <% loop $FieldSet %>
+ <% if $Selected %>
+ <li$Selected>
+ $RadioLabel
+ $FieldHolder
+ </li>
+ <% end_if %>
<% end_loop %>
+ </ul>
<% else %>
<ul class="SelectionGroup<% if extraClass %> $extraClass<% end_if %>"><% loop FieldSet %><li$Selected>{$RadioButton}{$RadioLabel}{$FieldHolder}</li><% end_loop %></ul>
<% end_if %>
diff --git a/templates/forms/TabSet.ss b/templates/forms/TabSet.ss
deleted file mode 100644
index 77f5f08..0000000
--- a/templates/forms/TabSet.ss
+++ /dev/null
@@ -1,19 +0,0 @@
-<div $AttributesHTML>
- <ul>
- <% loop Tabs %>
- <li class="$FirstLast $MiddleString $extraClass"><a href="#$id" id="tab-$id">$Title</a></li>
- <% end_loop %>
- </ul>
-
- <% loop Tabs %>
- <% if Tabs %>
- $FieldHolder
- <% else %>
- <div $AttributesHTML>
- <% loop Fields %>
- $FieldHolder
- <% end_loop %>
- </div>
- <% end_if %>
- <% end_loop %>
-</div>
diff --git a/templates/forms/TextField.ss b/templates/forms/TextField.ss
index a327b40..a6ee3cc 100644
--- a/templates/forms/TextField.ss
+++ b/templates/forms/TextField.ss
@@ -1 +1 @@
-<input <% if RightTitle %>aria-describedby="$ID-extra"<% end_if %> $AttributesHTML />
\ No newline at end of file
+<input <% if $RightTitle %>aria-describedby="$ID-extra"<% end_if %> $AttributesHTML />
\ No newline at end of file
diff --git a/templates/forms/TextareaField.ss b/templates/forms/TextareaField.ss
index 610282a..aa4a0f2 100644
--- a/templates/forms/TextareaField.ss
+++ b/templates/forms/TextareaField.ss
@@ -1 +1 @@
-<textarea <% if RightTitle %>aria-describedby="$ID-extra"<% end_if %> $AttributesHTML>$Value</textarea>
\ No newline at end of file
+<textarea <% if $RightTitle %>aria-describedby="$ID-extra"<% end_if %> $AttributesHTML>$Value</textarea>
\ No newline at end of file
diff --git a/templates/forms/TreeDropdownField.ss b/templates/forms/TreeDropdownField.ss
deleted file mode 100644
index 762f655..0000000
--- a/templates/forms/TreeDropdownField.ss
+++ /dev/null
@@ -1,8 +0,0 @@
-<div id="TreeDropdownField_$ID"
- 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 %>>
- <input id="$ID" type="hidden" name="$Name" value="$Value" />
-</div>
\ No newline at end of file
--
GitLab