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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
James 2012-08-02 17:04:49 -04:00
commit 82970c6e73
4 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/controllers/LibraryController.php
View file

@ -79,7 +79,7 @@ class LibraryController extends Zend_Controller_Action
if (!$obj->isStatic()){
unset($menu["play"]);
}
if ($isAdminOrPM || $obj->getCreatorId() == $user->getId()) {
if (($isAdminOrPM || $obj->getCreatorId() == $user->getId()) && $screen == "playlist") {
if ($this->obj_sess->type === "playlist") {
$menu["pl_add"] = array("name"=> "Add to Playlist", "icon" => "add-playlist", "icon" => "copy");
}

4
airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
View file

@ -1,5 +1,5 @@
<form id="smart-playlist-form" method="post" action="">
<fieldset class='toggle <?php echo $this->openOption ? "" : "closed"?>' id='smart_playlist_options'>
<fieldset class='sp-scrollable toggle <?php echo $this->openOption ? "" : "closed"?>' id='smart_playlist_options'>
<legend style='cursor: pointer;'><span class='ui-icon ui-icon-triangle-2-n-s'></span>Smart Playlist Options</legend>
<dl class='zend_form'>
<div id='sp-success' class='success' style='display:none'></div>
@ -17,7 +17,7 @@
</label>
<?php $i = $i + 1; ?>
<?php endforeach; ?>
<?php echo $this->element->getElement('save_button') ?>
<?php echo $this->element->getElement('generate_button') ?>
<?php echo $this->element->getElement('shuffle_button') ?>