1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

update progressive encoding

This commit is contained in:
Luke Pulverenti 2016-02-07 16:48:08 -05:00
parent 1121dd8ae4
commit 9915242409
9 changed files with 45 additions and 39 deletions

View file

@ -18,7 +18,7 @@
<div class="detailSectionContent"> <div class="detailSectionContent">
<br /> <br />
<div> <div>
<label for="selectLanguage">${LabelPreferredDisplayLanguage}</label> <label for="selectLanguage" class="selectLabel">${LabelPreferredDisplayLanguage}</label>
<select id="selectLanguage" data-mini="true"> <select id="selectLanguage" data-mini="true">
<option value="ar">Arabic</option> <option value="ar">Arabic</option>
<option value="bg-BG">Bulgarian (Bulgaria)</option> <option value="bg-BG">Bulgarian (Bulgaria)</option>
@ -72,7 +72,7 @@
<div class="detailSectionContent"> <div class="detailSectionContent">
<br /> <br />
<div> <div>
<label for="selectThemeSong">${LabelEnableThemeSongs}</label> <label for="selectThemeSong" class="selectLabel">${LabelEnableThemeSongs}</label>
<select id="selectThemeSong" data-mini="true"> <select id="selectThemeSong" data-mini="true">
<option value="">${OptionAuto}</option> <option value="">${OptionAuto}</option>
<option value="1">${OptionYes}</option> <option value="1">${OptionYes}</option>
@ -82,7 +82,7 @@
</div> </div>
<br /> <br />
<div class="fldEnableBackdrops" style="display:none;"> <div class="fldEnableBackdrops" style="display:none;">
<label for="selectBackdrop">${LabelEnableBackdrops}</label> <label for="selectBackdrop" class="selectLabel">${LabelEnableBackdrops}</label>
<select id="selectBackdrop" data-mini="true"> <select id="selectBackdrop" data-mini="true">
<option value="">${OptionAuto}</option> <option value="">${OptionAuto}</option>
<option value="1">${OptionYes}</option> <option value="1">${OptionYes}</option>

View file

@ -18,7 +18,7 @@
<div class="detailSectionContent"> <div class="detailSectionContent">
<br /> <br />
<div> <div>
<label for="selectHomeSection1">${LabelHomePageSection1}</label> <label for="selectHomeSection1" class="selectLabel">${LabelHomePageSection1}</label>
<select id="selectHomeSection1" data-mini="true"> <select id="selectHomeSection1" data-mini="true">
<option value="">${OptionAuto}</option> <option value="">${OptionAuto}</option>
<option value="latestmedia">${OptionLatestMedia}</option> <option value="latestmedia">${OptionLatestMedia}</option>
@ -32,7 +32,7 @@
</div> </div>
<br /> <br />
<div> <div>
<label for="selectHomeSection2">${LabelHomePageSection2}</label> <label for="selectHomeSection2" class="selectLabel">${LabelHomePageSection2}</label>
<select id="selectHomeSection2" data-mini="true"> <select id="selectHomeSection2" data-mini="true">
<option value="">${OptionAuto}</option> <option value="">${OptionAuto}</option>
<option value="latestmedia">${OptionLatestMedia}</option> <option value="latestmedia">${OptionLatestMedia}</option>
@ -47,7 +47,7 @@
</div> </div>
<br /> <br />
<div> <div>
<label for="selectHomeSection3">${LabelHomePageSection3}</label> <label for="selectHomeSection3" class="selectLabel">${LabelHomePageSection3}</label>
<select id="selectHomeSection3" data-mini="true"> <select id="selectHomeSection3" data-mini="true">
<option value="">${OptionAuto}</option> <option value="">${OptionAuto}</option>
<option value="latestmedia">${OptionLatestMedia}</option> <option value="latestmedia">${OptionLatestMedia}</option>
@ -62,7 +62,7 @@
</div> </div>
<br /> <br />
<div> <div>
<label for="selectHomeSection4">${LabelHomePageSection4}</label> <label for="selectHomeSection4" class="selectLabel">${LabelHomePageSection4}</label>
<select id="selectHomeSection4" data-mini="true"> <select id="selectHomeSection4" data-mini="true">
<option value="">${OptionAuto}</option> <option value="">${OptionAuto}</option>
<option value="latestmedia">${OptionLatestMedia}</option> <option value="latestmedia">${OptionLatestMedia}</option>

View file

@ -19,19 +19,19 @@
<div class="detailSectionContent"> <div class="detailSectionContent">
<br /> <br />
<div> <div>
<label for="selectAudioLanguage">${LabelAudioLanguagePreference}</label> <label for="selectAudioLanguage" class="selectLabel">${LabelAudioLanguagePreference}</label>
<select id="selectAudioLanguage" data-mini="true"></select> <select id="selectAudioLanguage" data-mini="true"></select>
</div> </div>
<br /> <br />
<paper-checkbox class="chkPlayDefaultAudioTrack">${LabelPlayDefaultAudioTrack}</paper-checkbox> <paper-checkbox class="chkPlayDefaultAudioTrack">${LabelPlayDefaultAudioTrack}</paper-checkbox>
<br /><br /><br /> <br /><br /><br />
<div> <div>
<label for="selectSubtitleLanguage">${LabelSubtitleLanguagePreference}</label> <label for="selectSubtitleLanguage" class="selectLabel">${LabelSubtitleLanguagePreference}</label>
<select id="selectSubtitleLanguage" data-mini="true"></select> <select id="selectSubtitleLanguage" data-mini="true"></select>
</div> </div>
<br /> <br />
<div> <div>
<label for="selectSubtitlePlaybackMode">${LabelSubtitlePlaybackMode}</label> <label for="selectSubtitlePlaybackMode" class="selectLabel">${LabelSubtitlePlaybackMode}</label>
<select id="selectSubtitlePlaybackMode" data-mini="true"> <select id="selectSubtitlePlaybackMode" data-mini="true">
<option value="Default">${OptionDefaultSubtitles}</option> <option value="Default">${OptionDefaultSubtitles}</option>
<option value="Smart">${OptionSmartSubtitles}</option> <option value="Smart">${OptionSmartSubtitles}</option>
@ -68,12 +68,12 @@
<div class="detailSectionContent"> <div class="detailSectionContent">
<br /> <br />
<div> <div>
<label for="selectMaxBitrate">${LabelMaxStreamingBitrate}</label> <label for="selectMaxBitrate" class="selectLabel">${LabelMaxStreamingBitrate}</label>
<select id="selectMaxBitrate" data-mini="true"></select> <select id="selectMaxBitrate" data-mini="true"></select>
</div> </div>
<br /> <br />
<div> <div>
<label for="selectMaxChromecastBitrate">${LabelMaxChromecastBitrate}</label> <label for="selectMaxChromecastBitrate" class="selectLabel">${LabelMaxChromecastBitrate}</label>
<select id="selectMaxChromecastBitrate" data-mini="true"> <select id="selectMaxChromecastBitrate" data-mini="true">
</select> </select>
</div> </div>

View file

@ -1,11 +1,11 @@
(function () { (function () {
$(document).on('pageshow', "#logPage", function () { $(document).on('pagebeforeshow', "#logPage", function () {
var page = this; var page = this;
Dashboard.showLoadingMsg();
require(['paper-fab', 'paper-item-body', 'paper-icon-item'], function () {
require(['paper-fab', 'paper-progress', 'paper-item-body', 'paper-icon-item'], function () {
var apiClient = ApiClient; var apiClient = ApiClient;
@ -56,6 +56,7 @@
html += '</div>'; html += '</div>';
$('.serverLogs', page).html(html).trigger('create'); $('.serverLogs', page).html(html).trigger('create');
Dashboard.hideLoadingMsg();
}); });
}); });

View file

@ -183,7 +183,7 @@
//html += '</div>'; //html += '</div>';
//html += '</div>'; //html += '</div>';
$(elem).html(html); $(elem).html(html).trigger('create');
$('#selectSyncTarget', elem).on('change', function () { $('#selectSyncTarget', elem).on('change', function () {

View file

@ -4,7 +4,7 @@
<title>${TitleSync}</title> <title>${TitleSync}</title>
</head> </head>
<body> <body>
<div id="syncJobPage" data-role="page" class="page type-interior syncConfigurationPage syncJobPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Sync" data-require="jqmcontrolgroup,scripts/syncjob,paper-fab,paper-item-body,paper-icon-item"> <div id="syncJobPage" data-role="page" class="page type-interior syncConfigurationPage syncJobPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Sync" data-require="scripts/syncjob,paper-fab,paper-item-body,paper-icon-item,jqmcollapsible">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">

View file

@ -1,8 +1,13 @@
.udiv[data-role="controlgroup"], fieldset[data-role="controlgroup"] { div[data-role="controlgroup"], fieldset[data-role="controlgroup"] {
padding: 0; padding: 0;
margin: .5em 0; margin: .5em 0;
clear: both;
} }
div[data-role="controlgroup"] + *, fieldset[data-role="controlgroup"] + * {
clear: both;
}
*[data-role="controlgroup"].ui-mini .ui-btn-icon-notext, *[data-role="controlgroup"].ui-mini .ui-btn-icon-notext,
*[data-role="controlgroup"] .ui-mini.ui-btn-icon-notext { *[data-role="controlgroup"] .ui-mini.ui-btn-icon-notext {
font-size: inherit; font-size: inherit;
@ -24,26 +29,22 @@
list-style: none; list-style: none;
} }
div[data-role="controlgroup"][data-type="horizontal"] .ui-btn, *[data-role="controlgroup"][data-type="horizontal"] .ui-btn,
div[data-role="controlgroup"][data-type="horizontal"] li > .ui-btn, *[data-role="controlgroup"][data-type="horizontal"] li > .ui-btn,
div[data-role="controlgroup"][data-type="horizontal"] .ui-checkbox, *[data-role="controlgroup"][data-type="horizontal"] .ui-checkbox,
div[data-role="controlgroup"][data-type="horizontal"] .ui-radio, *[data-role="controlgroup"][data-type="horizontal"] .ui-radio,
div[data-role="controlgroup"][data-type="horizontal"].ui-select { *[data-role="controlgroup"][data-type="horizontal"].ui-select {
float: left; float: left;
clear: none; clear: none;
} }
div[data-role="controlgroup"][data-type="horizontal"] input[type="radio"] { *[data-role="controlgroup"][data-type="horizontal"] button.ui-btn,
display: none;
}
div[data-role="controlgroup"][data-type="horizontal"] button.ui-btn,
*[data-role="controlgroup"] .ui-btn-icon-notext { *[data-role="controlgroup"] .ui-btn-icon-notext {
width: auto; width: auto;
} }
div[data-role="controlgroup"][data-type="horizontal"] .ui-btn-icon-notext, *[data-role="controlgroup"][data-type="horizontal"] .ui-btn-icon-notext,
div[data-role="controlgroup"][data-type="horizontal"] button.ui-btn-icon-notext { *[data-role="controlgroup"][data-type="horizontal"] button.ui-btn-icon-notext {
width: 1.5em; width: 1.5em;
} }
@ -56,18 +57,22 @@ div[data-role="controlgroup"][data-type="horizontal"] button.ui-btn-icon-notext
border-bottom-width: 0; border-bottom-width: 0;
} }
*[data-role="controlgroup"]:not([data-type="horizontal"]) .ui-checkbox:last-child .ui-btn { *[data-role="controlgroup"]:not([data-type="horizontal"]) .ui-checkbox:last-child .ui-btn {
border-bottom-width: 1px; border-bottom-width: 1px;
} }
div[data-role="controlgroup"][data-type="horizontal"] .ui-btn { *[data-role="controlgroup"][data-type="horizontal"] .ui-btn {
border-right-width: 0; border-right-width: 0;
} }
div[data-role="controlgroup"][data-type="horizontal"] .ui-btn:last-child { *[data-role="controlgroup"][data-type="horizontal"] .ui-btn:last-child {
border-right-width: 1px; border-right-width: 1px;
} }
*[data-role="controlgroup"][data-type="horizontal"] .ui-radio:last-child label {
border-right-width: 1px;
}
*[data-role="controlgroup"] .ui-btn-corner-all, *[data-role="controlgroup"] .ui-btn-corner-all,
*[data-role="controlgroup"] .ui-btn.ui-corner-all { *[data-role="controlgroup"] .ui-btn.ui-corner-all {
-webkit-border-radius: 0; -webkit-border-radius: 0;
@ -82,14 +87,14 @@ div[data-role="controlgroup"][data-type="horizontal"] .ui-btn {
border-radius: inherit; border-radius: inherit;
} }
div[data-role="controlgroup"][data-type="horizontal"] .ui-btn:first-child { *[data-role="controlgroup"][data-type="horizontal"] .ui-btn:first-child {
-webkit-border-top-left-radius: inherit; -webkit-border-top-left-radius: inherit;
border-top-left-radius: inherit; border-top-left-radius: inherit;
-webkit-border-bottom-left-radius: inherit; -webkit-border-bottom-left-radius: inherit;
border-bottom-left-radius: inherit; border-bottom-left-radius: inherit;
} }
div[data-role="controlgroup"][data-type="horizontal"] .ui-btn:last-child { *[data-role="controlgroup"][data-type="horizontal"] .ui-btn:last-child {
-webkit-border-top-right-radius: inherit; -webkit-border-top-right-radius: inherit;
border-top-right-radius: inherit; border-top-right-radius: inherit;
-webkit-border-bottom-right-radius: inherit; -webkit-border-bottom-right-radius: inherit;

View file

@ -449,7 +449,7 @@ paper-input label, paper-textarea label {
} }
.ui-body-b .paper-input-container-0 .input-content.paper-input-container label, .ui-body-b .paper-input-container-0 .input-content.paper-input-container .paper-input-label, .ui-body-b paper-textarea label, .ui-body-b .selectLabel, .ui-body-b .fieldDescription { .ui-body-b .paper-input-container-0 .input-content.paper-input-container label, .ui-body-b .paper-input-container-0 .input-content.paper-input-container .paper-input-label, .ui-body-b paper-textarea label, .ui-body-b .selectLabel, .ui-body-b .fieldDescription {
color: #858585; color: #ccc;
} }
.ui-body-a .paper-input-container-0 .input-content.paper-input-container label, .ui-body-a .paper-input-container-0 .input-content.paper-input-container .paper-input-label, .ui-body-a paper-textarea label, .ui-body-a .selectLabel, .ui-body-a .fieldDescription { .ui-body-a .paper-input-container-0 .input-content.paper-input-container label, .ui-body-a .paper-input-container-0 .input-content.paper-input-container .paper-input-label, .ui-body-a paper-textarea label, .ui-body-a .selectLabel, .ui-body-a .fieldDescription {

View file

@ -18,7 +18,7 @@
<ul data-role="listview" class="ulForm"> <ul data-role="listview" class="ulForm">
<li> <li>
<label for="selectMaxParentalRating">${LabelMaxParentalRating}</label> <label for="selectMaxParentalRating" class="selectLabel">${LabelMaxParentalRating}</label>
<select name="selectMaxParentalRating" id="selectMaxParentalRating" data-mini="true"></select> <select name="selectMaxParentalRating" id="selectMaxParentalRating" data-mini="true"></select>
<div class="fieldDescription">${MaxParentalRatingHelp}</div> <div class="fieldDescription">${MaxParentalRatingHelp}</div>
</li> </li>