diff --git a/packages/file-handling/src/clipboard.js b/packages/file-handling/src/clipboard.js index 84c0132a2315c78d93eeb581e506f6b141e1be1d..9572f73a5f9b7f88faa02c225d1c3187d431c924 100644 --- a/packages/file-handling/src/clipboard.js +++ b/packages/file-handling/src/clipboard.js @@ -466,9 +466,9 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) { } openFilesource() { - const fileSource = this._("#file-source"); + const fileSource = this._("#file-source-clipboard"); if (fileSource) { - this._("#file-source").setAttribute("dialog-open", ""); + this._("#file-source-clipboard").setAttribute("dialog-open", ""); } } @@ -496,7 +496,7 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) { </div> <dbp-file-source - id="file-source" + id="file-source-clipboard" context="${i18n.t('clipboard.add-files')}" allowed-mime-types="${this.allowedMimeTypes}" nextcloud-auth-url="${this.nextcloudWebAppPasswordURL}" @@ -633,8 +633,9 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) { } .warning-icon{ - margin-right: 20px; + margin-right: 10px; font-size: 1.5rem; + margin-top: -23px; } .container{ @@ -716,6 +717,10 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) { .additional-button-container{ margin-top: 0.5rem; } + + .warning-container p{ + margin-top: 0px; + } @media only screen and (orientation: portrait) @@ -746,6 +751,8 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) { .checkmark{ height: 30px; width:30px; + left: 0px; + top: 2px; } .button-container .checkmark::after{ @@ -768,6 +775,12 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) { margin-top: 5px; } + .warning-icon{ + margin-right: 10px; + font-size: 85px; + margin-top: -43px; + } + } `; diff --git a/packages/file-handling/src/dbp-nextcloud-file-picker.js b/packages/file-handling/src/dbp-nextcloud-file-picker.js index d9b98e8ba33cd0d090356c746f649a38fbf930c8..55f82b0b2d810e6c6b8a8ee404527b030431c34b 100644 --- a/packages/file-handling/src/dbp-nextcloud-file-picker.js +++ b/packages/file-handling/src/dbp-nextcloud-file-picker.js @@ -1462,6 +1462,8 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) { .checkmark{ height: 30px; width:30px; + left: 0px; + top: 2px; } } diff --git a/packages/file-handling/src/file-sink.js b/packages/file-handling/src/file-sink.js index 1dfff2d782706b7694ed88f1a9f3cfc7451c2e8d..f2a5d536662d33c073806c91ea5e65d4960896cf 100644 --- a/packages/file-handling/src/file-sink.js +++ b/packages/file-handling/src/file-sink.js @@ -203,7 +203,10 @@ export class FileSink extends ScopedElementsMixin(DBPLitElement) { } openDialog() { - this.loadWebdavDirectory(); + console.log("open sink"); + if (this.enabledTargets.includes('nextcloud')) { + this.loadWebdavDirectory(); + } const filePicker = this._('#modal-picker'); if (filePicker) { MicroModal.show(filePicker, { @@ -226,6 +229,8 @@ export class FileSink extends ScopedElementsMixin(DBPLitElement) { } } + //TODO find open error!! + closeDialog(e) { this.sendDestination(); MicroModal.close(this._('#modal-picker')); diff --git a/packages/file-handling/src/file-source.js b/packages/file-handling/src/file-source.js index 8d3afb93475f68a440cc8a3bfc68dce001e4780b..87ea187c4ffb40e32dcbfc67ac222112b12a2dca 100644 --- a/packages/file-handling/src/file-source.js +++ b/packages/file-handling/src/file-source.js @@ -369,6 +369,8 @@ export class FileSource extends ScopedElementsMixin(DBPLitElement) { } openDialog() { + console.log("open source"); + if (this.enabledTargets.includes('nextcloud')) { this.loadWebdavDirectory(); } @@ -428,8 +430,12 @@ export class FileSource extends ScopedElementsMixin(DBPLitElement) { mode="file-source" subscribe="clipboard-files:clipboard-files" lang="${this.lang}" - enabled-targets="${this.enabledTargets}" auth-url="${this.nextcloudAuthUrl}" + enabled-targets="${this.enabledTargets}" + nextcloud-auth-url="${this.nextcloudAuthUrl}" + nextcloud-web-dav-url="${this.nextcloudWebDavUrl}" + nextcloud-name="${this.nextcloudName}" + nextcloud-file-url="${this.nextcloudFileURL}" allowed-mime-types="${this.allowedMimeTypes}" @dbp-clipboard-file-picker-file-downloaded="${(event) => { this.sendFileEvent(event.detail.file);}}">