-
-
+
+
diff --git a/dashboard-ui/mypreferenceshome.html b/dashboard-ui/mypreferenceshome.html
index f402f5b9e4..99894a36cd 100644
--- a/dashboard-ui/mypreferenceshome.html
+++ b/dashboard-ui/mypreferenceshome.html
@@ -86,7 +86,7 @@
${LabelSelectFolderGroups}
-
${LabelSelectFolderGroupsHelp}
+
${LabelSelectFolderGroupsHelp}
@@ -112,7 +112,7 @@
-
${LabelSelectViewStylesHelp}
+
${LabelSelectViewStylesHelp}
diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js
index 5522872cea..962f35fc46 100644
--- a/dashboard-ui/scripts/itemdetailpage.js
+++ b/dashboard-ui/scripts/itemdetailpage.js
@@ -33,13 +33,18 @@
setInitialCollapsibleState(page, item, context, user);
renderDetails(page, item, context);
+ var hasBackdrop = false;
if (item.Type == 'MusicAlbum1' || item.Type == 'Season1') {
Backdrops.setBackdrops(page, [item]);
$('#itemBackdrop', page).addClass('noBackdrop').css('background-image', 'none');
} else {
- LibraryBrowser.renderDetailPageBackdrop(page, item);
+ hasBackdrop = LibraryBrowser.renderDetailPageBackdrop(page, item);
}
+ var transparentHeader = hasBackdrop && page.classList.contains('noSecondaryNavPage');
+
+ LibraryMenu.setTransparentMenu(transparentHeader);
+
var canPlay = false;
if (item.Type == 'Program') {
@@ -311,9 +316,9 @@
renderSiblingLinks(page, item, context);
if (item.Taglines && item.Taglines.length) {
- $('#itemTagline', page).html(item.Taglines[0]).show();
+ $('.tagline', page).html(item.Taglines[0]).show();
} else {
- $('#itemTagline', page).hide();
+ $('.tagline', page).hide();
}
LibraryBrowser.renderOverview(page.querySelectorAll('.itemOverview'), item);
@@ -350,9 +355,9 @@
}
if (item.ArtistItems && item.ArtistItems.length && item.Type != "MusicAlbum") {
- $('#artist', page).show().html(getArtistLinksHtml(item.ArtistItems, context)).trigger('create');
+ $('.artist', page).show().html(getArtistLinksHtml(item.ArtistItems, context)).trigger('create');
} else {
- $('#artist', page).hide();
+ $('.artist', page).hide();
}
if (item.MediaSources && item.MediaSources.length && item.Path) {
@@ -1697,6 +1702,7 @@
var page = this;
Events.off(ApiClient, 'websocketmessage', onWebSocketMessage);
+ LibraryMenu.setTransparentMenu(false);
});
function itemDetailPage() {
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 2c63054b05..61ed97d814 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -3236,6 +3236,7 @@
var screenWidth = screen.availWidth;
var imgUrl;
+ var hasbackdrop = false;
if (item.BackdropImageTags && item.BackdropImageTags.length) {
@@ -3247,6 +3248,7 @@
});
ImageLoader.lazyImage($('#itemBackdrop', page).removeClass('noBackdrop')[0], imgUrl);
+ hasbackdrop = true;
}
else if (item.ParentBackdropItemId && item.ParentBackdropImageTags && item.ParentBackdropImageTags.length) {
@@ -3258,12 +3260,14 @@
});
ImageLoader.lazyImage($('#itemBackdrop', page).removeClass('noBackdrop')[0], imgUrl);
-
+ hasbackdrop = true;
}
else {
$('#itemBackdrop', page).addClass('noBackdrop').css('background-image', 'none');
}
+
+ return hasbackdrop;
}
};
diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js
index b3c1886b4b..05592d65f1 100644
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@@ -575,6 +575,18 @@
mainDrawerButton.classList.remove('hide');
}
}
+ },
+ setTransparentMenu: function (transparent) {
+
+ var viewMenuBar = document.querySelector('.viewMenuBar');
+
+ if (viewMenuBar) {
+ if (transparent) {
+ viewMenuBar.classList.add('semiTransparent');
+ } else {
+ viewMenuBar.classList.remove('semiTransparent');
+ }
+ }
}
};
diff --git a/dashboard-ui/scripts/mypreferenceshome.js b/dashboard-ui/scripts/mypreferenceshome.js
index 9ea7678b37..a4afe6ec95 100644
--- a/dashboard-ui/scripts/mypreferenceshome.js
+++ b/dashboard-ui/scripts/mypreferenceshome.js
@@ -4,21 +4,19 @@
var folderHtml = '';
- folderHtml += '
';
+ folderHtml += '
';
folderHtml += result.Items.map(function (i) {
var currentHtml = '';
var id = 'chkGroupFolder' + i.Id;
- currentHtml += '
';
-
var isChecked = (user.Configuration.ExcludeFoldersFromGrouping != null && user.Configuration.ExcludeFoldersFromGrouping.indexOf(i.Id) == -1) ||
user.Configuration.GroupedFolders.indexOf(i.Id) != -1;
var checkedHtml = isChecked ? ' checked="checked"' : '';
- currentHtml += '
';
+ currentHtml += '
' + i.Name + '';
return currentHtml;
@@ -33,19 +31,17 @@
var folderHtml = '';
- folderHtml += '
';
+ folderHtml += '
';
folderHtml += result.map(function (i) {
var currentHtml = '';
var id = 'chkPlainFolder' + i.Id;
- currentHtml += '
';
-
var isChecked = user.Configuration.PlainFolderViews.indexOf(i.Id) == -1;
var checkedHtml = isChecked ? ' checked="checked"' : '';
- currentHtml += '
';
+ currentHtml += '
' + i.Name + '';
return currentHtml;
@@ -66,19 +62,17 @@
var folderHtml = '';
- folderHtml += '
';
+ folderHtml += '
';
folderHtml += result.Items.map(function (i) {
var currentHtml = '';
var id = 'chkIncludeInLatest' + i.Id;
- currentHtml += '
';
-
var isChecked = user.Configuration.LatestItemsExcludes.indexOf(i.Id) == -1;
var checkedHtml = isChecked ? ' checked="checked"' : '';
- currentHtml += '
';
+ currentHtml += '
' + i.Name + '';
return currentHtml;
diff --git a/dashboard-ui/themes/android.css b/dashboard-ui/themes/android.css
index 8e87fec792..2f76a87ece 100644
--- a/dashboard-ui/themes/android.css
+++ b/dashboard-ui/themes/android.css
@@ -2,6 +2,10 @@
background-color: #1b1b1b;
}
+ .viewMenuBar.semiTransparent {
+ background-color: rgba(27, 27, 27, .8);
+ }
+
.ui-page-theme-b:not(.pageWithAbsoluteTabs), .pageWithAbsoluteTabs .pageBackground {
background-color: #2b2b2b;
}
@@ -19,9 +23,9 @@
}
.libraryViewNav a {
- font-weight: 500!important;
+ font-weight: 500 !important;
}
paper-tab {
- font-weight: 500!important;
+ font-weight: 500 !important;
}
diff --git a/dashboard-ui/themes/ios.css b/dashboard-ui/themes/ios.css
index 2354105d5c..457eeb630a 100644
--- a/dashboard-ui/themes/ios.css
+++ b/dashboard-ui/themes/ios.css
@@ -12,6 +12,10 @@ html, body, .ui-btn, .pageTitle {
background-color: rgba(28,28,28,.97);
}
+ .viewMenuBar.semiTransparent {
+ background-color: rgba(28, 28, 28, .8);
+ }
+
.backdropPage.ui-page-theme-b {
background-color: rgba(28,28,28,.92) !important;
}