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

merge branch 'master' into dkanada-patch-1

Browse source
This commit is contained in:
dkanada 2021-03-26 19:49:50 +09:00
commit c369c5b73c
224 changed files with 964 additions and 505 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/dashboard/dashboard.js
View file

@ -13,7 +13,7 @@ import imageLoader from '../../components/images/imageLoader';
import ActivityLog from '../../components/activitylog';
import imageHelper from '../../scripts/imagehelper';
import indicators from '../../components/indicators/indicators';
import '../../components/listview/listview.css';
import '../../components/listview/listview.scss';
import '../../elements/emby-button/emby-button';
import '../../assets/css/flexstyles.scss';
import '../../elements/emby-itemscontainer/emby-itemscontainer';
@ -106,9 +106,9 @@ import confirm from '../../components/confirm/confirm';
case 'sendmessage':
showSendMessageForm(btn, session);
break;
case 'transcodinginfo':
showPlaybackInfo(btn, session);
break;
}
});
});

2
src/controllers/dashboard/devices/devices.js
View file

@ -6,7 +6,7 @@ import { formatDistanceToNow } from 'date-fns';
import { localeWithSuffix } from '../../../scripts/dfnshelper';
import '../../../elements/emby-button/emby-button';
import '../../../elements/emby-itemscontainer/emby-itemscontainer';
import '../../../components/cardbuilder/card.css';
import '../../../components/cardbuilder/card.scss';
import Dashboard from '../../../scripts/clientUtils';
import confirm from '../../../components/confirm/confirm';

2
src/controllers/dashboard/dlna/profile.js
View file

@ -5,7 +5,7 @@ import '../../../elements/emby-select/emby-select';
import '../../../elements/emby-button/emby-button';
import '../../../elements/emby-input/emby-input';
import '../../../elements/emby-checkbox/emby-checkbox';
import '../../../components/listview/listview.css';
import '../../../components/listview/listview.scss';
import Dashboard from '../../../scripts/clientUtils';
import toast from '../../../components/toast/toast';

2
src/controllers/dashboard/dlna/profiles.js
View file

@ -2,7 +2,7 @@ import 'jquery';
import globalize from '../../../scripts/globalize';
import loading from '../../../components/loading/loading';
import libraryMenu from '../../../scripts/libraryMenu';
import '../../../components/listview/listview.css';
import '../../../components/listview/listview.scss';
import '../../../elements/emby-button/emby-button';
import confirm from '../../../components/confirm/confirm';

14
src/controllers/dashboard/library.js
View file

@ -5,7 +5,7 @@ import libraryMenu from '../../scripts/libraryMenu';
import globalize from '../../scripts/globalize';
import dom from '../../scripts/dom';
import imageHelper from '../../scripts/imagehelper';
import '../../components/cardbuilder/card.css';
import '../../components/cardbuilder/card.scss';
import '../../elements/emby-itemrefreshindicator/emby-itemrefreshindicator';
import Dashboard, { pageClassOn, pageIdOn } from '../../scripts/clientUtils';
import confirm from '../../components/confirm/confirm';
@ -101,7 +101,7 @@ import cardBuilder from '../../components/cardbuilder/cardBuilder';
menuItems.push({
name: globalize.translate('ManageLibrary'),
id: 'edit',
icon: 'folder_open'
icon: 'folder'
});
menuItems.push({
name: globalize.translate('ButtonRemove'),
@ -169,7 +169,8 @@ import cardBuilder from '../../components/cardbuilder/cardBuilder';
showType: false,
showLocations: false,
showMenu: false,
showNameWithIcon: false
showNameWithIcon: false,
elementId: 'addLibrary'
});
for (let i = 0; i < virtualFolders.length; i++) {
@ -255,11 +256,8 @@ import cardBuilder from '../../components/cardbuilder/cardBuilder';
style += 'min-width:33.3%;';
}
if (virtualFolder.Locations.length == 0) {
html += '<div id="addLibrary" class="card backdropCard scalableCard backdropCard-scalable" style="' + style + '" data-index="' + index + '" data-id="' + virtualFolder.ItemId + '">';
} else {
html += '<div class="card backdropCard scalableCard backdropCard-scalable" style="' + style + '" data-index="' + index + '" data-id="' + virtualFolder.ItemId + '">';
}
const elementId = virtualFolder.elementId ? `id="${virtualFolder.elementId}" ` : '';
html += '<div ' + elementId + 'class="card backdropCard scalableCard backdropCard-scalable" style="' + style + '" data-index="' + index + '" data-id="' + virtualFolder.ItemId + '">';
html += '<div class="cardBox visualCardBox">';
html += '<div class="cardScalable visualCardBox-cardScalable">';

2
src/controllers/dashboard/logs.js
View file

@ -1,7 +1,7 @@
import datetime from '../../scripts/datetime';
import loading from '../../components/loading/loading';
import '../../elements/emby-button/emby-button';
import '../../components/listview/listview.css';
import '../../components/listview/listview.scss';
import '../../assets/css/flexstyles.scss';
/* eslint-disable indent */

2
src/controllers/dashboard/metadataImages.js
View file

@ -2,7 +2,7 @@ import 'jquery';
import loading from '../../components/loading/loading';
import libraryMenu from '../../scripts/libraryMenu';
import globalize from '../../scripts/globalize';
import '../../components/listview/listview.css';
import '../../components/listview/listview.scss';
import Dashboard from '../../scripts/clientUtils';
/* eslint-disable indent */

2
src/controllers/dashboard/notifications/notifications/index.js
View file

@ -1,6 +1,6 @@
import loading from '../../../../components/loading/loading';
import globalize from '../../../../scripts/globalize';
import '../../../../components/listview/listview.css';
import '../../../../components/listview/listview.scss';
import '../../../../elements/emby-button/emby-button';
function reload(page) {

4
src/controllers/dashboard/plugins/add/index.js
View file

@ -22,6 +22,10 @@ function populateHistory(packageInfo, page) {
function populateVersions(packageInfo, page, installedPlugin) {
let html = '';
packageInfo.versions.sort((a, b) => {
return b.timestamp < a.timestamp ? -1 : 1;
});
for (let i = 0; i < packageInfo.versions.length; i++) {
const version = packageInfo.versions[i];
html += '<option value="' + version.version + '">' + globalize.translate('PluginFromRepo', version.version, version.repositoryName) + '</option>';

2
src/controllers/dashboard/plugins/available/index.js
View file

@ -2,7 +2,7 @@ import loading from '../../../../components/loading/loading';
import libraryMenu from '../../../../scripts/libraryMenu';
import globalize from '../../../../scripts/globalize';
import * as cardBuilder from '../../../../components/cardbuilder/cardBuilder.js';
import '../../../../components/cardbuilder/card.css';
import '../../../../components/cardbuilder/card.scss';
import '../../../../elements/emby-button/emby-button';
import '../../../../elements/emby-checkbox/emby-checkbox';
import '../../../../elements/emby-select/emby-select';

14
src/controllers/dashboard/plugins/installed/index.js
View file

@ -3,7 +3,7 @@ import libraryMenu from '../../../../scripts/libraryMenu';
import dom from '../../../../scripts/dom';
import globalize from '../../../../scripts/globalize';
import * as cardBuilder from '../../../../components/cardbuilder/cardBuilder.js';
import '../../../../components/cardbuilder/card.css';
import '../../../../components/cardbuilder/card.scss';
import '../../../../elements/emby-button/emby-button';
import Dashboard, { pageIdOn } from '../../../../scripts/clientUtils';
import confirm from '../../../../components/confirm/confirm';
@ -87,12 +87,10 @@ function getPluginCardHtml(plugin, pluginConfigurationPages) {
html += '</div>';
}
html += "<div class='cardText'>";
html += configPage && configPage.DisplayName ? configPage.DisplayName : plugin.Name;
html += `<br/>${globalize.translate('LabelStatus')} ${plugin.Status}</div>`;
html += "<div class='cardText cardText-secondary'>";
html += plugin.Version;
html += '<div class="cardText">';
html += `${plugin.Name}<span class='cardText cardText-secondary'>${plugin.Version}</span>`;
html += '</div>';
html += `<div class="cardText">${globalize.translate('LabelStatus')} ${plugin.Status}</div>`;
html += '</div>';
html += '</div>';
html += '</div>';
@ -161,7 +159,7 @@ function showPluginMenu(page, elem) {
menuItems.push({
name: globalize.translate('EnablePlugin'),
id: 'enable',
icon: 'mode_enable'
icon: 'check_circle_outline'
});
}
@ -169,7 +167,7 @@ function showPluginMenu(page, elem) {
menuItems.push({
name: globalize.translate('DisablePlugin'),
id: 'disable',
icon: 'mode_disable'
icon: 'do_not_disturb'
});
}

4
src/controllers/dashboard/plugins/repositories/index.js
View file

@ -5,8 +5,8 @@ import dialogHelper from '../../../../components/dialogHelper/dialogHelper';
import '../../../../elements/emby-button/emby-button';
import '../../../../elements/emby-checkbox/emby-checkbox';
import '../../../../elements/emby-select/emby-select';
import '../../../../components/formdialog.css';
import '../../../../components/listview/listview.css';
import '../../../../components/formdialog.scss';
import '../../../../components/listview/listview.scss';
let repositories = [];

2
src/controllers/dashboard/scheduledtasks/scheduledtask.js
View file

@ -43,7 +43,7 @@ import confirm from '../../../components/confirm/confirm';
$('.taskName', view).html(task.Name);
$('#pTaskDescription', view).html(task.Description);
import('../../../components/listview/listview.css').then(() => {
import('../../../components/listview/listview.scss').then(() => {
ScheduledTaskPage.loadTaskTriggers(view, task);
});

2
src/controllers/dashboard/scheduledtasks/scheduledtasks.js
View file

@ -5,7 +5,7 @@ import globalize from '../../../scripts/globalize';
import serverNotifications from '../../../scripts/serverNotifications';
import { formatDistance, formatDistanceToNow } from 'date-fns';
import { getLocale, localeWithSuffix } from '../../../scripts/dfnshelper';
import '../../../components/listview/listview.css';
import '../../../components/listview/listview.scss';
import '../../../elements/emby-button/emby-button';
/* eslint-disable indent */

2
src/controllers/dashboard/users/userparentalcontrol.js
View file

@ -3,7 +3,7 @@ import datetime from '../../../scripts/datetime';
import loading from '../../../components/loading/loading';
import libraryMenu from '../../../scripts/libraryMenu';
import globalize from '../../../scripts/globalize';
import '../../../components/listview/listview.css';
import '../../../components/listview/listview.scss';
import '../../../elements/emby-button/paper-icon-button-light';
import toast from '../../../components/toast/toast';

4
src/controllers/dashboard/users/userprofilespage.js
View file

@ -4,9 +4,9 @@ import globalize from '../../../scripts/globalize';
import { formatDistanceToNow } from 'date-fns';
import { localeWithSuffix } from '../../../scripts/dfnshelper';
import '../../../elements/emby-button/paper-icon-button-light';
import '../../../components/cardbuilder/card.css';
import '../../../components/cardbuilder/card.scss';
import '../../../elements/emby-button/emby-button';
import '../../../components/indicators/indicators.css';
import '../../../components/indicators/indicators.scss';
import '../../../assets/css/flexstyles.scss';
import Dashboard, { pageIdOn } from '../../../scripts/clientUtils';
import confirm from '../../../components/confirm/confirm';