Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • advertisement
  • automagic
  • dbp-translation-component
  • demo
  • demo-file-handling
  • favorites-and-recent-files
  • icon-set-mapping
  • lit2
  • main
  • person-select-custom
  • port-i18next-parser
  • publish
  • remove-sentry
  • renovate/lock-file-maintenance
  • revert-6c632dc6
  • wc-part
  • wip-cleanup
17 results

Target

Select target project
  • 987FCF504483CBC8/toolkit
1 result
Select Git revision
  • advertisement
  • automagic
  • dbp-translation-component
  • demo
  • demo-file-handling
  • favorites-and-recent-files
  • icon-set-mapping
  • lit2
  • main
  • person-select-custom
  • port-i18next-parser
  • publish
  • remove-sentry
  • renovate/lock-file-maintenance
  • revert-6c632dc6
  • wc-part
  • wip-cleanup
17 results
Show changes
Commits on Source (1)
......@@ -498,7 +498,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
this.abortUpload = false;
this.abortUploadButton = false;
this.forAll = false;
this.statusText = "Vorgang wurde abgebrochen";
this.statusText = i18n.t('nextcloud-file-picker.abort-message');
this._("#replace_mode_all").checked = false;
return;
}
......@@ -559,7 +559,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
this.abortUpload = false;
this.abortUploadButton = false;
this.forAll = false;
this.statusText = "Vorgang wurde abgebrochen";
this.statusText = i18n.t('nextcloud-file-picker.abort-message');
this._("#replace_mode_all").checked = false;
return;
}
......@@ -1276,6 +1276,14 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
animation: added 0.4s ease;
}
#abortButton{
color: var(--dbp-danger-bg-color);
}
#abortButton:hover{
color: white;
}
@keyframes added {
0% {
background-color: white;
......@@ -1480,7 +1488,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
@click="${() => { this.sendDirectory(this.tabulatorTable.getSelectedData()); }}">${this.folderIsSelected}</button>
<button class="button select-button is-primary ${classMap({hidden: this.directoriesOnly})}"
@click="${() => { this.downloadFiles(this.tabulatorTable.getSelectedData()); }}">${i18n.t('nextcloud-file-picker.select-files')}</button>
<button class="button select-button ${classMap({hidden: (!this.abortUploadButton && !this.forAll)})}"
<button id="abortButton" class="button select-button ${classMap({hidden: (!this.abortUploadButton && !this.forAll)})}"
title="${i18n.t('nextcloud-file-picker.abort')}" @click="${() => { this.abortUpload = true; }}">${i18n.t('nextcloud-file-picker.abort')}</button>
<div class="block info-box ${classMap({hidden: this.statusText === ""})}">
......
......@@ -354,7 +354,7 @@ export class FileSource extends ScopedElementsMixin(DBPLitElement) {
width: auto;
margin: var(--FUMargin, 0px);
padding: var(--FUPadding, 20px);
/*flex-grow: 1;*/
flex-grow: 1;
height: 100%;
display: flex;
flex-direction: column;
......
......@@ -76,6 +76,7 @@
"select-all-title": "Alle verfügbaren Dateien in diesem Ordner auswählen",
"select-nothing": "Nichts auswählen",
"select-nothing-title": "Alle gewählten Dateien nicht mehr selektieren",
"abort": "Vorgang abbrechen"
"abort": "Vorgang abbrechen",
"abort-message": "Vorgang wurde abgebrochen."
}
}
......@@ -76,6 +76,7 @@
"select-all-title": "Select all files in this folder",
"select-nothing": "Select none",
"select-nothing-title": "Select no files",
"abort": "Cancel process"
"abort": "Cancel process",
"abort-message": "The process was canceled."
}
}