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

Merge branch '2.1.x' into devel

Browse source
This commit is contained in:
denise 2012-06-11 15:10:33 -04:00
commit d498c51814
14 changed files with 118 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

1
airtime_mvc/application/views/scripts/form/add-show-live-stream.phtml
View file

@ -21,6 +21,7 @@
<div id="custom_auth_div">
<dt id="custom_username-label" class="block-display">
<label class="optional" for="custom_username"><?php echo $this->element->getElement('custom_username')->getLabel() ?> :
<span class='stream_username_help_icon'></span>
</label>
</dt>
<dd id="custom_username-element" class="block-display">

1
airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
View file

@ -33,6 +33,7 @@
</dd>
<dt id="master_username-label">
<label class="optional" for="master_username"><?php echo $this->element->getElement('master_username')->getLabel() ?> :
<span class='stream_username_help_icon'></span>
</label>
</dt>
<dd id="master_username-element">

4
airtime_mvc/application/views/scripts/form/stream-setting-form.phtml
View file

@ -68,7 +68,9 @@
</legend>
<dl class="zend_form">
<dt id="outputUser-label">
<label for="outputUser"><?php echo $this->element->getElement('user')->getLabel()?> :</label>
<label for="outputUser"><?php echo $this->element->getElement('user')->getLabel()?> :
<span class='stream_username_help_icon'></span>
</label>
</dt>
<dd id="outputUser-element">
<?php echo $this->element->getElement('user')?>