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

move more metadata settings to per library

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-apiclient/.bower.json vendored
View file

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

2
dashboard-ui/bower_components/emby-apiclient/connectionmanager.js vendored
View file

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

4
dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css vendored
View file

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

8
dashboard-ui/bower_components/hlsjs/.bower.json vendored
View file

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

2
dashboard-ui/bower_components/hlsjs/bower.json vendored
View file

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

10
dashboard-ui/bower_components/hlsjs/dist/hls.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
dashboard-ui/bower_components/hlsjs/package.json vendored
View file

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

16
dashboard-ui/components/libraryoptionseditor/libraryoptionseditor.js
View file

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

16
dashboard-ui/components/libraryoptionseditor/libraryoptionseditor.template.html
View file

@ -1,4 +1,18 @@
<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">
<label>
<input type="checkbox" is="emby-checkbox" class="chkEnablePhotos" checked />
@ -8,7 +22,7 @@
</div>
<div class="checkboxContainer checkboxContainer-withDescription">
<label>
<input type="checkbox" is="emby-checkbox" class="chkEnableRealtimeMonitor"/>
<input type="checkbox" is="emby-checkbox" class="chkEnableRealtimeMonitor" />
<span>${LabelEnableRealtimeMonitor}</span>
</label>
<div class="fieldDescription checkboxFieldDescription">${LabelEnableRealtimeMonitorHelp}</div>

2
dashboard-ui/dashboard.html
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 class="content-primary">

18
dashboard-ui/metadata.html
View file

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

2
dashboard-ui/scheduledtasks.html
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>
.taskProgressOuter {

2
dashboard-ui/scripts/dashboardpage.js
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) {

20
dashboard-ui/scripts/loginpage.js
View file

@ -131,17 +131,8 @@
html += '</div>';
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>';
@ -151,15 +142,6 @@
context.querySelector('#divUsers').innerHTML = html;
}
function getLastSeenText(lastActivityDate) {
if (!lastActivityDate) {
return "";
}
return "Last seen " + humane_date(lastActivityDate);
}
return function (view, params) {
var self = this;

4
dashboard-ui/scripts/metadataconfigurationpage.js
View file

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

2
dashboard-ui/scripts/scheduledtaskspage.js
View file

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

2
dashboard-ui/scripts/site.js
View file

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

21
dashboard-ui/scripts/userprofilespage.js
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) {
@ -152,6 +152,16 @@
html += user.Name;
html += "</div>";
html += '<div class="cardText cardText-secondary">';
var lastSeen = getLastSeenText(user.LastActivityDate);
if (lastSeen != "") {
html += lastSeen;
}
else {
html += "&nbsp;";
}
html += '</div>';
// cardFooter
html += "</div>";
@ -164,6 +174,15 @@
return html;
}
function getLastSeenText(lastActivityDate) {
if (!lastActivityDate) {
return "";
}
return "Last seen " + humane_date(lastActivityDate);
}
function getUserSectionHtml(users, addConnectIndicator) {
var html = '';

2
dashboard-ui/scripts/wizardsettings.js
View file

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

21
dashboard-ui/wizardsettings.html
View file

@ -4,26 +4,7 @@
<div class="ui-corner-all ui-shadow wizardContent">
<form class="wizardSettingsForm">
<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>
<h1>${HeaderPreferredMetadataLanguage}</h1>
<div class="selectContainer">
<select is="emby-select" id="selectLanguage" required="required" label="${LabelLanguage}"></select>