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

update guide style

Browse source
This commit is contained in:
Luke Pulverenti 2015-04-14 11:26:02 -04:00
parent d396001ad0
commit a472453e4b
3 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -197,10 +197,10 @@
} }
.channelHeaderCellInner { .channelHeaderCellInner {
padding: .7em .5em .5em; padding: .2em .5em .5em;
display: block; display: block;
text-decoration: none; text-decoration: none;
font-weight: normal !important; font-weight: 300 !important;
color: #fff !important; color: #fff !important;
position: relative; position: relative;
} }
@ -211,6 +211,8 @@
.channelList { .channelList {
float: left; float: left;
font-size: 18px;
font-weight: 300;
} }
.programGrid { .programGrid {
@ -318,6 +320,14 @@
.channelPrograms, .timeslotHeadersInner { .channelPrograms, .timeslotHeadersInner {
width: 6500px; width: 6500px;
} }
.channelList {
font-size: 14px;
}
.channelHeaderCellInner {
padding-top: .6em;
}
} }
.channelList, .programGrid { .channelList, .programGrid {

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

@ -87,6 +87,12 @@
channelQuery.StartIndex -= channelQuery.Limit; channelQuery.StartIndex -= channelQuery.Limit;
reloadChannels(page); reloadChannels(page);
}); });
$('.selectPageSize', page).on('change', function () {
channelQuery.Limit = parseInt(this.value);
channelQuery.StartIndex = 0;
reloadChannels(page);
});
}); });
} }
@ -413,7 +419,7 @@
}); });
} }
}).on('pagebeforeshow', "#liveTvGuidePage", function () { }).on('pageshow', "#liveTvGuidePage", function () {
var page = this; var page = this;

5
dashboard-ui/scripts/mediaplayer.js
View file

@ -831,6 +831,8 @@
var deviceProfile = self.getDeviceProfile(); var deviceProfile = self.getDeviceProfile();
Dashboard.showLoadingMsg();
getPlaybackInfo(item.Id, deviceProfile, startPosition).done(function (playbackInfoResult) { getPlaybackInfo(item.Id, deviceProfile, startPosition).done(function (playbackInfoResult) {
if (validatePlaybackInfoResult(playbackInfoResult)) { if (validatePlaybackInfoResult(playbackInfoResult)) {
@ -852,6 +854,7 @@
playInternalPostMediaSourceSelection(item, mediaSource, startPosition, callback); playInternalPostMediaSourceSelection(item, mediaSource, startPosition, callback);
} }
} else { } else {
Dashboard.hideLoadingMsg();
showPlaybackInfoErrorMessage('NoCompatibleStream'); showPlaybackInfoErrorMessage('NoCompatibleStream');
} }
} }
@ -861,6 +864,8 @@
function playInternalPostMediaSourceSelection(item, mediaSource, startPosition, callback) { function playInternalPostMediaSourceSelection(item, mediaSource, startPosition, callback) {
Dashboard.hideLoadingMsg();
self.currentMediaSource = mediaSource; self.currentMediaSource = mediaSource;
self.currentItem = item; self.currentItem = item;