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

move more metadata settings to per library

This commit is contained in:
Luke Pulverenti 2016-10-02 00:31:47 -04:00
parent 9dcf14df27
commit af2e209ce4
20 changed files with 79 additions and 85 deletions

View file

@ -16,12 +16,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.1.84", "version": "1.1.85",
"_release": "1.1.84", "_release": "1.1.85",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.1.84", "tag": "1.1.85",
"commit": "adc79119a845784ce08fa33930e6eb903dfab16a" "commit": "6fc42ba6b9d72c3e4af4a7b7797d53b08342f095"
}, },
"_source": "https://github.com/MediaBrowser/Emby.ApiClient.Javascript.git", "_source": "https://github.com/MediaBrowser/Emby.ApiClient.Javascript.git",
"_target": "^1.1.51", "_target": "^1.1.51",

View file

@ -215,7 +215,7 @@
return connectUser; return connectUser;
}; };
var minServerVersion = '3.0.5984'; var minServerVersion = '3.0.5986';
self.minServerVersion = function (val) { self.minServerVersion = function (val) {
if (val) { if (val) {

View file

@ -244,6 +244,10 @@
color: inherit; color: inherit;
} }
.singleCardText {
padding: .5em;
}
.cardTextCentered { .cardTextCentered {
text-align: center; text-align: center;
} }

View file

@ -1,6 +1,6 @@
{ {
"name": "hls.js", "name": "hls.js",
"version": "0.5.48", "version": "0.5.49",
"license": "Apache-2.0", "license": "Apache-2.0",
"description": "Media Source Extension - HLS library, by/for Dailymotion", "description": "Media Source Extension - HLS library, by/for Dailymotion",
"homepage": "https://github.com/dailymotion/hls.js", "homepage": "https://github.com/dailymotion/hls.js",
@ -16,11 +16,11 @@
"test", "test",
"tests" "tests"
], ],
"_release": "0.5.48", "_release": "0.5.49",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v0.5.48", "tag": "v0.5.49",
"commit": "d37a6900d9a9c487b686b6cad4e8aabd5ad03893" "commit": "faf1c90b096abf152cce4ba107fbd5511d44a998"
}, },
"_source": "git://github.com/dailymotion/hls.js.git", "_source": "git://github.com/dailymotion/hls.js.git",
"_target": "~0.5.7", "_target": "~0.5.7",

View file

@ -1,6 +1,6 @@
{ {
"name": "hls.js", "name": "hls.js",
"version": "0.5.48", "version": "0.5.49",
"license": "Apache-2.0", "license": "Apache-2.0",
"description": "Media Source Extension - HLS library, by/for Dailymotion", "description": "Media Source Extension - HLS library, by/for Dailymotion",
"homepage": "https://github.com/dailymotion/hls.js", "homepage": "https://github.com/dailymotion/hls.js",

File diff suppressed because one or more lines are too long

View file

@ -1,6 +1,6 @@
{ {
"name": "hls.js", "name": "hls.js",
"version": "0.5.48", "version": "0.5.49",
"license": "Apache-2.0", "license": "Apache-2.0",
"description": "Media Source Extension - HLS library, by/for Dailymotion", "description": "Media Source Extension - HLS library, by/for Dailymotion",
"homepage": "https://github.com/dailymotion/hls.js", "homepage": "https://github.com/dailymotion/hls.js",

View file

@ -35,14 +35,18 @@
if (contentType == 'homevideos' || contentType == 'photos') { if (contentType == 'homevideos' || contentType == 'photos') {
parent.querySelector('.chkEnablePhotosContainer').classList.remove('hide'); parent.querySelector('.chkEnablePhotosContainer').classList.remove('hide');
parent.querySelector('.chkDownloadImagesInAdvanceContainer').classList.add('hide');
parent.querySelector('.chkEnableInternetProvidersContainer').classList.add('hide');
} else { } else {
parent.querySelector('.chkEnablePhotosContainer').classList.add('hide'); parent.querySelector('.chkEnablePhotosContainer').classList.add('hide');
parent.querySelector('.chkDownloadImagesInAdvanceContainer').classList.remove('hide');
parent.querySelector('.chkEnableInternetProvidersContainer').classList.remove('hide');
} }
if (contentType == 'homevideos') { if (contentType == 'photos') {
parent.querySelector('.chkDownloadImagesInAdvanceContainer').classList.add('hide'); parent.querySelector('.chkSaveLocalContainer').classList.add('hide');
} else { } else {
parent.querySelector('.chkDownloadImagesInAdvanceContainer').classList.remove('hide'); parent.querySelector('.chkSaveLocalContainer').classList.remove('hide');
} }
if (contentType == 'tvshows' || contentType == 'movies' || contentType == 'homevideos' || contentType == 'musicvideos' || contentType == 'mixed' || !contentType) { if (contentType == 'tvshows' || contentType == 'movies' || contentType == 'homevideos' || contentType == 'musicvideos' || contentType == 'mixed' || !contentType) {
@ -62,7 +66,9 @@
EnableRealtimeMonitor: parent.querySelector('.chkEnableRealtimeMonitor').checked, EnableRealtimeMonitor: parent.querySelector('.chkEnableRealtimeMonitor').checked,
ExtractChapterImagesDuringLibraryScan: parent.querySelector('.chkExtractChaptersDuringLibraryScan').checked, ExtractChapterImagesDuringLibraryScan: parent.querySelector('.chkExtractChaptersDuringLibraryScan').checked,
EnableChapterImageExtraction: parent.querySelector('.chkExtractChapterImages').checked, EnableChapterImageExtraction: parent.querySelector('.chkExtractChapterImages').checked,
DownloadImagesInAdvance: parent.querySelector('#chkDownloadImagesInAdvance').checked DownloadImagesInAdvance: parent.querySelector('#chkDownloadImagesInAdvance').checked,
EnableInternetProviders: parent.querySelector('#chkEnableInternetProviders').checked,
SaveLocalMetadata: parent.querySelector('#chkSaveLocal').checked
}; };
return options; return options;
@ -76,6 +82,8 @@
parent.querySelector('.chkExtractChaptersDuringLibraryScan').checked = options.ExtractChapterImagesDuringLibraryScan; parent.querySelector('.chkExtractChaptersDuringLibraryScan').checked = options.ExtractChapterImagesDuringLibraryScan;
parent.querySelector('.chkExtractChapterImages').checked = options.EnableChapterImageExtraction; parent.querySelector('.chkExtractChapterImages').checked = options.EnableChapterImageExtraction;
parent.querySelector('#chkDownloadImagesInAdvance').checked = options.DownloadImagesInAdvance; parent.querySelector('#chkDownloadImagesInAdvance').checked = options.DownloadImagesInAdvance;
parent.querySelector('#chkEnableInternetProviders').checked = options.EnableInternetProviders;
parent.querySelector('#chkSaveLocal').checked = options.SaveLocalMetadata;
} }
return { return {

View file

@ -1,4 +1,18 @@
<h1>${HeaderSettings}</h1> <h1>${HeaderSettings}</h1>
<div class="checkboxContainer checkboxContainer-withDescription chkEnableInternetProvidersContainer hide">
<label>
<input is="emby-checkbox" type="checkbox" id="chkEnableInternetProviders" />
<span>${LabelDownloadInternetMetadata}</span>
</label>
<div class="fieldDescription checkboxFieldDescription">${LabelDownloadInternetMetadataHelp}</div>
</div>
<div class="checkboxContainer checkboxContainer-withDescription chkSaveLocalContainer hide">
<label>
<input is="emby-checkbox" type="checkbox" id="chkSaveLocal" />
<span>${LabelSaveLocalMetadata}</span>
</label>
<div class="fieldDescription checkboxFieldDescription">${LabelSaveLocalMetadataHelp}</div>
</div>
<div class="checkboxContainer checkboxContainer-withDescription chkEnablePhotosContainer"> <div class="checkboxContainer checkboxContainer-withDescription chkEnablePhotosContainer">
<label> <label>
<input type="checkbox" is="emby-checkbox" class="chkEnablePhotos" checked /> <input type="checkbox" is="emby-checkbox" class="chkEnablePhotos" checked />
@ -8,7 +22,7 @@
</div> </div>
<div class="checkboxContainer checkboxContainer-withDescription"> <div class="checkboxContainer checkboxContainer-withDescription">
<label> <label>
<input type="checkbox" is="emby-checkbox" class="chkEnableRealtimeMonitor"/> <input type="checkbox" is="emby-checkbox" class="chkEnableRealtimeMonitor" />
<span>${LabelEnableRealtimeMonitor}</span> <span>${LabelEnableRealtimeMonitor}</span>
</label> </label>
<div class="fieldDescription checkboxFieldDescription">${LabelEnableRealtimeMonitorHelp}</div> <div class="fieldDescription checkboxFieldDescription">${LabelEnableRealtimeMonitorHelp}</div>

View file

@ -1,4 +1,4 @@
<div id="dashboardPage" data-role="page" class="page type-interior dashboardHomePage fullWidthContent" data-require="scripts/dashboardpage,humanedate,buttonenabled,listViewStyle,emby-collapse,emby-button"> <div id="dashboardPage" data-role="page" class="page type-interior dashboardHomePage fullWidthContent" data-require="scripts/dashboardpage,buttonenabled,listViewStyle,emby-collapse,emby-button">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">

View file

@ -6,20 +6,12 @@
<form class="metadataConfigurationForm"> <form class="metadataConfigurationForm">
<div class="checkboxContainer checkboxContainer-withDescription"> <div style="margin:1em 0;background: #e8e8e8;padding: 1em;">
<label> <h1 style="margin-top:.5em;">Some metadata settings have moved</h1>
<input is="emby-checkbox" type="checkbox" id="chkEnableInternetProviders" /> <p>You can now configure internet providers and saving of local metadata on a per-library basis.</p>
<span>${LabelDownloadInternetMetadata}</span> <p>To do this, go to Library setup and click on a library to view the options.</p>
</label>
<div class="fieldDescription checkboxFieldDescription">${LabelDownloadInternetMetadataHelp}</div>
</div>
<div class="checkboxContainer checkboxContainer-withDescription">
<label>
<input is="emby-checkbox" type="checkbox" id="chkSaveLocal" />
<span>${LabelSaveLocalMetadata}</span>
</label>
<div class="fieldDescription checkboxFieldDescription">${LabelSaveLocalMetadataHelp}</div>
</div> </div>
<br/>
<div class="selectContainer"> <div class="selectContainer">
<select is="emby-select" id="selectLanguage" label="${LabelMetadataDownloadLanguage}" required="required"></select> <select is="emby-select" id="selectLanguage" label="${LabelMetadataDownloadLanguage}" required="required"></select>
</div> </div>

View file

@ -1,4 +1,4 @@
<div id="scheduledTasksPage" data-role="page" class="page type-interior scheduledTasksConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Scheduled%20tasks" data-require="scripts/scheduledtaskspage,humanedate"> <div id="scheduledTasksPage" data-role="page" class="page type-interior scheduledTasksConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Scheduled%20tasks" data-require="scripts/scheduledtaskspage">
<style> <style>
.taskProgressOuter { .taskProgressOuter {

View file

@ -1,4 +1,4 @@
define(['datetime', 'jQuery', 'dom', 'cardStyle', 'listViewStyle'], function (datetime, $, dom) { define(['datetime', 'jQuery', 'dom', 'humanedate', 'cardStyle', 'listViewStyle'], function (datetime, $, dom) {
function renderNoHealthAlertsMessage(page) { function renderNoHealthAlertsMessage(page) {

View file

@ -131,17 +131,8 @@
html += '</div>'; html += '</div>';
html += '<div class="cardFooter visualCardBox-cardFooter">'; html += '<div class="cardFooter visualCardBox-cardFooter">';
html += '<div class="cardText">' + user.Name + '</div>'; html += '<div class="cardText singleCardText">' + user.Name + '</div>';
html += '<div class="cardText cardText-secondary">';
var lastSeen = getLastSeenText(user.LastActivityDate);
if (lastSeen != "") {
html += lastSeen;
}
else {
html += "&nbsp;";
}
html += '</div>';
html += '</div>'; html += '</div>';
html += '</div>'; html += '</div>';
@ -151,15 +142,6 @@
context.querySelector('#divUsers').innerHTML = html; context.querySelector('#divUsers').innerHTML = html;
} }
function getLastSeenText(lastActivityDate) {
if (!lastActivityDate) {
return "";
}
return "Last seen " + humane_date(lastActivityDate);
}
return function (view, params) { return function (view, params) {
var self = this; var self = this;

View file

@ -5,8 +5,6 @@
return; return;
} }
page.querySelector('#chkEnableInternetProviders').checked = config.EnableInternetProviders;
page.querySelector('#chkSaveLocal').checked = config.SaveLocalMeta;
$('#selectLanguage', page).val(config.PreferredMetadataLanguage); $('#selectLanguage', page).val(config.PreferredMetadataLanguage);
$('#selectCountry', page).val(config.MetadataCountryCode); $('#selectCountry', page).val(config.MetadataCountryCode);
@ -20,8 +18,6 @@
ApiClient.getServerConfiguration().then(function (config) { ApiClient.getServerConfiguration().then(function (config) {
config.EnableInternetProviders = form.querySelector('#chkEnableInternetProviders').checked;
config.SaveLocalMeta = form.querySelector('#chkSaveLocal').checked;
config.PreferredMetadataLanguage = $('#selectLanguage', form).val(); config.PreferredMetadataLanguage = $('#selectLanguage', form).val();
config.MetadataCountryCode = $('#selectCountry', form).val(); config.MetadataCountryCode = $('#selectCountry', form).val();

View file

@ -1,4 +1,4 @@
define(['jQuery', 'listViewStyle'], function ($) { define(['jQuery', 'humanedate', 'listViewStyle'], function ($) {
function reloadList(page) { function reloadList(page) {

View file

@ -2200,7 +2200,7 @@ var AppInfo = {};
defineRoute({ defineRoute({
path: '/login.html', path: '/login.html',
dependencies: ['emby-button', 'humanedate', 'emby-input'], dependencies: ['emby-button', 'emby-input'],
autoFocus: false, autoFocus: false,
anonymous: true, anonymous: true,
startup: true, startup: true,

View file

@ -1,4 +1,4 @@
define(['jQuery', 'paper-icon-button-light', 'cardStyle'], function ($) { define(['jQuery', 'humanedate', 'paper-icon-button-light', 'cardStyle'], function ($) {
function deleteUser(page, id) { function deleteUser(page, id) {
@ -152,6 +152,16 @@
html += user.Name; html += user.Name;
html += "</div>"; html += "</div>";
html += '<div class="cardText cardText-secondary">';
var lastSeen = getLastSeenText(user.LastActivityDate);
if (lastSeen != "") {
html += lastSeen;
}
else {
html += "&nbsp;";
}
html += '</div>';
// cardFooter // cardFooter
html += "</div>"; html += "</div>";
@ -164,6 +174,15 @@
return html; return html;
} }
function getLastSeenText(lastActivityDate) {
if (!lastActivityDate) {
return "";
}
return "Last seen " + humane_date(lastActivityDate);
}
function getUserSectionHtml(users, addConnectIndicator) { function getUserSectionHtml(users, addConnectIndicator) {
var html = ''; var html = '';

View file

@ -11,8 +11,6 @@
config.PreferredMetadataLanguage = $('#selectLanguage', page).val(); config.PreferredMetadataLanguage = $('#selectLanguage', page).val();
config.MetadataCountryCode = $('#selectCountry', page).val(); config.MetadataCountryCode = $('#selectCountry', page).val();
config.SaveLocalMeta = page.querySelector('.chkSaveLocalMetadata').checked;
config.EnableInternetProviders = page.querySelector('.chkEnableInternetProviders').checked;
apiClient.ajax({ apiClient.ajax({

View file

@ -4,26 +4,7 @@
<div class="ui-corner-all ui-shadow wizardContent"> <div class="ui-corner-all ui-shadow wizardContent">
<form class="wizardSettingsForm"> <form class="wizardSettingsForm">
<h1> <h1>${HeaderPreferredMetadataLanguage}</h1>
${LabelConfigureSettings}
</h1>
<br/>
<div class="checkboxContainer checkboxContainer-withDescription">
<label>
<input type="checkbox" is="emby-checkbox" class="chkEnableInternetProviders" />
<span>${LabelDownloadInternetMetadata}</span>
</label>
<div class="fieldDescription checkboxFieldDescription">${LabelDownloadInternetMetadataHelp}</div>
</div>
<div class="checkboxContainer checkboxContainer-withDescription">
<label>
<input type="checkbox" is="emby-checkbox" class="chkSaveLocalMetadata" />
<span>${LabelSaveLocalMetadata}</span>
</label>
<div class="fieldDescription checkboxFieldDescription">${LabelSaveLocalMetadataHelp}</div>
</div>
<h1 style="margin:2em 0 1.5em;">${HeaderPreferredMetadataLanguage}</h1>
<div class="selectContainer"> <div class="selectContainer">
<select is="emby-select" id="selectLanguage" required="required" label="${LabelLanguage}"></select> <select is="emby-select" id="selectLanguage" required="required" label="${LabelLanguage}"></select>