From 36d1cf3a59a03bbba21e36c29cf5cbceac0f5b57 Mon Sep 17 00:00:00 2001 From: dkanada Date: Mon, 10 Jun 2019 14:21:10 -0700 Subject: [PATCH 1/8] fix capitalization of nfo --- src/strings/en-us.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/strings/en-us.json b/src/strings/en-us.json index f5ce57b217..fbf87ac7b2 100644 --- a/src/strings/en-us.json +++ b/src/strings/en-us.json @@ -675,7 +675,7 @@ "LabelKodiMetadataSaveImagePaths": "Save image paths within nfo files", "LabelKodiMetadataSaveImagePathsHelp": "This is recommended if you have image file names that don't conform to Kodi guidelines.", "LabelKodiMetadataUser": "Save user watch data to nfo's for:", - "LabelKodiMetadataUserHelp": "Enable this to save watch data to Nfo files for other applications to utilize.", + "LabelKodiMetadataUserHelp": "Enable this to save watch data to NFO files for other applications to utilize.", "LabelLanNetworks": "LAN networks:", "LabelLanguage": "Language:", "LabelLineup": "Lineup:", @@ -1349,7 +1349,7 @@ "TabMusicVideos": "Music Videos", "TabMyPlugins": "My Plugins", "TabNetworks": "Networks", - "TabNfoSettings": "Nfo Settings", + "TabNfoSettings": "NFO Settings", "TabNotifications": "Notifications", "TabOther": "Other", "TabParentalControl": "Parental Control", From 166c95ea3ab3a2e5182e0c457177c9af4bf6afa6 Mon Sep 17 00:00:00 2001 From: dkanada Date: Mon, 10 Jun 2019 14:44:52 -0700 Subject: [PATCH 2/8] remove page with only two options --- src/controllers/librarydisplay.js | 55 ++++++++++++++++---- src/controllers/librarysettings.js | 74 --------------------------- src/controllers/medialibrarypage.js | 4 +- src/controllers/metadataimagespage.js | 4 +- src/controllers/metadatanfo.js | 4 +- src/librarydisplay.html | 21 +++++++- src/librarysettings.html | 28 ---------- 7 files changed, 66 insertions(+), 124 deletions(-) delete mode 100644 src/controllers/librarysettings.js delete mode 100644 src/librarysettings.html diff --git a/src/controllers/librarydisplay.js b/src/controllers/librarydisplay.js index 80f5bbc09b..b1cc6ffe20 100644 --- a/src/controllers/librarydisplay.js +++ b/src/controllers/librarydisplay.js @@ -14,25 +14,58 @@ define(["globalize", "loading", "libraryMenu", "emby-checkbox", "emby-button", " }, { href: "metadatanfo.html", name: Globalize.translate("TabNfoSettings") - }, { - href: "librarysettings.html", - name: Globalize.translate("TabAdvanced") }] } + return function(view, params) { function loadData() { ApiClient.getServerConfiguration().then(function(config) { - view.querySelector(".chkFolderView").checked = config.EnableFolderView, view.querySelector(".chkGroupMoviesIntoCollections").checked = config.EnableGroupingIntoCollections, view.querySelector(".chkDisplaySpecialsWithinSeasons").checked = config.DisplaySpecialsWithinSeasons, view.querySelector(".chkExternalContentInSuggestions").checked = config.EnableExternalContentInSuggestions - }) + view.querySelector(".chkFolderView").checked = config.EnableFolderView; + view.querySelector(".chkGroupMoviesIntoCollections").checked = config.EnableGroupingIntoCollections; + view.querySelector(".chkDisplaySpecialsWithinSeasons").checked = config.DisplaySpecialsWithinSeasons; + view.querySelector(".chkExternalContentInSuggestions").checked = config.EnableExternalContentInSuggestions; + view.querySelector("#chkSaveMetadataHidden").checked = config.SaveMetadataHidden; + }); + ApiClient.getNamedConfiguration("metadata").then(function(metadata) { + loadMetadataConfig(this, metadata) + }); } + + function loadMetadataConfig(page, config) { + $("#selectDateAdded", page).val(config.UseFileCreationTimeForDateAdded ? "1" : "0"); + } + view.querySelector("form").addEventListener("submit", function(e) { loading.show(); var form = this; - return ApiClient.getServerConfiguration().then(function(config) { - config.EnableFolderView = form.querySelector(".chkFolderView").checked, config.EnableGroupingIntoCollections = form.querySelector(".chkGroupMoviesIntoCollections").checked, config.DisplaySpecialsWithinSeasons = form.querySelector(".chkDisplaySpecialsWithinSeasons").checked, config.EnableExternalContentInSuggestions = form.querySelector(".chkExternalContentInSuggestions").checked, ApiClient.updateServerConfiguration(config).then(Dashboard.processServerConfigurationUpdateResult) - }), e.preventDefault(), !1 - }), view.addEventListener("viewshow", function() { - libraryMenu.setTabs("librarysetup", 1, getTabs), loadData() - }) + ApiClient.getServerConfiguration().then(function(config) { + config.EnableFolderView = form.querySelector(".chkFolderView").checked; + config.EnableGroupingIntoCollections = form.querySelector(".chkGroupMoviesIntoCollections").checked; + config.DisplaySpecialsWithinSeasons = form.querySelector(".chkDisplaySpecialsWithinSeasons").checked; + config.EnableExternalContentInSuggestions = form.querySelector(".chkExternalContentInSuggestions").checked; + config.SaveMetadataHidden = form.querySelector("#chkSaveMetadataHidden").checked; + ApiClient.updateServerConfiguration(config).then(Dashboard.processServerConfigurationUpdateResult); + }); + ApiClient.getNamedConfiguration("metadata").then(function(config) { + config.UseFileCreationTimeForDateAdded = "1" === $("#selectDateAdded", form).val(); + ApiClient.updateNamedConfiguration("metadata", config); + }); + + e.preventDefault(); + loading.hide(); + return false; + }); + + view.addEventListener("viewshow", function() { + libraryMenu.setTabs("librarysetup", 1, getTabs); + loadData(); + ApiClient.getSystemInfo().then(function(info) { + if ("Windows" === info.OperatingSystem) { + page.querySelector(".fldSaveMetadataHidden").classList.remove("hide"); + } else { + page.querySelector(".fldSaveMetadataHidden").classList.add("hide"); + } + }); + }); } }); \ No newline at end of file diff --git a/src/controllers/librarysettings.js b/src/controllers/librarysettings.js deleted file mode 100644 index db190b3487..0000000000 --- a/src/controllers/librarysettings.js +++ /dev/null @@ -1,74 +0,0 @@ -define(["jQuery", "loading", "libraryMenu", "fnchecked", "emby-checkbox", "emby-button"], function($, loading, libraryMenu) { - "use strict"; - - function loadPage(page, config) { - $("#chkSaveMetadataHidden", page).checked(config.SaveMetadataHidden); - } - - function loadMetadataConfig(page, config) { - $("#selectDateAdded", page).val(config.UseFileCreationTimeForDateAdded ? "1" : "0"); - } - - function alertText(options) { - require(["alert"], function(alert) { - alert(options); - }); - } - - function onSubmit() { - loading.show(); - var form = this; - ApiClient.getServerConfiguration().then(function(config) { - config.SaveMetadataHidden = $("#chkSaveMetadataHidden", form).checked(); - ApiClient.updateServerConfiguration(config).then(Dashboard.processServerConfigurationUpdateResult); - }); - ApiClient.getNamedConfiguration("metadata").then(function(config) { - config.UseFileCreationTimeForDateAdded = "1" === $("#selectDateAdded", form).val(); - ApiClient.updateNamedConfiguration("metadata", config); - }); - loading.hide(); - return false; - } - - function getTabs() { - return [{ - href: "library.html", - name: Globalize.translate("HeaderLibraries") - }, { - href: "librarydisplay.html", - name: Globalize.translate("TabDisplay") - }, { - href: "metadataimages.html", - name: Globalize.translate("TabMetadata") - }, { - href: "metadatanfo.html", - name: Globalize.translate("TabNfoSettings") - }, { - href: "librarysettings.html", - name: Globalize.translate("TabAdvanced") - }] - } - - return function(view, params) { - $(".librarySettingsForm").off("submit", onSubmit).on("submit", onSubmit); - view.addEventListener("viewshow", function() { - libraryMenu.setTabs("librarysetup", 4, getTabs); - loading.show(); - var page = this; - ApiClient.getServerConfiguration().then(function(config) { - loadPage(page, config) - }); - ApiClient.getNamedConfiguration("metadata").then(function(metadata) { - loadMetadataConfig(page, metadata) - }); - ApiClient.getSystemInfo().then(function(info) { - if ("Windows" === info.OperatingSystem) { - page.querySelector(".fldSaveMetadataHidden").classList.remove("hide"); - } else { - page.querySelector(".fldSaveMetadataHidden").classList.add("hide"); - } - }); - loading.hide(); - }); - } -}); diff --git a/src/controllers/medialibrarypage.js b/src/controllers/medialibrarypage.js index 458d415734..488ff94f4c 100644 --- a/src/controllers/medialibrarypage.js +++ b/src/controllers/medialibrarypage.js @@ -334,11 +334,9 @@ define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "gl }, { href: "metadatanfo.html", name: globalize.translate("TabNfoSettings") - }, { - href: "librarysettings.html", - name: globalize.translate("TabAdvanced") }] } + window.WizardLibraryPage = { next: function() { Dashboard.navigate("wizardsettings.html") diff --git a/src/controllers/metadataimagespage.js b/src/controllers/metadataimagespage.js index 58eae09dd1..3a6656e4b6 100644 --- a/src/controllers/metadataimagespage.js +++ b/src/controllers/metadataimagespage.js @@ -53,11 +53,9 @@ define(["jQuery", "dom", "loading", "libraryMenu", "listViewStyle"], function($, }, { href: "metadatanfo.html", name: Globalize.translate("TabNfoSettings") - }, { - href: "librarysettings.html", - name: Globalize.translate("TabAdvanced") }] } + $(document).on("pageinit", "#metadataImagesConfigurationPage", function() { $(".metadataImagesConfigurationForm").off("submit", onSubmit).on("submit", onSubmit) }).on("pageshow", "#metadataImagesConfigurationPage", function() { diff --git a/src/controllers/metadatanfo.js b/src/controllers/metadatanfo.js index d7ed677304..1de17ae836 100644 --- a/src/controllers/metadatanfo.js +++ b/src/controllers/metadatanfo.js @@ -40,11 +40,9 @@ define(["jQuery", "loading", "libraryMenu"], function($, loading, libraryMenu) { }, { href: "metadatanfo.html", name: Globalize.translate("TabNfoSettings") - }, { - href: "librarysettings.html", - name: Globalize.translate("TabAdvanced") }] } + var metadataKey = "xbmcmetadata"; $(document).on("pageinit", "#metadataNfoPage", function() { $(".metadataNfoForm").off("submit", onSubmit).on("submit", onSubmit) diff --git a/src/librarydisplay.html b/src/librarydisplay.html index f013343f6b..b5510ddb14 100644 --- a/src/librarydisplay.html +++ b/src/librarydisplay.html @@ -1,8 +1,15 @@
-
+
+ +
${LabelDateAddedBehaviorHelp}
+
+
${OptionDisplayFolderViewHelp}
+ +
${OptionEnableExternalContentInSuggestionsHelp}
+ +
+ +
${OptionSaveMetadataAsHiddenHelp}
+
+
-
diff --git a/src/librarysettings.html b/src/librarysettings.html deleted file mode 100644 index b72c61fe57..0000000000 --- a/src/librarysettings.html +++ /dev/null @@ -1,28 +0,0 @@ -
-
-
-
- -
- -
${LabelDateAddedBehaviorHelp}
-
- -
- -
${OptionSaveMetadataAsHiddenHelp}
-
- -
- - -
-
-
-
\ No newline at end of file From e21763dfcda369e1ab3b86c7dcd4ac0791537c9f Mon Sep 17 00:00:00 2001 From: dkanada Date: Mon, 10 Jun 2019 15:25:07 -0700 Subject: [PATCH 3/8] remove redundant advanced label --- src/{serversecurity.html => apikeys.html} | 2 +- .../playbacksettings.template.html | 4 +- .../{serversecurity.js => apikeys.js} | 43 +++++++++---------- .../{dashboardhosting.js => networking.js} | 22 ++++------ ...{dashboardhosting.html => networking.html} | 8 +--- src/scripts/librarymenu.js | 23 +++++----- src/scripts/routes.js | 8 ++-- src/strings/ar.json | 4 -- src/strings/bg-bg.json | 4 -- src/strings/ca.json | 2 - src/strings/cs.json | 4 -- src/strings/da.json | 4 -- src/strings/de.json | 4 -- src/strings/el.json | 4 -- src/strings/en-gb.json | 1 - src/strings/en-us.json | 5 +-- src/strings/es-ar.json | 1 - src/strings/es-mx.json | 4 -- src/strings/es.json | 4 -- src/strings/fa.json | 2 - src/strings/fi.json | 2 - src/strings/fr-ca.json | 1 - src/strings/fr.json | 4 -- src/strings/gsw.json | 1 - src/strings/he.json | 2 - src/strings/hr.json | 4 -- src/strings/hu.json | 4 -- src/strings/is-is.json | 1 - src/strings/it.json | 3 -- src/strings/ja.json | 1 - src/strings/kk.json | 4 -- src/strings/ko.json | 2 - src/strings/lt-lt.json | 2 - src/strings/ms.json | 1 - src/strings/nb.json | 4 -- src/strings/nl.json | 2 - src/strings/pl.json | 4 -- src/strings/pt-br.json | 4 -- src/strings/pt-pt.json | 3 -- src/strings/ro.json | 1 - src/strings/ru.json | 4 -- src/strings/sk.json | 2 - src/strings/sl-si.json | 2 - src/strings/sv.json | 3 -- src/strings/tr.json | 2 - src/strings/uk.json | 1 - src/strings/vi.json | 1 - src/strings/zh-cn.json | 4 -- src/strings/zh-hk.json | 1 - src/strings/zh-tw.json | 2 - 50 files changed, 50 insertions(+), 175 deletions(-) rename src/{serversecurity.html => apikeys.html} (89%) rename src/controllers/{serversecurity.js => apikeys.js} (74%) rename src/controllers/{dashboardhosting.js => networking.js} (92%) rename src/{dashboardhosting.html => networking.html} (97%) diff --git a/src/serversecurity.html b/src/apikeys.html similarity index 89% rename from src/serversecurity.html rename to src/apikeys.html index 4df33acc60..43cfae5b13 100644 --- a/src/serversecurity.html +++ b/src/apikeys.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/components/playbacksettings/playbacksettings.template.html b/src/components/playbacksettings/playbacksettings.template.html index 046c9da5d1..06cfe3f3d6 100644 --- a/src/components/playbacksettings/playbacksettings.template.html +++ b/src/components/playbacksettings/playbacksettings.template.html @@ -12,7 +12,7 @@ ${LabelPlayDefaultAudioTrack}
- +

@@ -41,7 +41,7 @@

- ${Advanced} + ${TabAdvanced}