Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Martin Konecny 2012-08-21 10:50:33 -04:00
parent 47852bce2a 025656be1c
commit d2eca0faaf
4 changed files with 4 additions and 4 deletions
airtime_mvc
application
forms
SmartBlockCriteria.php
views/scripts/playlist
playlist.phtmlsmart-block.phtml
public/js/airtime/playlist
smart_blockbuilder.js

2
airtime_mvc/application/forms/SmartBlockCriteria.php
View File

@ -240,7 +240,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
$generate = new Zend_Form_Element_Button('generate_button');
$generate->setAttrib('class', 'ui-button ui-state-default sp-button');
$generate->setAttrib('title', 'Generate playlist content');
$generate->setAttrib('title', 'Generate playlist content and save criteria');
$generate->setIgnore(true);
$generate->setLabel('Generate');
$generate->setDecorators(array('viewHelper'));

2
airtime_mvc/application/views/scripts/playlist/playlist.phtml
View File

@ -13,7 +13,7 @@ if (isset($this->obj)) {
<?php endif; ?>
<?php if (isset($this->obj)) : ?>
<button class="ui-button ui-state-default sp-save" type="button" id="save_button">Save</button>
<button class="ui-button ui-state-default sp-save" title='Save playlist' type="button" id="save_button">Save</button>
<input id="obj_id" type="hidden" value="<?php echo $this->obj->getId(); ?>"></input>
<input id="obj_lastMod" type="hidden" value="<?php echo $this->obj->getLastModified('U'); ?>"></input>
<input id='obj_type' type='hidden' value='playlist'></input>

2
airtime_mvc/application/views/scripts/playlist/smart-block.phtml
View File

@ -10,7 +10,7 @@ if (isset($this->obj)) {
<a href="#" id="spl_crossfade" class="ui-button ui-button-icon-only ui-widget ui-state-default crossfade-main-button" style="display:<?php echo ($this->obj->isStatic() && $count > 0) ?"block;":"none;"?>">
<span class="ui-icon crossfade-main-icon"></span><span class="ui-button-text">Playlist crossfade</span>
</a>
<button class="ui-button ui-state-default sp-save" type="button" id="save_button">Save</button>
<button class="ui-button ui-state-default sp-save" title='Save smart block&#39s title, description, and criteria' type="button" id="save_button">Save</button>
<?php endif; ?>
<?php if (isset($this->obj)) : ?>

2
airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
View File

@ -458,7 +458,7 @@ function callback(data, type) {
if (type == 'shuffle') {
form.find('.success').text('Smart block shuffled');
} else if (type == 'generate') {
form.find('.success').text('Smart block generated and saved');
form.find('.success').text('Smart block generated and criteria saved');
//redraw library table so the length gets updated
dt.fnStandingRedraw();
}