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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Tim Hobbs 2014-04-18 11:51:53 -07:00
commit a463914607
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dashboard-ui/css/site.css
View File

@ -934,16 +934,16 @@ progress {
z-index: 1000;
}
.notPlayingSession .sessionNowPlayingContent {
.activeSession:not(.playingSession) .sessionNowPlayingContent {
display: none;
}
.notPlayingSession .sessionNowPlayingInnerContent {
.activeSession:not(.playingSession) .sessionNowPlayingInnerContent {
background-color: #f0f0f0;
color: #000;
}
.notPlayingSession .sessionUserInfo, .notPlayingSession .sessionNowPlayingInfo {
.activeSession:not(.playingSession) .sessionUserInfo, .activeSession:not(.playingSession) .sessionNowPlayingInfo {
bottom: 0;
}

5
dashboard-ui/encodingsettings.html
View File

@ -40,6 +40,11 @@
<br />
<ul data-role="listview" class="ulForm">
<li>
<label for="txtDownMixAudioBoost">${LabelDownMixAudioScale}</label>
<input type="number" id="txtDownMixAudioBoost" pattern="[0-9]*" required="required" min=".5" max="3" step=".1" data-mini="true" />
<div class="fieldDescription">${LabelDownMixAudioScaleHelp}</div>
</li>
<li>
<input type="checkbox" id="chkAllowUpscaling" name="chkAllowUpscaling" data-mini="true" />
<label for="chkAllowUpscaling">${OptionUpscaling}</label>

10
dashboard-ui/scripts/dashboardpage.js
View File

@ -209,7 +209,7 @@
var nowPlayingItem = connection.NowPlayingItem;
var className = nowPlayingItem ? 'activeSession' : 'notPlayingSession activeSession';
var className = nowPlayingItem ? 'playingSession activeSession' : 'activeSession';
html += '<div class="' + className + '" id="' + rowId + '">';
@ -400,9 +400,9 @@
var nowPlayingItem = session.NowPlayingItem;
if (nowPlayingItem) {
row.removeClass('notPlayingSession');
row.addClass('playingSession');
} else {
row.addClass('notPlayingSession');
row.removeClass('playingSession');
}
$('.sessionUserName', row).html(DashboardPage.getUsersHtml(session));
@ -877,8 +877,8 @@ $(document).on('pageshow', "#dashboardPage", DashboardPage.onPageShow).on('pageh
return this;
}
return this.off('.sessionItemMenu').on('mouseenter.sessionItemMenu', '.activeSession', onHoverIn)
.on('mouseleave.sessionItemMenu', '.activeSession', onHoverOut);
return this.off('.sessionItemMenu').on('mouseenter.sessionItemMenu', '.playingSession', onHoverIn)
.on('mouseleave.sessionItemMenu', '.playingSession', onHoverOut);
};
})(jQuery, document, window);

3
dashboard-ui/scripts/encodingsettings.js
View File

@ -12,6 +12,8 @@
$('#chkAllowUpscaling', page).checked(config.AllowVideoUpscaling).checkboxradio("refresh");
$('#txtDownMixAudioBoost', page).val(config.DownMixAudioBoost);
Dashboard.hideLoadingMsg();
}
@ -41,6 +43,7 @@
config.AllowVideoUpscaling = $('#chkAllowUpscaling', form).checked();
config.EnableDebugEncodingLogging = $('#chkEnableDebugEncodingLogging', form).checked();
config.MediaEncodingQuality = $('.radioEncodingQuality:checked', form).val();
config.DownMixAudioBoost = $('#txtDownMixAudioBoost', form).val();
ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult);
});