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 live tv styles

Browse source
This commit is contained in:
Luke Pulverenti 2013-12-23 12:30:26 -05:00
parent b9d90edfb2
commit 701926c5dc
5 changed files with 12 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,7 +25,7 @@
top: 0; top: 0;
left: 0; left: 0;
bottom: 0; bottom: 0;
border-bottom: 1px solid #555; border-bottom: 1px solid #444;
} }
.tvProgramTimeSlotInner { .tvProgramTimeSlotInner {
@ -34,12 +34,15 @@
.tvProgramInfo { .tvProgramInfo {
vertical-align: middle; vertical-align: middle;
border-left: 1px solid #444;
padding: .5em .5em; padding: .5em .5em;
margin-left: 80px;
border-bottom: 1px solid #444; border-bottom: 1px solid #444;
} }
.tvProgramTimeSlot + .tvProgramInfo {
margin-left: 80px;
border-left: 1px solid #444;
}
.tvProgramName { .tvProgramName {
color: #fff; color: #fff;
font-weight: bold; font-weight: bold;

2
dashboard-ui/livetvseriestimer.html
View file

@ -100,7 +100,7 @@
<button type="submit" data-theme="b" data-icon="ok" data-mini="true"> <button type="submit" data-theme="b" data-icon="ok" data-mini="true">
Save Save
</button> </button>
<button type="button" onclick="Dashboard.navigate('livetvtimers.html');" data-icon="delete" data-mini="true"> <button type="button" onclick="history.back();" data-icon="delete" data-mini="true">
Cancel Cancel
</button> </button>
</li> </li>

4
dashboard-ui/livetvseriestimers.html
View file

@ -13,8 +13,10 @@
<a href="livetvseriestimers.html" class="ui-btn-active">Series</a> <a href="livetvseriestimers.html" class="ui-btn-active">Series</a>
</div> </div>
<div data-role="content"> <div data-role="content">
<div style="max-width: 700px; margin: 0 auto;">
<br /> <br />
<div id="items" class="itemsContainer"></div> <div id="items"></div>
</div>
</div> </div>
</div> </div>
</body> </body>

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

@ -1212,7 +1212,7 @@
html.push('<a class="detailPageParentLink" href="itemdetails.html?id=' + item.SeriesId + '">' + item.SeriesName + '</a>'); html.push('<a class="detailPageParentLink" href="itemdetails.html?id=' + item.SeriesId + '">' + item.SeriesName + '</a>');
} }
else if (item.ParentIndexNumber && item.Type == "Episode") { else if (item.ParentIndexNumber != null && item.Type == "Episode") {
html.push('<a class="detailPageParentLink" href="itemdetails.html?id=' + item.SeasonId + '">Season ' + item.ParentIndexNumber + '</a>'); html.push('<a class="detailPageParentLink" href="itemdetails.html?id=' + item.SeasonId + '">Season ' + item.ParentIndexNumber + '</a>');
} }

54
dashboard-ui/scripts/livetvchannel.js
View file

@ -15,20 +15,6 @@
var html = ''; var html = '';
//var cssClass = "detailTable";
//html += '<div class="detailTableContainer"><table class="' + cssClass + '">';
//html += '<tr>';
//html += '<th>&nbsp;</th>';
//html += '<th>Date</th>';
//html += '<th>Start</th>';
//html += '<th class="tabletColumn">End</th>';
//html += '<th>Name</th>';
//html += '</tr>';
var currentIndexValue; var currentIndexValue;
for (var i = 0, length = result.Items.length; i < length; i++) { for (var i = 0, length = result.Items.length; i < length; i++) {
@ -114,49 +100,9 @@
html += '</div>'; html += '</div>';
html += '</div>'; html += '</div>';
//html += '<tr>';
//html += '<td>';
//if (program.RecordingId) {
// html += '<button data-recordingid="' + program.RecordingId + '" class="btnCancelRecording" type="button" data-icon="delete" data-inline="true" data-mini="true" data-iconpos="notext">Cancel</button>';
//} else {
// html += '<a href="livetvnewrecording.html?programid=' + program.Id + '" data-role="button" type="button" data-icon="facetime-video" data-inline="true" data-mini="true" data-theme="b" data-iconpos="notext">Record</a>';
//}
//html += '</td>';
//var startDate = program.StartDate;
//try {
// startDate = parseISO8601Date(startDate, { toLocal: true });
//} catch (err) {
//}
//html += '<td>' + startDate.toLocaleDateString() + '</td>';
//html += '<td>' + LiveTvHelpers.getDisplayTime(program.StartDate) + '</td>';
//html += '<td class="tabletColumn">' + LiveTvHelpers.getDisplayTime(program.EndDate) + '</td>';
//html += '<td>';
//if (program.Name) {
// //html += '<a href="livetvprogram.html?id=' + program.Id + '">';
// html += program.Name;
// //html += '</a>';
//}
//html += '</td>';
html += '</a>'; html += '</a>';
} }
//html += '</table></div>';
$('#programList', page).html(html).trigger('create'); $('#programList', page).html(html).trigger('create');
} }