Merge branch 'master' of dev.sourcefabric.org:campcaster

.zfproject.xml

@@ -95,6 +95,9 @@
           <actionMethod actionName="index"/>
           <actionMethod actionName="update"/>
         </controllerFile>
+        <controllerFile controllerName="Dashboard">
+          <actionMethod actionName="index"/>
+        </controllerFile>
       </controllersDirectory>
       <formsDirectory>
         <formFile formName="Login"/>
@@ -311,6 +314,9 @@
           <viewControllerScriptsDirectory forControllerName="Schedule">
             <viewScriptFile forActionName="addShow"/>
           </viewControllerScriptsDirectory>
+          <viewControllerScriptsDirectory forControllerName="Dashboard">
+            <viewScriptFile forActionName="index"/>
+          </viewControllerScriptsDirectory>
         </viewScriptsDirectory>
         <viewHelpersDirectory/>
         <viewFiltersDirectory enabled="false"/>
@@ -355,6 +361,7 @@
           <testApplicationControllerFile filesystemName="UserControllerTest.php"/>
           <testApplicationControllerFile filesystemName="NowplayingControllerTest.php"/>
           <testApplicationControllerFile filesystemName="PreferenceControllerTest.php"/>
+          <testApplicationControllerFile filesystemName="DashboardControllerTest.php"/>
         </testApplicationControllerDirectory>
       </testApplicationDirectory>
       <testLibraryDirectory>

application/Bootstrap.php

@@ -59,6 +59,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 		$view->headScript()->appendFile('/js/libs/jquery-ui-1.8.8.custom.min.js','text/javascript');
 		$view->headScript()->appendFile('/js/libs/stuHover.js','text/javascript');
         $view->headScript()->appendFile('/js/libs/jquery.stickyPanel.js','text/javascript');
+        $view->headScript()->appendFile('/js/qtip/jquery.qtip-1.0.0.min.js','text/javascript');
 
         //scripts for now playing bar
         $this->view->headScript()->appendFile('/js/playlist/helperfunctions.js','text/javascript');

application/controllers/DashboardController.php

@@ -0,0 +1,22 @@
+<?php
+
+class DashboardController extends Zend_Controller_Action
+{
+
+    public function init()
+    {
+        /* Initialize action controller here */
+    }
+
+    public function indexAction()
+    {
+        // action body
+    }
+
+
+
+
+}
+
+
+

application/controllers/LibraryController.php

@@ -24,7 +24,6 @@ class LibraryController extends Zend_Controller_Action
         $this->view->headScript()->appendFile('/js/contextmenu/jjmenu.js','text/javascript');
         $this->view->headScript()->appendFile('/js/jplayer/jquery.jplayer.min.js');
         $this->view->headScript()->appendFile('/js/datatables/js/jquery.dataTables.js','text/javascript');
-        $this->view->headScript()->appendFile('/js/qtip/jquery.qtip-1.0.0.min.js','text/javascript');
         $this->view->headScript()->appendFile('/js/airtime/library/library.js','text/javascript');
         $this->view->headScript()->appendFile('/js/airtime/library/advancedsearch.js','text/javascript');
 

application/views/scripts/dashboard/index.phtml

@@ -0,0 +1 @@
+<br /><br /><center>View script for controller <b>Dashboard</b> and script/action name <b>index</b></center>

application/views/scripts/nowplaying/day-view.phtml

@@ -1,4 +1,4 @@
 <div class="button-bar-top">
-    <a href="javascript:void(0)" class="toggle-button" id="now_view">Now View</a><a href="javascript:void(0)" class="toggle-button-active end-button" id="day_view">Day View</a><input type="text" id="datepicker" class="input_text">
+    <a href="javascript:void(0)" class="toggle-button end-button" id="now_view">Now View</a><a href="javascript:void(0)" class="toggle-button-active" id="day_view">Day View</a><input type="text" id="datepicker" class="input_text">
 </div>
 <div id='demo'></div>

application/views/scripts/nowplaying/index.phtml

@@ -1,4 +1,4 @@
 <div class="button-bar-top">
-    <a href="javascript:void(0)" class="toggle-button-active" id="now_view">Now View</a><a href="javascript:void(0)" class="toggle-button end-button" id="day_view">Day View</a>
+    <a href="javascript:void(0)" class="toggle-button-active end-button" id="now_view">Now View</a><a href="javascript:void(0)" class="toggle-button" id="day_view">Day View</a>
 </div>
 <div id='demo'></div>

application/views/scripts/partialviews/header.phtml

@@ -28,7 +28,7 @@
   </div>
   <div class="personal-block">
     <ul>
-      <li><a href="#">About</a></li> 
+      <li><a id="about-link" href="#">About</a></li> 
       <li>&nbsp;</li> 
       <li>Signed in:</li>
       <li class="name"><?php echo $this->user ?></li>
@@ -37,3 +37,8 @@
   </div>
 </div>
 <div id="jquery_jplayer_1" class="jp-jplayer" style="width:0px; height:0px;"></div>
+
+<div id="about-txt" style="display: none;">
+<a href="http://airtime.sourcefabric.org">Airtime</a>, the open radio software for scheduling and remote station management.<br>
+© 2011 <a href="http://www.sourcefabric.org">Sourcefabric</a> o.p.s 2011. Airtime is distributed under the <a href="http://www.gnu.org/licenses/gpl-3.0-standalone.html">GNU GPL v.3</a>
+</div>

public/js/playlist/nowplayingdatagrid.js

@@ -76,11 +76,11 @@ function createDataGrid(){
 		"aoColumns": columns,
 		"fnRowCallback": function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {
             if (aData[aData.length-2] == "t")
-                $(nRow).attr("style", "background-color:#166622");
+                $(nRow).attr("class", "playing-list");
             if (aData[0] == "c")
-				$(nRow).attr("style", "background-color:#61B329");
+				$(nRow).attr("class", "playing-song");
             else if (aData[0] == "b")
-                $(nRow).attr("style", "background-color:#EE3B3B");
+                $(nRow).attr("class", "gap");
 			return nRow;
 		},
         "bAutoWidth":false

public/js/playlist/playlist.js

@@ -241,6 +241,18 @@ function init() {
 	
     //begin consumer "thread"
     secondsTimer();
+    
+    $('#about-link').qtip({
+        content: $('#about-txt').html(),
+        show: 'mouseover',
+        hide: { when: 'mouseout', fixed: true },
+        position: {
+            corner: {
+                target: 'center',
+                tooltip: 'topRight'
+            }
+        }
+    });
 }
 
 $(document).ready(function() {

tests/application/controllers/DashboardControllerTest.php

@@ -0,0 +1,20 @@
+<?php
+
+require_once 'PHPUnit/Framework/TestCase.php';
+
+class DashboardControllerTest extends PHPUnit_Framework_TestCase
+{
+
+    public function setUp()
+    {
+        /* Setup Routine */
+    }
+
+    public function tearDown()
+    {
+        /* Tear Down Routine */
+    }
+
+
+}
+