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

updated tv guide

Browse source
This commit is contained in:
Luke Pulverenti 2014-01-06 13:25:33 -05:00
parent 08b1008f6a
commit 231ed3c315
6 changed files with 41 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
dashboard-ui/css/livetv.css
View file

@ -168,7 +168,7 @@
border-bottom: 1px solid #444;
border-left: 1px solid #444;
border-right: 1px solid #444;
width: 139px;
width: 189px;
}
.channelTimeslotHeader, .timeslotHeader {
@ -188,6 +188,7 @@
text-decoration: none;
font-weight: normal!important;
color: #fff!important;
position: relative;
}
.channelHeaderCellInner:hover {
@ -235,7 +236,7 @@
}
.timeslotHeaders, .programGrid {
left: 141px;
left: 191px;
}
.channelTimeslotHeader, .timeslotHeaders {
@ -261,6 +262,21 @@
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) {
.channelHeaderCell, .channelTimeslotHeader {
@ -270,6 +286,10 @@
.timeslotHeaders, .programGrid {
left: 91px;
}
.guideChannelImage {
display: none;
}
}
/* Account for hidden navigation */
@media (max-width: 750px) {

2
dashboard-ui/edititemimages.html
View file

@ -87,7 +87,7 @@
<option value="Thumb">Thumb</option>
</select>
</p>
<button type="submit" data-icon="picture" data-theme="b">Upload</button>
<button type="submit" data-icon="check" data-theme="b">Upload</button>
</div>
<a data-role="button" data-rel="back" data-icon="delete" onclick="$('#uploadImage').val('').trigger('change');">Cancel</a>
</div>

4
dashboard-ui/livetvguide.html
View file

@ -29,10 +29,6 @@
<div class="programGrid">
</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>

2
dashboard-ui/livetvrecordings.html
View file

@ -28,7 +28,7 @@
<br />
</div>
<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>
</td>

16
dashboard-ui/scripts/livetvguide.js
View file

@ -300,7 +300,21 @@
html += '<div class="channelHeaderCell">';
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 += '</div>';

4
dashboard-ui/scripts/livetvrecordinglist.js
View file

@ -99,11 +99,11 @@
if (query.GroupId) {
ApiClient.getLiveTvRecordingGroup(query.GroupId).done(function (group) {
$('.listName', page).show().html(group.Name);
$('.listName', page).html(group.Name);
});
} else {
$('.listName', page).hide();
$('.listName', page).html('All Recordings');
}
}).on('pageshow', "#liveTvRecordingListPage", function () {