ENHANCEMENT: allow left column on LeftAndMain::getEditForm

silverstripe · Feb 11, 2012 · 649f4ce · 649f4ce
1 parent 37156b0
commit 649f4ce
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 33 deletions.
diff --git a/admin/css/screen.css b/admin/css/screen.css
diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss
@@ -405,6 +405,8 @@ body.cms {
 	overflow-y: auto;	
 	overflow-x: hidden;
 	z-index: 70;
+	float: left;
+	position: relative;
 
 	.cms-panel-header {
 		padding: 0;

diff --git a/admin/templates/Includes/LeftAndMain_EditForm.ss b/admin/templates/Includes/LeftAndMain_EditForm.ss
@@ -1,7 +1,6 @@
 <% if IncludeFormTag %>
 <form $FormAttributes data-layout="{type: 'border'}">
 <% end_if %>
-
 	<div class="cms-content-header north">
 		<div>
 			<h2 id="page-title-heading" title="$Record.Breadcrumbs(20, true)">
@@ -22,43 +21,45 @@
 			<!-- <div class="cms-content-search">...</div> -->
 		</div>
 	</div>
-
-	<div class="cms-content-fields center">
-
-		<!-- <div class="cms-content-tools west">
+
+	<% if Left %>
+		<div class="cms-content-tools west cms-panel cms-panel-layout collapsed" id="cms-content-tools" data-expandOnClick="true" data-layout="{type: 'border'}">
 			$Left
-		</div> -->
-
-		<% 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 %>
+		</div>
+	<% end_if %>
+
+	<div class="center cms-panel-layout" id="center-container-here" data-layout="{type: 'border'}">
+		<div class="cms-content-fields center">
+			<% 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 %> 
-			<% control Fields %>
-				$FieldHolder
-			<% end_control %>
-			<div class="clear"><!-- --></div>
-		</fieldset>
-	</div>
+			<fieldset>
+				<% if Legend %><legend>$Legend</legend><% end_if %> 
+				<% control Fields %>
+					$FieldHolder
+				<% end_control %>
+				<div class="clear"><!-- --></div>
+			</fieldset>
+		</div>
 
-	<div class="cms-content-actions south">
-		<% if Actions %>
-		<div class="Actions">
-			<% control Actions %>
-				$Field
-			<% end_control %>
-			<% if CurrentPage.PreviewLink %>
-			<a href="$CurrentPage.PreviewLink" class="cms-preview-toggle-link ss-ui-button">
-				<% _t('LeftAndMain.PreviewButton', 'Preview') %> &raquo;
-			</a>
+		<div class="cms-content-actions south">
+			<% if Actions %>
+			<div class="Actions">
+				<% control Actions %>
+					$Field
+				<% end_control %>
+				<% if CurrentPage.PreviewLink %>
+				<a href="$CurrentPage.PreviewLink" class="cms-preview-toggle-link ss-ui-button">
+					<% _t('LeftAndMain.PreviewButton', 'Preview') %> &raquo;
+				</a>
+				<% end_if %>
+			</div>
 			<% end_if %>
 		</div>
-		<% end_if %>
 	</div>
-
 <% if IncludeFormTag %>
 </form>
 <% end_if %>