From f85d0da5223abb9620a4ebecb68ef22aba31a48e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christina=20T=C3=B6gl?= <toegl@tugraz.at>
Date: Tue, 9 Nov 2021 14:56:33 +0100
Subject: [PATCH] Adapt menu, change css
---
packages/file-handling/src/file-sink.js | 1 -
.../src/i18n/de/translation.json | 10 +--
.../src/i18n/en/translation.json | 10 +--
.../src/nextcloud-file-picker.js | 85 +++++--------------
4 files changed, 26 insertions(+), 80 deletions(-)
diff --git a/packages/file-handling/src/file-sink.js b/packages/file-handling/src/file-sink.js
index 4cb3f73f..95e09e0a 100644
--- a/packages/file-handling/src/file-sink.js
+++ b/packages/file-handling/src/file-sink.js
@@ -308,7 +308,6 @@ export class FileSink extends ScopedElementsMixin(DbpFileHandlingLitElement) {
?store-nextcloud-session="${this.nextcloudStoreSession}"
?show-nextcloud-additional-menu="${this.showNextcloudAdditionalMenu}"
store-nextcloud-session="true"
- ?show-nextcloud-additional-menu="${this.showNextcloudAdditionalMenu}"
@dbp-nextcloud-file-picker-file-uploaded="${(event) => {
this.uploadToNextcloud(event.detail);
}}"
diff --git a/packages/file-handling/src/i18n/de/translation.json b/packages/file-handling/src/i18n/de/translation.json
index 9a6a0110..f66db570 100644
--- a/packages/file-handling/src/i18n/de/translation.json
+++ b/packages/file-handling/src/i18n/de/translation.json
@@ -45,6 +45,7 @@
"connect-nextcloud": "{{name}} verbinden",
"no-data": "In diesem Ordner befinden sich keine Dateien.",
"no-data-type": "In diesem Ordner befinden sich keine Daten vom benötigten Typ.",
+ "no-favorites": "Es wurden keine Favoriten gefunden.",
"webdav-error": "Etwas ist schief gelaufen: {{error}}",
"add-folder-error": "Die Ressource \"{{folder}}\", ist bereits vorhanden.",
"add-folder-success": "Der Ordner \"{{folder}}\" wurde erfolgreich erstellt.",
@@ -70,20 +71,13 @@
"onlyedit": "Sie dürfen in diesem Ordner nur Dateien bearbeiten.",
"abort": "Vorgang abbrechen",
"abort-message": "Vorgang wurde abgebrochen.",
- "remember-me": "Mit {{name}} verbunden bleiben",
- "log-out": "Verbindung trennen",
- "open-submenu": "Untermenü öffnen",
"error-save-to-favorites": "Speichern in Favoriten nicht möglich! Bitte wählen Sie einen Ordner innerhalb der Favoriten aus.",
"error-save-to-recent": "Speichern in den neuesten Dateien nicht möglich! Bitte wählen Sie einen Ordner innerhalb der neuesten Dateien aus.",
"recent-files-link-text": "Neueste Dateien",
"favorites-link-text": "Meine Favoriten",
"remember-me": "Mit {{name}} verbunden bleiben",
"log-out": "Verbindung trennen",
- "open-submenu": "Untermenü öffnen",
- "error-save-to-favorites": "Speichern in Favoriten nicht möglich! Bitte wählen Sie einen Ordner innerhalb der Favoriten aus.",
- "error-save-to-recent": "Speichern in den neuesten Dateien nicht möglich! Bitte wählen Sie einen Ordner innerhalb der neuesten Dateien aus.",
- "recent-files-link-text": "Neueste Dateien",
- "favorites-link-text": "Meine Favoriten"
+ "open-submenu": "Untermenü öffnen"
},
"clipboard": {
"add-files": "Dateien der Zwischenablage hinzufügen",
diff --git a/packages/file-handling/src/i18n/en/translation.json b/packages/file-handling/src/i18n/en/translation.json
index 0a04f4e8..e9ae6f05 100644
--- a/packages/file-handling/src/i18n/en/translation.json
+++ b/packages/file-handling/src/i18n/en/translation.json
@@ -46,6 +46,7 @@
"connect-nextcloud": "Connect {{name}}",
"no-data": "No data avaible in this folder.",
"no-data-type": "No data avaible in this folder.",
+ "no-favorites": "No favorites could be found.",
"webdav-error": "Something went wrong",
"add-folder-error": "The resource \"{{folder}}\" you tried to create already exists.",
"add-folder-success": "The folder '{{folder}}' was created successfully.",
@@ -71,20 +72,13 @@
"onlyedit": "You are only allowed to edit files in this directory.",
"abort": "Cancel process",
"abort-message": "The process was canceled.",
- "remember-me": "Stay connected with {{name}}",
- "log-out": "Disconnect",
- "open-submenu": "Open submenu",
"error-save-to-favorites": "Saving to Favorites not possible! Please select a folder within the Favorites.",
"error-save-to-recent": "Saving to Recent Files not possible! Please select a folder within the Recent Files.",
"recent-files-link-text": "Recent Files",
"favorites-link-text": "My Favorites",
"remember-me": "Stay connected with {{name}}",
"log-out": "Disconnect",
- "open-submenu": "Open submenu",
- "error-save-to-favorites": "Saving to Favorites not possible! Please select a folder within the Favorites.",
- "error-save-to-recent": "Saving to Recent Files not possible! Please select a folder within the Recent Files.",
- "recent-files-link-text": "Recent Files",
- "favorites-link-text": "My Favorites"
+ "open-submenu": "Open submenu"
},
"clipboard": {
"add-files": "Add files to clipboard",
diff --git a/packages/file-handling/src/nextcloud-file-picker.js b/packages/file-handling/src/nextcloud-file-picker.js
index d6caf2a5..819b7b8e 100644
--- a/packages/file-handling/src/nextcloud-file-picker.js
+++ b/packages/file-handling/src/nextcloud-file-picker.js
@@ -171,7 +171,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
layout: "fitColumns",
selectable: this.maxSelectedItems,
selectableRangeMode: "drag",
- placeholder: this.directoriesOnly ? i18n.t('nextcloud-file-picker.no-data') : i18n.t('nextcloud-file-picker.no-data-type'),
+ placeholder: this.isInFavorites ? i18n.t('nextcloud-file-picker.no-favorites') : this.directoriesOnly ? i18n.t('nextcloud-file-picker.no-data') : i18n.t('nextcloud-file-picker.no-data-type'),
responsiveLayout: "collapse",
responsiveLayoutCollapseStartOpen: false,
resizableColumns: false,
@@ -1680,7 +1680,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
.extended-menu li {
padding: 7px;
padding-right: 46px;
- border-bottom: 1px solid #f3f3f3;
+ // border-bottom: 1px solid #f3f3f3; //deleted in JF 08.11.2021
}
.extended-menu li.active {
@@ -1714,12 +1714,12 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
color: #E4154B;
}
- ul.extended-menu li.close {
- display: block;
- padding: 7px 15px 7px 15px;
- text-align: right;
- cursor: pointer;
- }
+ // ul.extended-menu li.close { //deleted in JF 08.11.2021
+ // display: block;
+ // padding: 7px 15px 7px 15px;
+ // text-align: right;
+ // cursor: pointer;
+ // }
.nextcloud-header {
margin-bottom: 2rem;
@@ -1812,7 +1812,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
.additional-menu {
white-space: nowrap;
- align-self: end;
+ // align-self: end; //deleted in JF 08.11.2021
height: 33px;
margin-right: 5px;
}
@@ -2086,7 +2086,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
}
.more-menu {
- height: 22.4px;
+ // height: 22.4px; //deleted in JF 08.11.2021
width: 22.4px;
top: 8px;
}
@@ -2285,11 +2285,11 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
<div class="nextcloud-content ${classMap({hidden: !this.isPickerActive})}">
<div class="nextcloud-nav">
<p>${this.getBreadcrumb()}</p>
-<!-- TODO -->
+
<div class="additional-menu ${classMap({hidden: !this.showAdditionalMenu})}">
-
+
<a class="extended-menu-link" @click="${() => { this.toggleMoreMenu(); }}" title="${i18n.t('nextcloud-file-picker.more-menu')}">
- <dbp-icon name="more-filled" class="more-menu"></dbp-icon>
+ <dbp-icon name="menu-dots" class="more-menu"></dbp-icon> <!-- instead of name="more-filled" ; deleted in JF 08.11.2021-->
</a>
<ul class='extended-menu hidden'>
<li class="${classMap({active: this.isInFavorites})}" id="favorites-item">
@@ -2321,9 +2321,8 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
<dbp-icon name="checkmark-circle" class="nextcloud-add-folder"></dbp-icon>
</button>
</div>
-
- <!-- TODO begin -->
-
+ </div>
+ <!-- TODO begin -->
<!-- <div class="menu-buttons">
<div class="add-folder ${classMap({hidden: !this.directoriesOnly})}">
<div class="inline-block">
@@ -2340,49 +2339,8 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
</button>
</div> -->
+ <!-- TODO end -->
-<!-- TODO end -->
-<!--
- <div class="additional-menu ${classMap({hidden: !this.showAdditionalMenu})}">
-
- <a class="extended-menu-link" @click="${() => { this.toggleMoreMenu(); }}" title="${i18n.t('nextcloud-file-picker.more-menu')}">
- <dbp-icon name="more-filled" class="more-menu"></dbp-icon>
- </a>
- <ul class='extended-menu hidden'>
- <li class="${classMap({active: this.isInFavorites})}" id="favorites-item">
- <a class="" @click="${this.loadFavorites}">
- ${i18n.t('nextcloud-file-picker.favorites-link-text')}
- </a>
- </li>
- <li class="${classMap({active: this.isInRecent})}" id="recent-item">
- <a class="" @click="${this.loadRecent}">
- ${i18n.t('nextcloud-file-picker.recent-files-link-text')}
- </a>
- </li>
- <li class="${classMap({hidden: !this.directoriesOnly})}">
- <a class="${classMap({inactive: this.isInRecent || this.isInFavorites})}" @click="${() => { this.openAddFolderDialogue(); }}">
- ${i18n.t('nextcloud-file-picker.add-folder')}
- </a>
- </li>
-
- <div class="inline-block">
- <div id="new-folder-wrapper" class="hidden">
- <input type="text"
- placeholder="${i18n.t('nextcloud-file-picker.new-folder-placeholder')}"
- name="new-folder" class="input" id="new-folder"/>
- <button class="button add-folder-button"
- title="${i18n.t('nextcloud-file-picker.add-folder')}"
- @click="${() => {
- this.addFolder();
- }}">
- <dbp-icon name="checkmark-circle" class="nextcloud-add-folder"></dbp-icon>
- </button>
- </div>
--->
- <!-- TODO end -->
-<!--
- </div>
--->
<!-- <button class="button ${classMap({hidden: this.showAdditionalMenu})}"
title="${i18n.t('nextcloud-file-picker.add-folder-open')}"
@click="${() => {
@@ -2390,11 +2348,11 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
}}">
<dbp-icon name="plus" class="nextcloud-add-folder" id="add-folder-button"></dbp-icon>
</button> -->
-<!--
- <li class="close" @click="${this.hideMoreMenu}"><dbp-icon name="close" style="color: red"></dbp-icon></li>
+
+ <!-- deleted in JF 08.11.2021s -->
+ <!-- <li class="close" @click="${this.hideMoreMenu}"><dbp-icon name="close" style="color: red"></dbp-icon></li> -->
</ul>
-
- </div>
+<!-- TODO integrate submenu in additional menu
<div id="submenu" class="${classMap({hidden: !this.storeSession})}"
title="${i18n.t('nextcloud-file-picker.open-submenu')}"
@click="${() => {
@@ -2419,9 +2377,10 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
</button>
</div>
</div>
+-->
</div>
</div>
--->
+
<div class="filter-options-wrapper ${classMap({hidden: !this.isInRecent})}">
<label id="user_files_only_wrapper" class="button-container">
<!-- ${i18n.t('nextcloud-file-picker.replace-mode-all')} --> Show only my files <!--TODO-->
--
GitLab