diff --git a/CHANGELOG.md b/CHANGELOG.md index 995767700..e8c092b27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,6 +49,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed +- (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 - (GH #788) Fixed for objects of a copied folder rendering their tags correctly diff --git a/swift_browser_ui_frontend/src/common/globalFunctions.js b/swift_browser_ui_frontend/src/common/globalFunctions.js index 281fb75d6..e25dd90b8 100644 --- a/swift_browser_ui_frontend/src/common/globalFunctions.js +++ b/swift_browser_ui_frontend/src/common/globalFunctions.js @@ -5,6 +5,7 @@ export function toggleCreateFolderModal(folderName) { if (folderName) { store.commit("setFolderName", folderName); } + modifyBrowserPageStyles(); } export function toggleEditTagsModal(object) { @@ -23,6 +24,7 @@ export function toggleCopyFolderModal(folderName, sourceProjectId) { if(sourceProjectId) { store.commit("setSourceProjectId", sourceProjectId); } + modifyBrowserPageStyles(); } export function modifyBrowserPageStyles() { diff --git a/swift_browser_ui_frontend/src/common/lang.js b/swift_browser_ui_frontend/src/common/lang.js index 6804a0505..c76fe1060 100644 --- a/swift_browser_ui_frontend/src/common/lang.js +++ b/swift_browser_ui_frontend/src/common/lang.js @@ -289,6 +289,7 @@ let default_translations = { remove: "Remove", edit: "Edit", editTags: "Edit tags", + cancel: "Cancel", save: "Save", options: "Options", createContainerButton: "Create folder", @@ -363,8 +364,9 @@ let default_translations = { "megabytes, which can lead to a failure in encryption. " + "Try uploading files in smaller batches, or encrypt " + "them before uploading normally.", - enNotAvail: "ServiceWorker function not available in this browser. " + - "Recommended browsers are Firefox and Chrome.", + enNotAvail: + "ServiceWorker function not available in this browser. " + + "Recommended browsers are Firefox and Chrome.", enFiles: "Encrypt files before upload", fsWriteFail: "Failed to copy files into temporary file system. " + @@ -726,6 +728,7 @@ let default_translations = { remove: "Poista", edit: "Muokkaa", editTags: "Muokkaa tägejä", + cancel: "Peruuta", save: "Tallenna", options: "Valinnat", createContainerButton: "Luo säiliö", @@ -795,8 +798,9 @@ let default_translations = { "salausratkaisun rajoitteiden vuoksi. Lähetä tiedostot " + "pienemmissä erissä tai salaa ne ennen lähettämistä " + "tavallisesti.", - enNotAvail: "Selaimestasi ei löydy ServiceWorker -ominaisuutta. " + - "Suositellut selaimet ovat Chrome ja Firefox.", + enNotAvail: + "Selaimestasi ei löydy ServiceWorker -ominaisuutta. " + + "Suositellut selaimet ovat Chrome ja Firefox.", enFiles: "Salaa tiedostot ennen lähetystä", fsWriteFail: "Tiedostojen kopiointi väliaikaiseen tallennustilaan " + diff --git a/swift_browser_ui_frontend/src/components/BrowserMainNavbar.vue b/swift_browser_ui_frontend/src/components/BrowserMainNavbar.vue index 120c5ef4e..f6fec5e37 100644 --- a/swift_browser_ui_frontend/src/components/BrowserMainNavbar.vue +++ b/swift_browser_ui_frontend/src/components/BrowserMainNavbar.vue @@ -24,8 +24,8 @@ :items.prop="item.subs.map(subItem => ({ name: subItem.title, action: () => { - subItem.route && handleItemRoute(subItem) - subItem.action && subItem.action() + (subItem.route || subItem.href) && handleItemRoute(subItem); + subItem.action && subItem.action(); }, icon: subItem.href && extLinkIcon, }))" @@ -66,8 +66,8 @@ :target="subItem.href && '_blank'" :data-testid="subItem.testid" @click="() => { - subItem.route && handleItemRoute(subItem) - subItem.action && subItem.action() + (subItem.route || subItem.href) && handleItemRoute(subItem); + subItem.action && subItem.action(); }" > {{ subItem.title }} @@ -158,7 +158,7 @@ export default { icon: "mdi-web", testid: "language-selector", subs: this.langs.map(lang => ({ - title: lang.ph, + title: lang.ph, action: () => { this.$i18n.locale = lang.value; this.currentLang = lang.ph; @@ -179,13 +179,13 @@ export default { href: "https://research.csc.fi/pricing#buc", }, { - title: this.$t("message.supportMenu.sharing"), - route: {name: "TokensView", params: { - user: this.uname, + title: this.$t("message.supportMenu.sharing"), + route: {name: "TokensView", params: { + user: this.uname, project: this.active.id}}, }, { - title: this.$t("message.supportMenu.about"), + title: this.$t("message.supportMenu.about"), href: "https://research.csc.fi/sensitive-data", }, ], @@ -245,27 +245,27 @@ export default { padding: 0 1rem; box-shadow: rgba(0, 0, 0, 0.16) 2px 4px 10px; } - + .app-name { color: $csc-grey; font-size: 20px; } - + .desktop-menu { display: flex; align-items: center; } - + @media screen and (max-width: 767px) { .desktop-menu { display: none; } } - + @media screen and (min-width: 768px) { c-navigationbutton { display: none; } } - + \ No newline at end of file diff --git a/swift_browser_ui_frontend/src/components/BrowserSecondaryNavbar.vue b/swift_browser_ui_frontend/src/components/BrowserSecondaryNavbar.vue index a064b4bd0..1051252aa 100644 --- a/swift_browser_ui_frontend/src/components/BrowserSecondaryNavbar.vue +++ b/swift_browser_ui_frontend/src/components/BrowserSecondaryNavbar.vue @@ -108,7 +108,6 @@ export default { }, toggleCreateFolderModal: function (folderName) { toggleCreateFolderModal(folderName); - modifyBrowserPageStyles(); }, toggleUploadModal: function () { this.$store.commit("toggleUploadModal", true); @@ -147,11 +146,11 @@ export default {