mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

rename channel category to channel folder

Browse source
This commit is contained in:
Luke Pulverenti 2014-05-23 10:09:58 -04:00
parent 624687e363
commit 8cadabcbe5
8 changed files with 24 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dashboard-ui/css/librarybrowser.css
View file

@ -17,7 +17,7 @@
} }
.backdropPage { .backdropPage {
background-color: rgba(0, 0, 0, .87)!important; background-color: rgba(15, 15,15, .92)!important;
} }
.backdropContainer { .backdropContainer {
@ -38,7 +38,7 @@
.libraryPage > .ui-content { .libraryPage > .ui-content {
padding-top: 10px; padding-top: 10px;
padding-bottom: 50px; padding-bottom: 70px;
} }
.libraryPage .currentUsername { .libraryPage .currentUsername {

1
dashboard-ui/css/librarymenu.css
View file

@ -239,7 +239,6 @@
.dashboardViewMenu { .dashboardViewMenu {
background-image: url(images/items/folders/settings.png); background-image: url(images/items/folders/settings.png);
background-position: 16px 8px;
} }
.reportsViewMenu { .reportsViewMenu {

6
dashboard-ui/css/posteritem.css
View file

@ -141,7 +141,7 @@
} }
.myLibraryPosterItem .posterItemImage { .myLibraryPosterItem .posterItemImage {
height: 38px; height: 36px;
background-position: 12px center; background-position: 12px center;
background-size: 20px 20px; background-size: 20px 20px;
background-color: rgba(51, 136, 204, 0.5); background-color: rgba(51, 136, 204, 0.5);
@ -151,9 +151,9 @@
.myLibraryPosterItem .posterItemDefaultText { .myLibraryPosterItem .posterItemDefaultText {
top: 0; top: 0;
left: 0; left: 0;
line-height: 38px; line-height: 36px;
text-align: left; text-align: left;
padding-left: 45px; padding-left: 43px;
} }
.moviesPosterItem .posterItemImage { .moviesPosterItem .posterItemImage {

10
dashboard-ui/scripts/channelitems.js
View file

@ -9,7 +9,7 @@
}; };
function getSavedQueryId() { function getSavedQueryId() {
return 'channels-' + getParameterByName('id') + (getParameterByName('categoryId') || ''); return 'channels-' + getParameterByName('id') + (getParameterByName('folderId') || '');
} }
function showLoadingMessage(page) { function showLoadingMessage(page) {
@ -26,14 +26,14 @@
showLoadingMessage(page); showLoadingMessage(page);
var channelId = getParameterByName('id'); var channelId = getParameterByName('id');
var categoryId = getParameterByName('categoryId'); var folderId = getParameterByName('folderId');
query.UserId = Dashboard.getCurrentUserId(); 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); $('.categoryTitle', page).show().html(item.Name);
$('.channelHeader', page).show().html('<a href="channelitems.html?id=' + item.ChannelId + '">' + item.ChannelName + '</a>').trigger('create'); $('.channelHeader', page).show().html('<a href="channelitems.html?id=' + item.ChannelId + '">' + item.ChannelName + '</a>').trigger('create');
@ -48,7 +48,7 @@
}); });
} }
query.categoryId = categoryId; query.folderId = folderId;
query.Limit = 50; query.Limit = 50;
$.getJSON(ApiClient.getUrl("Channels/" + channelId + "/Items", query)).done(function (result) { $.getJSON(ApiClient.getUrl("Channels/" + channelId + "/Items", query)).done(function (result) {

2
dashboard-ui/scripts/itemdetailpage.js
View file

@ -184,7 +184,7 @@
$('#movieTabs', page).show(); $('#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(); $('#channelTabs', page).show();
$('.channelHeader', page).show().html('<a href="channelitems.html?id=' + item.ChannelId + '">' + item.ChannelName + '</a>').trigger('create'); $('.channelHeader', page).show().html('<a href="channelitems.html?id=' + item.ChannelId + '">' + item.ChannelName + '</a>').trigger('create');
} else { } else {

4
dashboard-ui/scripts/librarybrowser.js
View file

@ -389,8 +389,8 @@
if (item.Type == "Channel") { if (item.Type == "Channel") {
return "channelitems.html?id=" + id; return "channelitems.html?id=" + id;
} }
if (item.Type == "ChannelCategoryItem") { if (item.Type == "ChannelFolderItem") {
return "channelitems.html?id=" + item.ChannelId + '&categoryId=' + item.Id; return "channelitems.html?id=" + item.ChannelId + '&folderId=' + item.Id;
} }
if (item.Type == "Program") { if (item.Type == "Program") {
return "livetvprogram.html?id=" + id; return "livetvprogram.html?id=" + id;

10
dashboard-ui/scripts/librarymenu.js
View file

@ -301,6 +301,16 @@
updateLibraryNavLinks(page); updateLibraryNavLinks(page);
} }
}).on('pagebeforeshow', ".page", function () {
var page = this;
if ($(page).hasClass('libraryPage')) {
$('.viewMenuBar').show();
} else {
$('.viewMenuBar').hide();
}
}).on('pageshow', ".libraryPage", function () { }).on('pageshow', ".libraryPage", function () {
var page = this; var page = this;

2
dashboard-ui/scripts/mediaplayer-video.js
View file

@ -804,7 +804,7 @@
// Can't autoplay in these browsers so we need to use the full controls // Can't autoplay in these browsers so we need to use the full controls
if (requiresControls) { if (requiresControls) {
if ($.browser.msie) { if ($.browser.msie) {
html += '<video class="itemVideo" id="itemVideo" preload="none" autoplay="autoplay">'; html += '<video class="itemVideo" id="itemVideo" preload="none" autoplay="autoplay" controls="controls">';
} else { } else {
html += '<video class="itemVideo" id="itemVideo" preload="none" autoplay controls>'; html += '<video class="itemVideo" id="itemVideo" preload="none" autoplay controls>';
} }