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

Merge branch '1.9.1' into devel

Browse source 
Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/configs/navigation.php
	install_minimal/DoctrineMigrations/Version20110711161043.php
	python_apps/api_clients/api_client.py
This commit is contained in:
James 2011-08-18 19:05:13 -04:00
commit f855da0f45
10 changed files with 150 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,11 +9,6 @@
<?php echo $this->element->getSubform('preferences_soundcloud') ?>
</div>
<h3 class="collapsible-header" id="support-heading"><span class="arrow-icon"></span>Support Settings</h3>
<div class="collapsible-content" id="support-settings" style="display: none;">
<?php echo $this->element->getSubform('preferences_support') ?>
</div>
<div class="button-bar bottom" id="submit-element">
<?php echo $this->element->getElement('submit') ?>
</div>

12
airtime_mvc/application/views/scripts/form/preferences_support.phtml → airtime_mvc/application/views/scripts/form/support-setting.phtml
View file

@ -30,10 +30,10 @@
<?php endforeach; ?>
</ul>
<?php endif; ?>
</dd>
</dl>
<div class="info-text" style="clear: both;padding: 4px 0 4px 15px;"><p> Note: In order to promote your station, "Send support feedback" must be enabled</p></div>
<dl id="public-info" style="display:none;">
</dd>
</dl>
<div class="info-text" style="clear: both;padding: 4px 0 4px 15px;"><p> Note: In order to promote your station, "Send support feedback" must be enabled</p></div>
<dl id="public-info" style="display:none;">
<dt id="Phone-label" class="block-display">
<label class="optional" for="Phone"><?php echo $this->element->getElement('Phone')->getLabel() ?></label>
<span class="info-text-small">(for verification purposes only, will not be published)</span>
@ -144,7 +144,7 @@
</div>
<div>
<br>
<label class="optional" for="Privacy">
<label class="optional" for="Privacy">
<?php echo $this->element->getElement('Privacy') ?>
<?php echo $this->element->getElement('Privacy')->getLabel() ?>
</label>
@ -156,4 +156,4 @@
</ul>
<?php endif; ?>
</div>
</fieldset>
</fieldset>

12
airtime_mvc/application/views/scripts/preference/support-setting.phtml Normal file
View file

@ -0,0 +1,12 @@
<div class="ui-widget ui-widget-content block-shadow simple-formblock clearfix padded-strong preferences">
<h2>Support Setting</h2>
<form method="post" action="/Preference/support-setting" enctype="multipart/form-data">
<div id="support-settings">
<?php echo $this->statusMsg ?>
<?php echo $this->form ?>
</div>
<div class="button-bar bottom" id="submit-element">
<?php echo $this->form->getElement('submit') ?>
</div>
</form>
</div>