From 4fe80194b6a524d2bc279d76b6210ec9fab28091 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Mon, 21 May 2012 17:07:34 +0200
Subject: [PATCH] CC-3845 : General UI cleanup

---
 .../views/scripts/form/showbuilder.phtml      |  9 ++++++---
 .../views/scripts/showbuilder/builder.phtml   |  8 --------
 .../views/scripts/showbuilder/index.phtml     |  8 +-------
 airtime_mvc/public/css/showbuilder.css        | 20 +++++++++----------
 .../js/airtime/showbuilder/main_builder.js    | 16 ++++++++++++---
 5 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/airtime_mvc/application/views/scripts/form/showbuilder.phtml b/airtime_mvc/application/views/scripts/form/showbuilder.phtml
index 0f603ed41..68173ba41 100644
--- a/airtime_mvc/application/views/scripts/form/showbuilder.phtml
+++ b/airtime_mvc/application/views/scripts/form/showbuilder.phtml
@@ -1,4 +1,7 @@
 <div class="sb-timerange">
+    <div id="sb_edit" class="ui-button ui-state-default" title="open the library to schedule files.">
+        <span class="ui-icon ui-icon-arrowthick-1-nw"></span>
+    </div>
     <?php echo $this->element->getElement('sb_date_start') ?>
     <?php echo $this->element->getElement('sb_time_start') ?>
     <?php echo $this->element->getElement('sb_date_end') ?>
@@ -13,15 +16,15 @@
         	<span class="ui-icon ui-icon-triangle-2-n-s"></span>
         Filter By Show:
         </legend>
-        
+
         <div class="sb-options-form">
             <label><?php echo $this->element->getElement('sb_show_filter')->getLabel() ?></label>
             <?php echo $this->element->getElement('sb_show_filter') ?>
-        
+
             <?php if ($this->element->getElement('sb_my_shows')):?>
             <label><?php echo $this->element->getElement('sb_my_shows')->getLabel(); ?></label>
             <?php echo $this->element->getElement('sb_my_shows'); ?>
             <?php endif;?>
         </div>
-    </fieldset>   
+    </fieldset>
 </div>
\ No newline at end of file
diff --git a/airtime_mvc/application/views/scripts/showbuilder/builder.phtml b/airtime_mvc/application/views/scripts/showbuilder/builder.phtml
index a171768c0..e69de29bb 100644
--- a/airtime_mvc/application/views/scripts/showbuilder/builder.phtml
+++ b/airtime_mvc/application/views/scripts/showbuilder/builder.phtml
@@ -1,8 +0,0 @@
-<?php if ($this->toggleLib): ?>
-<div id="sb_edit" class="ui-state-default" title="open the library to schedule files.">
-    <span class="ui-icon ui-icon-arrowthick-1-nw"></span>
-</div>
-<?php endif; ?>
-
-<?php echo $this->sb_form; ?>
-<table id="show_builder_table" cellpadding="0" cellspacing="0" class="datatable"></table>
diff --git a/airtime_mvc/application/views/scripts/showbuilder/index.phtml b/airtime_mvc/application/views/scripts/showbuilder/index.phtml
index 28a882d7d..84d3db653 100644
--- a/airtime_mvc/application/views/scripts/showbuilder/index.phtml
+++ b/airtime_mvc/application/views/scripts/showbuilder/index.phtml
@@ -1,5 +1,5 @@
 <?php if (!$this->disableLib): ?>
-<div id="library_content" class="lib-content tabs ui-widget ui-widget-content block-shadow alpha-block padded" 
+<div id="library_content" class="lib-content tabs ui-widget ui-widget-content block-shadow alpha-block padded"
     <?php if (!$this->showLib): ?>
     style="display:none"
     <?php endif; ?>
@@ -9,12 +9,6 @@
 <?php endif; ?>
 
 <div id="show_builder" class="sb-content ui-widget ui-widget-content block-shadow omega-block padded">
-    <?php if (!$this->disableLib && !$this->showLib): ?>
-    <div id="sb_edit" class="ui-state-default" title="open the library to schedule files.">
-        <span class="ui-icon ui-icon-arrowthick-1-nw"></span>
-    </div>
-    <?php endif; ?>
-    
     <?php echo $this->sb_form; ?>
     <table id="show_builder_table" cellpadding="0" cellspacing="0" class="datatable"></table>
 </div>
diff --git a/airtime_mvc/public/css/showbuilder.css b/airtime_mvc/public/css/showbuilder.css
index dad808785..6aaeeba7e 100644
--- a/airtime_mvc/public/css/showbuilder.css
+++ b/airtime_mvc/public/css/showbuilder.css
@@ -19,15 +19,6 @@
     background-color: rgba(255, 136, 56, 1);
 }
 
-#sb_edit {
-	position: relative;
-	top: 2px;
-	float: left;
-	margin-right: 5px;
-	padding: 1px 2px;
-	cursor: pointer;
-}
-
 .sb-content .fg-toolbar ul {
 	float: left;
 	padding: 0;
@@ -99,13 +90,22 @@ div.sb-timerange {
     position: relative;
 }
 
-div.sb-timerange div {
+div.sb-timerange div#sb_edit {
+	position:absolute;
+    padding: 3px;
+}
+
+div.sb-timerange div#sb_submit {
 	position: absolute;
 	bottom: 0px;
 	padding: 3px;
 	margin-left: 5px;
 }
 
+div.sb-timerange input#sb_date_start {
+    margin-left: 30px;
+}
+
 .sb-starts,
 .sb-ends {
 	text-align: center;
diff --git a/airtime_mvc/public/js/airtime/showbuilder/main_builder.js b/airtime_mvc/public/js/airtime/showbuilder/main_builder.js
index 687184584..ca007e69c 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/main_builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/main_builder.js
@@ -15,7 +15,7 @@ AIRTIME = (function(AIRTIME) {
 		timeStartId = "#sb_time_start",
 		dateEndId = "#sb_date_end",
 		timeEndId = "#sb_time_end",
-		$toggleLib = $('<div id="sb_edit" class="ui-state-default" title="open the library to schedule files."><span class="ui-icon ui-icon-arrowthick-1-nw"></span></div>'),
+		$toggleLib = $('<div id="sb_edit" class="ui-button ui-state-default" title="open the library to schedule files."><span class="ui-icon ui-icon-arrowthick-1-nw"></span></div>'),
 		$libClose = $('<a />', {
 			"class": "close-round",
 			"href": "#",
@@ -74,6 +74,9 @@ AIRTIME = (function(AIRTIME) {
 	    	$builder.width(Math.floor(screenWidth * 0.5))
 				.find("#sb_edit")
 					.remove()
+					.end()
+				.find("#sb_date_start")
+					.css("margin-left", 0)
 					.end();
 	    	
 	    	oTable = $('#show_builder_table').dataTable();
@@ -143,7 +146,7 @@ AIRTIME = (function(AIRTIME) {
 			oTable.fnDraw();
 		});
 
-		$builder.on("click","#sb_edit", function () {
+		$builder.on("click","#sb_edit", function (ev){
 			var schedTable = $("#show_builder_table").dataTable();
 			
 			//reset timestamp to redraw the cursors.
@@ -155,6 +158,9 @@ AIRTIME = (function(AIRTIME) {
 			$builder.width(Math.floor(screenWidth * 0.5))
 				.find("#sb_edit")
 					.remove()
+					.end()
+				.find("#sb_date_start")
+					.css("margin-left", 0)
 					.end();
 			
 			schedTable.fnDraw();
@@ -174,9 +180,13 @@ AIRTIME = (function(AIRTIME) {
 			$lib.hide();
 			$builder.width(screenWidth)
 				.find(".sb-timerange")
-					.append($toggleLib)
+					.prepend($toggleLib)
+					.find("#sb_date_start")
+						.css("margin-left", 30)
+						.end()
 					.end();
 			
+			$toggleLib.removeClass("ui-state-hover");
 			schedTable.fnDraw();
 			
 			$.ajax({