diff --git a/src/mypreferencesmenu.html b/src/mypreferencesmenu.html index 8ef8117743..0d331e2218 100644 --- a/src/mypreferencesmenu.html +++ b/src/mypreferencesmenu.html @@ -3,6 +3,15 @@
+ +
+ person +
+
${ButtonProfile}
+
+
+ +
tv @@ -38,15 +47,6 @@
- - -
- person -
-
${ButtonProfile}
-
-
-

@@ -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 ae9403a17c..ac08e68205 100644 --- a/src/scripts/librarymenu.js +++ b/src/scripts/librarymenu.js @@ -177,49 +177,41 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " function refreshLibraryInfoInDrawer(user, drawer) { 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 += "
"; + html += 'home' + globalize.translate("ButtonHome") + ""; + + // libraries are added here 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 += '' + globalize.translate("ButtonManageServer") + ""; - html += '' + globalize.translate("MetadataManager") + ""; + html += 'dashboard' + globalize.translate("TabDashboard") + ""; html += "
"; } html += '
'; - + html += '

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

"; if (user.localUser) { - html += '' + globalize.translate("ButtonSettings") + ""; + html += 'settings' + globalize.translate("ButtonSettings") + ""; } - - html += '' + globalize.translate("sharedcomponents#Sync") + ""; - if (AppInfo.isNativeApp) { - html += '' + globalize.translate("ButtonSelectServer") + ""; + html += 'wifi' + globalize.translate("ButtonSelectServer") + ""; } - - if (!(!user.localUser || user.localUser.EnableAutoLogin)) { - html += '' + globalize.translate("ButtonSignOut") + ""; + if (user.localUser && !user.localUser.EnableAutoLogin) { + html += 'exit_to_app' + 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); } @@ -298,13 +290,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"] }]; @@ -317,7 +309,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("TabCameraUpload"), @@ -329,7 +321,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, @@ -339,13 +331,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, @@ -353,7 +345,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"] @@ -362,7 +354,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"), @@ -373,7 +365,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 3d3a2c4a23..c4c13fa256 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",