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

start pulling in EmbyTV

This commit is contained in:
Luke Pulverenti 2015-07-20 14:32:55 -04:00
parent adfc486508
commit 0e4e4da6c8
11 changed files with 31 additions and 199 deletions

View file

@ -23,14 +23,14 @@
"web-component-tester": "*" "web-component-tester": "*"
}, },
"private": true, "private": true,
"homepage": "https://github.com/Polymer/polymer", "homepage": "https://github.com/polymer/polymer",
"_release": "1.0.7", "_release": "1.0.7",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.7", "tag": "v1.0.7",
"commit": "b39d0015ce5428232409eb3aca7ddefea899f894" "commit": "b39d0015ce5428232409eb3aca7ddefea899f894"
}, },
"_source": "git://github.com/Polymer/polymer.git", "_source": "git://github.com/polymer/polymer.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "Polymer/polymer" "_originalSource": "polymer/polymer"
} }

View file

@ -20,7 +20,7 @@
<neon-animated-pages> <neon-animated-pages>
<neon-animatable> <neon-animatable>
<div class="pageTabContent latestContent"> <div class="pageTabContent latestContent">
<div class="latestItems items"></div> <div class="latestItems"></div>
</div> </div>
</neon-animatable> </neon-animatable>
<neon-animatable> <neon-animatable>

View file

@ -358,7 +358,7 @@
width: 42%; width: 42%;
} }
@media all and (max-width: 480px) { @media all and (max-width: 420px) {
.backdropCard { .backdropCard {
width: 100% !important; width: 100% !important;
@ -573,7 +573,7 @@
} }
} }
@media all and (max-width: 480px) { @media all and (max-width: 420px) {
.detailPage169Card { .detailPage169Card {
width: 100% !important; width: 100% !important;

View file

@ -5,117 +5,7 @@
</head> </head>
<body> <body>
<div id="itemByNameDetailPage" data-role="page" class="page libraryPage itemDetailPage backdropPage" data-require="scripts/itembynamedetailpage"> <div id="itemByNameDetailPage" data-role="page" class="page libraryPage itemDetailPage backdropPage noSecondaryNavPage" data-require="scripts/itembynamedetailpage" data-backbutton="true" data-menubutton="false">
<div id="movieGenreTabs" class="itemTabs" style="display: none;">
<div class="libraryViewNav scopedLibraryViewNav">
<a href="moviesrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
<a href="movies.html"><iron-icon icon="local-movies"></iron-icon>${TabMovies}</a>
<a href="movietrailers.html" class="movieTrailersTab"><iron-icon icon="movie"></iron-icon>${TabTrailers}</a>
<a href="collections.html?context=movies"><iron-icon icon="video-library"></iron-icon>${TabCollections}</a>
<a href="moviegenres.html" class="ui-btn-active"><iron-icon icon="video-library"></iron-icon>${TabGenres}</a>
<a href="moviepeople.html" class="moviePeopleTab"><iron-icon icon="people"></iron-icon>${TabPeople}</a>
<a href="moviestudios.html" class="movieStudiosTab"><iron-icon icon="account-box"></iron-icon>${TabStudios}</a>
</div>
</div>
<div id="moviePeopleTabs" class="itemTabs" style="display: none;">
<div class="libraryViewNav scopedLibraryViewNav">
<a href="moviesrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
<a href="movies.html"><iron-icon icon="local-movies"></iron-icon>${TabMovies}</a>
<a href="movietrailers.html" class="movieTrailersTab"><iron-icon icon="movie"></iron-icon>${TabTrailers}</a>
<a href="collections.html?context=movies"><iron-icon icon="video-library"></iron-icon>${TabCollections}</a>
<a href="moviegenres.html"><iron-icon icon="video-library"></iron-icon>${TabGenres}</a>
<a href="moviepeople.html" class="ui-btn-active moviePeopleTab"><iron-icon icon="people"></iron-icon>${TabPeople}</a>
<a href="moviestudios.html" class="movieStudiosTab"><iron-icon icon="account-box"></iron-icon>${TabStudios}</a>
</div>
</div>
<div id="movieStudioTabs" class="itemTabs" style="display: none;">
<div class="libraryViewNav scopedLibraryViewNav">
<a href="moviesrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
<a href="movies.html"><iron-icon icon="local-movies"></iron-icon>${TabMovies}</a>
<a href="movietrailers.html" class="movieTrailersTab"><iron-icon icon="movie"></iron-icon>${TabTrailers}</a>
<a href="collections.html?context=movies"><iron-icon icon="video-library"></iron-icon>${TabCollections}</a>
<a href="moviegenres.html"><iron-icon icon="video-library"></iron-icon>${TabGenres}</a>
<a href="moviepeople.html" class="moviePeopleTab"><iron-icon icon="people"></iron-icon>${TabPeople}</a>
<a href="moviestudios.html" class="ui-btn-active movieStudiosTab"><iron-icon icon="account-box"></iron-icon>${TabStudios}</a>
</div>
</div>
<div id="tvGenreTabs" class="itemTabs" style="display: none;">
<div class="libraryViewNav scopedLibraryViewNav">
<a href="tvrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
<a href="tvlatest.html"><iron-icon icon="new-releases"></iron-icon>${TabLatest}</a>
<a href="tvupcoming.html"><iron-icon icon="schedule"></iron-icon>${TabUpcoming}</a>
<a href="tvshows.html"><iron-icon icon="live-tv"></iron-icon>${TabShows}</a>
<a href="episodes.html" class="tvEpisodesTab"><iron-icon icon="slideshow"></iron-icon>${TabEpisodes}</a>
<a href="tvgenres.html" class="ui-btn-active"><iron-icon icon="video-library"></iron-icon>${TabGenres}</a>
<a href="tvpeople.html" class="tvPeopleTab"><iron-icon icon="people"></iron-icon>${TabPeople}</a>
<a href="tvstudios.html" class="tvStudiosTab"><iron-icon icon="account-box"></iron-icon>${TabNetworks}</a>
</div>
</div>
<div id="tvPeopleTabs" class="itemTabs" style="display: none;">
<div class="libraryViewNav scopedLibraryViewNav">
<a href="tvrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
<a href="tvlatest.html"><iron-icon icon="new-releases"></iron-icon>${TabLatest}</a>
<a href="tvupcoming.html"><iron-icon icon="schedule"></iron-icon>${TabUpcoming}</a>
<a href="tvshows.html"><iron-icon icon="live-tv"></iron-icon>${TabShows}</a>
<a href="episodes.html" class="tvEpisodesTab"><iron-icon icon="slideshow"></iron-icon>${TabEpisodes}</a>
<a href="tvgenres.html"><iron-icon icon="video-library"></iron-icon>${TabGenres}</a>
<a href="tvpeople.html" class="ui-btn-active tvPeopleTab"><iron-icon icon="people"></iron-icon>${TabPeople}</a>
<a href="tvstudios.html" class="tvStudiosTab"><iron-icon icon="account-box"></iron-icon>${TabNetworks}</a>
</div>
</div>
<div id="tvStudioTabs" class="itemTabs" style="display: none;">
<div class="libraryViewNav scopedLibraryViewNav">
<a href="tvrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
<a href="tvlatest.html"><iron-icon icon="new-releases"></iron-icon>${TabLatest}</a>
<a href="tvupcoming.html"><iron-icon icon="schedule"></iron-icon>${TabUpcoming}</a>
<a href="tvshows.html"><iron-icon icon="live-tv"></iron-icon>${TabShows}</a>
<a href="episodes.html" class="tvEpisodesTab"><iron-icon icon="slideshow"></iron-icon>${TabEpisodes}</a>
<a href="tvgenres.html"><iron-icon icon="video-library"></iron-icon>${TabGenres}</a>
<a href="tvpeople.html" class="tvPeopleTab"><iron-icon icon="people"></iron-icon>${TabPeople}</a>
<a href="tvstudios.html" class="ui-btn-active tvStudiosTab"><iron-icon icon="account-box"></iron-icon>${TabNetworks}</a>
</div>
</div>
<div id="musicGenreTabs" class="itemTabs" style="display: none;">
<div class="libraryViewNav scopedLibraryViewNav">
<a href="musicrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
<a href="musicalbums.html"><iron-icon icon="album"></iron-icon>${TabAlbums}</a>
<a href="musicalbumartists.html"><iron-icon icon="music-note"></iron-icon>${TabAlbumArtists}</a>
<a href="musicartists.html" class="musicArtistsTab"><iron-icon icon="music-note"></iron-icon>${TabArtists}</a>
<a href="songs.html" class="musicSongsTab"><iron-icon icon="music-note"></iron-icon>${TabSongs}</a>
<a href="musicgenres.html" class="ui-btn-active"><iron-icon icon="library-music"></iron-icon>${TabGenres}</a>
<a href="musicvideos.html"><iron-icon icon="video-library"></iron-icon>${TabMusicVideos}</a>
</div>
</div>
<div id="artistTabs" class="itemTabs" style="display: none;">
<div class="libraryViewNav scopedLibraryViewNav">
<a href="musicrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
<a href="musicalbums.html"><iron-icon icon="album"></iron-icon>${TabAlbums}</a>
<a href="musicalbumartists.html"><iron-icon icon="music-note"></iron-icon>${TabAlbumArtists}</a>
<a href="musicartists.html" class="ui-btn-active musicArtistsTab"><iron-icon icon="music-note"></iron-icon>${TabArtists}</a>
<a href="songs.html" class="musicSongsTab"><iron-icon icon="music-note"></iron-icon>${TabSongs}</a>
<a href="musicgenres.html"><iron-icon icon="library-music"></iron-icon>${TabGenres}</a>
<a href="musicvideos.html"><iron-icon icon="video-library"></iron-icon>${TabMusicVideos}</a>
</div>
</div>
<div id="gameGenreTabs" class="itemTabs" style="display: none;">
<div class="libraryViewNav scopedLibraryViewNav">
<a href="gamesrecommended.html">${TabSuggestions}</a>
<a href="games.html">${TabGames}</a>
<a href="gamesystems.html">Game Systems</a>
<a href="gamegenres.html" class="ui-btn-active">${TabGenres}</a>
<a href="gamestudios.html">${TabStudios}</a>
</div>
</div>
<div id="gameStudioTabs" class="itemTabs" style="display: none;">
<div class="libraryViewNav scopedLibraryViewNav">
<a href="gamesrecommended.html">${TabSuggestions}</a>
<a href="games.html">${TabGames}</a>
<a href="gamesystems.html">Game Systems</a>
<a href="gamegenres.html">${TabGenres}</a>
<a href="gamestudios.html" class="ui-btn-active">${TabStudios}</a>
</div>
</div>
<div style="padding: 1em 0;"> <div style="padding: 1em 0;">
<table class="detailPageContent primaryDetailPageContent"> <table class="detailPageContent primaryDetailPageContent">
<tr> <tr>

View file

@ -77,7 +77,7 @@
var tabs = page.querySelector('paper-tabs'); var tabs = page.querySelector('paper-tabs');
var pages = page.querySelector('neon-animated-pages'); var pages = page.querySelector('neon-animated-pages');
LibraryBrowser.configurePaperLibraryTabs(page, tabs, pages, 1); LibraryBrowser.configurePaperLibraryTabs(page, tabs, pages);
$(tabs).on('iron-select', function () { $(tabs).on('iron-select', function () {
var selected = this.selected; var selected = this.selected;

View file

@ -1534,9 +1534,7 @@
tabs.hideScrollButtons = true; tabs.hideScrollButtons = true;
$(ownerpage).on('pagebeforeshowready', function() { $(ownerpage).on('pagebeforeshowready', LibraryBrowser.onTabbedPageBeforeShowReady);
LibraryBrowser.onTabbedPageBeforeShowReady(this);
});
$(pages).on('iron-select', function () { $(pages).on('iron-select', function () {

View file

@ -479,12 +479,6 @@
var query = "id=" + item.Id; var query = "id=" + item.Id;
var context = getParameterByName('context');
if (context) {
query += "&context=" + context;
}
return query; return query;
}; };

View file

@ -49,16 +49,12 @@
var context = getParameterByName('context'); var context = getParameterByName('context');
var editQuery = '?id=' + item.Id; var editQuery = '?id=' + item.Id;
if (context) {
editQuery += '&context=' + context;
}
currentItem = item; currentItem = item;
LibraryMenu.setTitle(item.Name);
Backdrops.setBackdrops(page, [item]); Backdrops.setBackdrops(page, [item]);
renderHeader(page, item, context);
var name = item.Name; var name = item.Name;
Dashboard.setPageTitle(name); Dashboard.setPageTitle(name);
@ -104,48 +100,6 @@
}); });
} }
function renderHeader(page, item, context) {
$('.itemTabs', page).hide();
if (context == "movies" && item.Type == "Genre") {
$('#movieGenreTabs', page).show();
}
if (context == "movies" && item.Type == "Person") {
$('#moviePeopleTabs', page).show();
}
if (context == "movies" && item.Type == "Studio") {
$('#movieStudioTabs', page).show();
}
if (context == "tv" && item.Type == "Studio") {
$('#tvStudioTabs', page).show();
}
if (context == "tv" && item.Type == "Genre") {
$('#tvGenreTabs', page).show();
}
if (context == "tv" && item.Type == "Person") {
$('#tvPeopleTabs', page).show();
}
if (context == "music" && item.Type == "MusicGenre") {
$('#musicGenreTabs', page).show();
}
if (context == "music" && item.Type == "MusicArtist") {
$('#artistTabs', page).show();
}
if (context == "games" && item.Type == "GameGenre") {
$('#gameGenreTabs', page).show();
}
if (context == "games" && item.Type == "Studio") {
$('#gameStudioTabs', page).show();
}
}
function renderTabs(page, item, context) { function renderTabs(page, item, context) {
var html = '<fieldset data-role="controlgroup" data-type="horizontal" class="libraryTabs">'; var html = '<fieldset data-role="controlgroup" data-type="horizontal" class="libraryTabs">';

View file

@ -235,9 +235,7 @@
$('.libraryViewNav', ownerpage).removeClass('libraryViewNavWithMinHeight'); $('.libraryViewNav', ownerpage).removeClass('libraryViewNavWithMinHeight');
} }
$(ownerpage).on('pagebeforeshowready', function () { $(ownerpage).on('pagebeforeshowready', LibraryBrowser.onTabbedPageBeforeShowReady);
LibraryBrowser.onTabbedPageBeforeShowReady(ownerpage, defaultTabIndex);
});
$(pages).on('iron-select', function () { $(pages).on('iron-select', function () {
@ -251,8 +249,9 @@
}); });
}, },
onTabbedPageBeforeShowReady: function (page, defaultTabIndex) { onTabbedPageBeforeShowReady: function () {
var page = this;
var tabs = page.querySelector('paper-tabs'); var tabs = page.querySelector('paper-tabs');
var selected = tabs.selected; var selected = tabs.selected;
@ -260,12 +259,7 @@
Logger.log('selected tab is null, checking query string'); Logger.log('selected tab is null, checking query string');
if (!LibraryBrowser.enableFullPaperTabs()) { selected = parseInt(getParameterByName('tab') || '0');
// Currently not supported in this mode
defaultTabIndex = null;
}
selected = parseInt(getParameterByName('tab')) || defaultTabIndex || 0;
Logger.log('selected tab will be ' + selected); Logger.log('selected tab will be ' + selected);

View file

@ -390,26 +390,28 @@
if (result.Items.length) { if (result.Items.length) {
var cssClass = index !== 0 ? 'listHeader' : 'listHeader'; html += '<div class="homePageSection">';
html += '<div>'; html += '<div>';
var text = Globalize.translate('HeaderLatestFromChannel').replace('{0}', channel.Name); var text = Globalize.translate('HeaderLatestFromChannel').replace('{0}', channel.Name);
html += '<h1 style="display:inline-block; vertical-align:middle;" class="' + cssClass + '">' + text + '</h1>'; html += '<h1 style="display:inline-block; vertical-align:middle;" class="listHeader">' + text + '</h1>';
html += '<a href="channelitems.html?context=channels&id=' + channel.Id + '" class="clearLink" style="margin-left:2em;"><paper-button raised class="more mini"><span>' + Globalize.translate('ButtonMore') + '</span></paper-button></a>'; html += '<a href="channelitems.html?context=channels&id=' + channel.Id + '" class="clearLink" style="margin-left:2em;"><paper-button raised class="more mini"><span>' + Globalize.translate('ButtonMore') + '</span></paper-button></a>';
html += '</div>'; html += '</div>';
html += '<div class="itemsContainer">';
html += LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: 'autohome',
defaultShape: 'square',
showTitle: true,
centerText: true,
context: 'channels',
lazy: true,
showDetailsMenu: true
});
html += '</div>';
html += '</div>';
} }
html += '<div class="itemsContainer">';
html += LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: 'autohome',
defaultShape: 'square',
showTitle: true,
centerText: true,
context: 'channels',
lazy: true,
showDetailsMenu: true
});
html += '</div>';
var elem = page.querySelector('#channel' + channel.Id + ''); var elem = page.querySelector('#channel' + channel.Id + '');
elem.innerHTML = html; elem.innerHTML = html;

View file

@ -62,7 +62,7 @@ html, body, .ui-btn, .pageTitle {
color: #FF2D55 !important; color: #FF2D55 !important;
} }
.viewMenuBar paper-icon-button { .viewMenuBar .headerButtonLeft {
color: #FF2D55 !important; color: #FF2D55 !important;
} }