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

Fixed Override Javascript and Functionality

This commit is contained in:
Robb Ebright 2017-03-14 23:03:37 -04:00
parent e873e0d8da
commit f31236fe66
4 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Vagrantfile vendored
View File

@ -9,9 +9,11 @@ Vagrant.configure("2") do |config|
config.vm.network "forwarded_port", guest: 8000, host:8000
# liquidsoap input harbors for instreaming (ie. /master)
config.vm.network "forwarded_port", guest: 8001, host:8001
# mkdics documentation
config.vm.network "forwarded_port", guest: 8002, host:8002
# mkdocs documentation
config.vm.network "forwarded_port", guest: 8888, host:8888
# make sure we are using nfs (doesn't work out of the box with debian)
config.vm.synced_folder ".", "/vagrant", type: "nfs"
# private network for nfs

18
airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
View File

@ -15,8 +15,13 @@
<?php echo $this->element->getElement('master_username')->render() ?>
<span class="master_username_help_icon"></span>
<?php echo $this->element->getElement('master_password')->render() ?>
<?php echo $this->element->getElement("master_source_host")->render() ?>
<span id="stream_url"><?php echo $this->element->getElement("master_source_host")->render() ?>
<a href=# id="connection_url_override" style="font-size: 12px;"><?php echo _("Override") ?></a>&nbsp;&nbsp;
<span class="override_help_icon"></span></br>
<div id="master_dj_connection_url_actions" style="display:none">
<a href=# id="ok" style="font-size: 12px;"><?php echo _("OK") ?></a> <a href=# id="reset" style="font-size: 12px;"><?php echo _("RESET"); ?></a>
</div>
</span>
<?php echo $this->element->getElement("master_source_port")->render() ?>
<?php echo $this->element->getElement("master_source_mount")->render() ?>
</fieldset>
@ -26,8 +31,15 @@
<p class="input-settings-inline-p">
<?php echo _("DJs can use these settings in their broadcasting software to broadcast live only during shows assigned to them.") ?>
</p>
<span id="stream_url">
<?php echo $this->element->getElement("show_source_host")->render() ?>
<a href=# id="connection_url_override" style="font-size: 12px;"><?php echo _("Override") ?></a>&nbsp;&nbsp;
<span class="override_help_icon"></span>
</br>
<div id="live_dj_connection_url_actions" style="display:none">
<a href=# id="ok" style="font-size: 12px;"><?php echo _("OK") ?></a> <a href=# id="reset" style="font-size: 12px;"><?php echo _("RESET"); ?></a>
</div>
</span>
<?php echo $this->element->getElement("show_source_port")->render() ?>
<?php echo $this->element->getElement("show_source_mount")->render() ?>
</fieldset>

11
airtime_mvc/public/css/styles.css
View File

@ -169,6 +169,17 @@ select {
right:7px;
line-height:16px !important;
}
#connection_url_override {
position: relative;
display: inline-block;
float: left;
margin-left: 5px;
}
#master_dj_connection_url_actions {
float:left;
}
#auto_switch_help, #auto_transition_help {
right: 200px;

15
airtime_mvc/public/js/airtime/preferences/streamsetting.js
View File

@ -111,18 +111,17 @@ function checkLiquidsoapStatus(){
function setLiveSourceConnectionOverrideListener(){
$("[id=connection_url_override]").click(function(event){
var url_input = $(this).parent().find("#stream_url").children();
var url_input = $(this).parent().find("dd[id$='_source_host-element']").children();
url_input.removeAttr("readonly");
$(this).parent().find("div[id$='_dj_connection_url_actions']").show();
event.preventDefault();
});
// set action for "OK" and "X"
var live_dj_actions = $("#live_dj_connection_url_actions");
var live_dj_input = live_dj_actions.parent().find("#stream_url").children();
var live_dj_input = live_dj_actions.parent().find("dd[id$='_source_host-element']").children();
var master_dj_actions = $("#master_dj_connection_url_actions");
var master_dj_input = master_dj_actions.parent().find("#stream_url").children();
var master_dj_input = master_dj_actions.parent().find("dd[id$='_source_host-element']").children();
live_dj_actions.find("#ok").click(function(event){
event.preventDefault();
@ -136,8 +135,8 @@ function setLiveSourceConnectionOverrideListener(){
live_dj_actions.find("#reset").click(function(event){
event.preventDefault();
var port = $("#dj_harbor_input_port").val();
var mount = $("#dj_harbor_input_mount_point").val();
var port = $("#show_source_port").val();
var mount = $("#show_source_mount").val();
var url = "http://"+location.hostname+":"+port+"/"+mount;
if (port == '' || mount == '') {
url = 'N/A';
@ -159,8 +158,8 @@ function setLiveSourceConnectionOverrideListener(){
});
master_dj_actions.find("#reset").click(function(event){
var port = $("#master_harbor_input_port").val();
var mount = $("#master_harbor_input_mount_point").val();
var port = $("#master_source_port").val();
var mount = $("#master_source_mount").val();
var url = "http://"+location.hostname+":"+port+"/"+mount;
if (port == '' || mount == '') {
url = 'N/A';