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

application/configs/navigation.php

@@ -9,24 +9,11 @@
 */
 $pages = array(
 	array(
-		'label'      => 'Now Playing',
-		'uri' => 'javascript:void(null)',
-		'pages'      => array(
-		    array(
-		        'label'      => 'Current',
-		        'module'     => 'default',
-		        'controller' => 'Nowplaying',
-		        'action'     => 'index',
-				'resource'	=>	'Nowplaying'
-		    ),
-		    array(
-		        'label'      => 'Daily View',
-		        'module'     => 'default',
-		        'controller' => 'Nowplaying',
-		        'action'     => 'day-view',
-				'resource'	=>	'Nowplaying'
-		    )
-		)
+        'label'      => 'Now Playing',
+        'module'     => 'default',
+        'controller' => 'Nowplaying',
+        'action'     => 'index',
+        'resource'	=>	'Nowplaying'
 	),
 	array(
 		'label'      => 'Schedule',

application/models/DateHelper.php

@@ -12,6 +12,10 @@ class Application_Model_DateHelper
        return date("Y-m-d H:i:s", $this->_timestamp);
    }
    
+   function getTime(){
+       return date("H:i:s", $this->_timestamp);
+   }
+   
    function setDate($dateString){
         $this->_timestamp = strtotime($dateString);
    }

application/models/Nowplaying.php

@@ -59,7 +59,8 @@ class Application_Model_Nowplaying
             $next = Schedule::Get_Scheduled_Item_Data($timeNow, 1, 10, "24 hours");
         } else {
             $date = new Application_Model_DateHelper;
-            $date->setDate($dateString);
+            $time = $date->getTime();
+            $date->setDate($dateString." ".$time);
             $timeNow = $date->getDate();
             
             $previous = array_reverse(Schedule::Get_Scheduled_Item_Data($timeNow, -1, "ALL", $date->getNowDayStartDiff()." seconds"));

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

@@ -1,2 +1,5 @@
-<input type="text" id="datepicker" class="input_text">
+<div class="button-bar-top">
+    Date:<input type="text" id="datepicker" class="input_text">
+    <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>
+</div>
 <div id='demo'></div>

application/views/scripts/nowplaying/index.phtml

@@ -1 +1,4 @@
+<div class="button-bar-top">
+    <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>