From 30ebe3858be94fe01d2eff49c13b26ac8fc3a126 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 24 Apr 2014 22:00:19 -0400
Subject: [PATCH] fixes #797 - Determine mpeg2ts timestamp info

---
 dashboard-ui/allusersettings.html       | 12 +++++------
 dashboard-ui/appsweather.html           | 10 ++++-----
 dashboard-ui/scripts/allusersettings.js | 28 ++++---------------------
 dashboard-ui/scripts/site.js            |  1 +
 4 files changed, 16 insertions(+), 35 deletions(-)

diff --git a/dashboard-ui/allusersettings.html b/dashboard-ui/allusersettings.html
index c1a7cac754..4b06be3fd5 100644
--- a/dashboard-ui/allusersettings.html
+++ b/dashboard-ui/allusersettings.html
@@ -16,18 +16,18 @@
 
                 <form id="allUserSettingsForm">
 
-                    <p>Require manual username entry for:</p>
+                    <p>${HeaderRequireManualLogin}</p>
 
                     <div data-role="controlgroup">
-                        <input type="checkbox" data-mini="true" id="chkMobileClients" name="chkMobileClients" />
-                        <label for="chkMobileClients">Mobile Clients</label>
+                        <input type="checkbox" data-mini="true" id="chkMobileClients" />
+                        <label for="chkMobileClients">${OptionMobileApps}</label>
 
-                        <input type="checkbox" data-mini="true" id="chkMBT" name="chkMBT" />
-                        <label for="chkMBT">Media Browser Theater</label>
+                        <input type="checkbox" data-mini="true" id="chkOtherApps" />
+                        <label for="chkOtherApps">${OptionOtherApps}</label>
 
                     </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 />
diff --git a/dashboard-ui/appsweather.html b/dashboard-ui/appsweather.html
index bb79fce7a3..ccc75a1d88 100644
--- a/dashboard-ui/appsweather.html
+++ b/dashboard-ui/appsweather.html
@@ -16,17 +16,17 @@
 
                     <ul data-role="listview" class="ulForm">
                         <li>
-                            <label for="txtWeatherLocation">Weather display location: </label>
+                            <label for="txtWeatherLocation">${LabelWeatherDisplayLocation}</label>
                             <input id="txtWeatherLocation" name="txtWeatherLocation" type="text" />
                             <div class="fieldDescription">
-                                US zip code / City, State, Country / City, Country
+                                ${LabelWeatherDisplayLocationHelp}
                             </div>
                         </li>
                         <li>
-                            <label for="selectWeatherUnit">Weather display unit: </label>
+                            <label for="selectWeatherUnit">${LabelWeatherDisplayUnit}</label>
                             <select id="selectWeatherUnit" name="selectWeatherUnit">
-                                <option value="Celsius">Celsius</option>
-                                <option value="Fahrenheit">Fahrenheit</option>
+                                <option value="Celsius">${OptionCelsius}</option>
+                                <option value="Fahrenheit">${OptionFahrenheit}</option>
                             </select>
                         </li>
                         <li>
diff --git a/dashboard-ui/scripts/allusersettings.js b/dashboard-ui/scripts/allusersettings.js
index af13aec697..51b0514ea2 100644
--- a/dashboard-ui/scripts/allusersettings.js
+++ b/dashboard-ui/scripts/allusersettings.js
@@ -2,19 +2,8 @@
 
     function loadPage(page, config) {
 
-        var clients = config.ManualLoginClients;
-
-        $('#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");
+        $('#chkMobileClients', page).checked(config.RequireManualLoginForMobileApps).checkboxradio("refresh");
+        $('#chkOtherApps', page).checked(config.RequireManualLoginForOtherApps).checkboxradio("refresh");
 
         Dashboard.hideLoadingMsg();
     }
@@ -43,17 +32,8 @@
 
             ApiClient.getServerConfiguration().done(function (config) {
 
-                var clients = [];
-
-                if ($('#chkMobileClients', form).checked()) {
-                    clients.push("Mobile");
-                }
-
-                if ($('#chkMBT', form).checked()) {
-                    clients.push("MediaBrowserTheater");
-                }
-
-                config.ManualLoginClients = clients;
+                config.RequireManualLoginForMobileApps = $('#chkMobileClients', form).checked();
+                config.RequireManualLoginForOtherApps = $('#chkOtherApps', form).checked();
 
                 ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult);
             });
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 3c0feecca2..d7e84f20a6 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -752,6 +752,7 @@ var Dashboard = {
             selected: page.hasClass("organizePage")
         }, {
             name: "DLNA",
+            divider: true,
             href: "dlnasettings.html",
             selected: page.hasClass("dlnaPage")
         }, {