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

fix channel count

Browse source
This commit is contained in:
Luke Pulverenti 2014-03-13 05:00:47 -04:00
parent 1bfd7d3cf0
commit 1c91ac9062
13 changed files with 116 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

12
dashboard-ui/collections.html
View file

@ -4,18 +4,8 @@
<title>Media Browser</title>
</head>
<body>
<div id="boxsetsPage" data-role="page" class="page libraryPage" data-theme="b" data-view="movies">
<div id="boxsetsPage" data-role="page" class="page libraryPage" data-theme="b" data-view="boxsets">
<div class="libraryViewNav">
<a href="moviesrecommended.html">Suggested</a>
<a href="movieslatest.html">Latest</a>
<a href="movies.html">Movies</a>
<a href="#" class="ui-btn-active">Collections</a>
<a href="movietrailers.html">Trailers</a>
<a href="moviegenres.html">Genres</a>
<a href="moviepeople.html">People</a>
<a href="moviestudios.html">Studios</a>
</div>
<div class="alphabetPicker">
</div>
<div data-role="content">

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

@ -7,6 +7,10 @@
padding-top: 48px !important;
}
.libraryPage:not(.metadataEditorPage):not(#indexPage):not(#boxsetsPage) {
padding-top: 91px !important;
}
.ui-panel fieldset + fieldset {
margin-top: 2em;
}
@ -24,6 +28,8 @@
z-index: 1000;
top: 0;
padding-left: 10px;
background: #181818;
border-bottom: 1px solid #080808;
}
.viewMenuLink {
@ -111,30 +117,66 @@
}
.libraryViewNav {
text-align: center;
background-image: linear-gradient(#404040,#222);
border-bottom: 1px solid #111;
border-top: 1px solid #000;
font-family: sans-serif, Arial;
height: 42px;
overflow: hidden;
border-bottom: 1px solid #333;
position: fixed;
left: 0;
right: 0;
top: 48px;
z-index: 1000;
background-color: #252525;
}
.libraryViewNav .ui-btn-active {
border: 0!important;
background-color: #38c;
}
.libraryViewNavInner {
text-align: center;
font-family: sans-serif, Arial;
font-size: 14px;
white-space: nowrap;
padding: 0 0 0;
overflow-x: auto;
height: 55px;
text-transform: uppercase;
}
.libraryViewNav a {
.libraryViewNav .ui-btn-active .libraryViewNavLinkContent {
border-bottom-color: #38c;
}
.libraryViewNav a {
display: inline-block;
padding: .6em 1em;
padding: 12px 0 0;
color: #eee!important;
text-decoration: none;
margin: 1px 0;
}
margin: 0 0;
position: relative;
font-weight: normal;
}
.libraryViewNav a:hover {
color: #bbb!important;
}
.libraryViewNav a:after {
content: "|";
color: #444;
font-size: 20px;
font-weight: normal !important;
position: absolute;
top: 7px;
}
.libraryViewNav a:last-child::after {
content: "";
}
.libraryViewNavLinkContent {
border-bottom: 6px solid transparent;
display: inline-block;
padding: 0 1em 6px;
margin: 0 -2px 0 -1px;
}
.ehsContent {
max-width: 620px;
margin: 0 auto;
@ -609,13 +651,6 @@ a.itemTag:hover {
height: 7px;
}
@media all and (max-width: 550px) {
.desktopViewMenuLink {
display: none;
}
}
@media all and (min-width: 600px) {
.inlineDetailSection:not(.hide) {
display: inline-block;
@ -627,17 +662,6 @@ a.itemTag:hover {
}
}
@media all and (max-width: 800px) {
.libraryViewNav {
display: none !important;
}
.desktopHomeLink {
display: none;
}
}
@media all and (min-width: 800px) {
.libraryMenuButton {
@ -645,6 +669,21 @@ a.itemTag:hover {
}
}
@media all and (max-width: 800px) {
.desktopHomeLink {
display: none;
}
.desktopViewMenuLink {
display: none;
}
.libraryViewNavInner {
text-align: left;
}
}
@media all and (max-width: 750px) {
.editorMenuLink {

9
dashboard-ui/itembynamedetails.html
View file

@ -7,10 +7,9 @@
<div id="itemByNameDetailPage" data-role="page" class="page libraryPage" data-theme="b">
<div id="movieGenreTabs" class="itemTabs" style="display: none;">
<div class="libraryViewNav">
<a href="moviesrecommended.html">Suggested</a>
<a href="movieslatest.html">Latest</a>
<a href="moviesrecommended.html">Suggested</a>
<a href="movies.html">Movies</a>
<a href="collections.html">Collections</a>
<a href="movietrailers.html">Trailers</a>
<a href="moviegenres.html" class="ui-btn-active">Genres</a>
<a href="moviepeople.html">People</a>
@ -19,10 +18,9 @@
</div>
<div id="moviePeopleTabs" class="itemTabs" style="display: none;">
<div class="libraryViewNav">
<a href="moviesrecommended.html">Suggested</a>
<a href="movieslatest.html">Latest</a>
<a href="moviesrecommended.html">Suggested</a>
<a href="movies.html">Movies</a>
<a href="collections.html">Collections</a>
<a href="movietrailers.html">Trailers</a>
<a href="moviegenres.html">Genres</a>
<a href="moviepeople.html" class="ui-btn-active">People</a>
@ -31,10 +29,9 @@
</div>
<div id="movieStudioTabs" class="itemTabs" style="display: none;">
<div class="libraryViewNav">
<a href="moviesrecommended.html">Suggested</a>
<a href="movieslatest.html">Latest</a>
<a href="moviesrecommended.html">Suggested</a>
<a href="movies.html">Movies</a>
<a href="collections.html">Collections</a>
<a href="movietrailers.html">Trailers</a>
<a href="moviegenres.html">Genres</a>
<a href="moviepeople.html">People</a>

6
dashboard-ui/itemdetails.html
View file

@ -7,10 +7,9 @@
<div id="itemDetailPage" data-role="page" class="page libraryPage" data-theme="b">
<div id="movieTabs" class="itemTabs" style="display: none;">
<div class="libraryViewNav">
<a href="moviesrecommended.html">Suggested</a>
<a href="movieslatest.html">Latest</a>
<a href="moviesrecommended.html">Suggested</a>
<a href="movies.html" class="ui-btn-active">Movies</a>
<a href="collections.html">Collections</a>
<a href="movietrailers.html">Trailers</a>
<a href="moviegenres.html">Genres</a>
<a href="moviepeople.html">People</a>
@ -19,10 +18,9 @@
</div>
<div id="trailerTabs" class="itemTabs" style="display: none;">
<div class="libraryViewNav">
<a href="moviesrecommended.html">Suggested</a>
<a href="movieslatest.html">Latest</a>
<a href="moviesrecommended.html">Suggested</a>
<a href="movies.html">Movies</a>
<a href="collections.html">Collections</a>
<a href="movietrailers.html" class="ui-btn-active">Trailers</a>
<a href="moviegenres.html">Genres</a>
<a href="moviepeople.html">People</a>

3
dashboard-ui/moviegenres.html
View file

@ -7,10 +7,9 @@
<div id="movieGenresPage" data-role="page" class="page libraryPage" data-theme="b" data-view="movies">
<div class="libraryViewNav">
<a href="moviesrecommended.html">Suggested</a>
<a href="movieslatest.html">Latest</a>
<a href="moviesrecommended.html">Suggested</a>
<a href="movies.html">Movies</a>
<a href="collections.html">Collections</a>
<a href="movietrailers.html">Trailers</a>
<a href="moviegenres.html" class="ui-btn-active">Genres</a>
<a href="moviepeople.html">People</a>

3
dashboard-ui/moviepeople.html
View file

@ -7,10 +7,9 @@
<div id="moviePeoplePage" data-role="page" class="page libraryPage" data-theme="b" data-view="movies">
<div class="libraryViewNav">
<a href="moviesrecommended.html">Suggested</a>
<a href="movieslatest.html">Latest</a>
<a href="moviesrecommended.html">Suggested</a>
<a href="movies.html">Movies</a>
<a href="collections.html">Collections</a>
<a href="movietrailers.html">Trailers</a>
<a href="moviegenres.html">Genres</a>
<a href="moviepeople.html" class="ui-btn-active">People</a>

3
dashboard-ui/movies.html
View file

@ -7,10 +7,9 @@
<div id="moviesPage" data-role="page" class="page libraryPage" data-theme="b" data-view="movies">
<div class="libraryViewNav">
<a href="moviesrecommended.html">Suggested</a>
<a href="movieslatest.html">Latest</a>
<a href="moviesrecommended.html">Suggested</a>
<a href="movies.html" class="ui-btn-active">Movies</a>
<a href="collections.html">Collections</a>
<a href="movietrailers.html">Trailers</a>
<a href="moviegenres.html">Genres</a>
<a href="moviepeople.html">People</a>

3
dashboard-ui/movieslatest.html
View file

@ -7,10 +7,9 @@
<div id="moviesLatestPage" data-role="page" class="page libraryPage" data-theme="b" data-view="movies">
<div class="libraryViewNav">
<a href="moviesrecommended.html">Suggested</a>
<a href="#" class="ui-btn-active">Latest</a>
<a href="moviesrecommended.html">Suggested</a>
<a href="movies.html">Movies</a>
<a href="collections.html">Collections</a>
<a href="movietrailers.html">Trailers</a>
<a href="moviegenres.html">Genres</a>
<a href="moviepeople.html">People</a>

3
dashboard-ui/moviesrecommended.html
View file

@ -7,10 +7,9 @@
<div id="moviesRecommendedPage" data-role="page" class="page libraryPage" data-theme="b" data-view="movies">
<div class="libraryViewNav">
<a href="#" class="ui-btn-active">Suggested</a>
<a href="movieslatest.html">Latest</a>
<a href="#" class="ui-btn-active">Suggested</a>
<a href="movies.html">Movies</a>
<a href="collections.html">Collections</a>
<a href="movietrailers.html">Trailers</a>
<a href="moviegenres.html">Genres</a>
<a href="moviepeople.html">People</a>

3
dashboard-ui/moviestudios.html
View file

@ -7,10 +7,9 @@
<div id="movieStudiosPage" data-role="page" class="page libraryPage" data-theme="b" data-view="movies">
<div class="libraryViewNav">
<a href="moviesrecommended.html">Suggested</a>
<a href="movieslatest.html">Latest</a>
<a href="moviesrecommended.html">Suggested</a>
<a href="movies.html">Movies</a>
<a href="collections.html">Collections</a>
<a href="movietrailers.html">Trailers</a>
<a href="moviegenres.html">Genres</a>
<a href="moviepeople.html">People</a>

3
dashboard-ui/movietrailers.html
View file

@ -7,10 +7,9 @@
<div id="movieTrailersPage" data-role="page" class="page libraryPage" data-theme="b" data-view="movies">
<div class="libraryViewNav">
<a href="moviesrecommended.html">Suggested</a>
<a href="movieslatest.html">Latest</a>
<a href="moviesrecommended.html">Suggested</a>
<a href="movies.html">Movies</a>
<a href="collections.html">Collections</a>
<a href="movietrailers.html" class="ui-btn-active">Trailers</a>
<a href="moviegenres.html">Genres</a>
<a href="moviepeople.html">People</a>

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

@ -174,7 +174,7 @@
var views = [];
if (counts.MovieCount || counts.TrailerCount) {
views.push({ id: "moviesView", name: "Movies", url: "moviesrecommended.html", img: "css/images/items/list/chapter.png", background: "#0094FF" });
views.push({ id: "moviesView", name: "Movies", url: "movieslatest.html", img: "css/images/items/list/chapter.png", background: "#0094FF" });
}
if (counts.EpisodeCount || counts.SeriesCount) {

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

@ -73,7 +73,7 @@
if (counts.MovieCount) {
html += '<a class="viewMenuLink viewMenuTextLink desktopViewMenuLink' + (view == 'movies' ? selectedCssClass : '') + '" href="moviesrecommended.html">' + (view == 'movies' ? selectedHtml : '') + '<span class="viewName">Movies</span></a>';
html += '<a class="viewMenuLink viewMenuTextLink desktopViewMenuLink' + (view == 'movies' ? selectedCssClass : '') + '" href="movieslatest.html">' + (view == 'movies' ? selectedHtml : '') + '<span class="viewName">Movies</span></a>';
}
if (counts.SeriesCount) {
@ -92,6 +92,10 @@
html += '<a class="viewMenuLink viewMenuTextLink desktopViewMenuLink' + (view == 'games' ? selectedCssClass : '') + '" href="gamesrecommended.html">' + (view == 'games' ? selectedHtml : '') + '<span class="viewName">Games</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>';
}
$('.viewMenuRemoteControlButton', page).before(html);
}
@ -122,75 +126,33 @@
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 data-role="collapsible-set" data-inset="false" data-mini="true">';
html += '<ul data-role="listview">';
if (counts.MovieCount) {
html += getCollapsibleHtml('Movies', [
{ text: 'Suggested', href: 'moviesrecommended.html' },
{ text: 'Latest', href: 'movieslatest.html' },
{ text: 'Movies', href: 'movies.html' },
{ text: 'Collections', href: 'collections.html' },
{ text: 'Trailers', href: 'movietrailers.html' },
{ text: 'Genres', href: 'moviegenres.html' },
{ text: 'People', href: 'moviepeople.html' },
{ text: 'Studios', href: 'moviestudios.html' }
]);
html += '<li><a class="libraryPanelLink" href="movieslatest.html">Movies</a></li>';
}
if (counts.SeriesCount) {
html += getCollapsibleHtml('TV', [
{ text: 'Suggested', href: 'tvrecommended.html' },
{ text: 'Latest', href: 'tvlatest.html' },
{ text: 'Upcoming', href: 'tvupcoming.html' },
{ text: 'Shows', href: 'tvshows.html' },
{ text: 'Episodes', href: 'episodes.html' },
{ text: 'Genres', href: 'tvgenres.html' },
{ text: 'People', href: 'tvpeople.html' },
{ text: 'Networks', href: 'tvstudios.html' }
]);
html += '<li><a class="libraryPanelLink" href="tvrecommended.html">TV</a></li>';
}
if (liveTvInfo.EnabledUsers.indexOf(Dashboard.getCurrentUserId()) != -1) {
html += getCollapsibleHtml('Live TV', [
{ text: 'Suggested', href: 'livetvsuggested.html' },
{ text: 'Guide', href: 'livetvguide.html' },
{ text: 'Channels', href: 'livetvchannels.html' },
{ text: 'Recordings', href: 'livetvrecordings.html' },
{ text: 'Scheduled', href: 'livetvtimers.html' },
{ text: 'Series', href: 'livetvseriestimers.html' }
]);
html += '<li><a class="libraryPanelLink" href="livetvsuggested.html">Live TV</a></li>';
}
if (counts.SongCount || counts.MusicVideoCount) {
html += getCollapsibleHtml('Music', [
{ text: 'Suggested', href: 'musicrecommended.html' },
{ text: 'Songs', href: 'songs.html' },
{ text: 'Albums', href: 'musicalbums.html' },
{ text: 'Album Artists', href: 'musicalbumartists.html' },
{ text: 'Artists', href: 'musicartists.html' },
{ text: 'Music Videos', href: 'musicvideos.html' },
{ text: 'Genres', href: 'musicgenres.html' }
]);
html += '<li><a class="libraryPanelLink" href="musicrecommended.html">Music</a></li>';
}
if (counts.GameCount) {
html += getCollapsibleHtml('Games', [
{ text: 'Suggested', href: 'gamesrecommended.html' },
{ text: 'Games', href: 'games.html' },
{ text: 'Game Systems', href: 'gamesystems.html' },
{ text: 'Genres', href: 'gamegenres.html' },
{ text: 'Studios', href: 'gamestudios.html' }
]);
html += '<li><a class="libraryPanelLink" href="gamesrecommended.html">Games</a></li>';
}
html += '</div>';
if (counts.BoxSetCount) {
html += '<li><a class="libraryPanelLink" href="collections.html">Collections</a></li>';
}
html += '</ul>';
html += '</div>';
$(page).append(html);
@ -201,50 +163,23 @@
return panel;
}
function getCollapsibleHtml(title, links) {
var i, length;
var selectedIndex = -1;
var collapsed = 'true';
var currentUrl = window.location.toString().toLowerCase();
for (i = 0, length = links.length; i < length; i++) {
if (currentUrl.indexOf(links[i].href.toLowerCase()) != -1) {
collapsed = 'false';
selectedIndex = i;
break;
}
}
var html = '';
html += '<div data-role="collapsible" data-mini="true" data-collapsed="' + collapsed + '">';
html += '<h4 class="libraryPanelCollapsibleHeader">' + title + '</h4>';
html += '<ul data-role="listview" data-inset="false">';
for (i = 0, length = links.length; i < length; i++) {
var link = links[i];
var href = selectedIndex == i ? '#' : link.href;
html += '<li><a class="libraryPanelLink" href="' + href + '">' + link.text + '</a></li>';
}
html += '</ul>';
html += '</div>';
return html;
}
window.LibraryMenu = {
showLibraryMenu: showLibraryMenu
};
$(document).on('pagebeforeshow', ".libraryPage", function () {
$(document).on('pageinit', ".libraryPage", function () {
var page = this;
$('.libraryViewNav', page).wrapInner('<div class="libraryViewNavInner"></div>');
$('.libraryViewNav a', page).each(function () {
this.innerHTML = '<span class="libraryViewNavLinkContent">' + this.innerHTML + '</span>';
});
}).on('pagebeforeshow', ".libraryPage", function () {
var page = this;