diff --git a/application/controllers/PlaylistController.php b/application/controllers/PlaylistController.php index 11de58a57..17d604c46 100644 --- a/application/controllers/PlaylistController.php +++ b/application/controllers/PlaylistController.php @@ -88,7 +88,7 @@ class PlaylistController extends Zend_Controller_Action $userInfo = Zend_Auth::getInstance()->getStorage()->read(); $pl = new Playlist(); - $pl_id = $pl->create("Test Zend Auth"); + $pl_id = $pl->create("Untitled Playlist"); $pl->setPLMetaData('dc:creator', $userInfo->login); $this->changePlaylist($pl_id); diff --git a/application/models/Nowplaying.php b/application/models/Nowplaying.php index 9f883c55c..966470528 100644 --- a/application/models/Nowplaying.php +++ b/application/models/Nowplaying.php @@ -4,8 +4,11 @@ class Application_Model_Nowplaying { public static function InsertBlankRow($i, $rows){ - $startDate = explode(".", $rows[$i-1][3]); - $endDate = explode(".", $rows[$i][2]); + $startDateFull = $rows[$i-1][3]; + $endDateFull = $rows[$i][2]; + + $startDate = explode(".", $startDateFull); + $endDate = explode(".", $endDateFull); $epochStartMS = strtotime($startDate[0])*1000; $epochEndMS = strtotime($endDate[0])*1000; @@ -15,7 +18,7 @@ class Application_Model_Nowplaying if (count($endDate) > 1) $epochEndMS += $endDate[1]; - $blankRow = array(array("b", "-", "-", "-", Application_Model_DateHelper::ConvertMSToHHMMSSmm($epochEndMS - $epochStartMS), "-", "-", "-", "-" , "-", "", "")); + $blankRow = array(array("b", $startDateFull, $startDateFull, $endDate, Application_Model_DateHelper::ConvertMSToHHMMSSmm($epochEndMS - $epochStartMS), "-", "-", "-", "-" , "-", "", "")); array_splice($rows, $i, 0, $blankRow); return $rows; } diff --git a/application/views/scripts/user/add-user.phtml b/application/views/scripts/user/add-user.phtml index 5a809ac1f..5760e28ae 100644 --- a/application/views/scripts/user/add-user.phtml +++ b/application/views/scripts/user/add-user.phtml @@ -6,13 +6,11 @@
-
-
- -
-
+
+ +
diff --git a/public/css/styles.css b/public/css/styles.css index 90144827b..1cbd252d0 100644 --- a/public/css/styles.css +++ b/public/css/styles.css @@ -1082,7 +1082,7 @@ button, input { .user-management { width:810px; - width:380px; + /*width:380px;*/ } .user-management-expanded { width:810px; @@ -1091,7 +1091,7 @@ button, input { float:left; width:420px; margin-left:10px; - display:none; + /* display:block;*/ } .user-list-wrapper { float:left; @@ -1183,4 +1183,4 @@ button, input { } .end-button { border-width:1px; -} \ No newline at end of file +} diff --git a/public/js/playlist/playlist.js b/public/js/playlist/playlist.js index e59dcc548..2993a8a52 100644 --- a/public/js/playlist/playlist.js +++ b/public/js/playlist/playlist.js @@ -104,23 +104,24 @@ function updateProgressBarValue(){ //calculate how much time left to next song if there is any if (nextSongs.length > 0 && nextSongPrepare){ var diff = nextSongs[0].songStartPosixTime - estimatedSchedulePosixTime; - if (diff < serverUpdateInterval && diff >= 0){ + if (diff < serverUpdateInterval){ + if (diff < 0) + diff=0; + nextSongPrepare = false; setTimeout(newSongStart, diff); - } else if (diff < 0 && APPLICATION_ENV == "development"){ - alert ("Warning: estimatedSchedulePosixTime > songStartPosixTime"); - alert (estimatedSchedulePosixTime + " " + nextSongs[0].songStartPosixTime); } } //calculate how much time left to next show if there is any if (nextShow.length > 0 && nextShowPrepare){ var diff = nextShow[0].showStartPosixTime - estimatedSchedulePosixTime; - if (diff < serverUpdateInterval && diff >= 0){ + if (diff < serverUpdateInterval){ + if (diff < 0) + diff=0; + nextShowPrepare = false; setTimeout(nextShowStart, diff); - } else if (diff < 0 && APPLICATION_ENV == "development"){ - alert ("Warning: estimatedSchedulePosixTime > showStartPosixTime"); } }