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

Merge branch 'saas-dev' into soundcloud

Browse source 
Conflicts:
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/public/js/airtime/preferences/preferences.js
This commit is contained in:
Duncan Sommerville 2015-06-26 10:37:30 -04:00
commit c44bae8140
18 changed files with 150 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

9
airtime_mvc/application/views/scripts/form/preferences.phtml
View file

@ -8,17 +8,14 @@
<?php echo $this->element->getSubform('preferences_tunein') ?>
</div>
<?php //No soundcloud stuff on Airtime Pro -- Albert ?>
<h3 class="collapsible-header" id="soundcloud-heading"><span class="arrow-icon"></span><?php echo _("SoundCloud Settings") ?></h3>
<div class="collapsible-content" id="soundcloud-settings">
<?php echo $this->element->getSubform('preferences_soundcloud') ?>
</div>
<h3 class="collapsible-header" id="dangerous-heading"><span class="arrow-icon"></span><?php echo _("Dangerous Options") ?></h3>
<div class="collapsible-content" id="dangerous-settings">
<!-- Hide the 'dangerous settings' by default -->
<h3 class="collapsible-header closed" id="dangerous-heading"><span class="arrow-icon"></span><?php echo _("Dangerous Options") ?></h3>
<div class="collapsible-content" id="dangerous-settings" style="display:none;">
<?php echo $this->element->getSubform('preferences_danger') ?>
</div>

2
airtime_mvc/application/views/scripts/form/preferences_general.phtml
View file

@ -37,7 +37,5 @@
<?php echo $this->element->getElement('thirdPartyApi')->render() ?>
<?php echo $this->element->getElement('widgetCode')->render() ?>
</dl>
</fieldset>