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

show context when navigating

Browse source
This commit is contained in:
Luke Pulverenti 2014-05-21 23:35:18 -04:00
parent ba33bf6fff
commit 624687e363
60 changed files with 184 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,7 +11,7 @@
SortBy: "DateCreated",
SortOrder: "Descending",
MediaTypes: "Game",
Limit: 10,
Limit: 8,
Recursive: true,
Fields: "ItemCounts,AudioInfo,PrimaryImageAspectRatio",
ParentId: parentId
@ -32,7 +32,7 @@
SortBy: "DatePlayed",
SortOrder: "Descending",
MediaTypes: "Game",
Limit: 10,
Limit: 8,
Recursive: true,
Filters: "IsPlayed",
Fields: "ItemCounts,AudioInfo,PrimaryImageAspectRatio",

86
dashboard-ui/scripts/indexpage.js
View file

@ -184,16 +184,19 @@
var html = '';
html += '<h1 class="listHeader">Latest Media</h1>';
html += '<div>';
html += LibraryBrowser.getPosterViewHtml({
items: result.Items,
preferThumb: true,
shape: 'backdrop',
showTitle: true,
centerText: true
});
html += '</div>';
if (result.Items.length) {
html += '<h1 class="listHeader">Latest Media</h1>';
html += '<div>';
html += LibraryBrowser.getPosterViewHtml({
items: result.Items,
preferThumb: true,
shape: 'backdrop',
showTitle: true,
centerText: true
});
html += '</div>';
}
$(elem).html(html).createPosterItemMenus();
});
@ -211,16 +214,18 @@
var html = '';
html += '<h1 class="listHeader">My Library</h1>';
html += '<div>';
html += LibraryBrowser.getPosterViewHtml({
items: result.Items,
preferThumb: true,
shape: 'backdrop',
showTitle: true,
centerText: true
});
html += '</div>';
if (result.Items.length) {
html += '<h1 class="listHeader">My Library</h1>';
html += '<div>';
html += LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: 'backdrop',
showTitle: true,
centerText: true
});
html += '</div>';
}
$(elem).html(html).createPosterItemMenus();
});
@ -247,17 +252,19 @@
var html = '';
html += '<h1 class="listHeader">Resume</h1>';
html += '<div>';
html += LibraryBrowser.getPosterViewHtml({
items: result.Items,
preferBackdrop: true,
shape: 'backdrop',
overlayText: screenWidth >= 600,
showTitle: true,
showParentTitle: true
});
html += '</div>';
if (result.Items.length) {
html += '<h1 class="listHeader">Resume</h1>';
html += '<div>';
html += LibraryBrowser.getPosterViewHtml({
items: result.Items,
preferBackdrop: true,
shape: 'backdrop',
overlayText: screenWidth >= 600,
showTitle: true,
showParentTitle: true
});
html += '</div>';
}
$(elem).html(html).createPosterItemMenus();
});
@ -280,6 +287,9 @@
}
else if (section == 'librarybuttons') {
loadlibraryButtons(elem, userId, index);
} else {
elem.empty();
}
}
@ -287,15 +297,19 @@
var i, length;
var sectionCount = 3;
var html = '';
for (i = 0, length = sectionCount; i < length; i++) {
var elem = $('.sections', page);
if (!elem.html().length) {
var html = '';
for (i = 0, length = sectionCount; i < length; i++) {
html += '<div class="section' + i + '"></div>';
html += '<div class="homePageSection section' + i + '"></div>';
}
elem.html(html);
}
$('.sections', page).html(html);
for (i = 0, length = sectionCount; i < length; i++) {
loadSection(page, userId, displayPreferences, i);

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

@ -1,12 +1,12 @@
(function (window, document, $) {
function renderHeader(page, user) {
function renderHeader(user) {
var html = '<div class="viewMenuBar ui-bar-b">';
html += '<button type="button" data-role="none" title="Menu" onclick="LibraryMenu.showLibraryMenu();" class="headerButton libraryMenuButton headerButtonLeft"><img src="css/images/menu.png" /></button>';
html += '<a class="desktopHomeLink headerButton headerButtonLeft" href="index.html"><span>MEDIA</span><span class="mediaBrowserAccent">BROWSER</span></a>';
html += '<button type="button" data-role="none" title="Menu" onclick="LibraryMenu.showLibraryMenu();" class="headerButton libraryMenuButton headerButtonLeft"><img src="css/images/menu.png" />';
html += '<div class="libraryMenuButtonText"><span>MEDIA</span><span class="mediaBrowserAccent">BROWSER</span></div>';
html += '</button>';
html += '<div class="viewMenuSecondary">';
@ -41,11 +41,9 @@
html += '</div>';
var $page = $(page);
$(document.body).prepend(html);
$page.prepend(html);
$page.trigger('headercreated');
$(document).trigger('headercreated');
}
function getItemHref(item) {
@ -84,7 +82,7 @@
$(panel).panel('toggle');
}
function updateLibraryMenu(panel) {
var userId = Dashboard.getCurrentUserId();
@ -104,7 +102,13 @@
}).join('');
$('.libraryMenuOptions').html(html);
var elem = $('.libraryMenuOptions').html(html);
$('.viewMenuTextLink', elem).on('click', function () {
$('.libraryMenuButtonText').html(this.innerHTML);
});
});
ApiClient.getLiveTvInfo().done(function (liveTvInfo) {
@ -152,9 +156,11 @@
html += '<div data-role="panel" id="libraryPanel" class="libraryPanel" data-position="left" data-display="overlay" data-position-fixed="true" data-theme="b">';
html += '<p class="libraryPanelHeader"><a href="index.html" class="imageLink"><img src="css/images/mblogoicon.png" /><span>MEDIA</span><span class="mediaBrowserAccent">BROWSER</span></a></p>';
html += '<div style="margin: 0 -1em;">';
html += '<a class="lnkMediaFolder viewMenuLink viewMenuTextLink homeViewMenu" href="index.html">Home</a>';
html += '<div class="libraryMenuDivider"></div>';
html += getViewsHtml(user, channelCount, items, liveTvInfo);
html += '</div>';
@ -249,6 +255,20 @@
});
}
function updateContextText(page) {
var name = page.getAttribute('data-contextname');
if (name) {
$('.libraryMenuButtonText').html('<span>' + name + '</span>');
}
else if ($(page).hasClass('allLibraryPage')) {
$('.libraryMenuButtonText').html('<span>MEDIA</span><span class="mediaBrowserAccent">BROWSER</span>');
}
}
$(document).on('pageinit', ".libraryPage", function () {
var page = this;
@ -265,18 +285,20 @@
var page = this;
updateLibraryNavLinks(page);
if (!$('.viewMenuBar', page).length) {
if (!$('.viewMenuBar').length) {
Dashboard.getCurrentUser().done(function (user) {
renderHeader(page, user);
renderHeader(user);
updateCastIcon();
updateLibraryNavLinks(page);
updateContextText(page);
});
} else {
updateContextText(page);
updateLibraryNavLinks(page);
}
}).on('pageshow', ".libraryPage", function () {

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

@ -570,7 +570,7 @@
};
}
$(document).on('headercreated', '.libraryPage', function () {
$(document).on('headercreated', function () {
$('.btnCast').on('click', function () {

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

@ -42,6 +42,8 @@
function enabled() {
var userId = Dashboard.getCurrentUserId();
var val = LocalSettings.val('enableThemeSongs', userId);
return val == '1';