diff --git a/packages/common/styles.js b/packages/common/styles.js
index c49dd4cfb1c3d0e1d780f72583f408bc8f196f62..31248cd3c84f51de7f1ebae40760d83315239dd7 100644
--- a/packages/common/styles.js
+++ b/packages/common/styles.js
@@ -567,7 +567,7 @@ export function getRadioAndCheckboxCss() {
}
.button-container input[type="checkbox"]:checked ~ .checkmark:after {
- border-color: var(--dbp-danger-bg-color);
+ border-color: var(--dbp-border-color);
}
.button-container input[type="checkbox"]:disabled ~ .checkmark {
@@ -594,7 +594,7 @@ export function getRadioAndCheckboxCss() {
top: 4px;
width: 6px;
height: 10px;
- border: solid var(--dbp-danger-bg-color);
+ border: solid var(--dbp-border-color);
border-width: 0 2px 2px 0;
-webkit-transform: rotate(45deg);
-ms-transform: rotate(45deg);
diff --git a/packages/file-handling/src/dbp-nextcloud-file-picker.js b/packages/file-handling/src/dbp-nextcloud-file-picker.js
index e826314258bef3cd02083aa9db6471c08f3b963a..38d9dcc6a1acbc937b98b9e53a6088a921bb51f1 100644
--- a/packages/file-handling/src/dbp-nextcloud-file-picker.js
+++ b/packages/file-handling/src/dbp-nextcloud-file-picker.js
@@ -118,7 +118,8 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
columns: [
{title: "", field: "type", align:"center", headerSort:false, width:50, responsive:1, formatter: (cell, formatterParams, onRendered) => {
const icon_tag = that.constructor.getScopedTagName("dbp-icon");
- let icon = `<${icon_tag} name="empty-file" class="nextcloud-picker-icon"></${icon_tag}>`;
+ let disabled = this.directoriesOnly ? "nextcloud-picker-icon-disabled" : "";
+ let icon = `<${icon_tag} name="empty-file" class="nextcloud-picker-icon ` + disabled + `"></${icon_tag}>`;
return (cell.getValue() === "directory") ? `<${icon_tag} name="folder" class="nextcloud-picker-icon"></${icon_tag}>` : icon;
}},
{title: i18n.t('nextcloud-file-picker.filename'), responsive: 0, widthGrow:5, minWidth: 150, field: "basename", sorter: "alphanum",
@@ -849,7 +850,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
}).catch(error => {
this.loading = false;
if (error.message.search("405") !== -1) {
- this.statusText = html`<span class="error"> ${i18n.t('nextcloud-file-picker.add-folder-error')} </span>`;
+ this.statusText = html`<span class="error"> ${i18n.t('nextcloud-file-picker.add-folder-error', {folder: folderName})} </span>`;
} else {
this.statusText = html`<span class="error"> ${i18n.t('nextcloud-file-picker.webdav-error', {error: error.message})} </span>`;
}
@@ -1020,7 +1021,6 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
display: flex;
flex-direction: column;
justify-content: center;
- /* align-items: center;*/
position: relative;
}
@@ -1285,6 +1285,10 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
.spinner{
font-size: 0.7em;
}
+
+ .nextcloud-picker-icon-disabled{
+ opacity: 0.4;
+ }
@media only screen
and (orientation: portrait)
@@ -1332,10 +1336,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
.wrapper{
display: grid;
- /*grid-template-areas: "header-l header-r" "content content";
- grid-template-rows: 50px auto;
- grid-template-columns: 50% 50%;*/
- grid-template-rows: auto 50px;
+ grid-template-rows: inherit;
grid-template-columns: 100%;
grid-template-areas: "content" "footer";
}
@@ -1350,34 +1351,21 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
}
.nextcloud-intro{
- /*grid-column-start: header-l-start;
- grid-column-end: header-r-end;
- grid-row-start: header-l-start;
- grid-row-end: content-end;*/
- grid-area: content;
text-align: center;
+ display: flex;
+ flex-direction: column;
}
.nextcloud-footer{
- /*grid-area: header-r;*/
- /*position: fixed;*/
bottom: 0px;
width: 100%;
left: 0px;
- padding: 20px;
}
.mobile-hidden{
display: none;
}
- .spinner{
- font-size: 1.2em;
- position: absolute;
- bottom: -19px;
- left: -40px;
- }
-
.info-box{
position:relative;
}
@@ -1385,6 +1373,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
.nextcloud-footer-grid{
display: flex;
justify-content: center;
+ flex-direction: column-reverse;
}
.select-button{
@@ -1481,7 +1470,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
<div class="block info-box ${classMap({hidden: this.statusText === ""})}">
<dbp-mini-spinner class="spinner ${classMap({hidden: this.loading === false})}"></dbp-mini-spinner>
- <span class="mobile-hidden">${this.statusText}</span>
+ <span>${this.statusText}</span>
</div>
</div>
diff --git a/packages/file-handling/src/i18n/de/translation.json b/packages/file-handling/src/i18n/de/translation.json
index 5b10855e7ca8d86e8218271db13e1d66c67adeaf..6d7ab285c5066635e7e682fcb1403ef9a9072824 100644
--- a/packages/file-handling/src/i18n/de/translation.json
+++ b/packages/file-handling/src/i18n/de/translation.json
@@ -34,7 +34,7 @@
"folder-home": "In das Home Verzeichnis springen",
"select-files": "Dateien auswählen",
"refresh-nextcloud-file-picker": "Erneut verbinden",
- "loadpath-nextcloud-file-picker": "Das {{name}} Verzeichnis wird geladen",
+ "loadpath-nextcloud-file-picker": "Das {{name}} Verzeichnis wird geladen.",
"load-path-link": "Gehe zu {{path}}",
"auth-progress": "Anmeldung läuft",
"last-modified": "Geändert",
@@ -46,12 +46,12 @@
"auth-info": "Eine neue Seite wird geöffnet, um Ihr Konto zu verbinden.",
"connect-nextcloud": "{{name}} verbinden",
"open-in-nextcloud": "In {{name}} öffnen",
- "no-data": "In diesem Ordner befinden sich keine Dateien",
+ "no-data": "In diesem Ordner befinden sich keine Dateien.",
"no-data-type": "In diesem Ordner befinden sich keine Daten vom benötigten Typ.",
"select-folder": "In diesem Ordner hochladen",
"webdav-error": "Etwas ist schief gelaufen: {{error}}",
- "add-folder-error": "Die Ressource, die Sie erstellen wollten, ist bereits vorhanden",
- "add-folder-success": "Der Ordner \"{{folder}}\" wurde erfolgreich erstellt",
+ "add-folder-error": "Die Ressource \"{{folder}}\", ist bereits vorhanden.",
+ "add-folder-success": "Der Ordner \"{{folder}}\" wurde erfolgreich erstellt.",
"add-folder-open": "Neuer Ordner Dialog öffnen",
"add-folder-close": "Neuer Ordner Dialog schließen",
"add-folder": "Neuen Ordner erstellen",
@@ -67,7 +67,7 @@
"replace-cancel": "Abbrechen",
"replace-cancel-all": "Alle abbrechen",
"replace-mode-all": "Für alle zukünftigen Konflikte übernehmen",
- "something-went-wrong": "Etwas ist schief gelaufen. Bitte verbinden Sie sich erneut",
+ "something-went-wrong": "Etwas ist schief gelaufen. Bitte verbinden Sie sich erneut.",
"upload-to": "Es wird nach {{- path}} hochgeladen ...",
"readonly": "Sie dürfen in diesem Ordner nichts hochladen.",
"onlycreate": "Sie dürfen in diesem Ordner nur neue Dateien erstellen.",
diff --git a/packages/file-handling/src/i18n/en/translation.json b/packages/file-handling/src/i18n/en/translation.json
index fbd015463e6bb0a8d906221bb991de3c3a99a1c2..cdfc1281e63bdf988384c3bb9d770163f845682a 100644
--- a/packages/file-handling/src/i18n/en/translation.json
+++ b/packages/file-handling/src/i18n/en/translation.json
@@ -34,7 +34,7 @@
"folder-home": "Jump to the home directory",
"select-files": "Select files",
"refresh-nextcloud-file-picker": "Connect again",
- "loadpath-nextcloud-file-picker": "Loading directory from {{name}}",
+ "loadpath-nextcloud-file-picker": "Loading directory from {{name}}.",
"load-path-link": "Go to {{path}}",
"auth-progress": "Authentification in progress",
"last-modified": "Last modified",
@@ -50,8 +50,8 @@
"no-data-type": "No data avaible in this folder.",
"select-folder": "Upload in selected folder",
"webdav-error": "Something went wrong",
- "add-folder-error": "The resource you tried to create already exists",
- "add-folder-success": "The folder '{{folder}}' was created successfully",
+ "add-folder-error": "The resource \"{{folder}}\" you tried to create already exists.",
+ "add-folder-success": "The folder '{{folder}}' was created successfully.",
"add-folder": "Add new folder",
"add-folder-open": "Open new folder dialogue",
"add-folder-close": "Close new folder dialogue",
@@ -67,7 +67,7 @@
"replace-cancel": "Cancel",
"replace-cancel-all": "Cancel all",
"replace-mode-all": "Do this for the next conflicts",
- "something-went-wrong": "Something went wrong. Please reload",
+ "something-went-wrong": "Something went wrong. Please reload.",
"upload-to": "Uploading to {{path}} ...",
"readonly": "You are not allowed to uploade files in this directory.",
"onlycreate": "You are only allowed to create new files in this directory.",