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

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

This commit is contained in:
James 2012-08-02 17:04:49 -04:00
parent af939469d3 361e681a59
commit 82970c6e73
4 changed files with 10 additions and 4 deletions
Show Stats 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()){ if (!$obj->isStatic()){
unset($menu["play"]); unset($menu["play"]);
} }
if ($isAdminOrPM || $obj->getCreatorId() == $user->getId()) { if (($isAdminOrPM || $obj->getCreatorId() == $user->getId()) && $screen == "playlist") {
if ($this->obj_sess->type === "playlist") { if ($this->obj_sess->type === "playlist") {
$menu["pl_add"] = array("name"=> "Add to Playlist", "icon" => "add-playlist", "icon" => "copy"); $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=""> <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> <legend style='cursor: pointer;'><span class='ui-icon ui-icon-triangle-2-n-s'></span>Smart Playlist Options</legend>
<dl class='zend_form'> <dl class='zend_form'>
<div id='sp-success' class='success' style='display:none'></div> <div id='sp-success' class='success' style='display:none'></div>
@ -17,7 +17,7 @@
</label> </label>
<?php $i = $i + 1; ?> <?php $i = $i + 1; ?>
<?php endforeach; ?> <?php endforeach; ?>
<?php echo $this->element->getElement('save_button') ?> <?php echo $this->element->getElement('save_button') ?>
<?php echo $this->element->getElement('generate_button') ?> <?php echo $this->element->getElement('generate_button') ?>
<?php echo $this->element->getElement('shuffle_button') ?> <?php echo $this->element->getElement('shuffle_button') ?>

5
airtime_mvc/public/css/styles.css
View File

@ -484,6 +484,11 @@ table.library-get-file-md.table-small{
/***** SMART PLAYLIST SPECIFIC STYLES BEGIN *****/ /***** SMART PLAYLIST SPECIFIC STYLES BEGIN *****/
.sp-scrollable{
overflow-x: auto;
width: 781px;
}
.sp-invisible{ .sp-invisible{
visibility: hidden; visibility: hidden;
} }

3
airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js
View File

@ -155,7 +155,8 @@ function setSmartPlaylistEvents() {
item_to_hide.children().attr('disabled', 'disabled'); item_to_hide.children().attr('disabled', 'disabled');
item_to_hide.find('[name^="sp_criteria_field"]').val(0).end() item_to_hide.find('[name^="sp_criteria_field"]').val(0).end()
.find('[name^="sp_criteria_modifier"]').val(0).end() .find('[name^="sp_criteria_modifier"]').val(0).end()
.find('[name^="sp_criteria_value"]').val(''); .find('[name^="sp_criteria_value"]').val('').end()
.find('[name^="sp_criteria_extra"]').val('');
sizeTextBoxes(item_to_hide.find('[name^="sp_criteria_value"]'), 'sp_extra_input_text', 'sp_input_text'); sizeTextBoxes(item_to_hide.find('[name^="sp_criteria_value"]'), 'sp_extra_input_text', 'sp_input_text');
item_to_hide.hide(); item_to_hide.hide();