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

move list page to the usual location

Browse Source
This commit is contained in:
dkanada 2019-03-29 15:09:51 -07:00
parent 3eec1cf2f7
commit 3f4b750288
7 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/favoriteitems.js
View File

@ -111,7 +111,7 @@ define(["loading", "libraryBrowser", "cardBuilder", "dom", "apphost", "imageLoad
var html = "";
if (result.Items.length) {
if (html += '<div class="sectionTitleContainer sectionTitleContainer-cards padded-left">', !layoutManager.tv && options.Limit && result.Items.length >= options.Limit) {
html += '<a is="emby-linkbutton" href="' + ("list/list.html?serverId=" + ApiClient.serverId() + "&type=" + section.types + "&IsFavorite=true") + '" class="more button-flat button-flat-mini sectionTitleTextButton">', html += '<h2 class="sectionTitle sectionTitle-cards">', html += globalize.translate(section.name), html += "</h2>", html += '<i class="md-icon">&#xE5CC;</i>', html += "</a>"
html += '<a is="emby-linkbutton" href="' + ("list.html?serverId=" + ApiClient.serverId() + "&type=" + section.types + "&IsFavorite=true") + '" class="more button-flat button-flat-mini sectionTitleTextButton">', html += '<h2 class="sectionTitle sectionTitle-cards">', html += globalize.translate(section.name), html += "</h2>", html += '<i class="md-icon">&#xE5CC;</i>', html += "</a>"
} else html += '<h2 class="sectionTitle sectionTitle-cards">' + globalize.translate(section.name) + "</h2>";
if (html += "</div>", enableScrollX()) {
var scrollXClass = "scrollX hiddenScrollX";

8
src/list/list.html → src/list.html
View File

@ -1,10 +1,7 @@
<div data-role="page" class="view flex flex-direction-column page libraryPage noSecondaryNavPage" data-backbutton="true">
<div class="alphaPicker alphaPicker-vertical alphaPicker-fixed focuscontainer-y hide"></div>
<div class="alphaPicker alphaPicker-vertical alphaPicker-fixed focuscontainer-y hide">
</div>
<div class="flex-grow padded-left padded-right pageContainerTopPadding">
<div class="flex align-items-center focuscontainer-x itemsViewSettingsContainer padded-top padded-bottom flex-wrap-wrap">
<button is="emby-button" class="btnPlay button-flat hide listTextButton-autohide">
<span>${HeaderPlayAll}</span>
@ -51,7 +48,6 @@
<i class="md-icon">&#xE5D3;</i>
</button>
</div>
<div is="emby-itemscontainer" class="vertical-wrap itemsContainer centered" style="padding: 0 0 10vh 0;">
</div>
</div>

12
src/livetv.html
View File

@ -5,7 +5,7 @@
<div class="pageTabContent" id="suggestionsTab" data-index="0">
<div id="activePrograms" class="verticalSection">
<div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
<a href="list/list.html?type=Programs&IsAiring=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
<a href="list.html?type=Programs&IsAiring=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
<h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${HeaderOnNow}</h2>
<i class="md-icon">&#xE5CC;</i>
</a>
@ -14,7 +14,7 @@
</div>
<div id="upcomingEpisodes" class="verticalSection">
<div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
<a href="list/list.html?type=Programs&IsSeries=true&IsMovie=false&IsNews=false" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
<a href="list.html?type=Programs&IsSeries=true&IsMovie=false&IsNews=false" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
<h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${TabShows}</h2>
<i class="md-icon">&#xE5CC;</i>
</a>
@ -23,7 +23,7 @@
</div>
<div id="upcomingTvMovies" class="verticalSection">
<div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
<a href="list/list.html?type=Programs&IsMovie=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
<a href="list.html?type=Programs&IsMovie=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
<h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${HeaderMovies}</h2>
<i class="md-icon">&#xE5CC;</i>
</a>
@ -32,7 +32,7 @@
</div>
<div id="upcomingSports" class="verticalSection">
<div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
<a href="list/list.html?type=Programs&IsSports=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
<a href="list.html?type=Programs&IsSports=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
<h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${Sports}</h2>
<i class="md-icon">&#xE5CC;</i>
</a>
@ -41,7 +41,7 @@
</div>
<div id="upcomingKids" class="verticalSection">
<div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
<a href="list/list.html?type=Programs&IsKids=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
<a href="list.html?type=Programs&IsKids=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
<h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${HeaderForKids}</h2>
<i class="md-icon">&#xE5CC;</i>
</a>
@ -50,7 +50,7 @@
</div>
<div id="upcomingNews" class="verticalSection">
<div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
<a href="list/list.html?type=Programs&IsNews=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
<a href="list.html?type=Programs&IsNews=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
<h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${News}</h2>
<i class="md-icon">&#xE5CC;</i>
</a>

2
src/scripts/itembynamedetailpage.js
View File

@ -210,7 +210,7 @@ define(["connectionManager", "listView", "cardBuilder", "imageLoader", "libraryB
}
function getMoreItemsHref(item, type) {
return "Genre" == item.Type ? "list/list.html?type=" + type + "&genreId=" + item.Id + "&serverId=" + item.ServerId : "MusicGenre" == item.Type ? "list/list.html?type=" + type + "&musicGenreId=" + item.Id + "&serverId=" + item.ServerId : "Studio" == item.Type ? "list/list.html?type=" + type + "&studioId=" + item.Id + "&serverId=" + item.ServerId : "MusicArtist" == item.Type ? "list/list.html?type=" + type + "&artistId=" + item.Id + "&serverId=" + item.ServerId : "Person" == item.Type ? "list/list.html?type=" + type + "&personId=" + item.Id + "&serverId=" + item.ServerId : "list/list.html?type=" + type + "&parentId=" + item.Id + "&serverId=" + item.ServerId
return "Genre" == item.Type ? "list.html?type=" + type + "&genreId=" + item.Id + "&serverId=" + item.ServerId : "MusicGenre" == item.Type ? "list.html?type=" + type + "&musicGenreId=" + item.Id + "&serverId=" + item.ServerId : "Studio" == item.Type ? "list.html?type=" + type + "&studioId=" + item.Id + "&serverId=" + item.ServerId : "MusicArtist" == item.Type ? "list.html?type=" + type + "&artistId=" + item.Id + "&serverId=" + item.ServerId : "Person" == item.Type ? "list.html?type=" + type + "&personId=" + item.Id + "&serverId=" + item.ServerId : "list.html?type=" + type + "&parentId=" + item.Id + "&serverId=" + item.ServerId
}
function addCurrentItemToQuery(query, item) {

2
src/scripts/livetvrecordings.js
View File

@ -45,7 +45,7 @@ define(["layoutManager", "loading", "cardBuilder", "apphost", "imageLoader", "sc
serverId = ApiClient.serverId();
switch (type) {
case "latest":
Dashboard.navigate("list/list.html?type=Recordings&serverId=" + serverId)
Dashboard.navigate("list.html?type=Recordings&serverId=" + serverId)
}
}
return function(view, params, tabContent) {

2
src/scripts/routes.js
View File

@ -119,7 +119,7 @@ define([
type: "home"
});
defineRoute({
path: "/list/list.html",
path: "/list.html",
autoFocus: false,
controller: "list",
transition: "fade"

24
src/scripts/site.js
View File

@ -992,11 +992,11 @@ var AppInfo = {};
}
if ("nextup" === item) {
return "list/list.html?type=nextup&serverId=" + options.serverId;
return "list.html?type=nextup&serverId=" + options.serverId;
}
if ("list" === item) {
var url = "list/list.html?serverId=" + options.serverId + "&type=" + options.itemTypes;
var url = "list.html?serverId=" + options.serverId + "&type=" + options.itemTypes;
if (options.isFavorite) {
url += "&IsFavorite=true";
@ -1011,27 +1011,27 @@ var AppInfo = {};
}
if ("movies" === options.section) {
return "list/list.html?type=Programs&IsMovie=true&serverId=" + options.serverId;
return "list.html?type=Programs&IsMovie=true&serverId=" + options.serverId;
}
if ("shows" === options.section) {
return "list/list.html?type=Programs&IsSeries=true&IsMovie=false&IsNews=false&serverId=" + options.serverId;
return "list.html?type=Programs&IsSeries=true&IsMovie=false&IsNews=false&serverId=" + options.serverId;
}
if ("sports" === options.section) {
return "list/list.html?type=Programs&IsSports=true&serverId=" + options.serverId;
return "list.html?type=Programs&IsSports=true&serverId=" + options.serverId;
}
if ("kids" === options.section) {
return "list/list.html?type=Programs&IsKids=true&serverId=" + options.serverId;
return "list.html?type=Programs&IsKids=true&serverId=" + options.serverId;
}
if ("news" === options.section) {
return "list/list.html?type=Programs&IsNews=true&serverId=" + options.serverId;
return "list.html?type=Programs&IsNews=true&serverId=" + options.serverId;
}
if ("onnow" === options.section) {
return "list/list.html?type=Programs&IsAiring=true&serverId=" + options.serverId;
return "list.html?type=Programs&IsAiring=true&serverId=" + options.serverId;
}
if ("dvrschedule" === options.section) {
@ -1050,7 +1050,7 @@ var AppInfo = {};
}
if ("Genre" === item.Type) {
url = "list/list.html?genreId=" + item.Id + "&serverId=" + serverId;
url = "list.html?genreId=" + item.Id + "&serverId=" + serverId;
if ("livetv" === context) {
url += "&type=Programs";
@ -1064,7 +1064,7 @@ var AppInfo = {};
}
if ("MusicGenre" === item.Type) {
url = "list/list.html?musicGenreId=" + item.Id + "&serverId=" + serverId;
url = "list.html?musicGenreId=" + item.Id + "&serverId=" + serverId;
if (options.parentId) {
url += "&parentId=" + options.parentId;
@ -1074,7 +1074,7 @@ var AppInfo = {};
}
if ("Studio" === item.Type) {
url = "list/list.html?studioId=" + item.Id + "&serverId=" + serverId;
url = "list.html?studioId=" + item.Id + "&serverId=" + serverId;
if (options.parentId) {
url += "&parentId=" + options.parentId;
@ -1123,7 +1123,7 @@ var AppInfo = {};
if (item.IsFolder) {
if (id) {
return "list/list.html?parentId=" + id + "&serverId=" + serverId;
return "list.html?parentId=" + id + "&serverId=" + serverId;
}
return "#";