mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
updated tv guide
This commit is contained in:
parent
08b1008f6a
commit
231ed3c315
6 changed files with 41 additions and 11 deletions
|
@ -168,7 +168,7 @@
|
||||||
border-bottom: 1px solid #444;
|
border-bottom: 1px solid #444;
|
||||||
border-left: 1px solid #444;
|
border-left: 1px solid #444;
|
||||||
border-right: 1px solid #444;
|
border-right: 1px solid #444;
|
||||||
width: 139px;
|
width: 189px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.channelTimeslotHeader, .timeslotHeader {
|
.channelTimeslotHeader, .timeslotHeader {
|
||||||
|
@ -188,6 +188,7 @@
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
font-weight: normal!important;
|
font-weight: normal!important;
|
||||||
color: #fff!important;
|
color: #fff!important;
|
||||||
|
position: relative;
|
||||||
}
|
}
|
||||||
|
|
||||||
.channelHeaderCellInner:hover {
|
.channelHeaderCellInner:hover {
|
||||||
|
@ -235,7 +236,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.timeslotHeaders, .programGrid {
|
.timeslotHeaders, .programGrid {
|
||||||
left: 141px;
|
left: 191px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.channelTimeslotHeader, .timeslotHeaders {
|
.channelTimeslotHeader, .timeslotHeaders {
|
||||||
|
@ -261,6 +262,21 @@
|
||||||
background-color: #252525;
|
background-color: #252525;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.guideChannelInfo {
|
||||||
|
display: inline-block;
|
||||||
|
max-width: 110px;
|
||||||
|
overflow: hidden;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.guideChannelImage {
|
||||||
|
max-width: 60px;
|
||||||
|
max-height: 35px;
|
||||||
|
position: absolute;
|
||||||
|
right: 5px;
|
||||||
|
top: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
@media (max-width: 600px) {
|
@media (max-width: 600px) {
|
||||||
|
|
||||||
.channelHeaderCell, .channelTimeslotHeader {
|
.channelHeaderCell, .channelTimeslotHeader {
|
||||||
|
@ -270,6 +286,10 @@
|
||||||
.timeslotHeaders, .programGrid {
|
.timeslotHeaders, .programGrid {
|
||||||
left: 91px;
|
left: 91px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.guideChannelImage {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
/* Account for hidden navigation */
|
/* Account for hidden navigation */
|
||||||
@media (max-width: 750px) {
|
@media (max-width: 750px) {
|
||||||
|
|
|
@ -87,7 +87,7 @@
|
||||||
<option value="Thumb">Thumb</option>
|
<option value="Thumb">Thumb</option>
|
||||||
</select>
|
</select>
|
||||||
</p>
|
</p>
|
||||||
<button type="submit" data-icon="picture" data-theme="b">Upload</button>
|
<button type="submit" data-icon="check" data-theme="b">Upload</button>
|
||||||
</div>
|
</div>
|
||||||
<a data-role="button" data-rel="back" data-icon="delete" onclick="$('#uploadImage').val('').trigger('change');">Cancel</a>
|
<a data-role="button" data-rel="back" data-icon="delete" onclick="$('#uploadImage').val('').trigger('change');">Cancel</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -29,10 +29,6 @@
|
||||||
<div class="programGrid">
|
<div class="programGrid">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- <div style="overflow-x: scroll;overflow-y:scroll;position:absolute;right: 1em;left: 1em;top: 135px;bottom: 30px;">
|
|
||||||
<div class="timeslotHeaders"></div>
|
|
||||||
<div id="guide"></div>
|
|
||||||
</div>-->
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
<br />
|
<br />
|
||||||
</div>
|
</div>
|
||||||
<div id="recordingGroups" style="display: none;">
|
<div id="recordingGroups" style="display: none;">
|
||||||
<h1 class="listHeader">Recording Archive</h1>
|
<h1 class="listHeader"><a href="livetvrecordinglist.html">All Recordings<img src="css/images/rightarrow.png" class="headerArrowImage" /></a></h1>
|
||||||
<div id="recordingGroupItems"></div>
|
<div id="recordingGroupItems"></div>
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
|
|
|
@ -300,7 +300,21 @@
|
||||||
|
|
||||||
html += '<div class="channelHeaderCell">';
|
html += '<div class="channelHeaderCell">';
|
||||||
html += '<a class="channelHeaderCellInner" href="livetvchannel.html?id=' + channel.Id + '">';
|
html += '<a class="channelHeaderCellInner" href="livetvchannel.html?id=' + channel.Id + '">';
|
||||||
html += channel.Name + '<br/>' + channel.Number;
|
|
||||||
|
html += '<div class="guideChannelInfo">' + channel.Name + '<br/>' + channel.Number + '</div>';
|
||||||
|
|
||||||
|
if (channel.ImageTags.Primary) {
|
||||||
|
|
||||||
|
var url = ApiClient.getUrl("LiveTV/Channels/" + channel.Id + "/Images/Primary", {
|
||||||
|
maxheight: 200,
|
||||||
|
maxwidth: 200,
|
||||||
|
tag: channel.ImageTags.Primary,
|
||||||
|
type: "Primary"
|
||||||
|
});
|
||||||
|
|
||||||
|
html += '<img class="guideChannelImage" src="' + url + '" />';
|
||||||
|
}
|
||||||
|
|
||||||
html += '</a>';
|
html += '</a>';
|
||||||
html += '</div>';
|
html += '</div>';
|
||||||
|
|
||||||
|
|
|
@ -99,11 +99,11 @@
|
||||||
if (query.GroupId) {
|
if (query.GroupId) {
|
||||||
|
|
||||||
ApiClient.getLiveTvRecordingGroup(query.GroupId).done(function (group) {
|
ApiClient.getLiveTvRecordingGroup(query.GroupId).done(function (group) {
|
||||||
$('.listName', page).show().html(group.Name);
|
$('.listName', page).html(group.Name);
|
||||||
});
|
});
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
$('.listName', page).hide();
|
$('.listName', page).html('All Recordings');
|
||||||
}
|
}
|
||||||
|
|
||||||
}).on('pageshow', "#liveTvRecordingListPage", function () {
|
}).on('pageshow', "#liveTvRecordingListPage", function () {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue