From 9915242409908dfc06e3d3a2dd8659c140cb9aa3 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 7 Feb 2016 16:48:08 -0500
Subject: [PATCH] update progressive encoding

---
 dashboard-ui/mypreferencesdisplay.html        |  6 +--
 dashboard-ui/mypreferenceshome.html           |  8 ++--
 dashboard-ui/mypreferenceslanguages.html      | 10 ++---
 dashboard-ui/scripts/logpage.js               |  7 +--
 dashboard-ui/scripts/sync.js                  |  2 +-
 dashboard-ui/syncjob.html                     |  2 +-
 .../jquerymobile-1.4.5/jqm.controlgroup.css   | 45 ++++++++++---------
 .../thirdparty/paper-button-style.css         |  2 +-
 dashboard-ui/userparentalcontrol.html         |  2 +-
 9 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/dashboard-ui/mypreferencesdisplay.html b/dashboard-ui/mypreferencesdisplay.html
index b1a9eba34f..22a9c679f0 100644
--- a/dashboard-ui/mypreferencesdisplay.html
+++ b/dashboard-ui/mypreferencesdisplay.html
@@ -18,7 +18,7 @@
                     <div class="detailSectionContent">
                         <br />
                         <div>
-                            <label for="selectLanguage">${LabelPreferredDisplayLanguage}</label>
+                            <label for="selectLanguage" class="selectLabel">${LabelPreferredDisplayLanguage}</label>
                             <select id="selectLanguage" data-mini="true">
                                 <option value="ar">Arabic</option>
                                 <option value="bg-BG">Bulgarian (Bulgaria)</option>
@@ -72,7 +72,7 @@
                     <div class="detailSectionContent">
                         <br />
                         <div>
-                            <label for="selectThemeSong">${LabelEnableThemeSongs}</label>
+                            <label for="selectThemeSong" class="selectLabel">${LabelEnableThemeSongs}</label>
                             <select id="selectThemeSong" data-mini="true">
                                 <option value="">${OptionAuto}</option>
                                 <option value="1">${OptionYes}</option>
@@ -82,7 +82,7 @@
                         </div>
                         <br />
                         <div class="fldEnableBackdrops" style="display:none;">
-                            <label for="selectBackdrop">${LabelEnableBackdrops}</label>
+                            <label for="selectBackdrop" class="selectLabel">${LabelEnableBackdrops}</label>
                             <select id="selectBackdrop" data-mini="true">
                                 <option value="">${OptionAuto}</option>
                                 <option value="1">${OptionYes}</option>
diff --git a/dashboard-ui/mypreferenceshome.html b/dashboard-ui/mypreferenceshome.html
index 83cc9be50d..df53cbaf98 100644
--- a/dashboard-ui/mypreferenceshome.html
+++ b/dashboard-ui/mypreferenceshome.html
@@ -18,7 +18,7 @@
                     <div class="detailSectionContent">
                         <br />
                         <div>
-                            <label for="selectHomeSection1">${LabelHomePageSection1}</label>
+                            <label for="selectHomeSection1" class="selectLabel">${LabelHomePageSection1}</label>
                             <select id="selectHomeSection1" data-mini="true">
                                 <option value="">${OptionAuto}</option>
                                 <option value="latestmedia">${OptionLatestMedia}</option>
@@ -32,7 +32,7 @@
                         </div>
                         <br />
                         <div>
-                            <label for="selectHomeSection2">${LabelHomePageSection2}</label>
+                            <label for="selectHomeSection2" class="selectLabel">${LabelHomePageSection2}</label>
                             <select id="selectHomeSection2" data-mini="true">
                                 <option value="">${OptionAuto}</option>
                                 <option value="latestmedia">${OptionLatestMedia}</option>
@@ -47,7 +47,7 @@
                         </div>
                         <br />
                         <div>
-                            <label for="selectHomeSection3">${LabelHomePageSection3}</label>
+                            <label for="selectHomeSection3" class="selectLabel">${LabelHomePageSection3}</label>
                             <select id="selectHomeSection3" data-mini="true">
                                 <option value="">${OptionAuto}</option>
                                 <option value="latestmedia">${OptionLatestMedia}</option>
@@ -62,7 +62,7 @@
                         </div>
                         <br />
                         <div>
-                            <label for="selectHomeSection4">${LabelHomePageSection4}</label>
+                            <label for="selectHomeSection4" class="selectLabel">${LabelHomePageSection4}</label>
                             <select id="selectHomeSection4" data-mini="true">
                                 <option value="">${OptionAuto}</option>
                                 <option value="latestmedia">${OptionLatestMedia}</option>
diff --git a/dashboard-ui/mypreferenceslanguages.html b/dashboard-ui/mypreferenceslanguages.html
index b99b90b45e..bd17ad2eee 100644
--- a/dashboard-ui/mypreferenceslanguages.html
+++ b/dashboard-ui/mypreferenceslanguages.html
@@ -19,19 +19,19 @@
                     <div class="detailSectionContent">
                         <br />
                         <div>
-                            <label for="selectAudioLanguage">${LabelAudioLanguagePreference}</label>
+                            <label for="selectAudioLanguage" class="selectLabel">${LabelAudioLanguagePreference}</label>
                             <select id="selectAudioLanguage" data-mini="true"></select>
                         </div>
                         <br />
                         <paper-checkbox class="chkPlayDefaultAudioTrack">${LabelPlayDefaultAudioTrack}</paper-checkbox>
                         <br /><br /><br />
                         <div>
-                            <label for="selectSubtitleLanguage">${LabelSubtitleLanguagePreference}</label>
+                            <label for="selectSubtitleLanguage" class="selectLabel">${LabelSubtitleLanguagePreference}</label>
                             <select id="selectSubtitleLanguage" data-mini="true"></select>
                         </div>
                         <br />
                         <div>
-                            <label for="selectSubtitlePlaybackMode">${LabelSubtitlePlaybackMode}</label>
+                            <label for="selectSubtitlePlaybackMode" class="selectLabel">${LabelSubtitlePlaybackMode}</label>
                             <select id="selectSubtitlePlaybackMode" data-mini="true">
                                 <option value="Default">${OptionDefaultSubtitles}</option>
                                 <option value="Smart">${OptionSmartSubtitles}</option>
@@ -68,12 +68,12 @@
                     <div class="detailSectionContent">
                         <br />
                         <div>
-                            <label for="selectMaxBitrate">${LabelMaxStreamingBitrate}</label>
+                            <label for="selectMaxBitrate" class="selectLabel">${LabelMaxStreamingBitrate}</label>
                             <select id="selectMaxBitrate" data-mini="true"></select>
                         </div>
                         <br />
                         <div>
-                            <label for="selectMaxChromecastBitrate">${LabelMaxChromecastBitrate}</label>
+                            <label for="selectMaxChromecastBitrate" class="selectLabel">${LabelMaxChromecastBitrate}</label>
                             <select id="selectMaxChromecastBitrate" data-mini="true">
                             </select>
                         </div>
diff --git a/dashboard-ui/scripts/logpage.js b/dashboard-ui/scripts/logpage.js
index 19db3c699b..a342eb62bd 100644
--- a/dashboard-ui/scripts/logpage.js
+++ b/dashboard-ui/scripts/logpage.js
@@ -1,11 +1,11 @@
 (function () {
 
-    $(document).on('pageshow', "#logPage", function () {
+    $(document).on('pagebeforeshow', "#logPage", function () {
 
         var page = this;
+        Dashboard.showLoadingMsg();
 
-
-        require(['paper-fab', 'paper-progress', 'paper-item-body', 'paper-icon-item'], function () {
+        require(['paper-fab', 'paper-item-body', 'paper-icon-item'], function () {
 
             var apiClient = ApiClient;
 
@@ -56,6 +56,7 @@
                 html += '</div>';
 
                 $('.serverLogs', page).html(html).trigger('create');
+                Dashboard.hideLoadingMsg();
 
             });
         });
diff --git a/dashboard-ui/scripts/sync.js b/dashboard-ui/scripts/sync.js
index 2b372f1334..fd1c94763a 100644
--- a/dashboard-ui/scripts/sync.js
+++ b/dashboard-ui/scripts/sync.js
@@ -183,7 +183,7 @@
         //html += '</div>';
         //html += '</div>';
 
-        $(elem).html(html);
+        $(elem).html(html).trigger('create');
 
         $('#selectSyncTarget', elem).on('change', function () {
 
diff --git a/dashboard-ui/syncjob.html b/dashboard-ui/syncjob.html
index 539d1430d1..5789453ee0 100644
--- a/dashboard-ui/syncjob.html
+++ b/dashboard-ui/syncjob.html
@@ -4,7 +4,7 @@
     <title>${TitleSync}</title>
 </head>
 <body>
-    <div id="syncJobPage" data-role="page" class="page type-interior syncConfigurationPage syncJobPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Sync" data-require="jqmcontrolgroup,scripts/syncjob,paper-fab,paper-item-body,paper-icon-item">
+    <div id="syncJobPage" data-role="page" class="page type-interior syncConfigurationPage syncJobPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Sync" data-require="scripts/syncjob,paper-fab,paper-item-body,paper-icon-item,jqmcollapsible">
 
         <div data-role="content">
             <div class="content-primary">
diff --git a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.controlgroup.css b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.controlgroup.css
index 77eaf253e9..8e20885378 100644
--- a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.controlgroup.css
+++ b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.controlgroup.css
@@ -1,8 +1,13 @@
-.udiv[data-role="controlgroup"], fieldset[data-role="controlgroup"] {
+div[data-role="controlgroup"], fieldset[data-role="controlgroup"] {
     padding: 0;
     margin: .5em 0;
+    clear: both;
 }
 
+    div[data-role="controlgroup"] + *, fieldset[data-role="controlgroup"] + * {
+        clear: both;
+    }
+
 *[data-role="controlgroup"].ui-mini .ui-btn-icon-notext,
 *[data-role="controlgroup"] .ui-mini.ui-btn-icon-notext {
     font-size: inherit;
@@ -24,26 +29,22 @@
     list-style: none;
 }
 
-div[data-role="controlgroup"][data-type="horizontal"] .ui-btn,
-div[data-role="controlgroup"][data-type="horizontal"] li > .ui-btn,
-div[data-role="controlgroup"][data-type="horizontal"] .ui-checkbox,
-div[data-role="controlgroup"][data-type="horizontal"] .ui-radio,
-div[data-role="controlgroup"][data-type="horizontal"].ui-select {
+*[data-role="controlgroup"][data-type="horizontal"] .ui-btn,
+*[data-role="controlgroup"][data-type="horizontal"] li > .ui-btn,
+*[data-role="controlgroup"][data-type="horizontal"] .ui-checkbox,
+*[data-role="controlgroup"][data-type="horizontal"] .ui-radio,
+*[data-role="controlgroup"][data-type="horizontal"].ui-select {
     float: left;
     clear: none;
 }
 
-div[data-role="controlgroup"][data-type="horizontal"] input[type="radio"] {
-    display: none;
-}
-
-div[data-role="controlgroup"][data-type="horizontal"] button.ui-btn,
+*[data-role="controlgroup"][data-type="horizontal"] button.ui-btn,
 *[data-role="controlgroup"] .ui-btn-icon-notext {
     width: auto;
 }
 
-div[data-role="controlgroup"][data-type="horizontal"] .ui-btn-icon-notext,
-div[data-role="controlgroup"][data-type="horizontal"] button.ui-btn-icon-notext {
+*[data-role="controlgroup"][data-type="horizontal"] .ui-btn-icon-notext,
+*[data-role="controlgroup"][data-type="horizontal"] button.ui-btn-icon-notext {
     width: 1.5em;
 }
 
@@ -56,18 +57,22 @@ div[data-role="controlgroup"][data-type="horizontal"] button.ui-btn-icon-notext
     border-bottom-width: 0;
 }
 
-    *[data-role="controlgroup"]:not([data-type="horizontal"]) .ui-checkbox:last-child .ui-btn {
-        border-bottom-width: 1px;
-    }
+*[data-role="controlgroup"]:not([data-type="horizontal"]) .ui-checkbox:last-child .ui-btn {
+    border-bottom-width: 1px;
+}
 
-div[data-role="controlgroup"][data-type="horizontal"] .ui-btn {
+*[data-role="controlgroup"][data-type="horizontal"] .ui-btn {
     border-right-width: 0;
 }
 
-    div[data-role="controlgroup"][data-type="horizontal"] .ui-btn:last-child {
+    *[data-role="controlgroup"][data-type="horizontal"] .ui-btn:last-child {
         border-right-width: 1px;
     }
 
+*[data-role="controlgroup"][data-type="horizontal"] .ui-radio:last-child label {
+    border-right-width: 1px;
+}
+
 *[data-role="controlgroup"] .ui-btn-corner-all,
 *[data-role="controlgroup"] .ui-btn.ui-corner-all {
     -webkit-border-radius: 0;
@@ -82,14 +87,14 @@ div[data-role="controlgroup"][data-type="horizontal"] .ui-btn {
     border-radius: inherit;
 }
 
-div[data-role="controlgroup"][data-type="horizontal"] .ui-btn:first-child {
+*[data-role="controlgroup"][data-type="horizontal"] .ui-btn:first-child {
     -webkit-border-top-left-radius: inherit;
     border-top-left-radius: inherit;
     -webkit-border-bottom-left-radius: inherit;
     border-bottom-left-radius: inherit;
 }
 
-div[data-role="controlgroup"][data-type="horizontal"] .ui-btn:last-child {
+*[data-role="controlgroup"][data-type="horizontal"] .ui-btn:last-child {
     -webkit-border-top-right-radius: inherit;
     border-top-right-radius: inherit;
     -webkit-border-bottom-right-radius: inherit;
diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css
index 94b0436bab..421dba23d3 100644
--- a/dashboard-ui/thirdparty/paper-button-style.css
+++ b/dashboard-ui/thirdparty/paper-button-style.css
@@ -449,7 +449,7 @@ paper-input label, paper-textarea label {
 }
 
 .ui-body-b .paper-input-container-0 .input-content.paper-input-container label, .ui-body-b .paper-input-container-0 .input-content.paper-input-container .paper-input-label, .ui-body-b paper-textarea label, .ui-body-b .selectLabel, .ui-body-b .fieldDescription {
-    color: #858585;
+    color: #ccc;
 }
 
 .ui-body-a .paper-input-container-0 .input-content.paper-input-container label, .ui-body-a .paper-input-container-0 .input-content.paper-input-container .paper-input-label, .ui-body-a paper-textarea label, .ui-body-a .selectLabel, .ui-body-a .fieldDescription {
diff --git a/dashboard-ui/userparentalcontrol.html b/dashboard-ui/userparentalcontrol.html
index 96b3528c04..1129b6e016 100644
--- a/dashboard-ui/userparentalcontrol.html
+++ b/dashboard-ui/userparentalcontrol.html
@@ -18,7 +18,7 @@
 
                     <ul data-role="listview" class="ulForm">
                         <li>
-                            <label for="selectMaxParentalRating">${LabelMaxParentalRating}</label>
+                            <label for="selectMaxParentalRating" class="selectLabel">${LabelMaxParentalRating}</label>
                             <select name="selectMaxParentalRating" id="selectMaxParentalRating" data-mini="true"></select>
                             <div class="fieldDescription">${MaxParentalRatingHelp}</div>
                         </li>