add organize now/sync prepare buttons

dashboard-ui/autoorganizelog.html

@@ -18,7 +18,13 @@
                     <div class="listTopPaging" style="float: left; position: relative; top: 15px;">
                     </div>
 
-                    <button style="display: none;" class="btnClearLog" type="button" data-inline="true" data-icon="forbidden" data-mini="true">Clear</button>
+                    <!--<button style="display: none;" class="btnClearLog" type="button" data-inline="true" data-icon="forbidden" data-mini="true">Clear</button>-->
+                    <div style="float: right; position: relative; top: 15px;margin-top: -5px;">
+                        <button type="button" class="btnOrganize" data-icon="action" data-mini="true" data-inline="true">${ButtonOrganizeNow}</button>
+                        <progress max="100" min="0" style="width:100px;display:none;" class="organizeProgress"></progress>
+                    </div>
+                    <br />
+
                     <div style="clear: both;"></div>
                 </div>
                 <table data-role="table" data-mode="reflow" class="tblOrganizationResults stripedTable ui-responsive table-stroke">
@@ -33,12 +39,12 @@
                     <tbody class="resultBody"></tbody>
                 </table>
                 <br />
-                <div style="text-align: right;" class="legend">
+                <div style="text-align: right;vertical-align:middle;" class="legend">
-                    <div style="display: inline-block; height: 10px; width: 10px; background: green;"></div>
+                    <div style="display: inline-block; height: 10px; width: 10px; background: green;margin-right:1px;"></div>
                     <span>${LabelCompleted}</span>
-                    <div style="display: inline-block; height: 10px; width: 10px; background: red; margin-left: 1em;"></div>
+                    <div style="display: inline-block; height: 10px; width: 10px; background: red; margin-left: 1em;margin-right:1px;"></div>
                     <span>${LabelFailed}</span>
-                    <div style="display: inline-block; height: 10px; width: 10px; background: blue; margin-left: 1em;"></div>
+                    <div style="display: inline-block; height: 10px; width: 10px; background: blue; margin-left: 1em;margin-right:1px;"></div>
                     <span>${LabelSkipped}</span>
                 </div>
                 <div class="listBottomPaging">

dashboard-ui/css/librarybrowser.css

@@ -1269,26 +1269,29 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
 .listItem a:first-child {
     margin-right: 0 !important;
     background-color: transparent !important;
+}
+
+.ui-page-theme-a .listItem a:first-child {
     border-color: #d8d8d8 !important;
 }
 
+.ui-page-theme-b .listItem a:first-child {
+    border-color: #383838 !important;
+}
+
 .listItem a + a {
     background-color: transparent !important;
     z-index: 1000;
 }
 
-.listItem:hover a {
+.ui-page-theme-a .listItem:hover a {
     background-color: #eee !important;
 }
 
-.page[data-theme='b'] .listItem:hover a {
+.ui-page-theme-b .listItem:hover a {
     background-color: #333 !important;
 }
 
-.page[data-theme='b'] .listItem a:first-child {
-    border-color: #282828 !important;
-}
-
 @media all and (max-width: 600px) {
 
     .itemsListview .ui-li-aside {

dashboard-ui/edititemmetadata.html

@@ -288,7 +288,7 @@
                             <div data-role="editableListviewContainer">
                                 <div>
                                     <div style="display: inline-block; width: 80%;">
-                                        <input type="text" />
+                                        <input type="text" class="txtEditableListview" />
                                     </div>
                                     <a data-role="button" data-inline="true" data-mini="true" data-icon="plus" data-iconpos="notext" onclick="EditItemMetadataPage.addElementToEditableListview(this)" style="vertical-align: top;">${ButtonAdd}</a>
                                 </div>
@@ -300,7 +300,7 @@
                             <div data-role="editableListviewContainer">
                                 <div>
                                     <div style="display: inline-block; width: 80%;">
-                                        <input type="text" />
+                                        <input type="text" class="txtEditableListview" />
                                     </div>
                                     <a data-role="button" data-inline="true" data-mini="true" data-icon="plus" data-iconpos="notext" onclick="EditItemMetadataPage.addElementToEditableListview(this)" style="vertical-align: top;">${ButtonAdd}</a>
                                 </div>
@@ -321,7 +321,7 @@
                             <div data-role="editableListviewContainer">
                                 <div>
                                     <div style="display: inline-block; width: 80%;">
-                                        <input type="text" />
+                                        <input type="text" class="txtEditableListview" />
                                     </div>
                                     <a data-role="button" data-inline="true" data-mini="true" data-icon="plus" data-iconpos="notext" onclick="EditItemMetadataPage.addElementToEditableListview(this)" style="vertical-align: top;">${ButtonAdd}</a>
                                 </div>
@@ -333,7 +333,7 @@
                             <div data-role="editableListviewContainer">
                                 <div>
                                     <div style="display: inline-block; width: 80%;">
-                                        <input type="text" />
+                                        <input type="text" class="txtEditableListview" />
                                     </div>
                                     <a data-role="button" data-inline="true" data-mini="true" data-icon="plus" data-iconpos="notext" onclick="EditItemMetadataPage.addElementToEditableListview(this)" style="vertical-align: top;">${ButtonAdd}</a>
                                 </div>
@@ -345,7 +345,7 @@
                             <div data-role="editableListviewContainer">
                                 <div>
                                     <div style="display: inline-block; width: 80%;">
-                                        <input type="text" />
+                                        <input type="text" class="txtEditableListview" />
                                     </div>
                                     <a data-role="button" data-inline="true" data-mini="true" data-icon="plus" data-iconpos="notext" onclick="EditItemMetadataPage.addElementToEditableListview(this)" style="vertical-align: top;">${ButtonAdd}</a>
                                 </div>

dashboard-ui/library.html

@@ -22,7 +22,7 @@
                     </div>
 
                     <br />
-                    <div class="readOnlyContent refreshLibraryPanel hide">
+                    <div class="readOnlyContent">
                         <button type="button" class="btnRefresh" data-icon="refresh" data-mini="true">${ButtonScanLibrary}</button>
                         <progress max="100" min="0" style="width: 100%;" class="refreshProgress"></progress>
                         <div style="margin-top: 5px;">${LabelLastResult} <span class="lastRefreshResult"></span></div>

dashboard-ui/livetvstatus.html

@@ -25,7 +25,7 @@
                         </div>
                         <br />
 
-                        <div class="refreshGuidePanel hide">
+                        <div class="refreshGuidePanel">
                             <button type="button" class="btnRefreshGuide" data-icon="refresh" data-mini="true">${ButtonRefreshGuideData}</button>
                             <progress max="100" min="0" style="width: 100%;" class="refreshGuideProgress"></progress>
                             <div style="margin-top: 5px;">${LabelLastResult} <span class="lastRefreshGuideResult"></span></div>

dashboard-ui/metadataadvanced.html

@@ -122,7 +122,7 @@
                                     <label for="txtFanartApiKey">${LabelFanartApiKey}</label>
                                     <input type="text" id="txtFanartApiKey" />
                                     <div class="fieldDescription">${LabelFanartApiKeyHelp}</div>
-                                    <div class="fieldDescription"><a href="https://fanart.tv/get-an-api-key" target="_blank">${ButtonLearnMore}</a></div>
+                                    <div class="fieldDescription"><a href="https://fanart.tv/2015/01/personal-api-keys" target="_blank">${ButtonLearnMore}</a></div>
                                 </li>
                                 <li>
                                     <input type="checkbox" id="chkEnableFanartUpdates" data-mini="true" />

dashboard-ui/scripts/autoorganizelog.js

@@ -329,9 +329,21 @@
 
         reloadItems(page);
 
+        // on here
+        $('.btnOrganize', page).taskButton({
+            mode: 'on',
+            progressElem: $('.organizeProgress', page),
+            taskKey: 'AutoOrganize'
+        });
+
     }).on('pagehide', "#libraryFileOrganizerLogPage", function () {
 
         currentResult = null;
+
+        // off here
+        $('.btnOrganize', page).taskButton({
+            mode: 'off'
+        });
     });
 
     window.OrganizerLogPage = {

dashboard-ui/scripts/edititemmetadata.js

@@ -963,11 +963,13 @@
         };
 
         self.addElementToEditableListview = function (source, sortCallback) {
-            var input = $(source).parent().find('input[type="text"], select');
+
+            var parent = $(source).parents('*[data-role="editableListviewContainer"]');
+            var input = parent.find('.txtEditableListview, select');
             var text = input.val();
-            input.val('');
+
             if (text == '') return;
-            var list = $(source).parents('[data-role="editableListviewContainer"]').find('ul[data-role="listview"]');
+            var list = parent.find('ul[data-role="listview"]');
             var items = editableListViewValues(list);
             items.push(text);
             populateListView(list, items, sortCallback);

dashboard-ui/scripts/editorsidebar.js

@@ -259,8 +259,6 @@
         if (elem) {
             elem.scrollIntoView();
         }
-
-        $(document).scrollTop(0);
     }
 
     function initializeTree(page, currentUser, openItems, selectedId) {

dashboard-ui/scripts/livetvstatus.js

@@ -161,109 +161,29 @@
         });
     }
 
-    function pollTasks(page) {
+    $(document).on('pageshow', "#liveTvStatusPage", function () {
-
-        ApiClient.getScheduledTasks().done(function (tasks) {
-
-            updateTasks(page, tasks);
-        });
-
-    }
-
-    function updateTasks(page, tasks) {
-
-        $('.refreshGuidePanel', page).removeClass('hide');
-
-        var task = tasks.filter(function (t) {
-
-            return t.Key == 'RefreshGuide';
-
-        })[0];
-
-        $('.btnRefreshGuide', page).buttonEnabled(task.State == 'Idle').attr('data-taskid', task.Id);
-
-        var progress = (task.CurrentProgressPercentage || 0).toFixed(1);
-        var progressElem = $('.refreshGuideProgress', page).val(progress);
-
-        if (task.State == 'Running') {
-            progressElem.show();
-        } else {
-            progressElem.hide();
-        }
-
-        var lastResult = task.LastExecutionResult ? task.LastExecutionResult.Status : '';
-
-        if (lastResult == "Failed") {
-            $('.lastRefreshGuideResult', page).html('<span style="color:#FF0000;">' + Globalize.translate('LabelFailed') + '</span>');
-        }
-        else if (lastResult == "Cancelled") {
-            $('.lastRefreshGuideResult', page).html('<span style="color:#0026FF;">' + Globalize.translate('LabelCancelled') + '</span>');
-        }
-        else if (lastResult == "Aborted") {
-            $('.lastRefreshGuideResult', page).html('<span style="color:#FF0000;">' + Globalize.translate('LabelAbortedByServerShutdown') + '</span>');
-        } else {
-            $('.lastRefreshGuideResult', page).html(lastResult);
-        }
-    }
-
-    function onWebSocketMessage(e, msg) {
-
-        if (msg.MessageType == "ScheduledTasksInfo") {
-
-            var tasks = msg.Data;
-
-            var page = $.mobile.activePage;
-
-            updateTasks(page, tasks);
-        }
-    }
-
-    $(document).on('pageinit', "#liveTvStatusPage", function () {
 
         var page = this;
 
-        $('.btnRefreshGuide', page).on('click', function () {
-
-            var button = this;
-            var id = button.getAttribute('data-taskid');
-
-            ApiClient.startScheduledTask(id).done(function () {
-
-                pollTasks(page);
-            });
-
-        });
-
-    }).on('pageshow', "#liveTvStatusPage", function () {
-
-        var page = this;
-
-        $('.refreshGuidePanel', page).addClass('hide');
-
         reload(page);
 
-        pollTasks(page);
+        // on here
-
+        $('.btnRefreshGuide', page).taskButton({
-        if (ApiClient.isWebSocketOpen()) {
+            mode: 'on',
-            ApiClient.sendWebSocketMessage("ScheduledTasksInfoStart", "1000,1000");
+            progressElem: $('.refreshGuideProgress', page),
-        }
+            lastResultElem: $('.lastRefreshGuideResult', page),
-
+            taskKey: 'RefreshGuide'
-        $(ApiClient).on("websocketmessage", onWebSocketMessage).on('websocketopen', function () {
-
-            if (ApiClient.isWebSocketOpen()) {
-                ApiClient.sendWebSocketMessage("ScheduledTasksInfoStart", "1000,1000");
-            }
         });
 
     }).on('pagehide', "#liveTvStatusPage", function () {
 
         var page = this;
 
-        if (ApiClient.isWebSocketOpen()) {
+        // off here
-            ApiClient.sendWebSocketMessage("ScheduledTasksInfoStop");
+        $('.btnRefreshGuide', page).taskButton({
-        }
+            mode: 'off'
+        });
 
-        $(ApiClient).off("websocketmessage", onWebSocketMessage);
     });
 
 })(jQuery, document, window);

dashboard-ui/scripts/medialibrarypage.js

@@ -371,111 +371,127 @@ var WizardLibraryPage = {
 
 (function ($, document, window) {
 
-    function pollTasks(page) {
+    $(document).on('pageshow', "#mediaLibraryPage", function () {
-
-        ApiClient.getScheduledTasks().done(function (tasks) {
-
-            updateTasks(page, tasks);
-        });
-
-    }
-
-    function updateTasks(page, tasks) {
-
-        $('.refreshLibraryPanel', page).removeClass('hide');
-
-        var task = tasks.filter(function (t) {
-
-            return t.Key == 'RefreshLibrary';
-
-        })[0];
-
-        $('.btnRefresh', page).buttonEnabled(task.State == 'Idle').attr('data-taskid', task.Id);
-
-        var progress = (task.CurrentProgressPercentage || 0).toFixed(1);
-        var progressElem = $('.refreshProgress', page).val(progress);
-
-        if (task.State == 'Running') {
-            progressElem.show();
-        } else {
-            progressElem.hide();
-        }
-
-        var lastResult = task.LastExecutionResult ? task.LastExecutionResult.Status : '';
-
-        if (lastResult == "Failed") {
-            $('.lastRefreshResult', page).html('<span style="color:#FF0000;">' + Globalize.translate('LabelFailed') + '</span>');
-        }
-        else if (lastResult == "Cancelled") {
-            $('.lastRefreshResult', page).html('<span style="color:#0026FF;">' + Globalize.translate('LabelCancelled') + '</span>');
-        }
-        else if (lastResult == "Aborted") {
-            $('.lastRefreshResult', page).html('<span style="color:#FF0000;">' + Globalize.translate('LabelAbortedByServerShutdown') + '</span>');
-        } else {
-            $('.lastRefreshResult', page).html(lastResult);
-        }
-    }
-
-    function onWebSocketMessage(e, msg) {
-
-        if (msg.MessageType == "ScheduledTasksInfo") {
-
-            var tasks = msg.Data;
-
-            var page = $.mobile.activePage;
-
-            updateTasks(page, tasks);
-        }
-    }
-
-    $(document).on('pageinit', "#mediaLibraryPage", function () {
 
         var page = this;
 
-        $('.btnRefresh', page).on('click', function () {
+        // on here
-
+        $('.btnRefresh', page).taskButton({
-            var button = this;
+            mode: 'on',
-            var id = button.getAttribute('data-taskid');
+            progressElem: $('.refreshProgress', page),
-
+            lastResultElem: $('.lastRefreshResult', page),
-            ApiClient.startScheduledTask(id).done(function () {
+            taskKey: 'RefreshLibrary'
-
-                pollTasks(page);
-            });
-
-        });
-
-    }).on('pageshow', "#mediaLibraryPage", function () {
-
-        var page = this;
-
-        $('.refreshLibraryPanel', page).addClass('hide');
-
-        pollTasks(page);
-
-        var apiClient = ApiClient;
-
-        if (apiClient.isWebSocketOpen()) {
-            apiClient.sendWebSocketMessage("ScheduledTasksInfoStart", "1000,1000");
-        }
-
-        $(apiClient).on("websocketmessage", onWebSocketMessage).on('websocketopen', function () {
-
-            if (apiClient.isWebSocketOpen()) {
-                apiClient.sendWebSocketMessage("ScheduledTasksInfoStart", "1000,1000");
-            }
         });
 
     }).on('pagehide', "#mediaLibraryPage", function () {
 
         var page = this;
 
-        var apiClient = ApiClient;
+        // off here
+        $('.btnRefresh', page).taskButton({
+            mode: 'off'
+        });
 
-        if (apiClient.isWebSocketOpen()) {
-            apiClient.sendWebSocketMessage("ScheduledTasksInfoStop");
-        }
-
-        $(apiClient).off("websocketmessage", onWebSocketMessage);
     });
 
 })(jQuery, document, window);
+
+$.fn.taskButton = function (options) {
+
+    function pollTasks(button) {
+
+        ApiClient.getScheduledTasks().done(function (tasks) {
+
+            updateTasks(button, tasks);
+        });
+
+    }
+
+    function updateTasks(button, tasks) {
+
+        var task = tasks.filter(function (t) {
+
+            return t.Key == options.taskKey;
+
+        })[0];
+
+        button.buttonEnabled(task.State == 'Idle').attr('data-taskid', task.Id);
+
+        var progress = (task.CurrentProgressPercentage || 0).toFixed(1);
+
+        if (options.progressElem) {
+            var progressElem = options.progressElem.val(progress);
+
+            if (task.State == 'Running') {
+                progressElem.show();
+            } else {
+                progressElem.hide();
+            }
+        }
+
+        if (options.lastResultElem) {
+            var lastResult = task.LastExecutionResult ? task.LastExecutionResult.Status : '';
+
+            if (lastResult == "Failed") {
+                options.lastResultElem.html('<span style="color:#FF0000;">' + Globalize.translate('LabelFailed') + '</span>');
+            }
+            else if (lastResult == "Cancelled") {
+                options.lastResultElem.html('<span style="color:#0026FF;">' + Globalize.translate('LabelCancelled') + '</span>');
+            }
+            else if (lastResult == "Aborted") {
+                options.lastResultElem.html('<span style="color:#FF0000;">' + Globalize.translate('LabelAbortedByServerShutdown') + '</span>');
+            } else {
+                options.lastResultElem.html(lastResult);
+            }
+        }
+    }
+
+    var self = this;
+
+    if (options.mode == 'off') {
+
+        if (ApiClient.isWebSocketOpen()) {
+            ApiClient.sendWebSocketMessage("ScheduledTasksInfoStop");
+        }
+
+        $(ApiClient).off(".taskbutton");
+
+    } else {
+
+        this.on('click', function () {
+
+            var button = this;
+            var id = button.getAttribute('data-taskid');
+
+            ApiClient.startScheduledTask(id).done(function () {
+
+                pollTasks(self);
+            });
+
+        });
+
+        pollTasks(self);
+
+        if (ApiClient.isWebSocketOpen()) {
+            ApiClient.sendWebSocketMessage("ScheduledTasksInfoStart", "1000,1000");
+        }
+
+        $(ApiClient).on("websocketmessage.taskbutton", function (e, msg) {
+
+            if (msg.MessageType == "ScheduledTasksInfo") {
+
+                var tasks = msg.Data;
+
+                updateTasks(self, tasks);
+            }
+
+        }).on('websocketopen.taskbutton', function () {
+
+            if (ApiClient.isWebSocketOpen()) {
+                ApiClient.sendWebSocketMessage("ScheduledTasksInfoStart", "1000,1000");
+            }
+        });
+    }
+
+    return this;
+};

dashboard-ui/scripts/syncactivity.js

@@ -246,6 +246,25 @@
 
         reloadData(page);
 
+        // on here
+        $('.btnSync', page).taskButton({
+            mode: 'on',
+            progressElem: $('.syncProgress', page),
+            taskKey: 'SyncPrepare'
+        });
+
+
+    }).on('pagehide', ".syncActivityPage", function () {
+
+        var page = this;
+
+        reloadData(page);
+
+        // off here
+        $('.btnSync', page).taskButton({
+            mode: 'off'
+        });
+
     });
 
 })();

dashboard-ui/syncactivity.html

@@ -14,6 +14,11 @@
                     <a href="syncsettings.html" data-role="button">${TabSettings}</a>
                 </div>
 
+                <div style="text-align:right;margin-top:-20px;">
+                    <button type="button" class="btnSync" data-icon="cloud" data-mini="true" data-inline="true">${ButtonConvertMedia}</button>
+                    <progress max="100" min="0" style="width:100px;display:none;" class="syncProgress"></progress>
+                </div>
+                <br />
                 <div class="syncActivity">
 
                 </div>