CC-3611: Show Form: "Repeats" font is wrong, info images in the wrong place
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:
parent
228f699943
commit
869eb77ca4
7 changed files with 20 additions and 14 deletions
|
@ -6,17 +6,17 @@ class Application_Form_AddShowLiveStream extends Zend_Form_SubForm
|
||||||
|
|
||||||
public function init()
|
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 = new Zend_Form_Element_Checkbox("cb_airtime_auth");
|
||||||
$cb_airtime_auth->setLabel("Use Airtime Authentication")
|
$cb_airtime_auth->setLabel("Use Airtime Authentication:")
|
||||||
->setDescription($description1)
|
->setDescription($description1)
|
||||||
->setRequired(false)
|
->setRequired(false)
|
||||||
->setDecorators(array('ViewHelper'));
|
->setDecorators(array('ViewHelper'));
|
||||||
$this->addElement($cb_airtime_auth);
|
$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 = new Zend_Form_Element_Checkbox("cb_custom_auth");
|
||||||
$cb_custom_auth ->setLabel("Use Custom Authentication")
|
$cb_custom_auth ->setLabel("Use Custom Authentication:")
|
||||||
->setDescription($description2)
|
->setDescription($description2)
|
||||||
->setRequired(false)
|
->setRequired(false)
|
||||||
->setDecorators(array('ViewHelper'));
|
->setDecorators(array('ViewHelper'));
|
||||||
|
|
|
@ -60,7 +60,7 @@
|
||||||
<label for="outputStreamURL">Connection URL: </label>
|
<label for="outputStreamURL">Connection URL: </label>
|
||||||
</dt>
|
</dt>
|
||||||
<dd id="Connection_URL-element">
|
<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>
|
</dd>
|
||||||
</dl>
|
</dl>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
|
@ -56,7 +56,7 @@
|
||||||
</ul>
|
</ul>
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
<dt id="add_show_repeats-label">
|
<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>
|
</dt>
|
||||||
<dd id="add_show_repeats-element">
|
<dd id="add_show_repeats-element">
|
||||||
<?php echo $this->element->getElement('add_show_repeats') ?>
|
<?php echo $this->element->getElement('add_show_repeats') ?>
|
||||||
|
|
|
@ -72,11 +72,11 @@
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
</dd>
|
</dd>
|
||||||
<dt id="master_dj_connection_url-label">
|
<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>
|
</label>
|
||||||
</dt>
|
</dt>
|
||||||
<dd id="master_dj_connection_url-element">
|
<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>
|
<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>
|
||||||
<span class="override_help_icon">
|
<span class="override_help_icon">
|
||||||
</span><br>
|
</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>
|
<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; ?>
|
<?php endif; ?>
|
||||||
</dd>
|
</dd>
|
||||||
<dt id="live_dj_connection_url-label">
|
<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>
|
</label>
|
||||||
</dt>
|
</dt>
|
||||||
<dd id="live_dj_connection_url-element">
|
<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>
|
<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>
|
||||||
<span class="override_help_icon">
|
<span class="override_help_icon">
|
||||||
</span><br>
|
</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>
|
<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>
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
<div style="clear:both"></div>
|
<div style="clear:both"></div>
|
||||||
<?php }?>
|
<?php }?>
|
||||||
<?php echo $this->statusMsg;?>
|
<?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">
|
<fieldset class="padded stream-setting-global">
|
||||||
<legend>Global Settings</legend>
|
<legend>Global Settings</legend>
|
||||||
<dl class="zend_form">
|
<dl class="zend_form">
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
<?php echo $this->repeats; ?>
|
<?php echo $this->repeats; ?>
|
||||||
</div>
|
</div>
|
||||||
<h3 class="collapsible-header"><span class="arrow-icon"></span>Live Stream</h3>
|
<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; ?>
|
<?php echo $this->live; ?>
|
||||||
</div>
|
</div>
|
||||||
<?php if(!$this->isSaas()){?>
|
<?php if(!$this->isSaas()){?>
|
||||||
|
|
|
@ -112,7 +112,7 @@ select {
|
||||||
display:inline-block; zoom:1; display:inline;
|
display:inline-block; zoom:1; display:inline;
|
||||||
width:14px; height:14px;
|
width:14px; height:14px;
|
||||||
background:url(/css/images/icon_info.png) 0 0 no-repeat;
|
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;
|
line-height:16px !important;
|
||||||
}
|
}
|
||||||
.info-tooltip span {
|
.info-tooltip span {
|
||||||
|
@ -441,6 +441,12 @@ label {
|
||||||
color:#5b5b5b;
|
color:#5b5b5b;
|
||||||
padding:0 16px 0 0;
|
padding:0 16px 0 0;
|
||||||
}
|
}
|
||||||
|
.static_text {
|
||||||
|
font-size:13px;
|
||||||
|
color:#3b3b3b;
|
||||||
|
padding:0 16px 0 0;
|
||||||
|
word-wrap: break-word;
|
||||||
|
}
|
||||||
#library_quick_search {
|
#library_quick_search {
|
||||||
margin-bottom:16px;
|
margin-bottom:16px;
|
||||||
}
|
}
|
||||||
|
@ -2564,7 +2570,7 @@ dd .stream-status {
|
||||||
}
|
}
|
||||||
|
|
||||||
.stream-setting-global dt{
|
.stream-setting-global dt{
|
||||||
width: 180px;
|
width: 195px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.stream-setting-global dd{
|
.stream-setting-global dd{
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue