diff --git a/src/components/serverrestartdialog/serverrestartdialog.js b/src/components/serverrestartdialog/serverrestartdialog.js index 6e284b612..c2469afc9 100644 --- a/src/components/serverrestartdialog/serverrestartdialog.js +++ b/src/components/serverrestartdialog/serverrestartdialog.js @@ -94,7 +94,7 @@ define(['loading', 'events', 'dialogHelper', 'dom', 'layoutManager', 'scrollHelp // dialogHelper.close(dlg); //}); - dlg.querySelector('.formDialogHeaderTitle').innerHTML = globalize.translate('HeaderRestartingEmbyServer'); + dlg.querySelector('.formDialogHeaderTitle').innerHTML = globalize.translate('RestartingServer'); dlg.querySelector('.text').innerHTML = globalize.translate('RestartPleaseWaitMessage'); diff --git a/src/controllers/dashboardpage.js b/src/controllers/dashboardpage.js index 0dc1f4e6f..2a7020813 100644 --- a/src/controllers/dashboardpage.js +++ b/src/controllers/dashboardpage.js @@ -1,11 +1,6 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globalize", "loading", "connectionManager", "playMethodHelper", "cardBuilder", "imageLoader", "components/activitylog", "humanedate", "listViewStyle", "emby-linkbutton", "flexStyles", "emby-button", "emby-itemscontainer"], function (datetime, events, itemHelper, serverNotifications, dom, globalize, loading, connectionManager, playMethodHelper, cardBuilder, imageLoader, ActivityLog) { "use strict"; - function onConnectionHelpClick(evt) { - evt.preventDefault(); - return false; - } - function buttonEnabled(elem, enabled) { if (enabled) { elem.setAttribute("disabled", ""); @@ -847,7 +842,6 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa } var serverId = ApiClient.serverId(); - view.querySelector(".btnConnectionHelp").addEventListener("click", onConnectionHelpClick); view.querySelector(".btnEditServerName").addEventListener("click", onEditServerNameClick); view.querySelector(".activeDevices").addEventListener("click", onActiveDevicesClick); view.addEventListener("viewshow", function () { diff --git a/src/controllers/wizarduserpage.js b/src/controllers/wizarduserpage.js index 252e005a8..c3508efc1 100644 --- a/src/controllers/wizarduserpage.js +++ b/src/controllers/wizarduserpage.js @@ -2,22 +2,17 @@ define(["loading", "globalize", "dashboardcss", "emby-input", "emby-button", "em "use strict"; function getApiClient() { - return ApiClient + return ApiClient; } function nextWizardPage() { - Dashboard.navigate("wizardlibrary.html") + Dashboard.navigate("wizardlibrary.html"); } function onUpdateUserComplete(result) { - if (loading.hide(), result.UserLinkResult) { - var msgKey = result.UserLinkResult.IsPending ? "MessagePendingEmbyAccountAdded" : "MessageEmbyAccountAdded"; - Dashboard.alert({ - message: globalize.translate(msgKey), - title: globalize.translate("HeaderEmbyAccountAdded"), - callback: nextWizardPage - }) - } else nextWizardPage() + console.log(result); + loading.hide(); + nextWizardPage(); } function submit(form) { @@ -27,12 +22,10 @@ define(["loading", "globalize", "dashboardcss", "emby-input", "emby-button", "em type: "POST", data: { Name: form.querySelector("#txtUsername").value, - Password: form.querySelector("#txtManualPassword").value + Password: form.querySelector("#txtManualPassword").value }, url: apiClient.getUrl("Startup/User") - }).then(onUpdateUserComplete, function(response) { - console.log(response); - }) + }).then(onUpdateUserComplete); } function onSubmit(e) { @@ -50,8 +43,8 @@ define(["loading", "globalize", "dashboardcss", "emby-input", "emby-button", "em function onViewShow() { loading.show(); - var page = this, - apiClient = getApiClient(); + var page = this; + var apiClient = getApiClient(); apiClient.getJSON(apiClient.getUrl("Startup/User")).then(function(user) { page.querySelector("#txtUsername").value = user.Name || ""; page.querySelector("#txtManualPassword").value = user.Password || ""; @@ -59,10 +52,13 @@ define(["loading", "globalize", "dashboardcss", "emby-input", "emby-button", "em }) } return function(view, params) { - view.querySelector(".wizardUserForm").addEventListener("submit", onSubmit), view.addEventListener("viewshow", function() { + view.querySelector(".wizardUserForm").addEventListener("submit", onSubmit); + view.addEventListener("viewshow", function() { document.querySelector(".skinHeader").classList.add("noHomeButtonHeader") - }), view.addEventListener("viewhide", function() { + }); + view.addEventListener("viewhide", function() { document.querySelector(".skinHeader").classList.remove("noHomeButtonHeader") - }), view.addEventListener("viewshow", onViewShow) + }); + view.addEventListener("viewshow", onViewShow); } }); diff --git a/src/dashboard.html b/src/dashboard.html index 6c751740c..25f4278be 100644 --- a/src/dashboard.html +++ b/src/dashboard.html @@ -1,30 +1,20 @@
-
-
-
-

-
+
-

-

+

-

-

-

- ${HowToConnectFromEmbyApps} -

@@ -36,13 +26,11 @@
-

${HeaderRunningTasks}

-
diff --git a/src/strings/en-us.json b/src/strings/en-us.json index 5947fa637..6bb916e37 100644 --- a/src/strings/en-us.json +++ b/src/strings/en-us.json @@ -442,6 +442,7 @@ "HeaderResponseProfile": "Response Profile", "HeaderResponseProfileHelp": "Response profiles provide a way to customize information sent to the device when playing certain kinds of media.", "HeaderRestart": "Restart", + "HeaderRestartingServer": "Restarting Server", "HeaderRevisionHistory": "Revision History", "HeaderRunningTasks": "Running Tasks", "HeaderScenes": "Scenes", @@ -955,6 +956,7 @@ "MessageItemsAdded": "Items added.", "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.", "MessageNoAvailablePlugins": "No available plugins.", + "MessageNoCollectionsAvailable": "Collections allow you to enjoy personalized groupings of Movies, Series, and albums Albums. Click the + button to start creating collections.", "MessageNoMovieSuggestionsAvailable": "No movie suggestions are currently available. Start watching and rating your movies, and then come back to view your recommendations.", "MessageNoPluginsInstalled": "You have no plugins installed.", "MessageNoServersAvailableToConnect": "No servers are available to connect to. If you've been invited to share a server, make sure to accept it below or by clicking the link in the email.",