Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

airtime_mvc/application/controllers/ShowbuilderController.php

@@ -147,6 +147,7 @@ class ShowbuilderController extends Zend_Controller_Action
 
         $start = DateTime::createFromFormat("U", $from, new DateTimeZone("UTC"));
         $start->setTimezone(new DateTimeZone(date_default_timezone_get()));
+
         $end = DateTime::createFromFormat("U", $to, new DateTimeZone("UTC"));
         $end->setTimezone(new DateTimeZone(date_default_timezone_get()));
 
@@ -310,13 +311,9 @@ class ShowbuilderController extends Zend_Controller_Action
         } catch (OutDatedScheduleException $e) {
             $this->view->error = $e->getMessage();
             Logging::info($e->getMessage());
-            Logging::info("{$e->getFile()}");
-            Logging::info("{$e->getLine()}");
         } catch (Exception $e) {
             $this->view->error = $e->getMessage();
             Logging::info($e->getMessage());
-            Logging::info("{$e->getFile()}");
-            Logging::info("{$e->getLine()}");
         }
     }
 
@@ -332,13 +329,9 @@ class ShowbuilderController extends Zend_Controller_Action
         } catch (OutDatedScheduleException $e) {
             $this->view->error = $e->getMessage();
             Logging::info($e->getMessage());
-            Logging::info("{$e->getFile()}");
-            Logging::info("{$e->getLine()}");
         } catch (Exception $e) {
             $this->view->error = $e->getMessage();
             Logging::info($e->getMessage());
-            Logging::info("{$e->getFile()}");
-            Logging::info("{$e->getLine()}");
         }
     }
 

airtime_mvc/application/controllers/WebstreamController.php

@@ -19,7 +19,6 @@ class WebstreamController extends Zend_Controller_Action
         if (!$this->isAuthorized(-1)) {
             // TODO: this header call does not actually print any error message
             header("Status: 401 Not Authorized");
-            Logging::info("Ain't not Authorized");
             return;
         }
 
@@ -112,8 +111,6 @@ class WebstreamController extends Zend_Controller_Action
                     host/dj, that he has the correct permission.*/
                 $user = Application_Model_User::getCurrentUser();
                 //only allow when webstream belongs to the DJ
-                Logging::info("Webstream id:".$webstream->getDbCreatorId());
-                Logging::info("User id:".$user->getId());
                 return $webstream->getDbCreatorId() == $user->getId();
             }
             /*we are creating a new stream. Don't need to check whether the
@@ -122,7 +119,6 @@ class WebstreamController extends Zend_Controller_Action
         } else {
             Logging::info( $user );
         }
-        Logging::info("what the fuck");
         return false;
     }
 
@@ -133,15 +129,12 @@ class WebstreamController extends Zend_Controller_Action
         $id = $request->getParam("id");
 
         $parameters = array();
-        $parameters['id'] = trim($request->getParam("id"));
-        $parameters['length'] = trim($request->getParam("length"));
-        $parameters['name'] = trim($request->getParam("name"));
-        $parameters['description'] = trim($request->getParam("description"));
-        $parameters['url'] = trim($request->getParam("url"));
+        foreach (array('id','length','name','description','url') as $p) {
+            $parameters[$p] = trim($request->getParam($p));
+        }
 
         if (!$this->isAuthorized($id)) {
             header("Status: 401 Not Authorized");
-
             return;
         }
 

airtime_mvc/application/models/User.php

@@ -335,11 +335,14 @@ class Application_Model_User
 
     public static function getUserData($id)
     {
-        $sql = "SELECT login, first_name, last_name, type, id, email, cell_phone, skype_contact, jabber_contact"
-        ." FROM cc_subjs"
-        ." WHERE id = :id";
-
-        return Application_Common_Database::prepareAndExecute($sql, array(":id" => $id), 'single');
+        $sql = <<<SQL
+SELECT login, first_name, last_name, type, id, email, cell_phone, skype_contact,
+       jabber_contact
+FROM cc_subjs
+WHERE id = :id
+SQL;
+        return Application_Common_Database::prepareAndExecute($sql, array(
+            ":id" => $id), 'single');
     }
 
     public static function getCurrentUser()

airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml

@@ -1,6 +1,7 @@
 <form id="smart-block-form" method="post" action="">
-<fieldset class='toggle <?php echo $this->openOption ? "" : "closed"?>' id='smart_block_options'>
+<fieldset class='toggle <?php echo $this->openOption ? "" : "closed"?> sb-criteria-fieldset' id='smart_block_options'>
 <legend style='cursor: pointer;'><span class='ui-icon ui-icon-triangle-2-n-s'></span>Smart Block Options</legend>
+
     <dl class='zend_form search-criteria'>
         <div class='btn-toolbar clearfix'>
             <div class='btn-group pull-right'>
@@ -101,7 +102,7 @@
             </div>
         <?php } ?>
 
-        
     </dl>
+
 </fieldset>
 </form>

airtime_mvc/application/views/scripts/form/stream-setting-form.phtml

@@ -1,7 +1,7 @@
         <?php 
         $s_name = "s".$this->stream_number;
         ?>
-        <h3 class="collapsible-header <?php echo $this->stream_number == '1'?"close":""?>"><span class="arrow-icon"></span>Stream <?php echo $this->stream_number?></h3>
+        <h3 class="collapsible-header <?php echo $this->stream_number == '1'?"closed":""?>"><span class="arrow-icon"></span>Stream <?php echo $this->stream_number?></h3>
         <div class="stream-setting-content" <?php echo $this->enabled == 0?'style="display: none;':''?> id="<?php echo $s_name?>-config">
         <fieldset class="padded">
             <dl class="zend_form clearfix">

airtime_mvc/public/css/jquery.contextMenu.css

@@ -41,6 +41,11 @@
     position: relative;
 	min-height: 18px;
     -moz-user-select: -moz-none;
+    display: block;
+    width: 100%;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box; 
 }
 
 .context-menu-item.icon {

airtime_mvc/public/css/playlist_builder.css

@@ -21,7 +21,14 @@
 .spl_fade_out {
 	clear: left;
 }
-
+#spl_sortable > li {
+	width: 100%;
+	margin-bottom:-1px;
+	position:relative;
+	-moz-box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box; 
+}
 /*#side_playlist button {
     float: left;
     font-size: 12px;
@@ -48,12 +55,6 @@
 	margin-bottom:0;
 }
 
-/*#side_playlist li {
-	width: 99.5%;
-	margin-bottom:-1px;
-	position:relative;
-}*/
-
 #side_playlist li div.list-item-container, #side_playlist li div.list-item-container.ui-state-active {
 	height:56px;
 	border: none;
@@ -480,3 +481,25 @@ li.spl_empty {
     height: 56px;
 }
 
+/*---////// SMART BLOCK /////---*/
+
+.smart-block-info {
+	padding: 5px 35px 10px 36px;
+	width: 100%;
+	-moz-box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box; 
+	}
+	.smart-block-info > li {
+		display: block;
+		float: none;
+		margin-bottom: 4px;
+		width: 100%;
+		}
+		.smart-block-info > li span {
+			text-align: right;
+			float: right;
+			color: #D5D5D5;
+			font-size: 12px;
+			}
+

airtime_mvc/public/css/styles.css

@@ -1373,7 +1373,11 @@ h2#scheduled_playlist_name span {
 }
 
 .simple-formblock .liquidsoap_status{
-    width: 95%;
+    width: 100%;
+	-moz-box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box; 
+	padding: 4px 0 8px;
 }
 
 .simple-formblock dd.block-display {
@@ -1642,8 +1646,8 @@ span.errors.sp-errors{
 	top:8px;
     
 }
-.collapsible-header.close .arrow-icon, collapsible-header-disabled.close  .arrow-icon {
-	background-position: 0 -11px;
+.collapsible-header.closed .arrow-icon, collapsible-header-disabled.close  .arrow-icon {
+	background-position: 0 -11px !important;
     
 }
 #schedule-add-show .button-bar {
@@ -1936,8 +1940,8 @@ span.errors.sp-errors{
     margin-top: 0px !important;
 }
 .small-icon.now-playing {
-    background:url(images/icon_nowplaying_n.png) no-repeat 0 0;
-    height:8px;
+    background:url(images/icon_play_cal.png) no-repeat 0 0;
+    height:10px;
 }
 .small-icon.progress {
 	background:url(images/upload-icon.gif) no-repeat;
@@ -1956,9 +1960,7 @@ span.errors.sp-errors{
 	margin-left:1px;
 }
 .small-icon.show-empty {
-    background:url(redmond/images/ui-icons_ff5d1a_256x240.png) no-repeat 0 -144px;
-    width: 16px;
-    margin-top: 0px !important;
+    background:url(images/icon_alert_cal_alt.png) no-repeat 0 0;
 }
 .medium-icon {
 	display:block;
@@ -2278,6 +2280,10 @@ fieldset.closed, fieldset.display_field.closed {
     margin-bottom: -6px;
     margin-left: 1px;
 }
+fieldset.sb-criteria-fieldset{
+    min-width:670px;
+    overflow-x:auto;
+}
 
 fieldset.closed dl, fieldset.closed textarea, fieldset.closed div, fieldset.closed h2 {
 	display:none;

airtime_mvc/public/js/airtime/library/library.js

@@ -50,6 +50,9 @@ var AIRTIME = (function(AIRTIME) {
             selected,
             $trs;
 
+
+        // TODO : hack, get rid of this crap library
+        if (!$libTable) { return ; }
         // Get visible items and check if any chosenItems are visible
         $trs = $libTable.find("tbody input:checkbox").parents("tr");
         $trs.each(function(i){
@@ -332,6 +335,7 @@ var AIRTIME = (function(AIRTIME) {
     };
     
     libraryInit = function() {
+        return;
         
         $libContent = $("#library_content");
         

airtime_mvc/public/js/airtime/preferences/preferences.js

@@ -85,7 +85,7 @@ $(document).ready(function() {
 
     $('.collapsible-header').live('click',function() {
         $(this).next().toggle('fast');
-        $(this).toggleClass("close");
+        $(this).toggleClass("closed");
         return false;
     }).next().hide();
 

airtime_mvc/public/js/airtime/preferences/streamsetting.js

@@ -238,7 +238,7 @@ $(document).ready(function() {
     
     $('.collapsible-header').click(function() {
         $(this).next().toggle('fast');
-        $(this).toggleClass("close");
+        $(this).toggleClass("closed");
         return false;
     })