diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js index 5f42c39d88..b2df21f20e 100644 --- a/dashboard-ui/scripts/dashboardpage.js +++ b/dashboard-ui/scripts/dashboardpage.js @@ -352,8 +352,6 @@ html += '
' + DashboardPage.getSessionNowPlayingTime(session) + '
'; - html += '
' + DashboardPage.getSessionNowPlayingStreamInfo(session) + '
'; - //if (session.TranscodingInfo && session.TranscodingInfo.Framerate) { // html += '
' + session.TranscodingInfo.Framerate + ' fps
'; @@ -391,8 +389,13 @@ // cardScalable html += ''; - html += '
'; + html += '
'; + html += '
'; + html += DashboardPage.getSessionNowPlayingStreamInfo(session); + html += '
'; + + html += '
'; var userImage = DashboardPage.getUserImage(session); if (userImage) { html += ''; @@ -404,6 +407,7 @@ html += DashboardPage.getUsersHtml(session) || ' '; html += '
'; html += '
'; + html += '
'; // cardBox html += ''; @@ -422,17 +426,21 @@ var html = ''; //html += '
'; - + var showTranscodingInfo = false; if (session.TranscodingInfo && session.TranscodingInfo.IsAudioDirect && session.TranscodingInfo.IsVideoDirect) { html += Globalize.translate('LabelPlayMethodDirectStream'); } + else if (session.TranscodingInfo && session.TranscodingInfo.IsVideoDirect) { + html += Globalize.translate('LabelPlayMethodDirectStream'); + } else if (session.PlayState.PlayMethod == 'Transcode') { html += Globalize.translate('LabelPlayMethodTranscoding'); if (session.TranscodingInfo && session.TranscodingInfo.Framerate) { - html += ' - ' + session.TranscodingInfo.Framerate + ' fps'; + html += ' (' + session.TranscodingInfo.Framerate + ' fps' + ')'; } + showTranscodingInfo = true; } else if (session.PlayState.PlayMethod == 'DirectStream') { html += Globalize.translate('LabelPlayMethodDirectPlay'); @@ -443,41 +451,42 @@ //html += '
'; - //if (session.TranscodingInfo) { + if (showTranscodingInfo) { - // html += '
'; + var line = []; - // var line = []; + if (session.TranscodingInfo.Bitrate) { - // if (session.TranscodingInfo.Container) { + if (session.TranscodingInfo.Bitrate > 1000000) { + line.push((session.TranscodingInfo.Bitrate / 1000000).toFixed(1) + ' Mbps'); + } else { + line.push(Math.floor(session.TranscodingInfo.Bitrate / 1000) + ' kbps'); + } + } + if (session.TranscodingInfo.Container) { - // line.push(session.TranscodingInfo.Container); - // } - // if (session.TranscodingInfo.Bitrate) { + line.push(session.TranscodingInfo.Container); + } - // if (session.TranscodingInfo.Bitrate > 1000000) { - // line.push((session.TranscodingInfo.Bitrate / 1000000).toFixed(1) + ' Mbps'); - // } else { - // line.push(Math.floor(session.TranscodingInfo.Bitrate / 1000) + ' kbps'); - // } - // } - // if (line.length) { + if (session.TranscodingInfo.VideoCodec) { - // html += '
' + line.join(' ') + '
'; - // } + //line.push(Globalize.translate('LabelVideoCodec').replace('{0}', session.TranscodingInfo.VideoCodec)); + line.push(session.TranscodingInfo.VideoCodec); + } + if (session.TranscodingInfo.AudioCodec && session.TranscodingInfo.AudioCodec != session.TranscodingInfo.Container) { - // if (session.TranscodingInfo.VideoCodec) { + //line.push(Globalize.translate('LabelAudioCodec').replace('{0}', session.TranscodingInfo.AudioCodec)); + line.push(session.TranscodingInfo.AudioCodec); + } - // html += '
' + Globalize.translate('LabelVideoCodec').replace('{0}', session.TranscodingInfo.VideoCodec) + '
'; - // } - // if (session.TranscodingInfo.AudioCodec && session.TranscodingInfo.AudioCodec != session.TranscodingInfo.Container) { + if (line.length) { - // html += '
' + Globalize.translate('LabelAudioCodec').replace('{0}', session.TranscodingInfo.AudioCodec) + '
'; - // } + html += ' - ' + line.join(' '); + } - //} + } - return html; + return html || ' '; }, getSessionNowPlayingTime: function (session) {