fixes #797 - Determine mpeg2ts timestamp info

This commit is contained in:
Luke Pulverenti 2014-04-24 22:00:19 -04:00
parent d96a3f1074
commit 30ebe3858b
4 changed files with 16 additions and 35 deletions

View File

@ -16,18 +16,18 @@
<form id="allUserSettingsForm"> <form id="allUserSettingsForm">
<p>Require manual username entry for:</p> <p>${HeaderRequireManualLogin}</p>
<div data-role="controlgroup"> <div data-role="controlgroup">
<input type="checkbox" data-mini="true" id="chkMobileClients" name="chkMobileClients" /> <input type="checkbox" data-mini="true" id="chkMobileClients" />
<label for="chkMobileClients">Mobile Clients</label> <label for="chkMobileClients">${OptionMobileApps}</label>
<input type="checkbox" data-mini="true" id="chkMBT" name="chkMBT" /> <input type="checkbox" data-mini="true" id="chkOtherApps" />
<label for="chkMBT">Media Browser Theater</label> <label for="chkOtherApps">${OptionOtherApps}</label>
</div> </div>
<div class="fieldDescription">When disabled clients may present a login screen with a visual selection of users.</div> <div class="fieldDescription">${HeaderRequireManualLoginHelp}</div>
<br /> <br />
<br /> <br />

View File

@ -16,17 +16,17 @@
<ul data-role="listview" class="ulForm"> <ul data-role="listview" class="ulForm">
<li> <li>
<label for="txtWeatherLocation">Weather display location: </label> <label for="txtWeatherLocation">${LabelWeatherDisplayLocation}</label>
<input id="txtWeatherLocation" name="txtWeatherLocation" type="text" /> <input id="txtWeatherLocation" name="txtWeatherLocation" type="text" />
<div class="fieldDescription"> <div class="fieldDescription">
US zip code / City, State, Country / City, Country ${LabelWeatherDisplayLocationHelp}
</div> </div>
</li> </li>
<li> <li>
<label for="selectWeatherUnit">Weather display unit: </label> <label for="selectWeatherUnit">${LabelWeatherDisplayUnit}</label>
<select id="selectWeatherUnit" name="selectWeatherUnit"> <select id="selectWeatherUnit" name="selectWeatherUnit">
<option value="Celsius">Celsius</option> <option value="Celsius">${OptionCelsius}</option>
<option value="Fahrenheit">Fahrenheit</option> <option value="Fahrenheit">${OptionFahrenheit}</option>
</select> </select>
</li> </li>
<li> <li>

View File

@ -2,19 +2,8 @@
function loadPage(page, config) { function loadPage(page, config) {
var clients = config.ManualLoginClients; $('#chkMobileClients', page).checked(config.RequireManualLoginForMobileApps).checkboxradio("refresh");
$('#chkOtherApps', page).checked(config.RequireManualLoginForOtherApps).checkboxradio("refresh");
$('#chkMobileClients', page).checked(clients.filter(function (i) {
return i == "Mobile";
}).length > 0).checkboxradio("refresh");
$('#chkMBT', page).checked(clients.filter(function (i) {
return i == "MediaBrowserTheater";
}).length > 0).checkboxradio("refresh");
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
} }
@ -43,17 +32,8 @@
ApiClient.getServerConfiguration().done(function (config) { ApiClient.getServerConfiguration().done(function (config) {
var clients = []; config.RequireManualLoginForMobileApps = $('#chkMobileClients', form).checked();
config.RequireManualLoginForOtherApps = $('#chkOtherApps', form).checked();
if ($('#chkMobileClients', form).checked()) {
clients.push("Mobile");
}
if ($('#chkMBT', form).checked()) {
clients.push("MediaBrowserTheater");
}
config.ManualLoginClients = clients;
ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult); ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult);
}); });

View File

@ -752,6 +752,7 @@ var Dashboard = {
selected: page.hasClass("organizePage") selected: page.hasClass("organizePage")
}, { }, {
name: "DLNA", name: "DLNA",
divider: true,
href: "dlnasettings.html", href: "dlnasettings.html",
selected: page.hasClass("dlnaPage") selected: page.hasClass("dlnaPage")
}, { }, {