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

side playlist looks good.

Browse source
This commit is contained in:
naomiaro 2011-01-16 23:43:12 -05:00
parent 9b4f9c8aa4
commit 7cf55e0201
6 changed files with 59 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
application/controllers/LibraryController.php
View file

@ -32,7 +32,6 @@ class LibraryController extends Zend_Controller_Action
$this->view->headScript()->appendFile('/js/airtime/onready/library.js','text/javascript'); $this->view->headScript()->appendFile('/js/airtime/onready/library.js','text/javascript');
$this->view->headScript()->appendFile('/js/contextmenu/jjmenu.js','text/javascript'); $this->view->headScript()->appendFile('/js/contextmenu/jjmenu.js','text/javascript');
$this->view->headLink()->appendStylesheet('/css/contextmenu.css'); $this->view->headLink()->appendStylesheet('/css/contextmenu.css');
//$this->view->headLink()->appendStylesheet('/css/media_library.css');
$this->_helper->layout->setLayout('library'); $this->_helper->layout->setLayout('library');
@ -123,6 +122,7 @@ class LibraryController extends Zend_Controller_Action
public function contentsAction() public function contentsAction()
{ {
$this->view->headScript()->appendFile('/js/airtime/library/library.js','text/javascript'); $this->view->headScript()->appendFile('/js/airtime/library/library.js','text/javascript');
$this->view->headLink()->appendStylesheet('/css/media_library.css');
$this->_helper->viewRenderer->setResponseSegment('library'); $this->_helper->viewRenderer->setResponseSegment('library');

2
application/layouts/scripts/library.phtml
View file

@ -12,7 +12,7 @@
<div id="nav"><?php echo $this->navigation()->menu()->setRenderInvisible(true) ?></div> <div id="nav"><?php echo $this->navigation()->menu()->setRenderInvisible(true) ?></div>
<div id="library_quick_search"><?php echo $this->layout()->quick_search ?></div> <div id="library_quick_search"><?php echo $this->layout()->quick_search ?></div>
<div id="library_content"><?php echo $this->layout()->library ?></div> <div id="library_content" class="ui-widget ui-widget-content ui-corner-all"><?php echo $this->layout()->library ?></div>
<div id="side_playlist" class="ui-widget ui-widget-content ui-corner-all"><?php echo $this->layout()->spl ?></div> <div id="side_playlist" class="ui-widget ui-widget-content ui-corner-all"><?php echo $this->layout()->spl ?></div>

5
application/views/scripts/playlist/sidebarcontent.phtml
View file

@ -1,4 +1,8 @@
<li class="ui-state-default" id="spl_<?php echo $this->partialCounter-1 ?>"> <li class="ui-state-default" id="spl_<?php echo $this->partialCounter-1 ?>">
<div>
<span class="ui-icon ui-icon-play"></span>
</div>
<div>
<span class="spl_title"><?php echo $this->CcFiles['track_title'] ?></span> <span class="spl_title"><?php echo $this->CcFiles['track_title'] ?></span>
<span class="spl_playlength"><?php echo $this->cliplength ?></span> <span class="spl_playlength"><?php echo $this->cliplength ?></span>
<span class="ui-icon ui-icon-close"></span> <span class="ui-icon ui-icon-close"></span>
@ -6,4 +10,5 @@
<?php if($this->partialCounter-1 > 0): ?> <?php if($this->partialCounter-1 > 0): ?>
<div id="fade_<?php echo $this->partialCounter-1 ?>" class="spl_fade_control ui-state-default ui-corner-all">Fade</div> <div id="fade_<?php echo $this->partialCounter-1 ?>" class="spl_fade_control ui-state-default ui-corner-all">Fade</div>
<?php endif; ?> <?php endif; ?>
<div>
</li> </li>

4
public/css/media_library.css
View file

@ -0,0 +1,4 @@
#library_content {
float: left;
width: 750px;
}

45
public/css/playlist_builder.css
View file

@ -1,5 +1,5 @@
#side_playlist { #side_playlist {
width: 500px; width: 450px;
padding: 0.5em; padding: 0.5em;
font-size: 16px; font-size: 16px;
} }
@ -41,36 +41,69 @@
#spl_sortable { #spl_sortable {
list-style: none; list-style: none;
padding:0; padding:0;
height: 300px;
width: 450px;
overflow: auto;
}
#side_playlist li {
width: 425px;
}
#side_playlist li > div {
height: 50px;
}
#spl_name {
margin-top: 0.5em;
}
.ui-icon-play {
margin-top: 17px;
}
.ui-icon-close {
margin-top: 7px;
} }
.spl_title { .spl_title {
display: inline-block; display: inline-block;
width: 325px; width: 260px;
margin-left: 20px;
} }
.spl_playlength { .spl_playlength {
display: inline-block; display: inline-block;
width: 150px; width: 100px;
font-size: 85%;
margin-top: 15px;
} }
.spl_artist { .spl_artist {
font-size: 90%; font-size: 90%;
width: 300px; width: 275px;
margin-left: 25px;
margin-top: -8px;
} }
.spl_fade_control { .spl_fade_control {
padding: 0.2em; padding: 0.2em;
margin-top: -34px; margin-top: -45px;
margin-left: -50px; margin-left: -80px;
z-index: 2; z-index: 2;
} }
#spl_editor {
height: 50px;
}
#spl_editor > div > span { #spl_editor > div > span {
display: inline-block; display: inline-block;
width: 150px; width: 150px;
} }
.ui-icon-close, .ui-icon-close,
.ui-icon-play,
.spl_fade_control, .spl_fade_control,
.spl_playlength { .spl_playlength {
cursor: pointer; cursor: pointer;

4
public/js/airtime/library/spl.js
View file

@ -35,7 +35,7 @@ function openCueEditor(event) {
var pos, url, li; var pos, url, li;
li = $(this).parent(); li = $(this).parent().parent();
pos = li.attr("id").split("_").pop(); pos = li.attr("id").split("_").pop();
url = '/Playlist/set-cue/format/json'; url = '/Playlist/set-cue/format/json';
url = url + '/pos/' + pos; url = url + '/pos/' + pos;
@ -90,7 +90,7 @@ function deleteSPLItem(event){
event.stopPropagation(); event.stopPropagation();
pos = $(this).parent().attr("id").split("_").pop(); pos = $(this).parent().parent().attr("id").split("_").pop();
url = '/Playlist/delete-item/format/json'; url = '/Playlist/delete-item/format/json';
url = url + '/pos/' + pos; url = url + '/pos/' + pos;