From 7ac964fca072a4b144ce8bb6cf3b32c3061fbac7 Mon Sep 17 00:00:00 2001 From: dkanada Date: Sun, 20 Jan 2019 17:33:48 +0900 Subject: [PATCH 1/4] minor changes to navbar elements --- src/scripts/librarymenu.js | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/src/scripts/librarymenu.js b/src/scripts/librarymenu.js index b0cd078b7..1de8bc036 100644 --- a/src/scripts/librarymenu.js +++ b/src/scripts/librarymenu.js @@ -178,17 +178,12 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " var html = ""; html += '
'; html += '' + globalize.translate("ButtonHome") + ""; - html += '
'; - html += '

'; - html += globalize.translate("sharedcomponents#HeaderMyDownloads"); - html += "

"; - html += '' + globalize.translate("sharedcomponents#Browse") + ""; - html += '' + globalize.translate("sharedcomponents#Manage") + ""; - html += "
"; + + // libraries are added here html += '
'; html += "
"; - var localUser = user.localUser; + var localUser = user.localUser; if (localUser && localUser.Policy.IsAdministrator) { html += '
'; html += '

'; @@ -200,26 +195,26 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " } html += '
'; - + html += '

'; + html += globalize.translate("HeaderUser"); + html += "

"; if (user.localUser) { html += '' + globalize.translate("ButtonSettings") + ""; } - - html += '' + globalize.translate("sharedcomponents#Sync") + ""; - if (AppInfo.isNativeApp) { html += '' + globalize.translate("ButtonSelectServer") + ""; } - - if (!(!user.localUser || user.localUser.EnableAutoLogin)) { + // null check for local user might not be required + if (user.localUser && !user.localUser.EnableAutoLogin) { html += '' + globalize.translate("ButtonSignOut") + ""; } - html += "
"; + + // add buttons to navigation drawer navDrawerScrollContainer.innerHTML = html; + // bind logout button click to method var btnLogout = navDrawerScrollContainer.querySelector(".btnLogout"); - if (btnLogout) { btnLogout.addEventListener("click", onLogoutClick); } From 925e4a4ba5827a1724601a8081840ff6a709ee88 Mon Sep 17 00:00:00 2001 From: dkanada Date: Sun, 20 Jan 2019 23:19:54 +0900 Subject: [PATCH 2/4] improvements to icons and strings on several pages --- src/mypreferencesmenu.html | 6 +++--- src/scripts/librarymenu.js | 30 +++++++++++++++--------------- src/strings/en-US.json | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/mypreferencesmenu.html b/src/mypreferencesmenu.html index 8ef811774..ab2cd9492 100644 --- a/src/mypreferencesmenu.html +++ b/src/mypreferencesmenu.html @@ -61,7 +61,7 @@
- lock + exit_to_app
${ButtonSignOut}
@@ -75,9 +75,9 @@
- settings + dashboard
-
${ButtonServerDashboard}
+
${TabDashboard}
 diff --git a/src/scripts/librarymenu.js b/src/scripts/librarymenu.js index 1de8bc036..5f84b482e 100644 --- a/src/scripts/librarymenu.js +++ b/src/scripts/librarymenu.js @@ -177,7 +177,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " function refreshLibraryInfoInDrawer(user, drawer) { var html = ""; html += '
'; - html += '' + globalize.translate("ButtonHome") + ""; + html += 'home' + globalize.translate("ButtonHome") + ""; // libraries are added here html += '
'; @@ -189,8 +189,8 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " html += '

'; html += globalize.translate("HeaderAdmin"); html += "

"; - html += '' + globalize.translate("ButtonManageServer") + ""; - html += '' + globalize.translate("MetadataManager") + ""; + html += 'dashboard' + globalize.translate("TabDashboard") + ""; + html += 'mode_edit' + globalize.translate("MetadataManager") + ""; html += "
"; } @@ -199,14 +199,14 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " html += globalize.translate("HeaderUser"); html += "

"; if (user.localUser) { - html += '' + globalize.translate("ButtonSettings") + ""; + html += 'settings' + globalize.translate("ButtonSettings") + ""; } if (AppInfo.isNativeApp) { - html += '' + globalize.translate("ButtonSelectServer") + ""; + html += 'wifi' + globalize.translate("ButtonSelectServer") + ""; } // null check for local user might not be required if (user.localUser && !user.localUser.EnableAutoLogin) { - html += '' + globalize.translate("ButtonSignOut") + ""; + html += 'exit_to_app' + globalize.translate("ButtonSignOut") + ""; } html += "
"; @@ -293,13 +293,13 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " color: "#38c" }, { name: globalize.translate("TabPlayback"), - icon: "play_circle_filled", + icon: "play_arrow", color: "#E5342E", href: "playbackconfiguration.html", pageIds: ["playbackConfigurationPage", "streamingSettingsPage"] }, { name: globalize.translate("TabTranscoding"), - icon: "transform", + icon: "swap_horiz", href: "encodingsettings.html", pageIds: ["encodingSettingsPage"] }]; @@ -312,7 +312,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " name: globalize.translate("TabDevices"), href: "devices/devices.html", pageIds: ["devicesPage", "devicePage"], - icon: "tablet" + icon: "devices" }); links.push({ name: globalize.translate("HeaderDownloadSync"), @@ -331,7 +331,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " name: globalize.translate("DLNA"), href: "dlnasettings.html", pageIds: ["dlnaSettingsPage", "dlnaProfilesPage", "dlnaProfilePage"], - icon: "" + icon: "input" }); links.push({ divider: true, @@ -341,13 +341,13 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " name: globalize.translate("TabLiveTV"), href: "livetvstatus.html", pageIds: ["liveTvStatusPage", "liveTvTunerPage"], - icon: "" + icon: "tv" }); links.push({ name: globalize.translate("DVR"), href: "livetvsettings.html", pageIds: ["liveTvSettingsPage"], - icon: "dvr" + icon: "list" }); links.push({ divider: true, @@ -355,7 +355,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " }); links.push({ name: globalize.translate("TabAdvanced"), - icon: "settings", + icon: "code", href: "dashboardhosting.html", color: "#F16834", pageIds: ["dashboardHostingPage", "serverSecurityPage"] @@ -364,7 +364,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " name: globalize.translate("TabLogs"), href: "log.html", pageIds: ["logPage"], - icon: "folder_open" + icon: "bug_report" }); links.push({ name: globalize.translate("TabNotifications"), @@ -375,7 +375,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " }); links.push({ name: globalize.translate("TabPlugins"), - icon: "add_shopping_cart", + icon: "shopping_cart", color: "#9D22B1", href: "plugins.html", pageIds: ["pluginsPage", "pluginCatalogPage"] diff --git a/src/strings/en-US.json b/src/strings/en-US.json index a16cba5bd..be859d60b 100644 --- a/src/strings/en-US.json +++ b/src/strings/en-US.json @@ -138,7 +138,7 @@ "ButtonShuffle": "Shuffle", "ButtonShutdown": "Shutdown", "ButtonSignIn": "Sign In", - "ButtonSignOut": "Sign out", + "ButtonSignOut": "Sign Out", "ButtonSignUp": "Sign up", "ButtonSkip": "Skip", "ButtonSort": "Sort", From 3b271ca3b7af243e5860091d389a3e4df80b602b Mon Sep 17 00:00:00 2001 From: dkanada Date: Sun, 20 Jan 2019 23:21:09 +0900 Subject: [PATCH 3/4] move profile to top of user settings --- src/mypreferencesmenu.html | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/mypreferencesmenu.html b/src/mypreferencesmenu.html index ab2cd9492..0d331e221 100644 --- a/src/mypreferencesmenu.html +++ b/src/mypreferencesmenu.html @@ -3,6 +3,15 @@
+ +
+ person +
+
${ButtonProfile}
+
+
+ +
tv @@ -38,15 +47,6 @@
- - -
- person -
-
${ButtonProfile}
-
-
-

From c2ddda7afcad467fae2b7a85a2a29c8ff8658c27 Mon Sep 17 00:00:00 2001 From: dkanada Date: Sun, 20 Jan 2019 23:32:17 +0900 Subject: [PATCH 4/4] remove metadata manager from navbar --- src/scripts/librarymenu.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/scripts/librarymenu.js b/src/scripts/librarymenu.js index 5f84b482e..a7239227d 100644 --- a/src/scripts/librarymenu.js +++ b/src/scripts/librarymenu.js @@ -183,14 +183,12 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " html += '
'; html += "
"; - var localUser = user.localUser; - if (localUser && localUser.Policy.IsAdministrator) { + if (user.localUser && user.localUser.Policy.IsAdministrator) { html += '
'; html += '

'; html += globalize.translate("HeaderAdmin"); html += "

"; html += 'dashboard' + globalize.translate("TabDashboard") + ""; - html += 'mode_edit' + globalize.translate("MetadataManager") + ""; html += "
"; } @@ -204,7 +202,6 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " if (AppInfo.isNativeApp) { html += 'wifi' + globalize.translate("ButtonSelectServer") + ""; } - // null check for local user might not be required if (user.localUser && !user.localUser.EnableAutoLogin) { html += 'exit_to_app' + globalize.translate("ButtonSignOut") + ""; }