@@ -86,9 +86,11 @@
-
diff --git a/dashboard-ui/components/medialibraryeditor/medialibraryeditor.js b/dashboard-ui/components/medialibraryeditor/medialibraryeditor.js
index 619d228799..b769bada8f 100644
--- a/dashboard-ui/components/medialibraryeditor/medialibraryeditor.js
+++ b/dashboard-ui/components/medialibraryeditor/medialibraryeditor.js
@@ -55,7 +55,10 @@
html += '
';
- html += '';
+ if (!$.browser.msie) {
+ // Not sure why, but this is causing the entire browser to hang
+ html += '';
+ }
html += '';
html += path;
diff --git a/dashboard-ui/tvproviders/schedulesdirect.js b/dashboard-ui/components/tvproviders/schedulesdirect.js
similarity index 100%
rename from dashboard-ui/tvproviders/schedulesdirect.js
rename to dashboard-ui/components/tvproviders/schedulesdirect.js
diff --git a/dashboard-ui/tvproviders/schedulesdirect.template.html b/dashboard-ui/components/tvproviders/schedulesdirect.template.html
similarity index 100%
rename from dashboard-ui/tvproviders/schedulesdirect.template.html
rename to dashboard-ui/components/tvproviders/schedulesdirect.template.html
diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index 844ce35ad0..0ce7be5f70 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -1032,6 +1032,8 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
right: 5px;
text-align: center;
vertical-align: middle;
+ width: 26px;
+ height: 26px;
border-radius: 50%;
color: #fff;
background: rgb(82, 181, 75);
@@ -1039,7 +1041,6 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
line-height: 21px;
line-height: initial;
font-weight: 500;
- padding: 5px;
}
.mediaSourceIndicator {
diff --git a/dashboard-ui/themes/android.css b/dashboard-ui/devices/android/android.css
similarity index 100%
rename from dashboard-ui/themes/android.css
rename to dashboard-ui/devices/android/android.css
diff --git a/dashboard-ui/css/ie.css b/dashboard-ui/devices/ie/ie.css
similarity index 76%
rename from dashboard-ui/css/ie.css
rename to dashboard-ui/devices/ie/ie.css
index 7fb2dd0e90..7bad58f9ef 100644
--- a/dashboard-ui/css/ie.css
+++ b/dashboard-ui/devices/ie/ie.css
@@ -3,5 +3,5 @@
}
paper-fab.keyboard-focus.paper-fab-0 {
- background: #444;
+ /*background: #444;*/
}
diff --git a/dashboard-ui/devices/ie/ie.js b/dashboard-ui/devices/ie/ie.js
new file mode 100644
index 0000000000..e5f66d3ed0
--- /dev/null
+++ b/dashboard-ui/devices/ie/ie.js
@@ -0,0 +1,33 @@
+(function () {
+
+ Dashboard.importCss('devices/ie/ie.css');
+
+ function onPageShow() {
+
+ var page = this;
+
+ if (navigator.userAgent.toLowerCase().indexOf('Windows NT 10.') != -1) {
+
+ var expectedValue = new Date().toDateString();
+ if (appStorage.getItem("ieswitchtoedge") == expectedValue) {
+ return;
+ }
+
+ appStorage.setItem("ieswitchtoedge", expectedValue);
+
+ var msg = Globalize.translate('MessageTryMicrosoftEdge');
+
+ msg += "
";
+ msg += '' + Globalize.translate('ButtonLearnMore') + '';
+
+ Dashboard.alert({
+ message: msg,
+ title: Globalize.translate('HeaderTryMicrosoftEdge')
+ });
+ }
+ }
+
+ pageClassOn('pageshow', "libraryPage", onPageShow);
+ pageClassOn('pageshow', "type-interior", onPageShow);
+
+})();
\ No newline at end of file
diff --git a/dashboard-ui/themes/ios.css b/dashboard-ui/devices/ios/ios.css
similarity index 100%
rename from dashboard-ui/themes/ios.css
rename to dashboard-ui/devices/ios/ios.css
diff --git a/dashboard-ui/scripts/livetvguideprovider.js b/dashboard-ui/scripts/livetvguideprovider.js
index cf693aaef3..3be8989d0a 100644
--- a/dashboard-ui/scripts/livetvguideprovider.js
+++ b/dashboard-ui/scripts/livetvguideprovider.js
@@ -2,7 +2,7 @@
function init(page, type, providerId) {
- var url = 'tvproviders/' + type + '.js';
+ var url = 'components/tvproviders/' + type + '.js';
require([url], function (factory) {
@@ -15,10 +15,10 @@
function loadTemplate(page, type, providerId) {
- ApiClient.ajax({
+ HttpClient.send({
type: 'GET',
- url: 'tvproviders/' + type + '.template.html'
+ url: 'components/tvproviders/' + type + '.template.html'
}).done(function (html) {
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index f3edafa87a..13ce034675 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1967,15 +1967,15 @@ var AppInfo = {};
function onDocumentReady() {
if ($.browser.msie) {
- Dashboard.importCss('css/ie.css');
+ require(['devices/ie/ie']);
}
// Do these now to prevent a flash of content
if (AppInfo.isNativeApp) {
if ($.browser.android) {
- Dashboard.importCss('themes/android.css');
+ Dashboard.importCss('devices/android.css');
} else if ($.browser.safari) {
- Dashboard.importCss('themes/ios.css');
+ Dashboard.importCss('devices/ios/ios.css');
}
} else {
loadTheme();
diff --git a/dashboard-ui/strings/javascript/en-US.json b/dashboard-ui/strings/javascript/en-US.json
index 192f861bb4..7016540d47 100644
--- a/dashboard-ui/strings/javascript/en-US.json
+++ b/dashboard-ui/strings/javascript/en-US.json
@@ -909,5 +909,7 @@
"ButtonAddMediaLibrary": "Add Media Library",
"ButtonManageFolders": "Manage folders",
"HeaderTryDragAndDrop": "Try Drag and Drop",
- "TryDragAndDropMessage": "To re-arrange playlist items, just drag and drop. Try it!"
+ "TryDragAndDropMessage": "To re-arrange playlist items, just drag and drop. Try it!",
+ "HeaderTryMicrosoftEdge": "Try Microsoft Edge",
+ "MessageTryMicrosoftEdge": "For a better experience on Windows 10, try the new Microsoft Edge Browser."
}
\ No newline at end of file
diff --git a/dashboard-ui/strings/javascript/javascript.json b/dashboard-ui/strings/javascript/javascript.json
index 1eefbec65b..cc6f6f1d20 100644
--- a/dashboard-ui/strings/javascript/javascript.json
+++ b/dashboard-ui/strings/javascript/javascript.json
@@ -919,5 +919,7 @@
"ButtonAddMediaLibrary": "Add Media Library",
"ButtonManageFolders": "Manage folders",
"HeaderTryDragAndDrop": "Try Drag and Drop",
- "TryDragAndDropMessage": "To re-arrange playlist items, just drag and drop. Try it!"
+ "TryDragAndDropMessage": "To re-arrange playlist items, just drag and drop. Try it!",
+ "HeaderTryMicrosoftEdge": "Try Microsoft Edge",
+ "MessageTryMicrosoftEdge": "For a better experience on Windows 10, try the new Microsoft Edge Browser."
}