Skip to content
Permalink
Browse files

Merge branch 'alpha' of https://github.com/sergejey/majordomo into alpha

  • Loading branch information...
sergejey committed Mar 25, 2019
2 parents a06cc38 + 415fef9 commit 12378e8d93d9a34e1a6476e3fba5699c46c444d2
Showing with 46 additions and 10 deletions.
  1. +2 −2 modules/devices/econommode_activate.php
  2. +44 −8 templates/terminals/terminals_edit.html
@@ -7,5 +7,5 @@
$total = count($objects);
for ($i = 0; $i < $total; $i++) {
callMethodSafe($objects[$i].'.turnOff');
sleep(1);
}
//sleep(1);
}
@@ -164,11 +164,47 @@
function player_type_select(type) {
$('small.addon-description').addClass('hidden');
$('small#'+type+'_description').removeClass('hidden');
if (type == 'dnla') {
$('#device_control_address').show();
} else {
$('#device_control_address').hide();
}
if (type == 'dnla') {
$('#device_control_address').show();
$('#player_name').hide();
$('#player_password').hide();
$('#player_port').hide();
} else if (type == 'chromecast') {
$('#device_control_address').hide();
$('#player_name').hide();
$('#player_password').hide();
$('#player_port').show();
} else if (type == 'foobar') {
$('#device_control_address').hide();
$('#player_name').hide();
$('#player_password').hide();
$('#player_port').show();
} else if (type == 'ghn') {
$('#device_control_address').hide();
$('#player_name').hide();
$('#player_password').hide();
$('#player_port').show();
} else if (type == 'majordroid') {
$('#device_control_address').hide();
$('#player_name').hide();
$('#player_password').hide();
$('#player_port').hide();
} else if (type == 'mpd') {
$('#device_control_address').hide();
$('#player_name').hide();
$('#player_password').show();
$('#player_port').show();
} else if (type == 'mpd') {
$('#device_control_address').hide();
$('#player_name').hide();
$('#player_password').show();
$('#player_port').show();
} else {
$('#device_control_address').hide();
$('#player_name').show();
$('#player_password').show();
$('#player_port').show();
}
return true;
}
$(document).ready(function() {
@@ -177,15 +213,15 @@
</script>
</div>
</div>
<div class="form-group ">
<div id='player_port' class="form-group ">
<label class="col-lg-4 control-label" for="inputTitle"><#LANG_PLAYER_PORT#>:</label>
<div class="col-lg-5"><input type="text" class="form-control" name="player_port" value="[#PLAYER_PORT#]"></div>
</div>
<div class="form-group ">
<div id='player_name' class="form-group ">
<label class="col-lg-4 control-label" for="inputTitle"><#LANG_PLAYER_USERNAME#>:</label>
<div class="col-lg-5"><input type="text" class="form-control" name="player_username" value="[#PLAYER_USERNAME#]"></div>
</div>
<div class="form-group ">
<div id='player_password' class="form-group ">
<label class="col-lg-4 control-label" for="inputTitle"><#LANG_PLAYER_PASSWORD#>:</label>
<div class="col-lg-5"><input type="text" class="form-control" name="player_password" value="[#PLAYER_PASSWORD#]"></div>
</div>

0 comments on commit 12378e8

Please sign in to comment.
You can’t perform that action at this time.