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

CC-3611: Show Form: "Repeats" font is wrong, info images in the wrong place

Browse source 
Fixed both of these issues.

Fixed issue with connection URLs in "Add Show" and in "Stream Prefs" where
the text was unstyled.

Fixed issue with long connection URLS causing display problems
in "Add Show" and in "Stream Prefs".  Now a scrollbar will appear if the
connection URL is too long.

Fixed bug in Stream Prefs where zooming out caused the page to be formatted
differently.

Fixed bug in Stream Prefs where the labels "Master Source Connection URL" and
"Show Source Connection URL" wrapped on multiple lines.

Fixed help text for Add Show -> Live Stream authication settings, the
instructions were wrong and there were misspelled words.
This commit is contained in:
Paul Baranowski 2012-05-17 17:33:50 -04:00
parent 228f699943
commit 869eb77ca4
7 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
airtime_mvc/application/forms/AddShowLiveStream.php
View file

@ -6,17 +6,17 @@ class Application_Form_AddShowLiveStream extends Zend_Form_SubForm
public function init()
{
$description1 = "This follows the same security pattern for the shows: if no users are explicitly set for the show, then anyone with a valid airtime login can connect to the stream, otherwise if there are users assigned to the show, then only those users can connect.";
$description1 = "This follows the same security pattern for the shows: only users assigned to the show can connect.";
$cb_airtime_auth = new Zend_Form_Element_Checkbox("cb_airtime_auth");
$cb_airtime_auth->setLabel("Use Airtime Authentication")
$cb_airtime_auth->setLabel("Use Airtime Authentication:")
->setDescription($description1)
->setRequired(false)
->setDecorators(array('ViewHelper'));
$this->addElement($cb_airtime_auth);
$description2 = "Specifiy custom athentification which will work for only the show.";
$description2 = "Specify custom authentication which will work for only for this show.";
$cb_custom_auth = new Zend_Form_Element_Checkbox("cb_custom_auth");
$cb_custom_auth ->setLabel("Use Custom Authentication")
$cb_custom_auth ->setLabel("Use Custom Authentication:")
->setDescription($description2)
->setRequired(false)
->setDecorators(array('ViewHelper'));

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

@ -60,7 +60,7 @@
<label for="outputStreamURL">Connection URL: </label>
</dt>
<dd id="Connection_URL-element">
<span id="stream_url"><?php echo $this->connection_url; ?></span>
<span id="stream_url" class="static_text"><?php echo $this->connection_url; ?></span>
</dd>
</dl>
</fieldset>

2
airtime_mvc/application/views/scripts/form/add-show-when.phtml
View file

@ -56,7 +56,7 @@
</ul>
<?php } ?>
<dt id="add_show_repeats-label">
<?php echo $this->element->getElement('add_show_repeats')->getLabel() ?>
<label><?php echo $this->element->getElement('add_show_repeats')->getLabel() ?></label>
</dt>
<dd id="add_show_repeats-element">
<?php echo $this->element->getElement('add_show_repeats') ?>

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

@ -72,11 +72,11 @@
<?php endif; ?>
</dd>
<dt id="master_dj_connection_url-label">
<label class="optional" for="master_dj_connection_url">Master Source Connection URL:
<label class="optional" for="master_dj_connection_url" style="white-space: nowrap">Master Source Connection URL:
</label>
</dt>
<dd id="master_dj_connection_url-element">
<span id="stream_url"><?php echo $this->master_dj_connection_url ?></span> <a href=# id="connection_url_override" style="font-size: 12px;">override</a>&nbsp;&nbsp;
<span id="stream_url" class="static_text"><?php echo $this->master_dj_connection_url ?></span> <a href=# id="connection_url_override" style="font-size: 12px;">override</a>&nbsp;&nbsp;
<span class="override_help_icon">
</span><br>
<div id="master_dj_connection_url_tb" style="display:none"><input type="text"><a href=# id="ok" style="font-size: 12px;">OK</a> <a href=# id="reset" style="font-size: 12px;">RESET</a></div>
@ -110,11 +110,11 @@
<?php endif; ?>
</dd>
<dt id="live_dj_connection_url-label">
<label class="optional" for="live_dj_connection_url">Show Source Connection URL:
<label class="optional" for="live_dj_connection_url" style="white-space: nowrap">Show Source Connection URL:
</label>
</dt>
<dd id="live_dj_connection_url-element">
<span id="stream_url"><?php echo $this->live_dj_connection_url ?></span> <a href=# id="connection_url_override" style="font-size: 12px;">override</a>&nbsp;&nbsp;
<span id="stream_url" class="static_text"><?php echo $this->live_dj_connection_url ?></span> <a href=# id="connection_url_override" style="font-size: 12px;">override</a>&nbsp;&nbsp;
<span class="override_help_icon">
</span><br>
<div id="live_dj_connection_url_tb" style="display:none"><input type="text"><a href=# id="ok" style="font-size: 12px;">OK</a> <a href=# id="reset" style="font-size: 12px;">RESET</a></div>

2
airtime_mvc/application/views/scripts/preference/stream-setting.phtml
View file

@ -8,7 +8,7 @@
<div style="clear:both"></div>
<?php }?>
<?php echo $this->statusMsg;?>
<div style="float: left; margin-right: 10px;">
<div style="float: left; margin-right: 10px; width: 490px; overflow: auto;">
<fieldset class="padded stream-setting-global">
<legend>Global Settings</legend>
<dl class="zend_form">

2
airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
View file

@ -17,7 +17,7 @@
<?php echo $this->repeats; ?>
</div>
<h3 class="collapsible-header"><span class="arrow-icon"></span>Live Stream</h3>
<div id="live-stream-override" class="collapsible-content">
<div id="live-stream-override" class="collapsible-content" style="overflow: auto">
<?php echo $this->live; ?>
</div>
<?php if(!$this->isSaas()){?>

10
airtime_mvc/public/css/styles.css
View file

@ -112,7 +112,7 @@ select {
display:inline-block; zoom:1; display:inline;
width:14px; height:14px;
background:url(/css/images/icon_info.png) 0 0 no-repeat;
float:right; position:relative; top:2px; right:7px;
float:right; position:relative; top:4px; right:7px; left: 3px;
line-height:16px !important;
}
.info-tooltip span {
@ -441,6 +441,12 @@ label {
color:#5b5b5b;
padding:0 16px 0 0;
}
.static_text {
font-size:13px;
color:#3b3b3b;
padding:0 16px 0 0;
word-wrap: break-word;
}
#library_quick_search {
margin-bottom:16px;
}
@ -2564,7 +2570,7 @@ dd .stream-status {
}
.stream-setting-global dt{
width: 180px;
width: 195px;
}
.stream-setting-global dd{