diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index bbf6823f63..9e293f9d64 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -17,7 +17,7 @@
}
.backdropPage {
- background-color: rgba(0, 0, 0, .87)!important;
+ background-color: rgba(15, 15,15, .92)!important;
}
.backdropContainer {
@@ -38,7 +38,7 @@
.libraryPage > .ui-content {
padding-top: 10px;
- padding-bottom: 50px;
+ padding-bottom: 70px;
}
.libraryPage .currentUsername {
diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css
index c9ca5bb246..7b7ea54865 100644
--- a/dashboard-ui/css/librarymenu.css
+++ b/dashboard-ui/css/librarymenu.css
@@ -239,7 +239,6 @@
.dashboardViewMenu {
background-image: url(images/items/folders/settings.png);
- background-position: 16px 8px;
}
.reportsViewMenu {
diff --git a/dashboard-ui/css/posteritem.css b/dashboard-ui/css/posteritem.css
index c3c27ee9e1..d861ceaa3e 100644
--- a/dashboard-ui/css/posteritem.css
+++ b/dashboard-ui/css/posteritem.css
@@ -141,7 +141,7 @@
}
.myLibraryPosterItem .posterItemImage {
- height: 38px;
+ height: 36px;
background-position: 12px center;
background-size: 20px 20px;
background-color: rgba(51, 136, 204, 0.5);
@@ -151,9 +151,9 @@
.myLibraryPosterItem .posterItemDefaultText {
top: 0;
left: 0;
- line-height: 38px;
+ line-height: 36px;
text-align: left;
- padding-left: 45px;
+ padding-left: 43px;
}
.moviesPosterItem .posterItemImage {
diff --git a/dashboard-ui/scripts/channelitems.js b/dashboard-ui/scripts/channelitems.js
index 871dc9992d..47cdd23761 100644
--- a/dashboard-ui/scripts/channelitems.js
+++ b/dashboard-ui/scripts/channelitems.js
@@ -9,7 +9,7 @@
};
function getSavedQueryId() {
- return 'channels-' + getParameterByName('id') + (getParameterByName('categoryId') || '');
+ return 'channels-' + getParameterByName('id') + (getParameterByName('folderId') || '');
}
function showLoadingMessage(page) {
@@ -26,14 +26,14 @@
showLoadingMessage(page);
var channelId = getParameterByName('id');
- var categoryId = getParameterByName('categoryId');
+ var folderId = getParameterByName('folderId');
query.UserId = Dashboard.getCurrentUserId();
- if (categoryId) {
+ if (folderId) {
- ApiClient.getItem(query.UserId, categoryId).done(function (item) {
+ ApiClient.getItem(query.UserId, folderId).done(function (item) {
$('.categoryTitle', page).show().html(item.Name);
$('.channelHeader', page).show().html('' + item.ChannelName + '').trigger('create');
@@ -48,7 +48,7 @@
});
}
- query.categoryId = categoryId;
+ query.folderId = folderId;
query.Limit = 50;
$.getJSON(ApiClient.getUrl("Channels/" + channelId + "/Items", query)).done(function (result) {
diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js
index ad552057e5..ed907f91ca 100644
--- a/dashboard-ui/scripts/itemdetailpage.js
+++ b/dashboard-ui/scripts/itemdetailpage.js
@@ -184,7 +184,7 @@
$('#movieTabs', page).show();
}
- if (item.Type == "ChannelVideoItem" || item.Type == "ChannelAudioItem" || item.Type == "ChannelCategoryItem") {
+ if (item.Type == "video.channelItem" || item.Type == "audio.channelItem" || item.Type == "folder.ChannelItem") {
$('#channelTabs', page).show();
$('.channelHeader', page).show().html('' + item.ChannelName + '').trigger('create');
} else {
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index e4409d7bdb..35b421996e 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -389,8 +389,8 @@
if (item.Type == "Channel") {
return "channelitems.html?id=" + id;
}
- if (item.Type == "ChannelCategoryItem") {
- return "channelitems.html?id=" + item.ChannelId + '&categoryId=' + item.Id;
+ if (item.Type == "ChannelFolderItem") {
+ return "channelitems.html?id=" + item.ChannelId + '&folderId=' + item.Id;
}
if (item.Type == "Program") {
return "livetvprogram.html?id=" + id;
diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js
index 4ec99b32a4..5abe9b6e79 100644
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@@ -301,6 +301,16 @@
updateLibraryNavLinks(page);
}
+ }).on('pagebeforeshow', ".page", function () {
+
+ var page = this;
+
+ if ($(page).hasClass('libraryPage')) {
+ $('.viewMenuBar').show();
+ } else {
+ $('.viewMenuBar').hide();
+ }
+
}).on('pageshow', ".libraryPage", function () {
var page = this;
diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js
index 78ce74542a..3aeef74bcd 100644
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@@ -804,7 +804,7 @@
// Can't autoplay in these browsers so we need to use the full controls
if (requiresControls) {
if ($.browser.msie) {
- html += '