cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-18 03:18:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Tim Hobbs 2014-03-18 12:58:36 -07:00
commit 16cf53b2cf
9 changed files with 228 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dashboard-ui/channelitems.html Normal file
View File

@ -0,0 +1,18 @@
<!DOCTYPE html>
<html>
<head>
<title>Media Browser</title>
</head>
<body>
<div id="channelItemsPage" data-role="page" class="page libraryPage" data-theme="b" data-view="channels">
<div data-role="content">
<div class="viewSettings">
<div class="listTopPaging">
</div>
</div>
<div id="items" class="itemsContainer"></div>
</div>
</div>
</body>
</html>

18
dashboard-ui/channels.html Normal file
View File

@ -0,0 +1,18 @@
<!DOCTYPE html>
<html>
<head>
<title>Media Browser</title>
</head>
<body>
<div id="channelsPage" data-role="page" class="page libraryPage" data-theme="b" data-view="channels">
<div data-role="content">
<div class="viewSettings">
<div class="listTopPaging">
</div>
</div>
<div id="items" class="itemsContainer"></div>
</div>
</div>
</body>
</html>

2
dashboard-ui/dashboard.html
View File

@ -61,7 +61,7 @@
</div>
<div data-role="collapsible" data-collapsed="false" style="margin-top: 2em;">
<h3>Active Connections</h3>
<h3>Active Devices</h3>
<div>
<table class="tblConnections" style="border-collapse: collapse;">
</table>

88
dashboard-ui/scripts/channelitems.js Normal file
View File

@ -0,0 +1,88 @@
(function ($, document) {
// The base query options
var query = {
StartIndex: 0
};
function getSavedQueryId() {
return 'channels-' + getParameterByName('id');
}
function reloadItems(page) {
Dashboard.showLoadingMsg();
var channelId = getParameterByName('id');
query.UserId = Dashboard.getCurrentUserId();
$.getJSON(ApiClient.getUrl("Channels/" + channelId + "/Items", query)).done(function (result) {
// Scroll back up so they can see the results from the beginning
$(document).scrollTop(0);
var html = '';
$('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create');
updateFilterControls(page);
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "portrait",
context: 'channels',
useAverageAspectRatio: true,
showTitle: true,
centerText: true
});
$('#items', page).html(html).trigger('create').createPosterItemMenus();
$('.btnNextPage', page).on('click', function () {
query.StartIndex += query.Limit;
reloadItems(page);
});
$('.btnPreviousPage', page).on('click', function () {
query.StartIndex -= query.Limit;
reloadItems(page);
});
$('.selectPageSize', page).on('change', function () {
query.Limit = parseInt(this.value);
query.StartIndex = 0;
reloadItems(page);
});
LibraryBrowser.saveQueryValues(getSavedQueryId(), query);
Dashboard.hideLoadingMsg();
});
}
function updateFilterControls(page) {
}
$(document).on('pagebeforeshow', "#channelItemsPage", function () {
var limit = LibraryBrowser.getDefaultPageSize();
// 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;
}
LibraryBrowser.loadSavedQueryValues(getSavedQueryId(), query);
reloadItems(this);
}).on('pageshow', "#channelItemsPage", function () {
updateFilterControls(this);
});
})(jQuery, document);

82
dashboard-ui/scripts/channels.js Normal file
View File

@ -0,0 +1,82 @@
(function ($, document) {
// The base query options
var query = {
StartIndex: 0
};
function reloadItems(page) {
Dashboard.showLoadingMsg();
query.UserId = Dashboard.getCurrentUserId();
$.getJSON(ApiClient.getUrl("Channels", query)).done(function (result) {
// Scroll back up so they can see the results from the beginning
$(document).scrollTop(0);
var html = '';
$('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create');
updateFilterControls(page);
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "square",
context: 'channels',
useAverageAspectRatio: true,
showTitle: true,
centerText: true
});
$('#items', page).html(html).trigger('create').createPosterItemMenus();
$('.btnNextPage', page).on('click', function () {
query.StartIndex += query.Limit;
reloadItems(page);
});
$('.btnPreviousPage', page).on('click', function () {
query.StartIndex -= query.Limit;
reloadItems(page);
});
$('.selectPageSize', page).on('change', function () {
query.Limit = parseInt(this.value);
query.StartIndex = 0;
reloadItems(page);
});
LibraryBrowser.saveQueryValues('channels', query);
Dashboard.hideLoadingMsg();
});
}
function updateFilterControls(page) {
}
$(document).on('pagebeforeshow', "#channelsPage", function () {
var limit = LibraryBrowser.getDefaultPageSize();
// 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;
}
LibraryBrowser.loadSavedQueryValues('channels', query);
reloadItems(this);
}).on('pageshow', "#channelsPage", function () {
updateFilterControls(this);
});
})(jQuery, document);

5
dashboard-ui/scripts/librarybrowser.js
View File

@ -368,6 +368,9 @@
if (item.Type == "TvChannel") {
return "livetvchannel.html?id=" + id;
}
if (item.Type == "Channel") {
return "channelitems.html?id=" + id;
}
if (item.Type == "Program") {
return "livetvprogram.html?id=" + id;
}
@ -728,7 +731,7 @@
var chkItemSelectId = 'chkItemSelect' + i;
// Render this pre-enhanced to save on jquery mobile dom manipulation
html += '<div class="itemSelectionPanel" onclick="return false;"><div class="ui-checkbox ui-mini"><label class="ui-btn ui-corner-all ui-btn-inherit ui-btn-icon-left ui-checkbox-off" for="' + chkItemSelectId + '">Select</label><input data-mini="true" id="' + chkItemSelectId + '" type="checkbox" class="chkItemSelect" data-enhanced="true" /></div></div>';
html += '<div class="itemSelectionPanel" onclick="return false;"><div class="ui-checkbox"><label class="ui-btn ui-corner-all ui-btn-inherit ui-btn-icon-left ui-checkbox-off" for="' + chkItemSelectId + '">Select</label><input id="' + chkItemSelectId + '" type="checkbox" class="chkItemSelect" data-enhanced="true" /></div></div>';
}

10
dashboard-ui/scripts/librarylist.js
View File

@ -260,11 +260,11 @@
if (user.Configuration.IsAdministrator) {
sequence.createContextMenu({
getOptions: getContextMenuOptions,
command: onMenuCommand,
selector: '.posterItem'
});
//sequence.createContextMenu({
// getOptions: getContextMenuOptions,
// command: onMenuCommand,
// selector: '.posterItem'
//});
}
});

12
dashboard-ui/scripts/librarymenu.js
View File

@ -92,8 +92,12 @@
html += '<a class="viewMenuLink viewMenuTextLink desktopViewMenuLink' + (view == 'games' ? selectedCssClass : '') + '" href="gamesrecommended.html">' + (view == 'games' ? selectedHtml : '') + '<span class="viewName">Games</span></a>';
}
if (counts.ChannelCount) {
html += '<a class="viewMenuLink viewMenuTextLink desktopViewMenuLink' + (view == 'channels' ? selectedCssClass : '') + '" href="channels.html">' + (view == 'channels' ? selectedHtml : '') + '<span class="viewName">Channels</span></a>';
}
//if (counts.BoxSetCount) {
html += '<a class="viewMenuLink viewMenuTextLink desktopViewMenuLink' + (view == 'boxsets' ? selectedCssClass : '') + '" href="collections.html">' + (view == 'boxsets' ? selectedHtml : '') + '<span class="viewName">Collections</span></a>';
html += '<a class="viewMenuLink viewMenuTextLink desktopViewMenuLink' + (view == 'boxsets' ? selectedCssClass : '') + '" href="collections.html">' + (view == 'boxsets' ? selectedHtml : '') + '<span class="viewName">Collections</span></a>';
//}
$('.viewMenuRemoteControlButton', page).before(html);
@ -144,12 +148,16 @@
html += '<li><a class="libraryPanelLink" href="musicrecommended.html">Music</a></li>';
}
if (counts.ChannelCount) {
html += '<li><a class="libraryPanelLink" href="channels.html">Channels</a></li>';
}
if (counts.GameCount) {
html += '<li><a class="libraryPanelLink" href="gamesrecommended.html">Games</a></li>';
}
//if (counts.BoxSetCount) {
html += '<li><a class="libraryPanelLink" href="collections.html">Collections</a></li>';
html += '<li><a class="libraryPanelLink" href="collections.html">Collections</a></li>';
//}
html += '</ul>';

3
dashboard-ui/scripts/libraryreport.js
View File

@ -13,7 +13,8 @@
IncludeItemTypes: "Movie",
IsMissing: false,
IsVirtualUnaired: false,
Limit: 300
Limit: 300,
CollapseBoxSetItems: false
};
function getHeaderCells(reportType) {