From 8ac0093e2e59f7ff40354b472390b197618c32ae Mon Sep 17 00:00:00 2001
From: naomiaro <naomiaro@gmail.com>
Date: Wed, 13 Oct 2010 11:29:39 -0400
Subject: [PATCH] fixing scheduler layout, moving side playlist.

---
 htmlUI/html/styles_campcaster.css     |  5 ++++-
 htmlUI/templates/masterpanel.tpl      | 11 ++++++-----
 htmlUI/templates/playlist/sidebar.tpl |  2 +-
 htmlUI/templates/scratchpad/main.tpl  |  2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/htmlUI/html/styles_campcaster.css b/htmlUI/html/styles_campcaster.css
index 527bbc232..9a9fbb55b 100644
--- a/htmlUI/html/styles_campcaster.css
+++ b/htmlUI/html/styles_campcaster.css
@@ -316,11 +316,14 @@ input, select {
     float: left;
 }
 
+.side_elements {
+	width: 250px;
+}
+
 .container_elements {
     border: 1px solid #cfcfcf;
     padding: 6px;
     margin-bottom: 21px;
-    width: 250px;
 }
 
 .container_elements h1 {
diff --git a/htmlUI/templates/masterpanel.tpl b/htmlUI/templates/masterpanel.tpl
index b5a9c4b5d..7d1188da1 100644
--- a/htmlUI/templates/masterpanel.tpl
+++ b/htmlUI/templates/masterpanel.tpl
@@ -78,17 +78,18 @@
         {/if}
         
         <div class="content" id="cc_right_panel">
-            {if $simpleSearchForm}
+            {if $simpleSearchForm && !showLibrary}
                 {include file="library/simpleSearchForm.tpl"}
             {/if}
+            
+            {if $showSidePL && !$PL_simpleManagement }
+                {include file="playlist/sidebar.tpl"}
+            {/if}
 
             {if $SCRATCHPAD}
                 {include file="scratchpad/main.tpl"}
-            {/if}
+            {/if}     
             
-            {if $showSidePL && !$PL_simpleManagement}
-                {include file="playlist/sidebar.tpl"}
-            {/if}
         </div>
     {/if}
 
diff --git a/htmlUI/templates/playlist/sidebar.tpl b/htmlUI/templates/playlist/sidebar.tpl
index aabd3ee0b..232027b9e 100644
--- a/htmlUI/templates/playlist/sidebar.tpl
+++ b/htmlUI/templates/playlist/sidebar.tpl
@@ -1,4 +1,4 @@
-<div class="container_elements">
+<div class="container_elements side_elements">
 	<h1>##Open Playlist##</h1>
 	{if $PL->activeId}
 	<input type="button" class="button" onClick="location.href='ui_browser.php?id=&act=PL.simpleManagement'"   value="Edit" />
diff --git a/htmlUI/templates/scratchpad/main.tpl b/htmlUI/templates/scratchpad/main.tpl
index 65c20e529..a411efb66 100644
--- a/htmlUI/templates/scratchpad/main.tpl
+++ b/htmlUI/templates/scratchpad/main.tpl
@@ -3,7 +3,7 @@
 
 <!-- start scratch pad -->
 <form name="SP">
-    <div class="container_elements">
+    <div class="container_elements side_elements">
         <h1>##ScratchPad##</h1>
         <div class="container_table">
             <table id="SP_table">