diff --git a/.github/config/.finnishwords.txt b/.github/config/.finnishwords.txt index 8c58ae752..2aaa3e30f 100644 --- a/.github/config/.finnishwords.txt +++ b/.github/config/.finnishwords.txt @@ -42,7 +42,9 @@ haku hakuindeksi haluat haluatko +halutaan halutako +Halutessasi haluttu halutun hinnoittelulaskuri @@ -63,6 +65,8 @@ jaettua jaettuja jaetun jaetut +jakaa +jakaa jakamaan jakamasi jakaminen @@ -74,8 +78,12 @@ jakoa jakopyynnöt jakopyyntöjä jakopyyntöjen +jakotunnus +jakotunnusta jälkeen jälkeenpäin +jäsenelle +jäseneltä jäsenet jäsenille jäsenten @@ -83,6 +91,7 @@ jne jo johtaa johtua +joltakin jonka jos jota @@ -204,6 +213,7 @@ luo luonnin luonti luotu +lupa määrä määrästä mahdollisia @@ -230,6 +240,7 @@ muuttaa muuttaaksesi näkyvissä nämä +nappi nappia navigointia näytä @@ -268,6 +279,7 @@ omistavan on ongelmiin onnistui +onnistuneesti onnistunut onnistuu operaatio @@ -303,6 +315,7 @@ poista poistaa poistaminen poistettava +poistettiin poistettu polku postamista @@ -454,6 +467,7 @@ tilapäisesti toiminto toiseen toisen +toisesta toteuttaa tueta tuettu diff --git a/CHANGELOG.md b/CHANGELOG.md index de25515b1..d7cf1fcc8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,6 +49,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed +- (GH #884) Fixed multiple bugs + - Redirected to AllFolders view whenever the selected project changes + - Modified function and fixed notification for removing a shared permission + - Made modal's scroll position to be always on top when opening a modal + - Add tooltip for Copy Share ID button + - Fine-tuned modals' font sizes and gaps between elements - (GH #858) Fixed for multiple bugs related to modals and background page's scrolling effect - (GH #853) Fix Node 18 needing python for npm install - (GH #827) Fixed for updating folder's items count and size when deleting objects inside it diff --git a/swift_browser_ui_frontend/src/common/lang.js b/swift_browser_ui_frontend/src/common/lang.js index 8ec546dab..897720f9f 100644 --- a/swift_browser_ui_frontend/src/common/lang.js +++ b/swift_browser_ui_frontend/src/common/lang.js @@ -173,6 +173,14 @@ let default_translations = { share: { share: "Share", share_id: "Share ID", + share_id_tooltip: + "When another project wants share a folder " + + "with your project: Select this button and " + + "send Share ID (now copied in your cache) " + + "to the project’s member. " + + "When you want to share a folder with " + + "another project. Ask Share ID from " + + "another project’s member.", close: "Close", instructions: "Share ID instructions", close_instructions: "Close instructions", @@ -194,7 +202,8 @@ let default_translations = { read_perm: "Read", write_perm: "Read and write", shared_successfully: "Folder was shared successfully!", - project_id: "Project ID", + remove_permission: "Permission was removed successfully!", + shared_table_title: "Project's folder has been shared with", field_label: "Project Identifiers to share with", field_placeholder: "Add Share IDs", cancel: "Cancel", @@ -623,6 +632,12 @@ let default_translations = { share: { share: "Jaa", share_id: "Jaa tunnus", + share_id_tooltip: + "Mikäli toisesta projektista halutaan jakaa kansio projektisi " + + "kanssa: Valitse tämä nappi ja lähetä Jakotunnus toisen " + + "projektin jäsenelle. Halutessasi jakaa kansion toisen " + + "projektin kanssa, pyydä jakotunnusta joltakin kyseisen " + + "projektin jäseneltä.", close: "Kiinni", instructions: "Jaa tunnus ohjeet", close_instructions: "Sulje ohjeet", @@ -640,7 +655,9 @@ let default_translations = { read_perm: "Salli säiliön luku", write_perm: "Salli säiliöön kirjoitus", shared_successfully: "Kansion jakaminen onnistui!", - project_id: "Jaa tunnus", + remove_permission: "Lupa poistettiin onnistuneesti!", + shared_table_title: "Projektin kansio on jaettu", + project_id: "Projektin tunnus", field_label: "Jaa projektitunnisteille", field_placeholder: "Lisää projektitunnukset", cancel: "Peru", diff --git a/swift_browser_ui_frontend/src/components/BrowserSecondaryNavbar.vue b/swift_browser_ui_frontend/src/components/BrowserSecondaryNavbar.vue index 1051252aa..36f1b0859 100644 --- a/swift_browser_ui_frontend/src/components/BrowserSecondaryNavbar.vue +++ b/swift_browser_ui_frontend/src/components/BrowserSecondaryNavbar.vue @@ -37,15 +37,21 @@ /> {{ $t("message.copy") }} {{ $t("message.share.share_id") }} +
+ + + + + {{ $t("message.share.share_id_tooltip") }} + +
- -
@@ -180,4 +188,54 @@ export default { flex: auto; } } + + .tooltip { + position: relative; + display: inline-block; + } + + .tooltip-content { + visibility: hidden; + text-align: left; + width: 20rem; + background-color: $white; + color: $text; + border: 1px solid $csc-primary; + border-radius: 0.375rem; + padding: 1rem; + + /* Position the tooltip */ + position: absolute; + z-index: 5; + top: 120%; + left: 50%; + margin-left: -10rem; + } + + .tooltip:hover .tooltip-content { + visibility: visible; + } + + .tooltip-content::before { + content: " "; + position: absolute; + left: 46%; + bottom: 100%; + width: 0; + height: 0; + border: 0.7rem solid transparent; + border-bottom-color: $csc-primary; + } + .tooltip-content::after { + content: " "; + position: absolute; + left: 50%; + bottom: 100%; + width: 0; + height: 0; + margin-left: -0.75rem; + border: 0.65rem solid transparent; + border-bottom-color: $white; + } + diff --git a/swift_browser_ui_frontend/src/components/CopyFolderModal.vue b/swift_browser_ui_frontend/src/components/CopyFolderModal.vue index cdbb795ce..cd6ac0b70 100644 --- a/swift_browser_ui_frontend/src/components/CopyFolderModal.vue +++ b/swift_browser_ui_frontend/src/components/CopyFolderModal.vue @@ -1,11 +1,11 @@