mirror of
https://github.com/jellyfin/jellyfin-web.git
synced 2024-11-17 19:08:18 -07:00
live tv updates
This commit is contained in:
Luke Pulverenti
parent
0b9f6ce000
commit
9ac1ae7f6b
@ -96,7 +96,7 @@
|
||||
.seriesTimerCircle {
|
||||
position: relative;
|
||||
margin-left: 0;
|
||||
left: 30px;
|
||||
left: 29px;
|
||||
opacity: .3;
|
||||
}
|
||||
|
||||
@ -111,7 +111,7 @@
|
||||
|
||||
.seriesTimerCircle + .seriesTimerCircle + .seriesTimerCircle {
|
||||
opacity: 1;
|
||||
left: -30px;
|
||||
left: -29px;
|
||||
}
|
||||
|
||||
.channelImageContainer .itemDetailImage {
|
||||
|
||||
@ -49,11 +49,7 @@ body {
|
||||
-webkit-font-smoothing: antialiased;
|
||||
}
|
||||
|
||||
.ui-header .ui-btn-inner, .ui-footer .ui-btn-inner, .ui-mini .ui-btn-inner {
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
.ui-li-desc {
|
||||
.ui-header .ui-btn-inner, .ui-footer .ui-btn-inner, .ui-mini .ui-btn-inner, .ui-li-desc {
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
@ -68,7 +64,6 @@ h1 {
|
||||
|
||||
.ui-loader h1 {
|
||||
font-weight: bold;
|
||||
font-family: Arial;
|
||||
}
|
||||
|
||||
h2 {
|
||||
@ -255,10 +250,6 @@ form, .readOnlyContent {
|
||||
margin-bottom: 0!important;
|
||||
}
|
||||
|
||||
.popup .ui-content {
|
||||
padding: 20px;
|
||||
}
|
||||
|
||||
.content-secondary {
|
||||
z-index: 99996;
|
||||
background: #262626;
|
||||
@ -1068,7 +1059,3 @@ input[type="range"]::-ms-fill-upper {
|
||||
#editItemMetadataPage #txtOverview {
|
||||
height: 70px;
|
||||
}
|
||||
|
||||
#editItemMetadataPage #providerSettingsContainer .ui-slider-switch {
|
||||
width: 8em;
|
||||
}
|
||||
|
||||
@ -72,7 +72,7 @@
|
||||
<br />
|
||||
<ul data-role="listview" class="ulForm">
|
||||
<li>
|
||||
<label for="txtPrePaddingSeconds">Pre-padding seconds: </label>
|
||||
<label for="txtPrePaddingSeconds">Pre-padding minutes: </label>
|
||||
<input type="number" id="txtPrePaddingSeconds" pattern="[0-9]*" required="required" min="0" max="10" step=".5" />
|
||||
</li>
|
||||
<li>
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
<br />
|
||||
<ul data-role="listview" class="ulForm">
|
||||
<li>
|
||||
<label for="txtPrePaddingSeconds">Pre-padding seconds: </label>
|
||||
<label for="txtPrePaddingSeconds">Pre-padding minutes: </label>
|
||||
<input type="number" id="txtPrePaddingSeconds" pattern="[0-9]*" required="required" min="0" max="10" step=".5" />
|
||||
</li>
|
||||
<li>
|
||||
|
||||
@ -28,11 +28,11 @@
|
||||
</li>
|
||||
<li>
|
||||
<label for="selectLanguage">Preferred language: </label>
|
||||
<select name="selectLanguage" id="selectLanguage" data-mini="true"></select>
|
||||
<select name="selectLanguage" id="selectLanguage" data-mini="true" required="required"></select>
|
||||
</li>
|
||||
<li>
|
||||
<label for="selectCountry">Country: </label>
|
||||
<select name="selectCountry" id="selectCountry" data-mini="true"></select>
|
||||
<select name="selectCountry" id="selectCountry" data-mini="true" required="required"></select>
|
||||
</li>
|
||||
<li>
|
||||
<button type="submit" data-theme="b" data-icon="ok" data-mini="true">
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
<h2>Chapter Images</h2>
|
||||
<ul data-role="listview" class="ulForm">
|
||||
<li>
|
||||
<label>Enable chapter image extraction for:</label>
|
||||
<label>Extract chapter images for:</label>
|
||||
<div data-role="controlgroup">
|
||||
<input type="checkbox" data-mini="true" id="chkMovies" name="chkMovies" />
|
||||
<label for="chkMovies">Movies</label>
|
||||
@ -37,7 +37,7 @@
|
||||
|
||||
<input type="checkbox" data-mini="true" id="chkOtherVideos" name="chkOtherVideos" />
|
||||
<label for="chkOtherVideos">Other Videos</label>
|
||||
<div class="fieldDescription">Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during usage hours.</div>
|
||||
<div class="fieldDescription">Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.</div>
|
||||
</div>
|
||||
</li>
|
||||
<li>
|
||||
|
||||
@ -50,7 +50,7 @@
|
||||
|
||||
var html = "";
|
||||
|
||||
html += "<option value=''>None</option>";
|
||||
html += "<option value=''></option>";
|
||||
|
||||
for (var i = 0, length = allCountries.length; i < length; i++) {
|
||||
|
||||
@ -66,7 +66,7 @@
|
||||
|
||||
var html = "";
|
||||
|
||||
html += "<option value=''>None</option>";
|
||||
html += "<option value=''></option>";
|
||||
|
||||
for (var i = 0, length = allCultures.length; i < length; i++) {
|
||||
|
||||
|
||||
@ -42,6 +42,8 @@ var Dashboard = {
|
||||
$.mobile.listview.prototype.options.dividerTheme = "b";
|
||||
|
||||
$.mobile.popup.prototype.options.theme = "c";
|
||||
$.mobile.popup.prototype.options.transition = "none";
|
||||
//$.mobile.defaultPageTransition = "none";
|
||||
//$.mobile.collapsible.prototype.options.contentTheme = "a";
|
||||
},
|
||||
|
||||
|
||||
@ -4,70 +4,103 @@
|
||||
|
||||
Dashboard.showLoadingMsg();
|
||||
|
||||
ApiClient.getScheduledTasks().done(function (tasks) {
|
||||
// After saving chapter task, now save server config
|
||||
ApiClient.getServerConfiguration().done(function (config) {
|
||||
|
||||
var chapterTask = tasks.filter(function (t) {
|
||||
return t.Name.toLowerCase() == 'chapter image extraction';
|
||||
})[0];
|
||||
config.SaveLocalMeta = $('#chkSaveLocalMetadata', page).checked();
|
||||
config.PreferredMetadataLanguage = $('#selectLanguage', page).val();
|
||||
config.MetadataCountryCode = $('#selectCountry', page).val();
|
||||
|
||||
if (!chapterTask) {
|
||||
throw new Error('Cannot find chapter scheduled task');
|
||||
}
|
||||
|
||||
// First update the chapters scheduled task
|
||||
var triggers = $('#chkChapters', page).checked() ? [{
|
||||
"Type": "DailyTrigger",
|
||||
"TimeOfDayTicks": 144000000000
|
||||
}] : [];
|
||||
|
||||
ApiClient.updateScheduledTaskTriggers(chapterTask.Id, triggers).done(function () {
|
||||
|
||||
|
||||
// After saving chapter task, now save server config
|
||||
ApiClient.getServerConfiguration().done(function (config) {
|
||||
|
||||
config.SaveLocalMeta = $('#chkSaveLocalMetadata', page).checked();
|
||||
config.EnableVideoImageExtraction = $('#chkVIdeoImages', page).checked();
|
||||
config.ImageSavingConvention = $('#selectImageSavingConvention', page).val();
|
||||
|
||||
ApiClient.updateServerConfiguration(config).done(function (result) {
|
||||
|
||||
Dashboard.processServerConfigurationUpdateResult(result);
|
||||
|
||||
navigateToNextPage();
|
||||
|
||||
});
|
||||
});
|
||||
ApiClient.updateServerConfiguration(config).done(function (result) {
|
||||
|
||||
navigateToNextPage();
|
||||
|
||||
});
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
function navigateToNextPage() {
|
||||
function populateCountries(page, allCountries) {
|
||||
|
||||
ApiClient.getSystemInfo().done(function (systemInfo) {
|
||||
var html = "";
|
||||
|
||||
var os = systemInfo.OperatingSystem.toLowerCase();
|
||||
html += "<option value=''></option>";
|
||||
|
||||
if (os.indexOf('windows') != -1) {
|
||||
Dashboard.navigate('wizardservice.html');
|
||||
} else {
|
||||
Dashboard.navigate('wizardfinish.html');
|
||||
}
|
||||
for (var i = 0, length = allCountries.length; i < length; i++) {
|
||||
|
||||
var culture = allCountries[i];
|
||||
|
||||
html += "<option value='" + culture.TwoLetterISORegionName + "'>" + culture.DisplayName + "</option>";
|
||||
}
|
||||
|
||||
$('#selectCountry', page).html(html).selectmenu("refresh");
|
||||
}
|
||||
|
||||
function populateLanguages(page, allCultures) {
|
||||
|
||||
var html = "";
|
||||
|
||||
html += "<option value=''></option>";
|
||||
|
||||
for (var i = 0, length = allCultures.length; i < length; i++) {
|
||||
|
||||
var culture = allCultures[i];
|
||||
|
||||
html += "<option value='" + culture.TwoLetterISOLanguageName + "'>" + culture.DisplayName + "</option>";
|
||||
}
|
||||
|
||||
$('#selectLanguage', page).html(html).selectmenu("refresh");
|
||||
}
|
||||
|
||||
function reloadData(page, config, cultures, countries) {
|
||||
|
||||
populateLanguages(page, cultures);
|
||||
populateCountries(page, countries);
|
||||
|
||||
$('#selectLanguage', page).val(config.PreferredMetadataLanguage).selectmenu("refresh");
|
||||
$('#selectCountry', page).val(config.MetadataCountryCode).selectmenu("refresh");
|
||||
|
||||
Dashboard.hideLoadingMsg();
|
||||
}
|
||||
|
||||
function reload(page) {
|
||||
|
||||
Dashboard.showLoadingMsg();
|
||||
|
||||
var promise1 = ApiClient.getServerConfiguration();
|
||||
var promise2 = ApiClient.getCultures();
|
||||
var promise3 = ApiClient.getCountries();
|
||||
|
||||
$.when(promise1, promise2, promise3).done(function (response1, response2, response3) {
|
||||
|
||||
reloadData(page, response1[0], response2[0], response3[0]);
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
$(document).on('pageinit', "#wizardSettingsPage", function () {
|
||||
function navigateToNextPage() {
|
||||
|
||||
Dashboard.navigate('wizardimagesettings.html');
|
||||
}
|
||||
|
||||
$(document).on('pageshow', "#wizardSettingsPage", function () {
|
||||
|
||||
var page = this;
|
||||
|
||||
$('#btnNextPage', page).on('click', function () {
|
||||
|
||||
save(page);
|
||||
});
|
||||
reload(page);
|
||||
});
|
||||
|
||||
window.WizardSettingsPage = {
|
||||
|
||||
onSubmit: function () {
|
||||
|
||||
var form = this;
|
||||
|
||||
save(form);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
})(jQuery, document, window);
|
||||
|
||||
@ -9,44 +9,40 @@
|
||||
<div data-role="content">
|
||||
|
||||
<div class="ui-corner-all ui-shadow wizardContent">
|
||||
<h2>
|
||||
<img src="css/images/mblogoicon.png" />Configure settings</h2>
|
||||
<form class="wizardSettingsForm">
|
||||
<h2>
|
||||
<img src="css/images/mblogoicon.png" />Configure settings</h2>
|
||||
|
||||
<br />
|
||||
<div style="margin: 1em 0;">
|
||||
<label for="chkSaveLocalMetadata">Save metadata into media folders</label>
|
||||
<input id="chkSaveLocalMetadata" name="chkSaveLocalMetadata" type="checkbox" checked="checked" />
|
||||
<div class="fieldDescription">Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited and help reduce the size of the server's data folder.</div>
|
||||
</div>
|
||||
<br />
|
||||
<div style="margin: 1em 0;">
|
||||
<label for="chkSaveLocalMetadata">Save metadata into media folders</label>
|
||||
<input id="chkSaveLocalMetadata" name="chkSaveLocalMetadata" type="checkbox" checked="checked" />
|
||||
<div class="fieldDescription">Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited and help reduce the size of the server's data folder.</div>
|
||||
</div>
|
||||
|
||||
<div style="margin: 2em 0;">
|
||||
<label for="selectImageSavingConvention"><b>Image saving convention:</b></label>
|
||||
<select name="selectImageSavingConvention" id="selectImageSavingConvention">
|
||||
<option value="Compatible" selected="selected">Compatible - MB3/Plex/Xbmc</option>
|
||||
<option value="Legacy">Standard - MB3/MB2</option>
|
||||
</select>
|
||||
<div class="fieldDescription">Media Browser recognizes images from most major media applications. Choosing your downloading convention is useful if you also use other products.</div>
|
||||
</div>
|
||||
<h2 style="margin-top: 1.5em;">Preferred download language</h2>
|
||||
|
||||
<div style="margin: 2em 0;">
|
||||
<label for="chkVIdeoImages">Enable video image extraction</label>
|
||||
<input id="chkVIdeoImages" name="chkVIdeoImages" type="checkbox" checked="checked" />
|
||||
<div class="fieldDescription">For videos that don't already have images, and that we're unable to find internet images for. This will add some additional time to the initial library scan but will result in a more pleasing presentation.</div>
|
||||
</div>
|
||||
<div style="margin: 2em 0;">
|
||||
<label for="selectLanguage">Language: </label>
|
||||
<select name="selectLanguage" id="selectLanguage" data-mini="true" required="required"></select>
|
||||
</div>
|
||||
|
||||
<div style="margin: 2em 0;">
|
||||
<label for="chkChapters">Enable video chapter image extraction</label>
|
||||
<input id="chkChapters" name="chkChapters" type="checkbox" checked="checked" />
|
||||
<div class="fieldDescription">Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during usage hours.</div>
|
||||
</div>
|
||||
<div style="margin: 2em 0;">
|
||||
<label for="selectCountry">Country: </label>
|
||||
<select name="selectCountry" id="selectCountry" data-mini="true" required="required"></select>
|
||||
</div>
|
||||
|
||||
<div class="wizardNavigation">
|
||||
<button type="button" data-iconpos="left" data-icon="arrow-left" data-inline="true" onclick="history.back();">Previous</button>
|
||||
<button id="btnNextPage" type="button" data-iconpos="right" data-icon="arrow-right" data-inline="true">Next</button>
|
||||
</div>
|
||||
<div class="wizardNavigation">
|
||||
<button type="button" data-iconpos="left" data-icon="arrow-left" data-inline="true" onclick="history.back();">Previous</button>
|
||||
<button id="btnNextPage" type="submit" data-iconpos="right" data-icon="arrow-right" data-inline="true">Next</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
$('.wizardSettingsForm').off('submit', WizardSettingsPage.onSubmit).on('submit', WizardSettingsPage.onSubmit);
|
||||
</script>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user