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

update detail screen

This commit is contained in:
Luke Pulverenti 2016-04-08 22:30:22 -04:00
parent 2e9653b4ca
commit d9299a0a48
4 changed files with 10 additions and 43 deletions

View file

@ -1,17 +1,5 @@
<div id="itemDetailPage" data-role="page" class="page libraryPage itemDetailPage noSecondaryNavPage selfBackdropPage" data-theme="b" data-require="scripts/itemdetailpage,tileitemcss,scripts/livetvcomponents,paper-fab,paper-item-body,paper-icon-item"> <div id="itemDetailPage" data-role="page" class="page libraryPage itemDetailPage noSecondaryNavPage selfBackdropPage" data-theme="b" data-require="scripts/itemdetailpage,tileitemcss,scripts/livetvcomponents,paper-fab,paper-item-body,paper-icon-item">
<div id="tvShowsTabs" class="itemTabs" style="display: none;">
<div class="libraryViewNav scopedLibraryViewNav">
<a href="tv.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
<a href="tv.html?tab=1"><iron-icon icon="new-releases"></iron-icon>${TabLatest}</a>
<a href="tv.html?tab=2"><iron-icon icon="schedule"></iron-icon>${TabUpcoming}</a>
<a href="tv.html?tab=3" class="ui-btn-active"><iron-icon icon="live-tv"></iron-icon>${TabShows}</a>
<a href="tv.html?tab=4" class="tvEpisodesTab"><iron-icon icon="slideshow"></iron-icon>${TabEpisodes}</a>
<a href="tv.html?tab=5"><iron-icon icon="video-library"></iron-icon>${TabGenres}</a>
<a href="tv.html?tab=6" class="tvStudiosTab"><iron-icon icon="account-box"></iron-icon>${TabNetworks}</a>
</div>
</div>
<div id="itemBackdrop" class="itemBackdrop noBackdrop"> <div id="itemBackdrop" class="itemBackdrop noBackdrop">
<div class="itemBackdropContent"> <div class="itemBackdropContent">
</div> </div>

View file

@ -55,7 +55,8 @@
var context = getContext(item); var context = getContext(item);
renderHeader(page, item, context); LibraryMenu.setBackButtonVisible(true);
LibraryMenu.setMenuButtonVisible(false);
LibraryBrowser.renderName(item, $('.itemName', page), false, context); LibraryBrowser.renderName(item, $('.itemName', page), false, context);
LibraryBrowser.renderParentName(item, $('.parentName', page), context); LibraryBrowser.renderParentName(item, $('.parentName', page), context);
@ -306,24 +307,6 @@
return getParameterByName('context'); return getParameterByName('context');
} }
function renderHeader(page, item, context) {
$('.itemTabs', page).hide();
if (context == 'tv') {
$(page).removeClass('noSecondaryNavPage');
$('#tvShowsTabs', page).show();
LibraryMenu.setMenuButtonVisible(true);
}
else {
$(page).addClass('noSecondaryNavPage');
LibraryMenu.setBackButtonVisible(true);
LibraryMenu.setMenuButtonVisible(false);
}
}
function renderNextUp(page, item, user) { function renderNextUp(page, item, user) {
var section = page.querySelector('.nextUpSection'); var section = page.querySelector('.nextUpSection');

View file

@ -192,7 +192,8 @@
modal: false, modal: false,
autoFocus: false, autoFocus: false,
entryAnimationDuration: 160, entryAnimationDuration: 160,
exitAnimationDuration: 160 exitAnimationDuration: 160,
enableHistory: false
}); });
dlg.classList.add('ui-body-a'); dlg.classList.add('ui-body-a');
@ -226,21 +227,13 @@
dlg.innerHTML = html; dlg.innerHTML = html;
document.body.appendChild(dlg); document.body.appendChild(dlg);
var destination;
dlg.addEventListener('click', function (e) { dlg.addEventListener('click', function (e) {
var link = parentWithTag(e.target, 'A'); var link = parentWithTag(e.target, 'A');
if (link) { if (link) {
destination = link.href;
dialogHelper.close(dlg); dialogHelper.close(dlg);
e.preventDefault();
return false;
}
});
dialogHelper.open(dlg).then(function () {
if (destination) {
Dashboard.navigate(destination);
} }
}); });
dialogHelper.open(dlg);
}); });
} }

View file

@ -691,10 +691,11 @@ var Dashboard = {
if (item.items) { if (item.items) {
var style = item.color ? ' iconstyle="color:' + item.color + '"' : ''; var style = item.color ? ' iconstyle="color:' + item.color + '"' : '';
var expanded = item.expanded ? (' expanded') : '';
if (item.icon) { if (item.icon) {
menuHtml += '<emby-collapsible icon="' + item.icon + '" title="' + item.name + '"' + style + '>'; menuHtml += '<emby-collapsible icon="' + item.icon + '" title="' + item.name + '"' + style + expanded + '>';
} else { } else {
menuHtml += '<emby-collapsible title="' + item.name + '"' + style + '>'; menuHtml += '<emby-collapsible title="' + item.name + '"' + style + expanded + '>';
} }
menuHtml += item.items.map(Dashboard.getToolsLinkHtml).join(''); menuHtml += item.items.map(Dashboard.getToolsLinkHtml).join('');
menuHtml += '</emby-collapsible>'; menuHtml += '</emby-collapsible>';
@ -720,6 +721,7 @@ var Dashboard = {
name: Globalize.translate('TabServer'), name: Globalize.translate('TabServer'),
icon: 'dashboard', icon: 'dashboard',
color: '#38c', color: '#38c',
expanded: true,
items: [ items: [
{ {
name: Globalize.translate('TabDashboard'), name: Globalize.translate('TabDashboard'),
@ -747,6 +749,7 @@ var Dashboard = {
name: Globalize.translate('TabLibrary'), name: Globalize.translate('TabLibrary'),
icon: 'folder', icon: 'folder',
color: '#ECA403', color: '#ECA403',
expanded: true,
items: [ items: [
{ {
name: Globalize.translate('TabFolders'), name: Globalize.translate('TabFolders'),