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

update tv recording page

This commit is contained in:
Luke Pulverenti 2013-12-12 23:06:38 -05:00
parent fb64641b57
commit 72b7920f68
9 changed files with 56 additions and 34 deletions

View file

@ -365,7 +365,7 @@ a.itemTag:hover {
} }
.itemBackdropContent { .itemBackdropContent {
height: 245px; height: 230px;
} }
.lnkSibling { .lnkSibling {
@ -399,7 +399,7 @@ a.itemTag:hover {
} }
.itemDetailImage { .itemDetailImage {
height: 255px; height: 240px;
-moz-box-shadow: 0px 0 20px #000; -moz-box-shadow: 0px 0 20px #000;
-webkit-box-shadow: 0px 0 20px #000; -webkit-box-shadow: 0px 0 20px #000;
box-shadow: 0px 0 20px #000; box-shadow: 0px 0 20px #000;
@ -433,7 +433,7 @@ a.itemTag:hover {
} }
.itemOverview { .itemOverview {
max-height: 80px; max-height: 60px;
overflow-y: auto; overflow-y: auto;
text-overflow: ellipsis; text-overflow: ellipsis;
} }

View file

@ -11,11 +11,10 @@
<tr> <tr>
<td> <td>
<h1 class="listHeader firstListHeader" id="viewsHeader" style="display: none;">Views</h1> <br /><br />
<div id="views"> <div id="views">
</div> </div>
<br /><br />
<h1 class="listHeader"><a href="itemlist.html">Media Collections<img src="css/images/rightarrow.png" class="headerArrowImage" /></a></h1> <h1 class="listHeader"><a href="itemlist.html">Media Collections<img src="css/images/rightarrow.png" class="headerArrowImage" /></a></h1>
<div id="divCollections"></div> <div id="divCollections"></div>

View file

@ -20,6 +20,7 @@
</td> </td>
<td style="vertical-align: top; padding: 0;"> <td style="vertical-align: top; padding: 0;">
<p><span class="itemName inlineItemName"></span><span class="itemMiscInfo" style="display: inline;"></span></p> <p><span class="itemName inlineItemName"></span><span class="itemMiscInfo" style="display: inline;"></span></p>
<p class="itemEpisodeName"></p>
<p class="itemChannelNumber"></p> <p class="itemChannelNumber"></p>
<p style="margin: 2em 0;"> <p style="margin: 2em 0;">
<span class="itemCommunityRating"></span> <span class="itemCommunityRating"></span>
@ -44,6 +45,19 @@
</span> </span>
</div> </div>
<div data-role="content"> <div data-role="content">
<div class="detailPageContent">
<div id="detailsSection" class="detailSection">
<div class="detailSectionHeader" style="margin-top: 0;">
Details
</div>
<div class="detailSectionContent" style="padding: 0 1em;">
<p class="status"></p>
<p class="audio"></p>
</div>
</div>
</div>
</div> </div>
</div> </div>
</body> </body>

View file

@ -13,12 +13,19 @@
</div> </div>
<div data-role="content"> <div data-role="content">
<form style="margin: 0 auto;"> <form style="margin: 0 auto;">
<h1 class="timerName"></h1> <h1>Timer Info</h1>
<p class="program"></p>
<p class="channel"></p>
<p class="overview"></p>
<br />
<br />
<ul data-role="listview" class="ulForm"> <ul data-role="listview" class="ulForm">
<li> <li>
<input type="checkbox" id="chkEnableInternetProviders" name="chkEnableInternetProviders" /> <label for="txtPortNumber">Http server port number: </label>
<label for="chkEnableInternetProviders">Download metadata from the internet </label> <input type="number" name="txtPortNumber" pattern="[0-9]*" required="required" min="1" readonly disabled />
</li> </li>
<li> <li>
<button type="submit" data-theme="b" data-icon="ok" data-mini="true"> <button type="submit" data-theme="b" data-icon="ok" data-mini="true">

View file

@ -870,16 +870,6 @@
attributes.push('<span class="mediaInfoAttribute">' + (parseInt(stream.BitRate / 1000)) + ' kbps</span>'); attributes.push('<span class="mediaInfoAttribute">' + (parseInt(stream.BitRate / 1000)) + ' kbps</span>');
} }
if (stream.SampleRate) {
attributes.push('<span class="mediaInfoAttribute">' + stream.SampleRate + ' khz</span>');
}
var framerate = stream.AverageFrameRate || stream.RealFrameRate;
if (framerate && item.MediaType != "Audio") {
attributes.push('<span class="mediaInfoAttribute">' + framerate + '</span>');
}
if (stream.IsDefault) { if (stream.IsDefault) {
attributes.push('<span class="mediaInfoAttribute">Default</span>'); attributes.push('<span class="mediaInfoAttribute">Default</span>');
} }

View file

@ -173,34 +173,22 @@
var views = []; var views = [];
var showViewsHeader;
if (counts.MovieCount || counts.TrailerCount) { if (counts.MovieCount || counts.TrailerCount) {
showViewsHeader = true;
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: "moviesrecommended.html", img: "css/images/items/list/chapter.png", background: "#0094FF" });
} }
if (counts.EpisodeCount || counts.SeriesCount) { if (counts.EpisodeCount || counts.SeriesCount) {
showViewsHeader = true;
views.push({ id: "tvView", name: "TV Shows", url: "tvrecommended.html", img: "css/images/items/list/collection.png", background: "#FF870F" }); views.push({ id: "tvView", name: "TV Shows", url: "tvrecommended.html", img: "css/images/items/list/collection.png", background: "#FF870F" });
} }
if (counts.SongCount || counts.MusicVideoCount) { if (counts.SongCount || counts.MusicVideoCount) {
showViewsHeader = true;
views.push({ id: "musicView", name: "Music", url: "musicrecommended.html", img: "css/images/items/list/audiocollection.png", background: "#6FBD45" }); views.push({ id: "musicView", name: "Music", url: "musicrecommended.html", img: "css/images/items/list/audiocollection.png", background: "#6FBD45" });
} }
if (counts.GameCount) { if (counts.GameCount) {
showViewsHeader = true;
views.push({ id: "gamesView", name: "Games", url: "gamesrecommended.html", img: "css/images/items/list/gamecollection.png", background: "#E12026" }); views.push({ id: "gamesView", name: "Games", url: "gamesrecommended.html", img: "css/images/items/list/gamecollection.png", background: "#E12026" });
} }
if (showViewsHeader) {
$('#viewsHeader', page).show();
} else {
$('#viewsHeader', page).hide();
}
var html = ''; var html = '';
for (var i = 0, length = views.length; i < length; i++) { for (var i = 0, length = views.length; i < length; i++) {

View file

@ -2051,6 +2051,18 @@
miscInfo.push(item.OfficialRating); miscInfo.push(item.OfficialRating);
} }
if (item.Type == "Recording") {
if (item.IsHD) {
miscInfo.push("HD");
}
if (item.IsRepeat) {
miscInfo.push("Repeat");
}
}
if (item.Video3DFormat) { if (item.Video3DFormat) {
miscInfo.push("3D"); miscInfo.push("3D");
} }

View file

@ -33,7 +33,9 @@
Dashboard.setPageTitle(name); Dashboard.setPageTitle(name);
$('.itemName', page).html(name); $('.itemName', page).html(name);
$('.itemChannelNumber', page).html(item.Number); $('.itemChannelNumber', page).html(item.ChannelName);
$('.itemEpisodeName', page).html(item.EpisodeTitle);
if (item.CommunityRating) { if (item.CommunityRating) {
$('.itemCommunityRating', page).html(LibraryBrowser.getRatingHtml(item)).show(); $('.itemCommunityRating', page).html(LibraryBrowser.getRatingHtml(item)).show();
@ -62,6 +64,14 @@
$('#playButtonContainer', page).hide(); $('#playButtonContainer', page).hide();
} }
$('.status', page).html('Status:&nbsp;&nbsp;&nbsp;' + item.Status);
if (item.Audio) {
$('.audio', page).html('Audio:&nbsp;&nbsp;&nbsp;' + item.Audio).show();
} else {
$('.audio', page).hide();
}
Dashboard.getCurrentUser().done(function (user) { Dashboard.getCurrentUser().done(function (user) {
if (user.Configuration.IsAdministrator && item.LocationType !== "Offline") { if (user.Configuration.IsAdministrator && item.LocationType !== "Offline") {

View file

@ -6,7 +6,9 @@
currentItem = item; currentItem = item;
$('.timerName', page).html(item.Name); $('.program', page).html(item.Name);
$('.channel', page).html(item.ChannelName);
$('.overview', page).html(item.Overview || '');
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
} }