diff --git a/dashboard-ui/css/livetv.css b/dashboard-ui/css/livetv.css index f76a0941fe..186cb31878 100644 --- a/dashboard-ui/css/livetv.css +++ b/dashboard-ui/css/livetv.css @@ -197,10 +197,10 @@ } .channelHeaderCellInner { - padding: .7em .5em .5em; + padding: .2em .5em .5em; display: block; text-decoration: none; - font-weight: normal !important; + font-weight: 300 !important; color: #fff !important; position: relative; } @@ -211,6 +211,8 @@ .channelList { float: left; + font-size: 18px; + font-weight: 300; } .programGrid { @@ -318,6 +320,14 @@ .channelPrograms, .timeslotHeadersInner { width: 6500px; } + + .channelList { + font-size: 14px; + } + + .channelHeaderCellInner { + padding-top: .6em; + } } .channelList, .programGrid { diff --git a/dashboard-ui/scripts/livetvguide.js b/dashboard-ui/scripts/livetvguide.js index eafcd1801e..34e2cbdd32 100644 --- a/dashboard-ui/scripts/livetvguide.js +++ b/dashboard-ui/scripts/livetvguide.js @@ -87,6 +87,12 @@ channelQuery.StartIndex -= channelQuery.Limit; 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; diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index 24374eff82..6b1851e956 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -831,6 +831,8 @@ var deviceProfile = self.getDeviceProfile(); + Dashboard.showLoadingMsg(); + getPlaybackInfo(item.Id, deviceProfile, startPosition).done(function (playbackInfoResult) { if (validatePlaybackInfoResult(playbackInfoResult)) { @@ -852,6 +854,7 @@ playInternalPostMediaSourceSelection(item, mediaSource, startPosition, callback); } } else { + Dashboard.hideLoadingMsg(); showPlaybackInfoErrorMessage('NoCompatibleStream'); } } @@ -861,6 +864,8 @@ function playInternalPostMediaSourceSelection(item, mediaSource, startPosition, callback) { + Dashboard.hideLoadingMsg(); + self.currentMediaSource = mediaSource; self.currentItem = item;