cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-18 03:18:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

update live tv labels

Browse Source
This commit is contained in:
Luke Pulverenti 2016-10-17 12:41:18 -04:00
parent b869606fdc
commit 138611efb5
5 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View File

@ -14,12 +14,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.4.313", "version": "1.4.314",
"_release": "1.4.313", "_release": "1.4.314",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.4.313", "tag": "1.4.314",
"commit": "79c18a7f2b379d8162bdca36b7cf0713bbe43ad8" "commit": "087a1aa017a98fe347ce4388a794b3de13468a4d"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1", "_target": "^1.2.1",

13
dashboard-ui/bower_components/emby-webcomponents/guide/guide.css vendored
View File

@ -317,8 +317,9 @@
padding: 0 .5em 0; padding: 0 .5em 0;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
display: flex;
align-items: center; align-items: center;
/* Need block here or the ellipsis overflow is lost */
display: block;
} }
.programIcon { .programIcon {
@ -335,6 +336,16 @@
margin-left: .25em; margin-left: .25em;
} }
.programTextIcon {
font-weight: bold;
color: rgb(30,30,30);
font-size: 1.0em;
background: #555;
padding: .18em .32em;
border-radius: .25em;
margin-right: .35em;
}
.guideChannelNumber { .guideChannelNumber {
padding-left: 1em; padding-left: 1em;
max-width: 30%; max-width: 30%;

9
dashboard-ui/bower_components/emby-webcomponents/guide/guide.js vendored
View File

@ -378,7 +378,7 @@
return '<i class="md-icon programIcon timerIcon">&#xE061;</i>'; return '<i class="md-icon programIcon timerIcon">&#xE061;</i>';
} }
function getChannelProgramsHtml(context, date, channel, programs, options) { function getChannelProgramsHtml(context, date, channel, programs, options, index) {
var html = ''; var html = '';
@ -482,7 +482,7 @@
timerAttributes += ' data-seriestimerid="' + program.SeriesTimerId + '"'; timerAttributes += ' data-seriestimerid="' + program.SeriesTimerId + '"';
} }
html += '<button data-action="' + clickAction + '"' + timerAttributes + ' data-isfolder="' + program.IsFolder + '" data-id="' + program.Id + '" data-serverid="' + program.ServerId + '" data-type="' + program.Type + '" class="' + cssClass + '" style="left:' + startPercent + '%;width:' + endPercent + '%;">'; html += '<button data-action="' + clickAction + '"' + timerAttributes + ' data-id="' + program.Id + '" data-serverid="' + program.ServerId + '" data-type="' + program.Type + '" class="' + cssClass + '" style="left:' + startPercent + '%;width:' + endPercent + '%;">';
if (displayInnerContent) { if (displayInnerContent) {
var guideProgramNameClass = "guideProgramName"; var guideProgramNameClass = "guideProgramName";
@ -506,7 +506,8 @@
html += '</div>'; html += '</div>';
if (program.IsHD && options.showHdIcon) { if (program.IsHD && options.showHdIcon) {
html += '<i class="guideHdIcon md-icon programIcon">hd</i>'; //html += '<i class="guideHdIcon md-icon programIcon">hd</i>';
html += '<div class="programIcon programTextIcon">HD</div>';
} }
html += getTimerIndicator(program); html += getTimerIndicator(program);
@ -543,7 +544,7 @@
for (var i = 0, length = channels.length; i < length; i++) { for (var i = 0, length = channels.length; i < length; i++) {
html.push(getChannelProgramsHtml(context, date, channels[i], programs, options)); html.push(getChannelProgramsHtml(context, date, channels[i], programs, options, i));
} }
var programGrid = context.querySelector('.programGrid'); var programGrid = context.querySelector('.programGrid');

2
dashboard-ui/scripts/livetvcomponents.js
View File

@ -87,7 +87,7 @@
html += cardBuilder.getCardsHtml({ html += cardBuilder.getCardsHtml({
items: group.items, items: group.items,
shape: getBackdropShape(), shape: getBackdropShape(),
showTitle: true, showParentTitleOrTitle: true,
showAirTime: true, showAirTime: true,
showAirEndTime: true, showAirEndTime: true,
showChannelName: true, showChannelName: true,

4
dashboard-ui/scripts/livetvrecordings.js
View File

@ -130,7 +130,9 @@
promise.then(function (result) { promise.then(function (result) {
renderRecordings(context.querySelector('#latestRecordings'), result.Items); renderRecordings(context.querySelector('#latestRecordings'), result.Items, {
shape: (enableScrollX() ? 'overflowBackdrop' : 'backdrop')
});
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
}); });