From 507530feda0c9c522c73d68be4ced613b8bd2e81 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 16 Oct 2016 19:52:36 -0400 Subject: [PATCH] update dialogs --- .../emby-webcomponents/.bower.json | 8 +++---- .../recordingcreator/recordingfields.js | 5 ----- .../recordingfields.template.html | 2 +- .../registrationservices.js | 21 +++++++++++++------ .../emby-webcomponents/strings/de.json | 8 +++---- .../emby-webcomponents/strings/kk.json | 8 +++---- .../emby-webcomponents/strings/ru.json | 8 +++---- dashboard-ui/scripts/sections.js | 2 -- dashboard-ui/strings/en-US.json | 4 ++-- 9 files changed, 34 insertions(+), 32 deletions(-) diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index 1092d49f5..b09177f0c 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -14,12 +14,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.4.311", - "_release": "1.4.311", + "version": "1.4.313", + "_release": "1.4.313", "_resolution": { "type": "version", - "tag": "1.4.311", - "commit": "79239f58e5686817ca11b88d3c105d5b887f6292" + "tag": "1.4.313", + "commit": "79c18a7f2b379d8162bdca36b7cf0713bbe43ad8" }, "_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_target": "^1.2.1", diff --git a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingfields.js b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingfields.js index 291cb0125..c972adf3a 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingfields.js +++ b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingfields.js @@ -286,11 +286,6 @@ var supporterButtons = context.querySelectorAll('.btnSupporter'); for (var i = 0, length = supporterButtons.length; i < length; i++) { - if (appHost.supports('externalpremium')) { - supporterButtons[i].classList.remove('hide'); - } else { - supporterButtons[i].classList.add('hide'); - } supporterButtons[i].addEventListener('click', onSupporterButtonClick); } diff --git a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingfields.template.html b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingfields.template.html index 8605e1930..908af798b 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingfields.template.html +++ b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingfields.template.html @@ -52,7 +52,7 @@

-
diff --git a/dashboard-ui/bower_components/emby-webcomponents/registrationservices/registrationservices.js b/dashboard-ui/bower_components/emby-webcomponents/registrationservices/registrationservices.js index 3a9e1496b..91e8f1a92 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/registrationservices/registrationservices.js +++ b/dashboard-ui/bower_components/emby-webcomponents/registrationservices/registrationservices.js @@ -43,7 +43,7 @@ var html = ''; html += '
'; html += ''; - html += '

'; + html += '

Emby Premiere'; html += '

'; html += '
'; @@ -74,6 +74,12 @@ dlg.innerHTML = html; + var i, length; + var btnPurchases = dlg.querySelectorAll('.buttonPremiereInfo'); + for (i = 0, length = btnPurchases.length; i < length; i++) { + btnPurchases[i].addEventListener('click', showExternalPremiereInfo); + } + if (layoutManager.tv) { centerFocus(dlg.querySelector('.formDialogContent'), false, true); } @@ -95,7 +101,6 @@ var onCancelClick = function () { dialogHelper.close(dlg); }; - var i, length; var elems = dlg.querySelectorAll('.btnCancelSupporterInfo'); for (i = 0, length = elems.length; i < length; i++) { elems[i].addEventListener('click', onCancelClick); @@ -111,6 +116,7 @@ } var settingsKey = 'periodicmessage-' + feature; + var lastMessage = parseInt(appSettings.get(settingsKey) || '0'); if (!lastMessage) { @@ -253,6 +259,7 @@ html += '
'; html += ''; html += '

'; + html += dialogOptions.title || ''; html += '

'; html += '
'; @@ -429,13 +436,13 @@ var cssClass = "listItem"; - cssClass += ' listItem-button'; - if (layoutManager.tv) { cssClass += ' listItem-focusscale'; } if (enableLink) { + cssClass += ' listItem-button'; + html += ''; + } else { + html += ''; } return html; diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/de.json b/dashboard-ui/bower_components/emby-webcomponents/strings/de.json index 72fe2fa71..72e64173d 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/strings/de.json +++ b/dashboard-ui/bower_components/emby-webcomponents/strings/de.json @@ -347,8 +347,8 @@ "ButtonPlayOneMinute": "Eine Minute wiedergeben", "PlaceFavoriteChannelsAtBeginning": "Platziere favorisierte Kan\u00e4le am Anfang", "HeaderUnlockFeature": "Feature freischalten", - "MessageDidYouKnowCinemaMode": "Did you know that with Emby Premiere, you can enhance your experience with features like Cinema Mode?", - "MessageDidYouKnowCinemaMode2": "Cinema Mode gives you the true cinema experience with trailers and custom intros before the main feature.", - "HeaderPlayMyMedia": "Play my Media", - "HeaderDiscoverEmbyPremiere": "Discover Emby Premiere" + "MessageDidYouKnowCinemaMode": "Wusstest du schon, das du mit Emby Premiere dein Erlebnis mit Funktionen wie dem Kino-Modus noch verbessern kannst?", + "MessageDidYouKnowCinemaMode2": "Der Kino-Modus bringt das richtige Kino-Erlebnis nach Hause, mit Trailern und eigenen Intros vor deinem Hauptfilm.", + "HeaderPlayMyMedia": "Spiele meine Medien ab", + "HeaderDiscoverEmbyPremiere": "Entdecke Emby Premiere" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/kk.json b/dashboard-ui/bower_components/emby-webcomponents/strings/kk.json index af44e4789..f78c5854e 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/strings/kk.json +++ b/dashboard-ui/bower_components/emby-webcomponents/strings/kk.json @@ -347,8 +347,8 @@ "ButtonPlayOneMinute": "\u0411\u0456\u0440 \u043c\u0438\u043d\u04e9\u0442 \u043e\u0439\u043d\u0430\u0442\u0443", "PlaceFavoriteChannelsAtBeginning": "\u0422\u0430\u04a3\u0434\u0430\u0443\u043b\u044b \u0430\u0440\u043d\u0430\u043b\u0430\u0440\u0434\u044b \u0435\u04a3 \u0431\u0430\u0441\u044b\u043d\u0430\u043d \u043e\u0440\u043d\u0430\u043b\u0430\u0441\u0442\u044b\u0440\u0443", "HeaderUnlockFeature": "\u0410\u0440\u0442\u044b\u049b\u0448\u044b\u043b\u044b\u049b \u049b\u04b1\u0440\u0441\u0430\u0443\u044b\u043d \u0431\u043e\u0441\u0430\u0442\u0443", - "MessageDidYouKnowCinemaMode": "Did you know that with Emby Premiere, you can enhance your experience with features like Cinema Mode?", - "MessageDidYouKnowCinemaMode2": "Cinema Mode gives you the true cinema experience with trailers and custom intros before the main feature.", - "HeaderPlayMyMedia": "Play my Media", - "HeaderDiscoverEmbyPremiere": "Discover Emby Premiere" + "MessageDidYouKnowCinemaMode": "Emby Premiere \u0430\u0440\u049b\u044b\u043b\u044b, \u041a\u0438\u043d\u043e\u0442\u0435\u0430\u0442\u0440 \u0440\u0435\u0436\u0456\u043c\u0456 \u0441\u0438\u044f\u049b\u0442\u044b \u049b\u04b1\u0440\u0430\u043c\u0434\u0430\u0441\u0442\u0430\u0440\u043c\u0435\u043d \u0442\u04d9\u0436\u0456\u0440\u0438\u0431\u0435\u04a3\u0456\u0437\u0434\u0456 \u0436\u0430\u049b\u0441\u0430\u0440\u0442\u0443\u044b\u04a3\u044b\u0437 \u043c\u04af\u043c\u043a\u0456\u043d \u0442\u0443\u0440\u0430\u043b\u044b \u0431\u0456\u043b\u0435\u0441\u0456\u0437 \u0431\u0435?", + "MessageDidYouKnowCinemaMode2": "\u041a\u0438\u043d\u043e\u0442\u0435\u0430\u0442\u0440 \u0440\u0435\u0436\u0456\u043c\u0456 \u0442\u0440\u0435\u0439\u043b\u0435\u0440\u043b\u0435\u0440\u0434\u0456 \u0436\u04d9\u043d\u0435 \u0442\u0435\u04a3\u0448\u0435\u043b\u0433\u0435\u043d \u043a\u04e9\u0440\u043d\u0435\u0443\u0434\u0456 \u043d\u0435\u0433\u0456\u0437\u0433\u0456 \u0444\u0438\u043b\u044c\u043c \u0430\u043b\u0434\u044b\u043d\u0434\u0430 \u043e\u0439\u043d\u0430\u0442\u0443 \u043a\u0438\u043d\u043e\u0437\u0430\u043b \u04d9\u0441\u0435\u0440\u0456\u043d \u0436\u0435\u0442\u043a\u0456\u0437\u0435\u0434\u0456.", + "HeaderPlayMyMedia": "\u041c\u0435\u043d\u0456\u04a3 \u0442\u0430\u0441\u044b\u0493\u044b\u0448\u0434\u0435\u0440\u0435\u043a\u0442\u0435\u0440\u0456\u043c\u0434\u0456 \u043e\u0439\u043d\u0430\u0442\u0443", + "HeaderDiscoverEmbyPremiere": "Emby Premiere \u0430\u0448\u044b\u04a3\u044b\u0437" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/ru.json b/dashboard-ui/bower_components/emby-webcomponents/strings/ru.json index 3b5e22be8..602db8c7f 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/strings/ru.json +++ b/dashboard-ui/bower_components/emby-webcomponents/strings/ru.json @@ -347,8 +347,8 @@ "ButtonPlayOneMinute": "\u0412\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0441\u0442\u0438 \u043e\u0434\u043d\u0443 \u043c\u0438\u043d\u0443\u0442\u0443", "PlaceFavoriteChannelsAtBeginning": "\u0420\u0430\u0437\u043c\u0435\u0441\u0442\u0438\u0442\u044c \u0438\u0437\u0431\u0440\u0430\u043d\u043d\u044b\u0435 \u043a\u0430\u043d\u0430\u043b\u044b \u0432 \u043d\u0430\u0447\u0430\u043b\u0435", "HeaderUnlockFeature": "\u0420\u0430\u0437\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0443", - "MessageDidYouKnowCinemaMode": "Did you know that with Emby Premiere, you can enhance your experience with features like Cinema Mode?", - "MessageDidYouKnowCinemaMode2": "Cinema Mode gives you the true cinema experience with trailers and custom intros before the main feature.", - "HeaderPlayMyMedia": "Play my Media", - "HeaderDiscoverEmbyPremiere": "Discover Emby Premiere" + "MessageDidYouKnowCinemaMode": "\u0417\u043d\u0430\u0435\u0442\u0435 \u043b\u0438 \u0432\u044b, \u0447\u0442\u043e \u0441 Emby Premiere \u0432\u044b \u0441\u043c\u043e\u0436\u0435\u0442\u0435 \u0440\u0430\u0441\u0448\u0438\u0440\u0438\u0442\u044c \u044d\u0444\u0444\u0435\u043a\u0442 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430\u043c\u0438 \u043f\u043e\u0434\u043e\u0431\u043d\u044b\u043c\u0438 \u0420\u0435\u0436\u0438\u043c\u0443 \u043a\u0438\u043d\u043e\u0437\u0430\u043b\u0430?", + "MessageDidYouKnowCinemaMode2": "\u0420\u0435\u0436\u0438\u043c \u043a\u0438\u043d\u043e\u0437\u0430\u043b\u0430 \u0434\u0430\u0441\u0442 \u0432\u0430\u043c \u044d\u0444\u0444\u0435\u043a\u0442 \u043d\u0430\u0441\u0442\u043e\u044f\u0449\u0435\u0433\u043e \u0437\u0440\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0433\u043e \u0437\u0430\u043b\u0430 \u0441 \u0442\u0440\u0435\u0439\u043b\u0435\u0440\u0430\u043c\u0438 \u0438 \u043f\u0440\u043e\u0438\u0437\u0432\u043e\u043b\u044c\u043d\u044b\u043c\u0438 \u0437\u0430\u0441\u0442\u0430\u0432\u043a\u0430\u043c\u0438 \u043f\u0435\u0440\u0435\u0434 \u0444\u0438\u043b\u044c\u043c\u043e\u043c.", + "HeaderPlayMyMedia": "\u0412\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u0435 \u043c\u043e\u0438\u0445 \u043c\u0435\u0434\u0438\u0430\u0434\u0430\u043d\u043d\u044b\u0445", + "HeaderDiscoverEmbyPremiere": "\u041e\u0442\u043a\u0440\u043e\u0439\u0442\u0435 Emby Premiere" } \ No newline at end of file diff --git a/dashboard-ui/scripts/sections.js b/dashboard-ui/scripts/sections.js index f48d93a95..8234a7175 100644 --- a/dashboard-ui/scripts/sections.js +++ b/dashboard-ui/scripts/sections.js @@ -167,8 +167,6 @@ infos.push(getUpgradeMobileLayoutsInfo); } - appSettings.set(cacheKey, new Date().getTime()); - return infos[getRandomInt(0, infos.length - 1)](); }); } diff --git a/dashboard-ui/strings/en-US.json b/dashboard-ui/strings/en-US.json index 84a74b66f..bc5ce1fa3 100644 --- a/dashboard-ui/strings/en-US.json +++ b/dashboard-ui/strings/en-US.json @@ -1932,8 +1932,8 @@ "SyncJobItemStatusCancelled": "Cancelled", "LabelProfile": "Profile:", "LabelBitrateMbps": "Bitrate (Mbps):", - "EmbyIntroDownloadMessage": "To download and install Emby Server visit {0}.", - "EmbyIntroDownloadMessageWithoutLink": "To download and install Emby Server visit the Emby website.", + "EmbyIntroDownloadMessage": "To download and install the free Emby Server visit {0}.", + "EmbyIntroDownloadMessageWithoutLink": "To download and install the free Emby Server visit the Emby website.", "ButtonNewServer": "New Server", "MyDevice": "My Device", "ButtonRemote": "Remote",