From 31b057360f237fba9050649dcffc4477cb0f5f83 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 2 Jun 2016 00:41:12 -0400 Subject: [PATCH] add provider ids to database --- dashboard-ui/components/viewcontainer-lite.js | 1 + dashboard-ui/reports.html | 3 --- dashboard-ui/scripts/reports.js | 9 -------- dashboard-ui/scripts/site.js | 22 ++++++++++--------- dashboard-ui/strings/en-US.json | 2 +- 5 files changed, 14 insertions(+), 23 deletions(-) diff --git a/dashboard-ui/components/viewcontainer-lite.js b/dashboard-ui/components/viewcontainer-lite.js index 14536ad4c5..c4b5fbd38b 100644 --- a/dashboard-ui/components/viewcontainer-lite.js +++ b/dashboard-ui/components/viewcontainer-lite.js @@ -55,6 +55,7 @@ define(['browser'], function (browser) { if (isPluginpage || (newView.classList && newView.classList.contains('type-interior'))) { dependencies.push('jqmlistview'); dependencies.push('scripts/notifications'); + dependencies.push('dashboardcss'); } return new Promise(function (resolve, reject) { diff --git a/dashboard-ui/reports.html b/dashboard-ui/reports.html index 824b61b649..0901aa24e8 100644 --- a/dashboard-ui/reports.html +++ b/dashboard-ui/reports.html @@ -145,9 +145,6 @@ - - - diff --git a/dashboard-ui/scripts/reports.js b/dashboard-ui/scripts/reports.js index 87d6ce3a95..756ebfaa2a 100644 --- a/dashboard-ui/scripts/reports.js +++ b/dashboard-ui/scripts/reports.js @@ -502,7 +502,6 @@ //Management $('#chkMissingRating', page).checked(query.HasOfficialRating == false).checkboxradio('refresh'); $('#chkMissingOverview', page).checked(query.HasOverview == false).checkboxradio('refresh'); - $('#chkYearMismatch', page).checked(query.IsYearMismatched == true).checkboxradio('refresh'); $('#chkIsLocked', page).checked(query.IsLocked == true).checkboxradio('refresh'); $('#chkMissingImdbId', page).checked(query.HasImdbId == false).checkboxradio('refresh'); $('#chkMissingTmdbId', page).checked(query.HasTmdbId == false).checkboxradio('refresh'); @@ -813,14 +812,6 @@ reloadItems(page); }); - $('#chkYearMismatch', page).on('change', function () { - - query.StartIndex = 0; - query.IsYearMismatched = this.checked ? true : null; - - reloadItems(page); - }); - //Episodes $('#chkMissingEpisode', page).on('change', function () { diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index c344f0ee2d..4f89cfe341 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -1891,7 +1891,9 @@ var AppInfo = {}; define("jstree", [bowerPath + "/jstree/dist/jstree", "css!thirdparty/jstree/themes/default/style.min.css"]); - define("jqmbase", ['css!css/dashboard', 'css!thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.theme.css']); + define("dashboardcss", ['css!css/dashboard']); + + define("jqmbase", ['dashboardcss', 'css!thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.theme.css']); define("jqmicons", ['jqmbase', 'css!thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.icons.css']); define("jqmtable", ['jqmbase', "thirdparty/jquerymobile-1.4.5/jqm.table", 'css!thirdparty/jquerymobile-1.4.5/jqm.table.css']); @@ -2986,14 +2988,14 @@ var AppInfo = {}; defineRoute({ path: '/wizardagreement.html', - dependencies: [], + dependencies: ['dashboardcss'], autoFocus: false, anonymous: true }); defineRoute({ path: '/wizardfinish.html', - dependencies: ['paper-button'], + dependencies: ['paper-button', 'dashboardcss'], autoFocus: false, anonymous: true, controller: 'scripts/wizardfinishpage' @@ -3001,49 +3003,49 @@ var AppInfo = {}; defineRoute({ path: '/wizardlibrary.html', - dependencies: [], + dependencies: ['dashboardcss'], autoFocus: false, anonymous: true }); defineRoute({ path: '/wizardlivetvguide.html', - dependencies: [], + dependencies: ['dashboardcss'], autoFocus: false, anonymous: true }); defineRoute({ path: '/wizardlivetvtuner.html', - dependencies: [], + dependencies: ['dashboardcss'], autoFocus: false, anonymous: true }); defineRoute({ path: '/wizardservice.html', - dependencies: [], + dependencies: ['dashboardcss'], autoFocus: false, anonymous: true }); defineRoute({ path: '/wizardsettings.html', - dependencies: [], + dependencies: ['dashboardcss'], autoFocus: false, anonymous: true }); defineRoute({ path: '/wizardstart.html', - dependencies: [], + dependencies: ['dashboardcss'], autoFocus: false, anonymous: true }); defineRoute({ path: '/wizarduser.html', - dependencies: [], + dependencies: ['dashboardcss'], autoFocus: false, anonymous: true }); diff --git a/dashboard-ui/strings/en-US.json b/dashboard-ui/strings/en-US.json index 3a4719efba..7837c52c4b 100644 --- a/dashboard-ui/strings/en-US.json +++ b/dashboard-ui/strings/en-US.json @@ -975,7 +975,7 @@ "LabelProtocolInfo": "Protocol info:", "LabelProtocolInfoHelp": "The value that will be used when responding to GetProtocolInfo requests from the device.", "TabNfoSettings": "Nfo Settings", - "HeaderKodiMetadataHelp": "Emby includes native support for Nfo metadata files. To enable or disable Nfo metadata, use the Advanced tab to configure options for your media types.", + "HeaderKodiMetadataHelp": "Emby includes native support for Nfo metadata files. To enable or disable Nfo metadata, use the Services tab to configure options for your media types.", "LabelKodiMetadataUser": "Sync user watch data to nfo's for:", "LabelKodiMetadataUserHelp": "Enable this to keep watch data in sync between Emby Server and Nfo files.", "LabelKodiMetadataDateFormat": "Release date format:",