From 55550e75b66bc32047a5e757c0e81e43899e2866 Mon Sep 17 00:00:00 2001 From: Ben Fayers Date: Mon, 31 Dec 2018 17:06:41 +0000 Subject: [PATCH] Follow up to #332 (Replace all emby.media links with jellyfin.media links) (#344) * Remove supporterkey.html * remove supporterkeypage.js * remove possibility to load "supporterkeypage" * add FIXMEs as per suggestion --- dashboard-ui/scripts/connectlogin.js | 1 + dashboard-ui/scripts/dashboardpage.js | 1 + dashboard-ui/scripts/site.js | 7 -- dashboard-ui/scripts/supporterkeypage.js | 141 ----------------------- dashboard-ui/supporterkey.html | 98 ---------------- 5 files changed, 2 insertions(+), 246 deletions(-) delete mode 100644 dashboard-ui/scripts/supporterkeypage.js delete mode 100644 dashboard-ui/supporterkey.html diff --git a/dashboard-ui/scripts/connectlogin.js b/dashboard-ui/scripts/connectlogin.js index 02e1daef22..8a401a8534 100644 --- a/dashboard-ui/scripts/connectlogin.js +++ b/dashboard-ui/scripts/connectlogin.js @@ -154,6 +154,7 @@ define(["appSettings", "loading", "browser", "emby-linkbutton"], function(appSet Dashboard.navigate("connectlogin.html?mode=connect") }); var terms = view.querySelector(".terms"); + //FIXME: Link below directs to "jellyfin.media/terms" which is a non existant URL terms.innerHTML = Globalize.translate("LoginDisclaimer") + "
" + Globalize.translate("TermsOfUse") + "
", AppInfo.isNativeApp ? (terms.classList.add("hide"), view.querySelector(".tvAppInfo").classList.add("hide")) : (terms.classList.remove("hide"), view.querySelector(".tvAppInfo").classList.remove("hide")), view.addEventListener("viewbeforeshow", function() { var page = this; if (page.querySelector("#txtSignupEmail").value = "", page.querySelector("#txtSignupUsername").value = "", page.querySelector("#txtSignupPassword").value = "", page.querySelector("#txtSignupPasswordConfirm").value = "", browser.safari && AppInfo.isNativeApp) page.querySelector(".embyIntroDownloadMessage").innerHTML = Globalize.translate("EmbyIntroDownloadMessageWithoutLink"); diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js index f2fbff2f7e..74852a739e 100644 --- a/dashboard-ui/scripts/dashboardpage.js +++ b/dashboard-ui/scripts/dashboardpage.js @@ -520,6 +520,7 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa serverId: ApiClient.serverId(), element: page.querySelector(".serverActivityItems") }))); + //FIXME: There is no jellyfin swagger instance, as such this url is currently invalid var swaggerUrl = "http://swagger.jellyfin.media?url=" + ApiClient.getUrl("openapi"); swaggerUrl = swaggerUrl + "&api_key=" + ApiClient.accessToken(), page.querySelector(".swaggerLink").setAttribute("href", swaggerUrl), refreshActiveRecordings(view, apiClient) } diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 7f159fbd61..8d200f7fab 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -720,12 +720,6 @@ var Dashboard = { dependencies: [], autoFocus: !1, roles: "admin" - }), defineRoute({ - path: "/supporterkey.html", - dependencies: [], - controller: "scripts/supporterkeypage", - autoFocus: !1, - roles: "admin" }), defineRoute({ path: "/syncactivity.html", dependencies: [], @@ -1087,7 +1081,6 @@ var Dashboard = { if ("wizard" === item) return "wizardstart.html"; if ("downloads" === item) return "offline/offline.html"; if ("downloadsettings" === item) return "mysyncsettings.html"; - if ("premiere" === item) return "supporterkey.html"; if ("managedownloads" === item) return "managedownloads.html"; if ("manageserver" === item) return "dashboard.html"; if ("recordedtv" === item) return "livetv.html?tab=3&serverId=" + options.serverId; diff --git a/dashboard-ui/scripts/supporterkeypage.js b/dashboard-ui/scripts/supporterkeypage.js deleted file mode 100644 index 3fdadbf875..0000000000 --- a/dashboard-ui/scripts/supporterkeypage.js +++ /dev/null @@ -1,141 +0,0 @@ -define(["fetchHelper", "dom", "registrationServices", "loading", "confirm", "globalize", "connectionManager", "emby-linkbutton", "emby-collapse", "emby-input", "emby-button"], function(fetchHelper, dom, registrationServices, loading, confirm, globalize, connectionManager) { - "use strict"; - - function getPluginSecurityInfo() { - var apiClient = ApiClient; - return apiClient.getJSON(apiClient.getUrl("Plugins/SecurityInfo")) - } - - function load(page) { - loading.show(), getPluginSecurityInfo().then(function(info) { - page.querySelector("#txtSupporterKey").value = info.SupporterKey || "", info.SupporterKey && !info.IsMBSupporter ? (page.querySelector("#txtSupporterKey").classList.add("invalidEntry"), page.querySelector(".notSupporter").classList.remove("hide")) : (page.querySelector("#txtSupporterKey").classList.remove("invalidEntry"), page.querySelector(".notSupporter").classList.add("hide")), info.IsMBSupporter ? (page.querySelector(".supporterContainer").classList.add("hide"), getPremiereStatus(info.SupporterKey).then(function(statusInfo) { - if (statusInfo) { - var statusLine, indicator = page.querySelector("#status-indicator .listItemIcon"), - extendedPlans = page.querySelector("#extended-plans"); - switch (extendedPlans.innerHTML = globalize.translate("MessagePremiereExtendedPlans", '', ""), statusInfo.deviceStatus) { - case 2: - statusLine = globalize.translate("MessagePremiereStatusOver", statusInfo.planType), indicator.classList.add("expiredBackground"), indicator.classList.remove("nearExpiredBackground"), indicator.innerHTML = "", extendedPlans.classList.remove("hide"); - break; - case 1: - statusLine = globalize.translate("MessagePremiereStatusClose", statusInfo.planType), indicator.classList.remove("expiredBackground"), indicator.classList.add("nearExpiredBackground"), indicator.innerHTML = "", extendedPlans.classList.remove("hide"); - break; - default: - statusLine = globalize.translate("MessagePremiereStatusGood", statusInfo.planType), indicator.classList.remove("expiredBackground"), indicator.classList.remove("nearExpiredBackground"), indicator.innerHTML = "", extendedPlans.classList.add("hide") - } - page.querySelector("#premiere-status").innerHTML = statusLine; - var subsElement = page.querySelector("#premiere-subs"); - if (statusInfo.subscriptions && statusInfo.subscriptions.length > 0) { - page.querySelector("#premiere-subs-content").innerHTML = getSubscriptionHtml(statusInfo.subscriptions, info.SupporterKey); - var sub = page.querySelector(".lnkSubscription"); - sub && sub.addEventListener("click", cancelSub), subsElement.classList.remove("hide") - } else subsElement.classList.add("hide"); - page.querySelector(".isSupporter").classList.remove("hide") - } - })) : (page.querySelector(".supporterContainer").classList.remove("hide"), page.querySelector(".isSupporter").classList.add("hide")), loading.hide() - }) - } - - function getPremiereStatus(key) { - var postData = "key=" + key + "&serverId=" + ApiClient.serverId(); - return fetchHelper.ajax({ - url: "https://mb3admin.local/admin/service/registration/getStatus", - type: "POST", - data: postData, - contentType: "application/x-www-form-urlencoded", - dataType: "json" - }) - } - - function getSubscriptionHtml(subs, key) { - return subs.map(function(item) { - var itemHtml = "", - makeLink = item.autoRenew && "Stripe" == item.store, - tagName = makeLink ? "button" : "div"; - return itemHtml += (tagName = ' - - - - -
- -
- -

${TabSupporterKey}

-
- -
- ${LabelSupporterKeyHelp} -
-
- -
-

- ${MessageInvalidKey} -

-

- ${ErrorMessageInvalidKey} -

-
- -
-

- -

-
-
-
-

${HeaderStatus}

- -
-
- -
-
-
-
-
-
- -
-

${Subscriptions}

-
-
-
-
-
-
-
-
- -
${LabelSupporterEmailAddress}
-
-

- -

-
-
-
- - - -