Merge remote-tracking branch 'NovaXeros/master' into develop

Conflicts:
	headphones/searcher.py
	headphones/webserve.py
This commit is contained in:
rembo10
2014-04-08 12:31:18 -07:00
6 changed files with 101 additions and 3 deletions

View File

@@ -672,6 +672,19 @@
</div>
</div>
</fieldset>
<fieldset>
<h3>LMS</h3>
<div class="checkbox row">
<input type="checkbox" name="lms_enabled" id="lms" value="1" ${config['lms_enabled']} /><label>Enable Squeezebox Updates</label>
</div>
<div id="lmsoptions">
<div class="row">
<label>LMS Host:Port</label>
<input type="text" name="lms_host" value="${config['lms_host']}" size="30">
<small>e.g. http://localhost:9000. Seperate hosts with commas</small>
</div>
</div>
</fieldset>
</td>
<td>
<fieldset>
@@ -1300,6 +1313,26 @@
}
});
if ($("#lms").is(":checked"))
{
$("#lmsoptions").show();
}
else
{
$("#lmsoptions").hide();
}
$("#lms").click(function(){
if ($("#lms").is(":checked"))
{
$("#lmsoptions").slideDown();
}
else
{
$("#lmsoptions").slideUp();
}
});
if ($("#plex").is(":checked"))
{
$("#plexoptions").show();