Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-synchronize

This commit is contained in:
mkonecny 2011-01-06 17:07:45 -05:00
parent 7cf9699e37
commit fb7b56b2c3
6 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/Bootstrap.php
View File

@ -53,6 +53,8 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
$view = $this->getResource('view'); $view = $this->getResource('view');
$view->headScript()->appendFile('/js/libs/jquery-1.4.4.min.js','text/javascript'); $view->headScript()->appendFile('/js/libs/jquery-1.4.4.min.js','text/javascript');
$view->headScript()->appendFile('/js/libs/jquery-ui-1.8.7.custom.min.js','text/javascript'); $view->headScript()->appendFile('/js/libs/jquery-ui-1.8.7.custom.min.js','text/javascript');
$view->headScript()->appendFile('/js/playlist/playlist.js','text/javascript');
$view->headScript()->appendFile('/js/progressbar/jquery.progressbar.min.js','text/javascript');
} }
} }

3
application/controllers/ScheduleController.php
View File

@ -177,8 +177,7 @@ class ScheduleController extends Zend_Controller_Action
public function viewPlaylistAction() public function viewPlaylistAction()
{ {
$this->view->headScript()->appendFile('/js/playlist/playlist.js','text/javascript'); //TODO: insert code for datagrid
$this->view->headScript()->appendFile('/js/progressbar/jquery.progressbar.min.js','text/javascript');
} }
public function getCurrentPlaylistAction() public function getCurrentPlaylistAction()

14
application/layouts/scripts/layout.phtml
View File

@ -11,7 +11,17 @@
<div id="nav"><?php echo $this->navigation()->menu()->setRenderInvisible(true) ?></div> <div id="nav"><?php echo $this->navigation()->menu()->setRenderInvisible(true) ?></div>
<div id="content"><?php echo $this->layout()->content ?></div> <div id="content" style="height: auto"><?php echo $this->layout()->content ?></div>
<div style="z-index: 1; position: absolute; width: 100%; left: 0px; right: 0px; bottom: 0px; color: black; min-height: 100px; background-color: #cc3300;">
<div style="float:left; width: 15%; height: 100%;">&nbsp;</div>
<div style="float:left; width: 25%; height: 100%;"><div>Show:</div><div>Playlist:</div><div>Host:</div></div>
<div style="float:left; width: 30%; height: 100%;"><div>Previous:</div><div>Current:</div><div>Upcoming:</div></div>
<div style="float:left; width: 30%; height: 100%;" id="list0" ></div>
</div>
<script>
$(document).ready(function() {
$("#list0").playlistViewer();
});
</script>
</body> </body>
</html> </html>

4
application/views/scripts/schedule/view-playlist.phtml
View File

@ -2,8 +2,8 @@
<script> <script>
$(document).ready(function() { $(document).ready(function() {
$("#list0").playlistViewer(); $("#list1").playlistViewer();
}); });
</script> </script>
<div id="list0"></div> <div id="list1"></div>
</div> </div>

1
public/js/playlist/playlist.js
View File

@ -21,7 +21,6 @@
$(cc.currentElem).append(prevDiv); $(cc.currentElem).append(prevDiv);
var currParentDiv = document.createElement('div'); var currParentDiv = document.createElement('div');
currParentDiv.setAttribute("style", "background-color:#bbbbbb;");
$(cc.currentElem).append(currParentDiv); $(cc.currentElem).append(currParentDiv);
var currDiv = document.createElement('div'); var currDiv = document.createElement('div');

2
pypo/tests/airtime-schedule-insert.php
View File

@ -66,7 +66,7 @@ if (is_null($mediaFile)) {
} }
$pl->addAudioClip($mediaFile->getId()); $pl->addAudioClip($mediaFile->getId());
$mediaFile = StoredFile::findByOriginalName("Peter Rudenko - Opening.mp3"); $mediaFile = StoredFile::findByOriginalName("Peter_Rudenko_-_Opening.mp3");
if (is_null($mediaFile)) { if (is_null($mediaFile)) {
echo "Adding test audio clip to the database.\n"; echo "Adding test audio clip to the database.\n";
$v = array("filepath" => __DIR__."/../../audio_samples/OpSound/Peter Rudenko - Opening.mp3"); $v = array("filepath" => __DIR__."/../../audio_samples/OpSound/Peter Rudenko - Opening.mp3");