Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
e97587f
Added new footer component
Oct 18, 2022
0d1baa9
Removing old footer
Oct 19, 2022
e72d47a
Some minor style changes
Oct 21, 2022
9ca3320
Translation Fixes
Oct 21, 2022
d7027c1
More treanslation for footer
Oct 24, 2022
5dd8909
Fixing the text overlapping in footer
Oct 24, 2022
16be0b5
Font weight bug fix for hyperlinks in footer
Nov 1, 2022
4fca02d
Adding link for museo font
Nov 2, 2022
a0746e4
Fix issues of footer and added Museo Fon
Nov 10, 2022
e727aa2
Adjusting footer height
Nov 10, 2022
1a36749
Added new footer component
Oct 18, 2022
85b3e00
Removing old footer
Oct 19, 2022
8d82f81
Some minor style changes
Oct 21, 2022
7be862c
Translation Fixes
Oct 21, 2022
0624175
More treanslation for footer
Oct 24, 2022
b9140c3
Fixing the text overlapping in footer
Oct 24, 2022
8294d12
Font weight bug fix for hyperlinks in footer
Nov 1, 2022
72a1cdc
Adding link for museo font
Nov 2, 2022
2e6ad80
Fix issues of footer and added Museo Fon
Nov 10, 2022
1757305
Adjusting footer height
Nov 10, 2022
acf3e87
Removing duplicate declaration
Nov 14, 2022
8b4ae91
Fixing the responsive issue of the footer
Nov 18, 2022
e60fb13
adding new finnish words
Nov 18, 2022
e75699d
Fixing the issue of blocking content by footer
Nov 18, 2022
d526e17
style change
Nov 18, 2022
44fb89e
bugfix for issue #809 and #810
Nov 20, 2022
342f6aa
Added text corrections
Nov 29, 2022
bf1505d
Changing the search box style
Dec 15, 2022
92be1c0
fixing code styling
Dec 15, 2022
44b9ea3
fix linter errors after rebasing
sampsapenna Jan 5, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions .github/config/.finnishwords.txt
Original file line number Diff line number Diff line change
Expand Up @@ -96,18 +96,14 @@ kansio
kansioille
kansioina
kansion
kansion
kansiossa
kansiot
kansiot
kansiota
kansiota
kanssa
kanssasi
käynnissä
käynnistyy
käytä
käytä
käytettävissä
käytetylle
käytössä
Expand Down Expand Up @@ -165,6 +161,7 @@ koskevia
kulutuksesta
kulutus
kunnes
kuvaus
kyseisen
ladata
ladattavat
Expand All @@ -174,7 +171,6 @@ lähetettäväksi
lähetettävät
lähetettiin
lähetetyt
lähetetyt
lähettäessä
lähettäjän
lähettämistä
Expand Down Expand Up @@ -318,7 +314,6 @@ projekteja
projekti
projektia
projektien
projektien
projektiin
projektilla
projektille
Expand Down Expand Up @@ -350,6 +345,7 @@ rajoitteiden
resurssienkäyttö
resurssit
rivinvaihtoa
saavutettavuus
sähköpostitse
säiliö
säiliöitä
Expand Down Expand Up @@ -432,7 +428,6 @@ tarkoittaen
tarvitset
tässä
tätä
tätä
taustalla
tavallisesti
täytyy
Expand All @@ -450,6 +445,7 @@ tieto
tietoa
tietosivulta
tietotekniikan
tietotekniikkakeskus
tila
tilan
tilankäyttö
Expand All @@ -472,6 +468,7 @@ tunnuksen
tunnus
tunti
tuo
tuottaa
tyhjä
tyhjennä
tyyppi
Expand Down
2 changes: 2 additions & 0 deletions swift_browser_ui_frontend/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/@mdi/font@6.5.95/css/materialdesignicons.min.css">
<link rel="stylesheet" href="https://use.typekit.net/csv4mjm.css" />

<title>Swift browser UI</title>
</head>

Expand Down
20 changes: 16 additions & 4 deletions swift_browser_ui_frontend/src/common/lang.js
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ let default_translations = {
instructions: "Share ID instructions",
close_instructions: "Close instructions",
share_cont: "Share the bucket",
share_title: "Share folder: ",
share_title: "Share folder",
share_subtitle:
"This folder is already accessible to all the members" +
" of this project.",
Expand All @@ -196,7 +196,7 @@ let default_translations = {
shared_successfully: "Folder was shared successfully!",
project_id: "Project ID",
field_label: "Project Identifiers to share with",
field_placeholder: "Add Project IDs",
field_placeholder: "Add Share IDs",
cancel: "Cancel",
confirm: "Share",
to_me: "Shared to the project",
Expand Down Expand Up @@ -451,6 +451,12 @@ let default_translations = {
sharing: "Sharing API tokens",
about: "About Sensitive Data Services",
},
footerMenu:{
groupandprogram:"Sensitive Data Services - SD Connect",
csc:"Powered by CSC - IT Center for Science Ltd.",
servicedescription:"Service Description",
accessibility:"Accessibility",
},
},
},
fi: {
Expand Down Expand Up @@ -621,7 +627,7 @@ let default_translations = {
instructions: "Jaa tunnus ohjeet",
close_instructions: "Sulje ohjeet",
share_cont: "Jaa säiliö",
share_title: "Jaa kansio: ",
share_title: "Jaa kansio ",
share_subtitle:
"Tämä kansio on jo kaikkien tämän projektin jäsenten käytettävissä.",
share_other_projects: "Jaa toisen projektin kanssa",
Expand All @@ -634,7 +640,7 @@ let default_translations = {
read_perm: "Salli säiliön luku",
write_perm: "Salli säiliöön kirjoitus",
shared_successfully: "Kansion jakaminen onnistui!",
project_id: "Projektin tunnus",
project_id: "Jaa tunnus",
field_label: "Jaa projektitunnisteille",
field_placeholder: "Lisää projektitunnukset",
cancel: "Peru",
Expand Down Expand Up @@ -885,6 +891,12 @@ let default_translations = {
sharing: "API avainten jakaminen",
about: "Tietoa",
},
footerMenu:{
groupandprogram:"Sensitive Data Service-SD Connect",
csc:"Palvelun tuottaa CSC -Tieteen Tietotekniikkakeskus Oy",
servicedescription: "Palvelun Kuvaus",
accessibility:"Saavutettavuus",
},
},
},
};
Expand Down
113 changes: 113 additions & 0 deletions swift_browser_ui_frontend/src/components/CFooter.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
<template>
<div id="c-footer">
<nav class="navbar">
<div class="navbar-menu is-active">
<div class="navbar-start">
<div class="col-3">
<div class="row navbar-item ">
<span class="largetext">
{{ $t("message.footerMenu.groupandprogram") }}
</span>
</div>
<div class="row navbar-item smalltext">
<a
class="linktext"
href="https://csc.fi"
:alt="$t('message.footerMenu.csc')"
>
{{ $t("message.footerMenu.csc") }}
</a>
</div>
</div>
</div>

<div
id="rightmenu"
class="navbar-end"
>
<div class="navbar-item smalltext">
<a
class="linktext"
href="https://research.csc.fi/-/sd-connect"
:alt="$t('message.footerMenu.servicedescription')"
>
{{ $t("message.footerMenu.servicedescription") }}
</a>
</div>
<div class="navbar-item smalltext">
<p>{{ $t("message.footerMenu.accessibility") }}</p>
</div>
</div>
</div>
</nav>
</div>
</template>

<script>

export default {
name:"CFooter",
};
</script>

<style lang="scss" scoped>
@import "@/css/prod.scss";

#c-footer{
height: fit-content;
width: 100%;
padding:40px 60px;
background-color:$csc-lightest-grey;
z-index: 2;
}

.navbar{
background-color:$csc-lightest-grey;
padding: auto;
width: 100%;

}
.navbar-menu{
background-color:$csc-lightest-grey;
width: 100%;
height: 100%;
box-shadow: none;
}

.navbar-start{
background-color:$csc-lightest-grey;
}

.navbar-end{
background-color:$csc-lightest-grey;
}

#leftmenu{
padding-left: 10px;
}

.largetext{
font-family: var(--csc-font-family);
font-style: normal;
font-weight: 600;
font-size: 16px;
line-height: 19px;
color: $csc-grey;
}
.smalltext{
font-family: var(--csc-font-family);;
font-style: normal;
font-weight: 400;
font-size: 14px;
line-height: 18px;
color: $csc-grey;
}
.linktext {
color: $csc-grey;
font-weight: 400;
}
a:hover {
background-color: #CCF4F0;
text-decoration: underline;
}
</style>
2 changes: 1 addition & 1 deletion swift_browser_ui_frontend/src/components/EditTagsModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
size="large"
@click="toggleEditTagsModal"
>
{{ $t("message.cancel") }}
{{ $t("message.cancel") }}
</c-button>
<c-button
size="large"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export default {
};
</script>

<style lang="scss">
<style lang="scss" scoped>
@import "@/css/prod.scss";

h3 {
Expand Down
4 changes: 4 additions & 0 deletions swift_browser_ui_frontend/src/css/csc.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,16 @@ $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;
$csc-green: #51a808;
$csc-orange: #ff5800;

//Font Setting
$csc-font-family: 'museo-sans';

// Set bulma initial colors to be derived from
// Not overriding black, black's fine as is
$orange: $csc-orange;
Expand Down
4 changes: 4 additions & 0 deletions swift_browser_ui_frontend/src/entries/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down Expand Up @@ -123,6 +126,7 @@ new Vue({
router,
store,
components: {
CFooter,
BrowserMainNavbar,
BrowserSecondaryNavbar,
CreateFolderModal,
Expand Down
Loading