mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
support url's after closing nfo tag
This commit is contained in:
parent
17074bfa0f
commit
0a81db18ed
7 changed files with 17 additions and 24 deletions
|
@ -118,14 +118,14 @@
|
||||||
@media all and (min-width: 1600px) {
|
@media all and (min-width: 1600px) {
|
||||||
|
|
||||||
.ehsContent {
|
.ehsContent {
|
||||||
width: 85%;
|
width: 92%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media all and (min-width: 1920px) {
|
@media all and (min-width: 1920px) {
|
||||||
|
|
||||||
.ehsContent {
|
.ehsContent {
|
||||||
width: 90%;
|
width: 94%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
<a href="movieslatest.html">${TabLatest}</a>
|
<a href="movieslatest.html">${TabLatest}</a>
|
||||||
<a href="moviesrecommended.html">${TabSuggested}</a>
|
<a href="moviesrecommended.html">${TabSuggested}</a>
|
||||||
<a href="movies.html" class="lnkMovies">${TabMovies}</a>
|
<a href="movies.html" class="lnkMovies">${TabMovies}</a>
|
||||||
<a href="movietrailers.html">${TabTrailers}</a>
|
<a href="movietrailers.html" class="lnkMovieTrailers">${TabTrailers}</a>
|
||||||
<a href="collections.html?context=movies" class="lnkCollections">${TabCollections}</a>
|
<a href="collections.html?context=movies" class="lnkCollections">${TabCollections}</a>
|
||||||
<a href="moviegenres.html">${TabGenres}</a>
|
<a href="moviegenres.html">${TabGenres}</a>
|
||||||
<a href="moviepeople.html">${TabPeople}</a>
|
<a href="moviepeople.html">${TabPeople}</a>
|
||||||
|
|
|
@ -24,13 +24,6 @@
|
||||||
<div class="listTopPaging">
|
<div class="listTopPaging">
|
||||||
</div>
|
</div>
|
||||||
<button class="btnTrailerReel" type="button" data-icon="play" data-inline="true" data-mini="true">${ButtonTrailerReel}</button>
|
<button class="btnTrailerReel" type="button" data-icon="play" data-inline="true" data-mini="true">${ButtonTrailerReel}</button>
|
||||||
<div class="selectionCommands" style="display: none;">
|
|
||||||
<div class="selectionCommandsControlGroup">
|
|
||||||
<button class="btnAddToPlaylist" data-mini="true" data-icon="plus" data-inline="true" title="${ButtonAddToPlaylist}">${ButtonAddToPlaylist}</button>
|
|
||||||
<button class="btnMergeVersions" data-mini="true" data-icon="recycle" data-inline="true" title="${ButtonGroupVersions}">${ButtonGroupVersions}</button>
|
|
||||||
<button class="btnAddToCollection" data-mini="true" data-icon="plus" data-inline="true" title="${ButtonAddToCollection}">${ButtonAddToCollection}</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div id="items" class="itemsContainer"></div>
|
<div id="items" class="itemsContainer"></div>
|
||||||
<p class="noItemsMessage" style="display:none;">${MessageNoTrailersFound}</p>
|
<p class="noItemsMessage" style="display:none;">${MessageNoTrailersFound}</p>
|
||||||
|
|
|
@ -248,13 +248,17 @@
|
||||||
$('a', elem).removeClass('ui-btn-active');
|
$('a', elem).removeClass('ui-btn-active');
|
||||||
$('.lnkHomeLatest', page).addClass('ui-btn-active');
|
$('.lnkHomeLatest', page).addClass('ui-btn-active');
|
||||||
}
|
}
|
||||||
else if (context == 'movies' || item.Type == 'Movie') {
|
else if (context == 'movies' || item.Type == 'Movie' || context == 'movies-trailers') {
|
||||||
elem = $('#movieTabs', page).show();
|
elem = $('#movieTabs', page).show();
|
||||||
$('a', elem).removeClass('ui-btn-active');
|
$('a', elem).removeClass('ui-btn-active');
|
||||||
|
|
||||||
if (item.Type == 'BoxSet') {
|
if (item.Type == 'BoxSet') {
|
||||||
$('.lnkCollections', page).addClass('ui-btn-active');
|
$('.lnkCollections', page).addClass('ui-btn-active');
|
||||||
} else {
|
}
|
||||||
|
else if (context == 'movies-trailers') {
|
||||||
|
$('.lnkMovieTrailers', page).addClass('ui-btn-active');
|
||||||
|
}
|
||||||
|
else {
|
||||||
$('.lnkMovies', page).addClass('ui-btn-active');
|
$('.lnkMovies', page).addClass('ui-btn-active');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -486,7 +486,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
if (item.CollectionType == 'trailers') {
|
if (item.CollectionType == 'trailers') {
|
||||||
return 'movietrailers.html?topParentId=' + item.Id;
|
return "itemlist.html?parentId=" + item.Id;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (item.CollectionType == 'movies') {
|
if (item.CollectionType == 'movies') {
|
||||||
|
|
|
@ -42,8 +42,7 @@
|
||||||
limit: query.Limit,
|
limit: query.Limit,
|
||||||
totalRecordCount: result.TotalRecordCount,
|
totalRecordCount: result.TotalRecordCount,
|
||||||
viewButton: true,
|
viewButton: true,
|
||||||
showLimit: false,
|
showLimit: false
|
||||||
addSelectionButton: true
|
|
||||||
});
|
});
|
||||||
|
|
||||||
$('.listTopPaging', page).html(pagingHtml).trigger('create');
|
$('.listTopPaging', page).html(pagingHtml).trigger('create');
|
||||||
|
@ -55,8 +54,7 @@
|
||||||
items: result.Items,
|
items: result.Items,
|
||||||
shape: "backdrop",
|
shape: "backdrop",
|
||||||
preferThumb: true,
|
preferThumb: true,
|
||||||
context: 'movies',
|
context: 'movies-trailers',
|
||||||
selectionPanel: true,
|
|
||||||
lazy: true,
|
lazy: true,
|
||||||
overlayText: true
|
overlayText: true
|
||||||
});
|
});
|
||||||
|
@ -68,7 +66,7 @@
|
||||||
items: result.Items,
|
items: result.Items,
|
||||||
shape: "banner",
|
shape: "banner",
|
||||||
preferBanner: true,
|
preferBanner: true,
|
||||||
context: 'movies',
|
context: 'movies-trailers',
|
||||||
lazy: true
|
lazy: true
|
||||||
});
|
});
|
||||||
$('.itemsContainer', page).removeClass('timelineItemsContainer');
|
$('.itemsContainer', page).removeClass('timelineItemsContainer');
|
||||||
|
@ -77,7 +75,7 @@
|
||||||
|
|
||||||
html = LibraryBrowser.getListViewHtml({
|
html = LibraryBrowser.getListViewHtml({
|
||||||
items: result.Items,
|
items: result.Items,
|
||||||
context: 'movies',
|
context: 'movies-trailers',
|
||||||
sortBy: query.SortBy
|
sortBy: query.SortBy
|
||||||
});
|
});
|
||||||
$('.itemsContainer', page).removeClass('timelineItemsContainer');
|
$('.itemsContainer', page).removeClass('timelineItemsContainer');
|
||||||
|
@ -86,10 +84,9 @@
|
||||||
html = LibraryBrowser.getPosterViewHtml({
|
html = LibraryBrowser.getPosterViewHtml({
|
||||||
items: result.Items,
|
items: result.Items,
|
||||||
shape: "portrait",
|
shape: "portrait",
|
||||||
context: 'movies',
|
context: 'movies-trailers',
|
||||||
showTitle: false,
|
showTitle: false,
|
||||||
centerText: true,
|
centerText: true,
|
||||||
selectionPanel: true,
|
|
||||||
lazy: true,
|
lazy: true,
|
||||||
overlayText: true
|
overlayText: true
|
||||||
});
|
});
|
||||||
|
@ -99,11 +96,10 @@
|
||||||
html = LibraryBrowser.getPosterViewHtml({
|
html = LibraryBrowser.getPosterViewHtml({
|
||||||
items: result.Items,
|
items: result.Items,
|
||||||
shape: "portrait",
|
shape: "portrait",
|
||||||
context: 'movies',
|
context: 'movies-trailers',
|
||||||
showTitle: true,
|
showTitle: true,
|
||||||
timeline: true,
|
timeline: true,
|
||||||
centerText: true,
|
centerText: true,
|
||||||
selectionPanel: true,
|
|
||||||
lazy: true
|
lazy: true
|
||||||
});
|
});
|
||||||
$('.itemsContainer', page).addClass('timelineItemsContainer');
|
$('.itemsContainer', page).addClass('timelineItemsContainer');
|
||||||
|
|
|
@ -114,7 +114,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
|
||||||
self.encodeName = function (name) {
|
self.encodeName = function (name) {
|
||||||
|
|
||||||
name = name.split('/').join('-');
|
name = name.split('/').join('-');
|
||||||
|
name = name.split('&').join('-');
|
||||||
name = name.split('?').join('-');
|
name = name.split('?').join('-');
|
||||||
|
|
||||||
var val = $.param({ name: name });
|
var val = $.param({ name: name });
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue