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

Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev

Browse source 
Conflicts:
	airtime_mvc/public/js/airtime/library/spl.js
This commit is contained in:
drigato 2015-09-09 13:55:27 -04:00
commit bd4fc62e04
6 changed files with 28 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/views/scripts/playlist/playlist.phtml
View file

@ -44,9 +44,9 @@ if (isset($this->obj)) {
<button class="btn" title='<?php echo _("Shuffle playlist") ?>' type="button" id="playlist_shuffle_button"><?php echo _("Shuffle") ?></button>
</div>
<div class='btn-group'>
<a href="#" id="spl_crossfade" class="btn crossfade-main-button" style="display:<?php echo $count > 0 ?"inherit;":"none;"?>">
<button id="spl_crossfade" class="btn crossfade-main-button">
<i class='crossfade-main-icon'></i><span class="ui-button-text"><?php echo _("Playlist crossfade") ?></span>
</a>
</button>
</div>
<div class='btn-group'>
<button class="btn btn-danger" title='<?php echo _("Empty playlist content") ?>' type="button" id="pl-bl-clear-content"><?php echo _("Clear") ?></button>

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

@ -52,9 +52,9 @@ if (isset($this->obj)) {
<?php echo $this->form->getElement('shuffle_button');?>
</div>
<div class='btn-group'>
<a href="#" id="spl_crossfade" class="btn crossfade-main-button" style="display:<?php echo ($this->obj->isStatic() && $count > 0) ?"inherit;":"none;"?>">
<button id="spl_crossfade" class="btn crossfade-main-button">
<i class='crossfade-main-icon'></i><span class="ui-button-text"><?php echo _("Playlist crossfade") ?></span>
</a>
</button>
</div>
<div class='btn-group'>
<button class="btn btn-danger" title='<?php echo _("Remove all content from this smart block") ?>' type="button" id="pl-bl-clear-content"><?php echo _("Clear") ?></button>