diff --git a/dashboard-ui/channelitems.html b/dashboard-ui/channelitems.html index 06af48d5b7..a670e61c3b 100644 --- a/dashboard-ui/channelitems.html +++ b/dashboard-ui/channelitems.html @@ -10,6 +10,8 @@ ${TabChannels} +
+
diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index b4f62f67d1..c95120bfc5 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -103,7 +103,7 @@ @media all and (min-width: 1600px) { - .ehsContent { + .homeEhsContent { max-width: 1540px; } @@ -1162,3 +1162,12 @@ a.itemTag:hover { overflow-x: visible!important; } } + +.channelHeader { + padding: 1em; + text-align: center; +} + + .channelHeader a { + text-decoration: none; + } diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index b3a8292bf2..c00af3cf25 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -100,6 +100,7 @@ top: 51px; z-index: 1000; background-color: #181818; + background-color: rgba(24, 24, 24, .95); } @media all and (max-width: 460px) { @@ -298,4 +299,4 @@ .headerSettingsButton { display: none; } -} \ No newline at end of file +} diff --git a/dashboard-ui/index.html b/dashboard-ui/index.html index f0acb43b13..ade35df672 100644 --- a/dashboard-ui/index.html +++ b/dashboard-ui/index.html @@ -8,7 +8,7 @@
- +

${HeaderMyLibrary}

diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html index a4012e1df9..aaaab96d43 100644 --- a/dashboard-ui/itemdetails.html +++ b/dashboard-ui/itemdetails.html @@ -91,6 +91,9 @@ ${TabStudios} + + +
diff --git a/dashboard-ui/scripts/channelitems.js b/dashboard-ui/scripts/channelitems.js index f081071b7d..871dc9992d 100644 --- a/dashboard-ui/scripts/channelitems.js +++ b/dashboard-ui/scripts/channelitems.js @@ -30,13 +30,26 @@ query.UserId = Dashboard.getCurrentUserId(); - ApiClient.getItem(query.UserId, categoryId || channelId).done(function (item) { - $('.categoryTitle', page).html(item.Name); - }); - + if (categoryId) { + + ApiClient.getItem(query.UserId, categoryId).done(function (item) { + + $('.categoryTitle', page).show().html(item.Name); + $('.channelHeader', page).show().html('' + item.ChannelName + '').trigger('create'); + }); + + } else { + + ApiClient.getItem(query.UserId, channelId).done(function (item) { + + $('.categoryTitle', page).hide().html(item.Name); + $('.channelHeader', page).show().html('' + item.Name + ''); + }); + } + query.categoryId = categoryId; - + query.Limit = 50; $.getJSON(ApiClient.getUrl("Channels/" + channelId + "/Items", query)).done(function (result) { // Scroll back up so they can see the results from the beginning @@ -79,9 +92,9 @@ LibraryBrowser.saveQueryValues(getSavedQueryId(), query); - - }).always(function() { - + + }).always(function () { + hideLoadingMessage(page); }); } @@ -171,8 +184,8 @@ // If the default page size has changed, the start index will have to be reset if (limit != query.Limit) { query.Limit = limit; - query.StartIndex = 0; } + query.StartIndex = 0; LibraryBrowser.loadSavedQueryValues(getSavedQueryId(), query); diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js index 682166d361..ad552057e5 100644 --- a/dashboard-ui/scripts/itemdetailpage.js +++ b/dashboard-ui/scripts/itemdetailpage.js @@ -186,6 +186,9 @@ if (item.Type == "ChannelVideoItem" || item.Type == "ChannelAudioItem" || item.Type == "ChannelCategoryItem") { $('#channelTabs', page).show(); + $('.channelHeader', page).show().html('' + item.ChannelName + '').trigger('create'); + } else { + $('.channelHeader', page).hide(); } if (item.Type == "BoxSet") { @@ -350,7 +353,7 @@ tabsHtml += ''; } - if (item.MediaSources && item.MediaSources.length) { + if (item.MediaSources && item.MediaSources.length && item.Path) { tabsHtml += ''; tabsHtml += ''; }