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

update metadata editor

Browse source
This commit is contained in:
Luke Pulverenti 2016-07-02 22:47:39 -04:00
parent 9ea4a29401
commit a033df6932
9 changed files with 29 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

1
dashboard-ui/bower_components/emby-webcomponents/emby-collapse/emby-collapse.css vendored
View file

@ -8,6 +8,7 @@
height: 0; height: 0;
transition-property: height; transition-property: height;
transition-duration: 300ms; transition-duration: 300ms;
overflow: hidden;
} }
.emby-collapsible-button { .emby-collapsible-button {

4
dashboard-ui/bower_components/emby-webcomponents/emby-collapse/emby-collapse.js vendored
View file

@ -47,9 +47,11 @@
var collapseContent = this.parentNode.querySelector('.collapseContent'); var collapseContent = this.parentNode.querySelector('.collapseContent');
if (collapseContent.classList.contains('expanded')) { if (collapseContent.expanded) {
collapseContent.expanded = false;
slideUpToHide(this, collapseContent); slideUpToHide(this, collapseContent);
} else { } else {
collapseContent.expanded = true;
slideDownToShow(this, collapseContent); slideDownToShow(this, collapseContent);
} }
} }

15
dashboard-ui/components/metadataeditor/metadataeditor.js
View file

@ -283,22 +283,19 @@
items.push({ items.push({
name: Globalize.translate('ButtonEditImages'), name: Globalize.translate('ButtonEditImages'),
id: 'images', id: 'images'
ironIcon: 'photo'
}); });
if (LibraryBrowser.canIdentify(user, currentItem.Type)) { if (LibraryBrowser.canIdentify(user, currentItem.Type)) {
items.push({ items.push({
name: Globalize.translate('ButtonIdentify'), name: Globalize.translate('ButtonIdentify'),
id: 'identify', id: 'identify'
ironIcon: 'info'
}); });
} }
items.push({ items.push({
name: Globalize.translate('ButtonRefresh'), name: Globalize.translate('ButtonRefresh'),
id: 'refresh', id: 'refresh'
ironIcon: 'refresh'
}); });
require(['actionsheet'], function (actionsheet) { require(['actionsheet'], function (actionsheet) {
@ -516,7 +513,7 @@
html += '</div>'; html += '</div>';
if (formatString) { if (formatString) {
html += '<a class="clearLink ' + buttonId + '" href="#" target="_blank" data-role="none" style="float: none; width: 1.75em"><button type="button" is="paper-icon-button-light"><iron-icon icon="open-in-browser"></iron-icon></button></a>'; html += '<a class="clearLink ' + buttonId + '" href="#" target="_blank" data-role="none" style="float: none; width: 1.75em"><button type="button" is="paper-icon-button-light" class="autoSize"><i class="md-icon">open_in_browser</i></button></a>';
} }
html += '</div>'; html += '</div>';
@ -980,7 +977,7 @@
html += '</div>'; html += '</div>';
html += '<button type="button" is="paper-icon-button-light" data-index="' + i + '" class="btnRemoveFromEditorList"><iron-icon icon="delete"></iron-icon></button>'; html += '<button type="button" is="paper-icon-button-light" data-index="' + i + '" class="btnRemoveFromEditorList autoSize"><i class="md-icon">delete</i></button>';
html += '</div>'; html += '</div>';
} }
@ -1017,7 +1014,7 @@
html += '</a>'; html += '</a>';
html += '</div>'; html += '</div>';
html += '<button type="button" is="paper-icon-button-light" data-index="' + i + '" class="btnDeletePerson"><iron-icon icon="delete"></iron-icon></button>'; html += '<button type="button" is="paper-icon-button-light" data-index="' + i + '" class="btnDeletePerson autoSize"><i class="md-icon">delete</i></button>';
html += '</div>'; html += '</div>';
} }

12
dashboard-ui/components/metadataeditor/metadataeditor.template.html
View file

@ -1,14 +1,18 @@
<div class="dialogHeader" style="margin:0 0 2em;"> <div class="dialogHeader" style="margin:0 0 2em;">
<button is="paper-icon-button-light" class="btnCancel" tabindex="-1"><iron-icon icon="arrow-back"></iron-icon></button> <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1">
<i class="md-icon">arrow_back</i>
</button>
<div class="dialogHeaderTitle"> <div class="dialogHeaderTitle">
${ButtonEdit} ${ButtonEdit}
</div> </div>
<div style="margin-left:auto; display: flex; align-items: center; justify-content: center;"> <div style="margin-left:auto; display: flex; align-items: center; justify-content: center;">
<button is="emby-button" type="button" class="btnHeaderSave accent" tabindex="-1"> <button is="emby-button" type="button" class="btnHeaderSave accent autoSize" tabindex="-1">
<iron-icon icon="check"></iron-icon> <i class="md-icon">check</i>
<span>${ButtonSave}</span> <span>${ButtonSave}</span>
</button> </button>
<button is="paper-icon-button-light" class="btnMore" tabindex="-1"><iron-icon icon="more-vert"></iron-icon></button> <button is="paper-icon-button-light" class="btnMore autoSize" tabindex="-1">
<i class="md-icon">more_vert</i>
</button>
</div> </div>
</div> </div>

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

@ -176,6 +176,8 @@
loadSuggestions(view); loadSuggestions(view);
} }
libraryBrowser.createCardMenus(searchResults);
view.querySelector('.txtSearch').addEventListener('input', function () { view.querySelector('.txtSearch').addEventListener('input', function () {
onSearchChange(this.value); onSearchChange(this.value);
}); });

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

@ -2784,7 +2784,7 @@ var AppInfo = {};
defineRoute({ defineRoute({
path: '/mysyncjob.html', path: '/mysyncjob.html',
dependencies: ['paper-fab', 'paper-item-body', 'paper-icon-item'], dependencies: [],
autoFocus: false, autoFocus: false,
transition: 'fade', transition: 'fade',
controller: 'scripts/syncjob' controller: 'scripts/syncjob'
@ -2946,7 +2946,7 @@ var AppInfo = {};
defineRoute({ defineRoute({
path: '/syncjob.html', path: '/syncjob.html',
dependencies: ['paper-fab', 'paper-item-body', 'paper-icon-item'], dependencies: [],
autoFocus: false, autoFocus: false,
transition: 'fade', transition: 'fade',
controller: 'scripts/syncjob' controller: 'scripts/syncjob'

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

@ -1,4 +1,4 @@
define(['jQuery', 'datetime', 'paper-progress', 'listViewStyle', 'paper-icon-button-light', 'emby-button'], function ($, datetime) { define(['jQuery', 'datetime', 'listViewStyle', 'paper-icon-button-light', 'emby-button'], function ($, datetime) {
function renderJob(page, job, dialogOptions) { function renderJob(page, job, dialogOptions) {
@ -83,7 +83,7 @@
html += '</div>'; html += '</div>';
html += '<div class="secondary" style="padding-top:5px;">'; html += '<div class="secondary" style="padding-top:5px;">';
html += '<paper-progress class="mini" style="width:100%;" value="' + (jobItem.Progress || 0) + '"></paper-progress>'; html += '<div style="background:#e0e0e0;height:4px;"><div style="background:#52B54B;width:' + (jobItem.Progress || 0) + '%;height:100%;"></div></div>';
html += '</div>'; html += '</div>';
html += '</div>'; html += '</div>';

9
dashboard-ui/scripts/wizardcomponents.js
View file

@ -19,6 +19,7 @@
} }
if (systemInfo.OperatingSystem == 'Windows' && systemInfo.SystemArchitecture != 'Arm') { if (systemInfo.OperatingSystem == 'Windows' && systemInfo.SystemArchitecture != 'Arm') {
view.querySelector('.suggestedLocation').innerHTML = Globalize.translate('FFmpegSuggestedDownload', '<a target="_blank" href="https://ffmpeg.zeranoe.com/builds">https://ffmpeg.zeranoe.com</a>'); view.querySelector('.suggestedLocation').innerHTML = Globalize.translate('FFmpegSuggestedDownload', '<a target="_blank" href="https://ffmpeg.zeranoe.com/builds">https://ffmpeg.zeranoe.com</a>');
if (systemInfo.SystemArchitecture == 'X86') { if (systemInfo.SystemArchitecture == 'X86') {
@ -28,30 +29,28 @@
instructions = 'Download FFmpeg 64-Bit Static'; instructions = 'Download FFmpeg 64-Bit Static';
} }
view.querySelector('.downloadInstructions').innerHTML = instructions;
} else if (systemInfo.OperatingSystem == 'Linux' && systemInfo.SystemArchitecture != 'Arm') { } else if (systemInfo.OperatingSystem == 'Linux' && systemInfo.SystemArchitecture != 'Arm') {
view.querySelector('.suggestedLocation').innerHTML = Globalize.translate('FFmpegSuggestedDownload', '<a target="_blank" href="http://johnvansickle.com/ffmpeg">http://johnvansickle.com/ffmpeg</a>'); view.querySelector('.suggestedLocation').innerHTML = Globalize.translate('FFmpegSuggestedDownload', '<a target="_blank" href="http://johnvansickle.com/ffmpeg">http://johnvansickle.com/ffmpeg</a>');
if (systemInfo.SystemArchitecture == 'X86') { if (systemInfo.SystemArchitecture == 'X86') {
instructions = 'Download x86 build'; instructions = 'Download x86 build';
} }
else if (systemInfo.SystemArchitecture == 'X64') { else if (systemInfo.SystemArchitecture == 'X64') {
instructions = 'Download x86_64 build'; instructions = 'Download x86_64 build';
} }
view.querySelector('.downloadInstructions').innerHTML = instructions;
} else if (systemInfo.OperatingSystem == 'Osx' && systemInfo.SystemArchitecture == 'X64') { } else if (systemInfo.OperatingSystem == 'Osx' && systemInfo.SystemArchitecture == 'X64') {
view.querySelector('.suggestedLocation').innerHTML = Globalize.translate('FFmpegSuggestedDownload', '<a target="_blank" href="http://evermeet.cx/ffmpeg">http://evermeet.cx/ffmpeg</a>'); view.querySelector('.suggestedLocation').innerHTML = Globalize.translate('FFmpegSuggestedDownload', '<a target="_blank" href="http://evermeet.cx/ffmpeg">http://evermeet.cx/ffmpeg</a>');
instructions = 'Download both ffmpeg and ffprobe, and extract them to the same folder.'; instructions = 'Download both ffmpeg and ffprobe, and extract them to the same folder.';
view.querySelector('.downloadInstructions').innerHTML = instructions;
} else { } else {
view.querySelector('.suggestedLocation').innerHTML = Globalize.translate('FFmpegSuggestedDownload', '<a target="_blank" href="http://ffmpeg.org">https://ffmpeg.org/download.html</a>'); view.querySelector('.suggestedLocation').innerHTML = Globalize.translate('FFmpegSuggestedDownload', '<a target="_blank" href="http://ffmpeg.org">https://ffmpeg.org/download.html</a>');
view.querySelector('.downloadInstructions').innerHTML = '';
} }
view.querySelector('.downloadInstructions').innerHTML = instructions;
var selectEncoderPath = view.querySelector('#selectEncoderPath'); var selectEncoderPath = view.querySelector('#selectEncoderPath');
selectEncoderPath.value = 'Custom'; selectEncoderPath.value = 'Custom';
onSelectEncoderPathChange.call(selectEncoderPath); onSelectEncoderPathChange.call(selectEncoderPath);

2
dashboard-ui/search.html
View file

@ -24,6 +24,6 @@
</div> </div>
</div> </div>
<div class="searchResults hide"></div> <div class="searchResults hide itemsContainer"></div>
</div> </div>
</div> </div>