From e97587ffacd7830ed4db8569a1f4ea077385402a Mon Sep 17 00:00:00 2001 From: rquazi Date: Tue, 18 Oct 2022 16:21:46 +0300 Subject: [PATCH 01/30] Added new footer component --- swift_browser_ui_frontend/src/common/lang.js | 6 ++ .../src/components/CFooter.vue | 57 +++++++++++++++++++ swift_browser_ui_frontend/src/css/csc.scss | 1 + swift_browser_ui_frontend/src/entries/main.js | 4 ++ .../src/pages/BrowserPage.vue | 31 +--------- .../src/pages/IndexOIDCPage.vue | 40 +------------ .../src/pages/LoginPassword.vue | 18 +----- 7 files changed, 74 insertions(+), 83 deletions(-) create mode 100644 swift_browser_ui_frontend/src/components/CFooter.vue diff --git a/swift_browser_ui_frontend/src/common/lang.js b/swift_browser_ui_frontend/src/common/lang.js index c76fe1060..7381b11a1 100644 --- a/swift_browser_ui_frontend/src/common/lang.js +++ b/swift_browser_ui_frontend/src/common/lang.js @@ -451,6 +451,12 @@ let default_translations = { sharing: "Sharing API tokens", about: "About Sensitive Data Services", }, + footerMenu:{ + groupandprogram:"Sensitive Data Service-SD Connect", + csc:"Powered by CSC -IT Center for Science Ltd", + servicedescription: "Service Description", + accessibility:"Accessibility", + }, }, }, fi: { diff --git a/swift_browser_ui_frontend/src/components/CFooter.vue b/swift_browser_ui_frontend/src/components/CFooter.vue new file mode 100644 index 000000000..046066109 --- /dev/null +++ b/swift_browser_ui_frontend/src/components/CFooter.vue @@ -0,0 +1,57 @@ + + + + + diff --git a/swift_browser_ui_frontend/src/css/csc.scss b/swift_browser_ui_frontend/src/css/csc.scss index f114506ad..fdab45ff7 100644 --- a/swift_browser_ui_frontend/src/css/csc.scss +++ b/swift_browser_ui_frontend/src/css/csc.scss @@ -17,6 +17,7 @@ $csc-light-green: #c9e2ae; $csc-grey: #595959; $csc-light-grey: #757575; $csc-lighter-grey: #d2d3d5; +$csc-lightest-grey:#dfe1e3; $csc-grey-blue: #8196b9; $csc-light-grey-blue: #f8f9fc; $csc-yellow: #ffd534; diff --git a/swift_browser_ui_frontend/src/entries/main.js b/swift_browser_ui_frontend/src/entries/main.js index b2293ccbb..877f28316 100644 --- a/swift_browser_ui_frontend/src/entries/main.js +++ b/swift_browser_ui_frontend/src/entries/main.js @@ -46,6 +46,9 @@ import Resumable from "resumablejs"; // Upload notification handler import UploadNotification from "@/components/UploadNotification"; +//Custom footer element +import CFooter from "@/components/CFooter"; + // Import delay import delay from "lodash/delay"; @@ -131,6 +134,7 @@ new Vue({ EditTagsModal, ShareModal, CopyFolderModal, + CFooter, }, data: function () { return { diff --git a/swift_browser_ui_frontend/src/pages/BrowserPage.vue b/swift_browser_ui_frontend/src/pages/BrowserPage.vue index 097d2055c..60ab66ae9 100644 --- a/swift_browser_ui_frontend/src/pages/BrowserPage.vue +++ b/swift_browser_ui_frontend/src/pages/BrowserPage.vue @@ -51,25 +51,6 @@ :active.sync="isLoading" :can-cancel="false" /> - + @@ -92,11 +74,13 @@ @@ -267,15 +251,6 @@ c-modal { border-radius: 6px; } -.footer { - flex-shrink: 0; - height: 10rem; - width: 100%; -} - -#footer { - margin-top: 15px; -} #copyFolder-toasts { position: sticky; diff --git a/swift_browser_ui_frontend/src/pages/IndexOIDCPage.vue b/swift_browser_ui_frontend/src/pages/IndexOIDCPage.vue index 3534955e4..7ca4ba0fe 100644 --- a/swift_browser_ui_frontend/src/pages/IndexOIDCPage.vue +++ b/swift_browser_ui_frontend/src/pages/IndexOIDCPage.vue @@ -38,23 +38,6 @@ -
- - -
-
CSC - IT Center for Science Ltd.
-

P.O. Box 405 FI-02101 Espoo, Finland

-

+358 9 457 2001

-
-
-
Service Desk
-

Open Monday to Friday from 8.30 a.m. to 4 p.m.

-

+358 9 457 2821

-

servicedesk@csc.fi

-
- - -
@@ -71,25 +54,6 @@ c-login-card { c-button { margin-top: 2rem; } -footer { - background-color: var(--csc-light-grey); - color: var(--csc-dark-grey); - padding: 1rem 0 1rem; - position: fixed; - left: 0; - right: 0; - bottom: 0; -} -footer h5 { - font-weight: bold; -} -footer p { - font-size: 0.875rem; - line-height: 1rem; -} -footer c-flex { - display: flex; - justify-content: space-around; - text-align: center; -} + + diff --git a/swift_browser_ui_frontend/src/pages/LoginPassword.vue b/swift_browser_ui_frontend/src/pages/LoginPassword.vue index d5d48def4..f87f61af2 100644 --- a/swift_browser_ui_frontend/src/pages/LoginPassword.vue +++ b/swift_browser_ui_frontend/src/pages/LoginPassword.vue @@ -59,23 +59,7 @@ -
- - -
-
CSC - IT Center for Science Ltd.
-

P.O. Box 405 FI-02101 Espoo, Finland

-

+358 9 457 2001

-
-
-
Service Desk
-

Open Monday to Friday from 8.30 a.m. to 4 p.m.

-

+358 9 457 2821

-

servicedesk@csc.fi

-
- - -
+ From 0d1baa96c561c9b87ca2bb138997e0f0f8245d1a Mon Sep 17 00:00:00 2001 From: rquazi Date: Wed, 19 Oct 2022 15:00:02 +0300 Subject: [PATCH 02/30] Removing old footer --- .../src/components/CFooter.vue | 70 ++++++++++++------- .../src/pages/BrowserPage.vue | 11 ++- .../src/pages/IndexPage.vue | 54 ++++---------- .../src/pages/LoginPassword.vue | 23 +----- 4 files changed, 72 insertions(+), 86 deletions(-) diff --git a/swift_browser_ui_frontend/src/components/CFooter.vue b/swift_browser_ui_frontend/src/components/CFooter.vue index 046066109..813060d17 100644 --- a/swift_browser_ui_frontend/src/components/CFooter.vue +++ b/swift_browser_ui_frontend/src/components/CFooter.vue @@ -1,30 +1,41 @@ @@ -144,25 +134,11 @@ c-login-card { c-button { margin-top: 2rem; } -footer { - background-color: var(--csc-light-grey); - color: var(--csc-dark-grey); - padding: 1rem 0 1rem; - position: fixed; - left: 0; - right: 0; - bottom: 0; -} -footer h5 { - font-weight: bold; -} -footer p { - font-size: 0.875rem; - line-height: 1rem; -} -footer c-flex { - display: flex; - justify-content: space-around; - text-align: center; + +#footer{ + position:absolute; + bottom:0; + width:100%; } + diff --git a/swift_browser_ui_frontend/src/pages/LoginPassword.vue b/swift_browser_ui_frontend/src/pages/LoginPassword.vue index f87f61af2..82bd0d6b6 100644 --- a/swift_browser_ui_frontend/src/pages/LoginPassword.vue +++ b/swift_browser_ui_frontend/src/pages/LoginPassword.vue @@ -59,7 +59,7 @@ - + @@ -76,25 +76,4 @@ c-login-card { c-button { margin-top: 2rem; } -footer { - background-color: var(--csc-light-grey); - color: var(--csc-dark-grey); - padding: 1rem 0 1rem; - position: fixed; - left: 0; - right: 0; - bottom: 0; -} -footer h5 { - font-weight: bold; -} -footer p { - font-size: 0.875rem; - line-height: 1rem; -} -footer c-flex { - display: flex; - justify-content: space-around; - text-align: center; -} From e72d47a618a0cd51f53feef61a1a99d17c73cf23 Mon Sep 17 00:00:00 2001 From: rquazi Date: Fri, 21 Oct 2022 14:44:22 +0300 Subject: [PATCH 03/30] Some minor style changes --- swift_browser_ui_frontend/src/components/CFooter.vue | 12 ++++++++---- swift_browser_ui_frontend/src/pages/BrowserPage.vue | 8 +++++--- swift_browser_ui_frontend/src/pages/IndexPage.vue | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/swift_browser_ui_frontend/src/components/CFooter.vue b/swift_browser_ui_frontend/src/components/CFooter.vue index 813060d17..624cdbfa4 100644 --- a/swift_browser_ui_frontend/src/components/CFooter.vue +++ b/swift_browser_ui_frontend/src/components/CFooter.vue @@ -20,9 +20,9 @@ -
-
- +
+ {{ @@ -33,9 +33,9 @@

{{ $t("message.footerMenu.accessibility") }}

+
- - diff --git a/swift_browser_ui_frontend/src/entries/main.js b/swift_browser_ui_frontend/src/entries/main.js index 877f28316..116ab3d65 100644 --- a/swift_browser_ui_frontend/src/entries/main.js +++ b/swift_browser_ui_frontend/src/entries/main.js @@ -49,6 +49,9 @@ import UploadNotification from "@/components/UploadNotification"; //Custom footer element import CFooter from "@/components/CFooter"; +//Custom footer element +import CFooter from "@/components/CFooter"; + // Import delay import delay from "lodash/delay"; diff --git a/swift_browser_ui_frontend/src/pages/BrowserPage.vue b/swift_browser_ui_frontend/src/pages/BrowserPage.vue index f67615868..cc434cd90 100644 --- a/swift_browser_ui_frontend/src/pages/BrowserPage.vue +++ b/swift_browser_ui_frontend/src/pages/BrowserPage.vue @@ -265,14 +265,4 @@ c-modal { .toasts-wrapper { padding: 1rem; } - -#footer{ - position:fixed; - bottom:0; - width: 100%; - flex-shrink: 0; - margin-top: 15px; - z-index: 2; -} - From 85b3e002092da5d065f59b25b3156ca824e3f0d8 Mon Sep 17 00:00:00 2001 From: rquazi Date: Wed, 19 Oct 2022 15:00:02 +0300 Subject: [PATCH 12/30] Removing old footer --- .../src/components/CFooter.vue | 70 ++++++++++++------- .../src/pages/BrowserPage.vue | 7 ++ .../src/pages/IndexPage.vue | 3 +- 3 files changed, 54 insertions(+), 26 deletions(-) diff --git a/swift_browser_ui_frontend/src/components/CFooter.vue b/swift_browser_ui_frontend/src/components/CFooter.vue index 046066109..813060d17 100644 --- a/swift_browser_ui_frontend/src/components/CFooter.vue +++ b/swift_browser_ui_frontend/src/components/CFooter.vue @@ -1,30 +1,41 @@ diff --git a/swift_browser_ui_frontend/src/pages/LoginPassword.vue b/swift_browser_ui_frontend/src/pages/LoginPassword.vue index 82bd0d6b6..b3cd37a50 100644 --- a/swift_browser_ui_frontend/src/pages/LoginPassword.vue +++ b/swift_browser_ui_frontend/src/pages/LoginPassword.vue @@ -59,7 +59,7 @@ - +