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

CC-1708 added x instead of input to remove items. Merging side playlist and playlist into one.

Browse source
This commit is contained in:
naomiaro 2011-01-16 15:35:00 -05:00
parent da85a5ad26
commit 01df8d8d6b
15 changed files with 78 additions and 230 deletions
Download patch file Download diff file Expand all files Collapse all files

35
application/views/scripts/playlist/index.phtml
View file

@ -1,19 +1,22 @@
<div><a href="<?php echo $this->url(
array(
'controller' => 'Playlist',
'action' => 'new'
),
'default',
true) ?>"> New Playlist</a></div>
<span id="spl_new">New</span>
<?php if (isset($this->pl)) : ?>
<span id="spl_delete">Delete</span>
<span id="spl_close">Close</span>
<?php endif; ?>
<div><a href="<?php echo $this->url(
array(
'controller' => 'Playlist',
'action' => 'edit'
),
'default',
true) ?>"> Edit Playlist</a></div>
<?php if (isset($this->pl)) : ?>
<?php
<div id="spl_name"><?php echo $this->pl->getName(); ?></div>
<div id="spl_length"><?php echo $this->pl->getLength(); ?></div>
echo $this->form;
<ul id="spl_sortable">
<?php if (count($this->pl->getContents())) : ?>
<?php echo $this->partialLoop('sideplaylist/sidebarcontent.phtml', $this->pl->getContents()); ?>
<?php else : ?>
<li class="spl_empty">Empty playlist</li>
<?php endif; ?>
</ul>
<?php else : ?>
<div>No open playlist</div>
<?php endif; ?>

6
application/views/scripts/playlist/sidebarcontent.phtml Normal file
View file

@ -0,0 +1,6 @@
<li class="spl_row" id="spl_<?php echo $this->partialCounter-1 ?>">
<span class="spl_title"><?php echo $this->CcFiles['track_title'] ?></span>
<span class="spl_playlength"><?php echo $this->cliplength ?></span>
<span class="ui-icon ui-icon-close"></span>
<span class="spl_artist"><?php echo $this->CcFiles['artist_name'] ?></span>
</li>

15
application/views/scripts/playlist/update.phtml
View file

@ -1,8 +1,7 @@
<?php
if (count($this->pl->getContents())) {
echo $this->partialLoop('playlist/playlistEditorTable.phtml', $this->pl->getContents());
}
else {
echo '<div class="pl_empty">Empty playlist</div>';
}
?>
<?php
if (count($this->pl->getContents())) {
echo $this->partialLoop('sideplaylist/sidebarcontent.phtml', $this->pl->getContents());
}
else {
echo '<li class="pl_empty">Empty playlist</li>';
}

46
application/views/scripts/sideplaylist/index.phtml
View file

@ -1,46 +0,0 @@
<form name="SPL">
<div>
<span id="spl_new">
<a href="<?php echo $this->url(
array(
'controller' => 'Playlist',
'action' => 'new'
),
'default',
true) ?>">New</a>
</span>
<?php if (isset($this->pl)) { echo '<span id="spl_delete">Delete</span>';} ?>
<?php if (isset($this->pl)) { echo '<span id="spl_close">Close</span>';} ?>
<div>
<div id="spl_name"><?php if (isset($this->pl)) { echo $this->pl->getName(); } ?></div>
<div id="spl_length"><?php if (isset($this->pl)) { echo $this->pl->getLength(); } ?></div>
<div class="spl_main">
<?php
if (isset($this->pl)) {
echo '<div class="spl_head">';
echo '<span class="spl_input"><input type="checkbox" name="all"></span>';
echo '<span class="spl_title">Title</span>';
echo '<span class="spl_artist">Creator</span>';
echo '<span class="spl_playlength">Playlength</span>';
echo '</div>';
echo '<ul id="spl_sortable">';
if (count($this->pl->getContents())) {
echo $this->partialLoop('sideplaylist/sidebarcontent.phtml', $this->pl->getContents());
}
else {
echo '<li class="spl_empty">Empty playlist</li>';
}
echo '</ul></div>';
}
else {
echo '<div>No open playlist</div>';
}
?>
</form>
<div class="spl_footer">
<?php if (isset($this->pl)) { echo '<span id="spl_remove_selected">Remove</span>';} ?>
</div>

14
application/views/scripts/sideplaylist/sidebarcontent.phtml
View file

@ -1,14 +0,0 @@
<li class="spl_row" id="spl_<?php echo $this->partialCounter-1 ?>">
<span class="spl_input">
<input type="checkbox" class="checkbox" name="<?php echo $this->partialCounter-1 ?>"/>
</span>
<span class="spl_title">
<?php echo $this->CcFiles['track_title'] ?>
</span>
<span class="spl_artist">
<?php echo $this->CcFiles['artist_name'] ?>
</span>
<span class="spl_playlength">
<?php echo $this->cliplength ?>
</span>
</li>

7
application/views/scripts/sideplaylist/update.phtml
View file

@ -1,7 +0,0 @@
<?php
if (count($this->pl->getContents())) {
echo $this->partialLoop('sideplaylist/sidebarcontent.phtml', $this->pl->getContents());
}
else {
echo '<li class="pl_empty">Empty playlist</li>';
}