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

update next/previous buttons

Browse source
This commit is contained in:
Luke Pulverenti 2014-01-24 13:09:50 -05:00
parent e22622a6ac
commit 10567bd881
11 changed files with 70 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -411,7 +411,7 @@ a.itemTag:hover {
.lnkSibling { .lnkSibling {
position: absolute; position: absolute;
top: 10px; top: 0;
text-decoration: none; text-decoration: none;
font-weight: normal!important; font-weight: normal!important;
display: none; display: none;
@ -425,18 +425,19 @@ a.itemTag:hover {
text-decoration: underline; text-decoration: underline;
} }
.noBackdrop .lnkSibling { @media all and (max-width: 1000px) {
background-color: transparent;
border-radius: 0; .lnkSibling {
padding: 0; display: none!important;
}
} }
.lnkPreviousItem { .lnkPreviousItem {
left: 15px; left: 5px;
} }
.lnkNextItem { .lnkNextItem {
right: 15px; right: 0;
} }
.itemDetailImage { .itemDetailImage {
@ -461,20 +462,13 @@ a.itemTag:hover {
} }
.parentName { .parentName {
padding: .5em; font-size: 15px;
text-align: center; display: block;
font-size: 16px; margin-bottom: .4em;
border: 0;
background-color: rgba(0,0,0,0.7);
}
.parentName a {
color: #fff!important;
font-weight: normal!important;
} }
.inlineItemName { .inlineItemName {
font-size: 22px; font-size: 20px;
} }
.itemName + .itemMiscInfo { .itemName + .itemMiscInfo {
@ -482,19 +476,19 @@ a.itemTag:hover {
} }
.itemOverview { .itemOverview {
/*max-height: 120px;
overflow-y: auto;*/
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.desktopOverview { .desktopOverview {
min-width: 500px; min-width: 500px;
max-height: 100px;
overflow-y: auto;
padding-right: 1em;
} }
.mobileOverview { .mobileOverview {
display: none; display: none;
padding: 0 1em; padding: 0 1em;
max-height: initial;
} }
.mobileGenres { .mobileGenres {
@ -668,10 +662,6 @@ a.itemTag:hover {
background-color: transparent; background-color: transparent;
} }
.parentName {
position: static!important;
}
.itemDetailImage { .itemDetailImage {
max-height: 240px; max-height: 240px;
max-width: 100px; max-width: 100px;

4
dashboard-ui/css/posteritem.css
View file

@ -157,11 +157,11 @@
} }
.smallBackdropPosterItem { .smallBackdropPosterItem {
width: 160px; width: 157px;
} }
.smallBackdropPosterItem .posterItemImage { .smallBackdropPosterItem .posterItemImage {
height: 90px; height: 88.3125px;
} }
.portraitPosterItem { .portraitPosterItem {

2
dashboard-ui/edititemimages.html
View file

@ -14,7 +14,7 @@
</div> </div>
<div class="editPageInnerContent"> <div class="editPageInnerContent">
<h1 class="itemName detailPageName editPageName">&nbsp;</h1> <h1 class="itemName editPageName">&nbsp;</h1>
<br /> <br />
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true"> <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
<a href="#" data-role="button" id="btnEditMetadata">Metadata</a> <a href="#" data-role="button" id="btnEditMetadata">Metadata</a>

2
dashboard-ui/edititemmetadata.html
View file

@ -13,7 +13,7 @@
</div> </div>
</div> </div>
<div class="editPageInnerContent"> <div class="editPageInnerContent">
<h1 class="itemName detailPageName editPageName">&nbsp;</h1> <h1 class="itemName editPageName">&nbsp;</h1>
<br /> <br />
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true"> <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
<a href="#" data-role="button" class="ui-btn-active">Metadata</a> <a href="#" data-role="button" class="ui-btn-active">Metadata</a>

2
dashboard-ui/edititempeople.html
View file

@ -13,7 +13,7 @@
</div> </div>
</div> </div>
<div class="editPageInnerContent"> <div class="editPageInnerContent">
<h1 class="itemName detailPageName editPageName">&nbsp;</h1> <h1 class="itemName editPageName">&nbsp;</h1>
<br /> <br />
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true"> <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
<a href="#" data-role="button" id="btnEditMetadata">Metadata</a> <a href="#" data-role="button" id="btnEditMetadata">Metadata</a>

10
dashboard-ui/itemdetails.html
View file

@ -102,8 +102,6 @@
</div> </div>
</div> </div>
<div id="itemBackdrop" class="itemBackdrop noBackdrop"> <div id="itemBackdrop" class="itemBackdrop noBackdrop">
<div class="parentName" style="display: none;">
</div>
<div class="itemBackdropContent"> <div class="itemBackdropContent">
<table class="detailPageContent primaryDetailPageContent"> <table class="detailPageContent primaryDetailPageContent">
<tr> <tr>
@ -114,7 +112,7 @@
</div> </div>
</td> </td>
<td style="vertical-align: top; padding: 0; position: relative;"> <td style="vertical-align: top; padding: 0; position: relative;">
<p><span class="itemName inlineItemName"></span><span class="itemMiscInfo" style="display: inline;"></span></p> <p><span class="parentName"></span><span class="itemName inlineItemName"></span><span class="itemMiscInfo" style="display: inline;"></span></p>
<p> <p>
<span class="itemCommunityRating"></span> <span class="itemCommunityRating"></span>
<span class="userDataIcons"></span> <span class="userDataIcons"></span>
@ -126,8 +124,8 @@
</tr> </tr>
</table> </table>
</div> </div>
<a href="#" id="lnkPreviousItem" class="lnkPreviousItem lnkSibling hide">← Previous</a> <a href="#" id="lnkPreviousItem" class="lnkPreviousItem lnkSibling hide" data-role="button" title="Previous" data-icon="carat-l" data-mini="true" data-inline="true" data-iconpos="notext">Previous</a>
<a href="#" id="lnkNextItem" class="lnkNextItem lnkSibling hide">Next →</a> <a href="#" id="lnkNextItem" class="lnkNextItem lnkSibling hide" data-role="button" title="Next" data-icon="carat-r" data-mini="true" data-inline="true" data-iconpos="notext">Next</a>
<p class="itemGenres mobileGenres"></p> <p class="itemGenres mobileGenres"></p>
<p class="itemOverview mobileOverview"></p> <p class="itemOverview mobileOverview"></p>
</div> </div>
@ -141,7 +139,7 @@
<span id="playButtonContainer" style="display: none;"> <span id="playButtonContainer" style="display: none;">
<button id="btnPlay" type="button" data-icon="play" data-inline="true" data-mini="true">Play</button> <button id="btnPlay" type="button" data-icon="play" data-inline="true" data-mini="true">Play</button>
</span> </span>
<span id="trailerButtonContainer"> <span id="trailerButtonContainer" style="display: none;">
<button id="btnPlayTrailer" type="button" data-icon="video" data-inline="true" data-mini="true">Trailer</button> <button id="btnPlayTrailer" type="button" data-icon="video" data-inline="true" data-mini="true">Trailer</button>
</span> </span>
<span id="playExternalButtonContainer" style="display: none;"> <span id="playExternalButtonContainer" style="display: none;">

7
dashboard-ui/itemgallery.html
View file

@ -5,12 +5,13 @@
</head> </head>
<body> <body>
<div id="itemGalleryPage" data-role="page" class="page libraryPage" data-theme="b"> <div id="itemGalleryPage" data-role="page" class="page libraryPage" data-theme="b">
<div class="parentName" style="display: none;">
</div>
<div data-role="content"> <div data-role="content">
<div class="ehsContent"> <div class="ehsContent">
<h1 class="itemName detailPageName"></h1> <br />
<div class="parentName" style="display: none;">
</div>
<h1 class="itemName"></h1>
<div id="galleryCollapsible" class="detailSection"> <div id="galleryCollapsible" class="detailSection">
<div class="detailSectionHeader"> <div class="detailSectionHeader">

2
dashboard-ui/livetvstatus.html
View file

@ -14,7 +14,7 @@
<a href="livetvsettings.html" data-role="button">Settings</a> <a href="livetvsettings.html" data-role="button">Settings</a>
</div> </div>
<div class="readOnlyContent" style="margin-top: 2em;"> <div style="margin-top: 2em;">
<div class="liveTvStatusContent" style="display: none;"> <div class="liveTvStatusContent" style="display: none;">

14
dashboard-ui/scripts/itemdetailpage.js
View file

@ -408,11 +408,11 @@
if (curr.IndexNumber < item.IndexNumber) { if (curr.IndexNumber < item.IndexNumber) {
$('.lnkPreviousItem', page).removeClass('hide').attr('href', 'itemdetails.html?id=' + curr.Id).html('← Previous'); $('.lnkPreviousItem', page).removeClass('hide').attr('href', 'itemdetails.html?id=' + curr.Id);
} }
else if (curr.IndexNumber > item.IndexNumber) { else if (curr.IndexNumber > item.IndexNumber) {
$('.lnkNextItem', page).removeClass('hide').attr('href', 'itemdetails.html?id=' + curr.Id).html('Next' + ' →'); $('.lnkNextItem', page).removeClass('hide').attr('href', 'itemdetails.html?id=' + curr.Id);
} }
} }
}); });
@ -1170,8 +1170,16 @@
renderCriticReviews(page, currentItem); renderCriticReviews(page, currentItem);
}).on('swipeleft.sibling', function() {
$('.lnkNextItem', page)[0].click();
}).on('swiperight.sibling', function () {
$('.lnkPreviousItem', page)[0].click();
}); });
reload(page); reload(page);
}).on('pagehide', "#itemDetailPage", function () { }).on('pagehide', "#itemDetailPage", function () {
@ -1180,7 +1188,7 @@
var page = this; var page = this;
$(page).off("click.moreScenes").off("click.morePeople").off("click.moreSpecials").off("click.moreCriticReviews"); $(page).off("click.moreScenes").off("click.morePeople").off("click.moreSpecials").off("click.moreCriticReviews").off("swipeleft.sibling").off("swiperight.sibling");
}); });
function itemDetailPage() { function itemDetailPage() {

18
dashboard-ui/scripts/librarybrowser.js
View file

@ -1101,7 +1101,7 @@
return day; return day;
}, },
getPosterViewDisplayName: function (item, displayAsSpecial) { getPosterViewDisplayName: function (item, displayAsSpecial, includeParentInfo) {
var name = item.EpisodeTitle || item.Name; var name = item.EpisodeTitle || item.Name;
@ -1117,7 +1117,11 @@
var displayIndexNumber = item.IndexNumber; var displayIndexNumber = item.IndexNumber;
var number = "S" + item.ParentIndexNumber + ", E" + displayIndexNumber; var number = "E" + displayIndexNumber;
if (includeParentInfo !== false) {
number = "S" + item.ParentIndexNumber + ", " + number;
}
if (item.IndexNumberEnd) { if (item.IndexNumberEnd) {
@ -1128,14 +1132,6 @@
name = number + " - " + name; name = number + " - " + name;
} }
else {
if (item.IndexNumber != null && item.Type !== "Season") {
name = item.IndexNumber + " - " + name;
}
if (item.ParentIndexNumber != null && item.Type != "Episode") {
name = item.ParentIndexNumber + "." + name;
}
}
return name; return name;
}, },
@ -1269,7 +1265,7 @@
renderName: function (item, nameElem, linkToElement) { renderName: function (item, nameElem, linkToElement) {
var name = LibraryBrowser.getPosterViewDisplayName(item); var name = LibraryBrowser.getPosterViewDisplayName(item, false, false);
Dashboard.setPageTitle(name); Dashboard.setPageTitle(name);

22
dashboard-ui/scripts/livetvstatus.js
View file

@ -39,7 +39,29 @@
html += '</td>'; html += '</td>';
html += '<td>'; html += '<td>';
if (tuner.Status == 'RecordingTv') {
if (tuner.ChannelName) {
html += '<a href="livetvchannel.html?id=' + tuner.ChannelId + '">Recording ' + tuner.ChannelName + '</a>';
} else {
html += 'Recording';
}
}
else if (tuner.Status == 'LiveTv') {
if (tuner.ChannelName) {
html += '<a href="livetvchannel.html?id=' + tuner.ChannelId + '">Watching ' + tuner.ChannelName + '</a>';
} else {
html += 'Watching';
}
}
else {
html += tuner.Status; html += tuner.Status;
}
html += '</td>'; html += '</td>';
html += '<td>'; html += '<td>';