;
editMode = false;
- languages = availableLanguages;
+ languages = [];
zenodoToken: string;
zenodoEmail: String;
roleOrganizationEnum = RoleOrganizationType;
@@ -86,7 +84,10 @@ export class UserProfileComponent extends BaseComponent implements OnInit, OnDes
private mergeEmailConfirmation: MergeEmailConfirmationService,
private httpClient: HttpClient,
private matomoService: MatomoService
- ) { super(); }
+ ) {
+ super();
+ this.languages = this.configurationService.availableLanguages;
+ }
ngOnInit() {
this.matomoService.trackPageView('User Profile');
@@ -101,7 +102,7 @@ export class UserProfileComponent extends BaseComponent implements OnInit, OnDes
this.zenodoEmail = result['zenodoEmail'];
this.userProfileEditorModel = new UserProfileEditorModel().fromModel(result);
- this.formGroup = this.userProfileEditorModel.buildForm();
+ this.formGroup = this.userProfileEditorModel.buildForm(this.configurationService.availableLanguages);
// this.formGroup = new FormBuilder().group({
// language: new FormControl(result['language'] ? availableLanguages.filter(x => x.value === result['language']['value']).pop() : '', [Validators.required]),
// timezone: new FormControl(result['timezone'], [Validators.required]),
diff --git a/dmp-frontend/src/assets/config/config.json b/dmp-frontend/src/assets/config/config.json
index 72c5d8a10..3b2190325 100644
--- a/dmp-frontend/src/assets/config/config.json
+++ b/dmp-frontend/src/assets/config/config.json
@@ -8,6 +8,48 @@
},
"defaultCulture": "en-US",
"defaultLanguage": "en",
+ "availableLanguages": [
+ {
+ "label": "GENERAL.LANGUAGES.ENGLISH",
+ "value": "en"
+ },
+ {
+ "label": "GENERAL.LANGUAGES.GREEK",
+ "value": "gr"
+ },
+ {
+ "label": "GENERAL.LANGUAGES.SPANISH",
+ "value": "es"
+ },
+ {
+ "label": "GENERAL.LANGUAGES.GERMAN",
+ "value": "de"
+ },
+ {
+ "label": "GENERAL.LANGUAGES.TURKISH",
+ "value": "tr"
+ },
+ {
+ "label": "GENERAL.LANGUAGES.SLOVAK",
+ "value": "sk"
+ },
+ {
+ "label": "GENERAL.LANGUAGES.SERBIAN",
+ "value": "sr"
+ },
+ {
+ "label": "GENERAL.LANGUAGES.PORTUGUESE",
+ "value": "pt"
+ },
+ {
+ "label": "GENERAL.LANGUAGES.CROATIAN",
+ "value": "hr"
+ },
+ {
+ "label": "GENERAL.LANGUAGES.POLISH",
+ "value": "pl"
+ }
+ ],
"loginProviders": {
"enabled": [1, 2, 3, 4, 5, 6, 7, 8],
"facebookConfiguration": { "clientId": "" },
diff --git a/dmp-frontend/src/assets/css/demo.css b/dmp-frontend/src/assets/css/demo.css
index 4667d7906..c05c09479 100644
--- a/dmp-frontend/src/assets/css/demo.css
+++ b/dmp-frontend/src/assets/css/demo.css
@@ -78,7 +78,7 @@ h6 {
}
.sidebar[data-color="danger"] li.active>a {
- background-color: rgb(0, 178, 159);
+ background-color: var(--primary-color-1);
/* -webkit-box-shadow: 0 4px 20px 0px rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(255, 255, 255, 0.4); */
/* box-shadow: 0 4px 20px 0px rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(255, 255, 255, 0.4); */
box-shadow: none;
@@ -353,7 +353,7 @@ table>thead>tr>th, .table>tbody>tr>th, .table>tfoot>tr>th, .table>thead>tr>td, .
}
.attach-file :hover {
- color: #00b29f
+ color: var(--primary-color-3)
}
.normal-btn {
@@ -361,7 +361,7 @@ table>thead>tr>th, .table>tbody>tr>th, .table>tfoot>tr>th, .table>thead>tr>td, .
max-width: 256px;
height: 40px;
cursor: pointer;
- background: #129d99 0% 0% no-repeat padding-box;
+ background: var(--primary-color) 0% 0% no-repeat padding-box;
box-shadow: 0px 3px 6px #1e202029;
border-radius: 30px;
border: none;
@@ -416,7 +416,7 @@ p {
}
p a {
- color: #23BCBA;
+ color: var(--primary-color-2);
}
.bootstrap-overrides a {
@@ -425,7 +425,7 @@ p a {
}
.bootstrap-overrides a:hover {
- color: #23BCBA;
+ color: var(--primary-color-2);
text-decoration: none;
}
@@ -566,7 +566,7 @@ hr {
max-width: 256px;
height: 40px;
cursor: pointer;
- background: #129D99 0% 0% no-repeat padding-box;
+ background: var(--primary-color) 0% 0% no-repeat padding-box;
box-shadow: 0px 3px 6px #1E202029;
border-radius: 30px;
border: none;
@@ -599,7 +599,7 @@ hr {
width: 894px;
height: 221px;
background: #FFFFFF 0% 0% no-repeat padding-box;
- border: 1px solid #23BCBA;
+ border: 1px solid var(--primary-color-2);
border-radius: 37px;
opacity: 1;
margin: 3.75rem 0rem;
diff --git a/dmp-frontend/src/assets/i18n/hr.json b/dmp-frontend/src/assets/i18n/hr.json
index 1a7e8157c..19e257327 100644
--- a/dmp-frontend/src/assets/i18n/hr.json
+++ b/dmp-frontend/src/assets/i18n/hr.json
@@ -125,7 +125,7 @@
"TERMS": "Uvjeti korištenja",
"COOKIES-POLICY": "Politika kolačića",
"PLANS": "Moji Planovi",
- "EXPLORE-PLANS": "Objavljeni Planovi",
+ "EXPLORE-PLANS": "Objavljeni Planovi upravljanja podacima",
"QUICK-WIZARD": "Novi Plan (Čarobnjak)",
"PLANS-NEW": "Novi Plan (Napredno)",
"DMP-NEW": "Novi Plan",
@@ -1245,7 +1245,7 @@
"NEW": "Novi Plan upravljanja podacima",
"EDIT": "Uredite",
"INTRO": "Nalazite se na sučelju za uređivanje Plana upravljanja podacima. Odgovorite na pitanja koja opisuju aktivnosti upravljanja Vašim podacima.",
- "INTRO-TIP": "Kako biste izbjegli nejasne ili pomiješane informacije različitih vrsta podataka, predlažemo da za svaku vrstu podataka unesete novi Opis skupa podataka."
+ "INTRO-TIP": "Kako biste izbjegli nejasne informacije o različitim vrstama podataka, predlažemo da za svaku vrstu podataka unesete novi Opis skupa podataka."
},
"FIELDS": {
"NAME": "Naziv skupa podataka",
@@ -1264,7 +1264,7 @@
"EXTERNAL-DATASET-INFO": "Informacije o vanjskom skupu podataka",
"DATAREPOSITORIES-INFO": "Informacije o podatkovnom repozitoriju",
"EXTERNAL-LINK": "Vanjska poveznica",
- "TAGS": "Oznake",
+ "TAGS": "Ključne riječi",
"CREATE": "Kreirajte novo"
},
"ACTIONS": {
@@ -1550,8 +1550,8 @@
}
},
"ABOUT": {
- "TITLE-DASHED": "- Više o -",
- "TITLE": "Više o",
+ "TITLE-DASHED": "- O Argosu -",
+ "TITLE": "O Argosu",
"MAIN-CONTENT": "Naš cilj je da pohranjeni podaci budu u skladu s FAIR načelima tj. da budu pretraživi (engl. findable), dostupni (engl. accessible), interoperabilni (engl. interoperable) i ponovo upotrebljivi (engl. re-usable). FAIR načela su neophodna za implementaciju Plana upravljanja podacima (eng. Data Management Plan) i ne zahtijevaju primjenu specifičnih tehnologija, standarda ili rješenja.",
"CONTRIBUTORS": "Suradnici",
"WELCOME": "Dobrodošli u ARGOS",
@@ -1563,7 +1563,7 @@
"GUIDE": "Upute za korisnike",
"GLOSSARY": "Rječnik",
"TERMS-OF-SERVICE": "Uvjeti korištenja",
- "ABOUT": "Više o",
+ "ABOUT": "O Argosu",
"COOKIES-POLICY": "Politika kolačića",
"PRIVACY-POLICY": "Politika privatnosti"
},
@@ -1893,4 +1893,4 @@
"FINALIZED": "Završeno",
"DELETED": "Izbrisano"
}
-}
\ No newline at end of file
+}
diff --git a/dmp-frontend/src/assets/images/OpenDMP(v1).png b/dmp-frontend/src/assets/images/OpenDMP(v1).png
deleted file mode 100644
index 6259b5813..000000000
Binary files a/dmp-frontend/src/assets/images/OpenDMP(v1).png and /dev/null differ
diff --git a/dmp-frontend/src/assets/images/OpenDMP.png b/dmp-frontend/src/assets/images/OpenDMP.png
deleted file mode 100644
index e629ca577..000000000
Binary files a/dmp-frontend/src/assets/images/OpenDMP.png and /dev/null differ
diff --git a/dmp-frontend/src/assets/images/dashboard-bg.png b/dmp-frontend/src/assets/images/dashboard-bg.png
deleted file mode 100644
index 29cfa1e5f..000000000
Binary files a/dmp-frontend/src/assets/images/dashboard-bg.png and /dev/null differ
diff --git a/dmp-frontend/src/assets/images/dashboard-popup.png b/dmp-frontend/src/assets/images/dashboard-popup.png
new file mode 100644
index 000000000..4bf64ce12
Binary files /dev/null and b/dmp-frontend/src/assets/images/dashboard-popup.png differ
diff --git a/dmp-frontend/src/assets/images/guided-tour-side.png b/dmp-frontend/src/assets/images/guided-tour-side.png
new file mode 100644
index 000000000..105178213
Binary files /dev/null and b/dmp-frontend/src/assets/images/guided-tour-side.png differ
diff --git a/dmp-frontend/src/assets/images/logan-troxell-9187-unsplash.jpg b/dmp-frontend/src/assets/images/logan-troxell-9187-unsplash.jpg
deleted file mode 100644
index 97c229def..000000000
Binary files a/dmp-frontend/src/assets/images/logan-troxell-9187-unsplash.jpg and /dev/null differ
diff --git a/dmp-frontend/src/assets/images/login-bottom-image.png b/dmp-frontend/src/assets/images/login-bottom-image.png
new file mode 100644
index 000000000..eaaa0a676
Binary files /dev/null and b/dmp-frontend/src/assets/images/login-bottom-image.png differ
diff --git a/dmp-frontend/src/assets/images/logo_cite.png b/dmp-frontend/src/assets/images/logo_cite.png
deleted file mode 100644
index 55328a679..000000000
Binary files a/dmp-frontend/src/assets/images/logo_cite.png and /dev/null differ
diff --git a/dmp-frontend/src/assets/images/main_nav_bg_LQ.PNG b/dmp-frontend/src/assets/images/main_nav_bg_LQ.PNG
deleted file mode 100644
index 92ee21470..000000000
Binary files a/dmp-frontend/src/assets/images/main_nav_bg_LQ.PNG and /dev/null differ
diff --git a/dmp-frontend/src/assets/images/nav-logo.png b/dmp-frontend/src/assets/images/nav-logo.png
new file mode 100644
index 000000000..9be9fcdab
Binary files /dev/null and b/dmp-frontend/src/assets/images/nav-logo.png differ
diff --git a/dmp-frontend/src/assets/images/public-datasets-bg.png b/dmp-frontend/src/assets/images/public-datasets-bg.png
deleted file mode 100644
index 019998754..000000000
Binary files a/dmp-frontend/src/assets/images/public-datasets-bg.png and /dev/null differ
diff --git a/dmp-frontend/src/assets/images/public-dmps-bg.png b/dmp-frontend/src/assets/images/public-dmps-bg.png
deleted file mode 100644
index 019998754..000000000
Binary files a/dmp-frontend/src/assets/images/public-dmps-bg.png and /dev/null differ
diff --git a/dmp-frontend/src/assets/images/repository-placeholder.png b/dmp-frontend/src/assets/images/repository-placeholder.png
index c5f84947a..2567afeba 100644
Binary files a/dmp-frontend/src/assets/images/repository-placeholder.png and b/dmp-frontend/src/assets/images/repository-placeholder.png differ
diff --git a/dmp-frontend/src/assets/resources/language.json b/dmp-frontend/src/assets/resources/language.json
deleted file mode 100644
index 38da65f22..000000000
--- a/dmp-frontend/src/assets/resources/language.json
+++ /dev/null
@@ -1,42 +0,0 @@
-[
- {
- "label": "GENERAL.LANGUAGES.ENGLISH",
- "value": "en"
- },
- {
- "label": "GENERAL.LANGUAGES.GREEK",
- "value": "gr"
- },
- {
- "label": "GENERAL.LANGUAGES.SPANISH",
- "value": "es"
- },
- {
- "label": "GENERAL.LANGUAGES.GERMAN",
- "value": "de"
- },
- {
- "label": "GENERAL.LANGUAGES.TURKISH",
- "value": "tr"
- },
- {
- "label": "GENERAL.LANGUAGES.SLOVAK",
- "value": "sk"
- },
- {
- "label": "GENERAL.LANGUAGES.SERBIAN",
- "value": "sr"
- },
- {
- "label": "GENERAL.LANGUAGES.PORTUGUESE",
- "value": "pt"
- },
- {
- "label": "GENERAL.LANGUAGES.CROATIAN",
- "value": "hr"
- },
- {
- "label": "GENERAL.LANGUAGES.POLISH",
- "value": "pl"
- }
-]
diff --git a/dmp-frontend/src/assets/scss/blue-theme.scss b/dmp-frontend/src/assets/scss/blue-theme.scss
index b1efe01e8..0c539ba18 100644
--- a/dmp-frontend/src/assets/scss/blue-theme.scss
+++ b/dmp-frontend/src/assets/scss/blue-theme.scss
@@ -41,7 +41,7 @@ $app-blue-theme-accent-palette: (
200: #80d9cf,
300: #4dc9bc,
400: #26bead,
- 500: #00b29f,
+ 500: var(--primary-color-3),
600: #00ab97,
700: #00a28d,
800: #009983,
diff --git a/dmp-frontend/src/assets/scss/green-theme.scss b/dmp-frontend/src/assets/scss/green-theme.scss
index 08463b3cf..b6b1f1283 100644
--- a/dmp-frontend/src/assets/scss/green-theme.scss
+++ b/dmp-frontend/src/assets/scss/green-theme.scss
@@ -8,7 +8,7 @@ $app-green-theme-primary-palette: (
200: #89cecc,
300: #59bab8,
400: #36aca8,
- 500: #129d99,
+ 500: var(--primary-color),
600: #109591,
700: #0d8b86,
800: #0a817c,
@@ -41,7 +41,7 @@ $app-green-theme-accent-palette: (
200: #fbeeb9,
300: #f9e79c,
400: #f8e287,
- 500: #f7dd72,
+ 500: var(--secondary-color),
600: #f6d96a,
700: #f5d45f,
800: #f3cf55,
diff --git a/dmp-frontend/src/common/forms/form-validation-errors-dialog/form-validation-errors-dialog.component.scss b/dmp-frontend/src/common/forms/form-validation-errors-dialog/form-validation-errors-dialog.component.scss
index c1ead4385..53d39107a 100644
--- a/dmp-frontend/src/common/forms/form-validation-errors-dialog/form-validation-errors-dialog.component.scss
+++ b/dmp-frontend/src/common/forms/form-validation-errors-dialog/form-validation-errors-dialog.component.scss
@@ -59,12 +59,12 @@ min-width: 101px;
.next-btn {
background: #ffffff 0% 0% no-repeat padding-box;
- border: 1px solid #129d99;
+ border: 1px solid var(--primary-color);
border-radius: 30px;
opacity: 1;
min-width: 101px;
height: 43px;
- color: #129d99;
+ color: var(--primary-color);
font-weight: 500;
}
diff --git a/dmp-frontend/src/common/modules/confirmation-dialog/confirmation-dialog.component.scss b/dmp-frontend/src/common/modules/confirmation-dialog/confirmation-dialog.component.scss
index 804e34258..71ada3465 100644
--- a/dmp-frontend/src/common/modules/confirmation-dialog/confirmation-dialog.component.scss
+++ b/dmp-frontend/src/common/modules/confirmation-dialog/confirmation-dialog.component.scss
@@ -56,8 +56,8 @@
min-width: 101px;
height: 43px;
background: #ffffff;
- color: #129d99;
- border: 1px solid #129d99;
+ color: var(--primary-color);
+ border: 1px solid var(--primary-color);
border-radius: 30px;
opacity: 1;
}
@@ -67,7 +67,7 @@
}
.submit-btn:not([disabled]):hover {
- background-color: #129d99;
+ background-color: var(--primary-color);
color: #ffffff;
}
diff --git a/dmp-frontend/src/common/modules/sign-in-dialog/sign-in-dialog.component.html b/dmp-frontend/src/common/modules/sign-in-dialog/sign-in-dialog.component.html
index 4f61a0bd2..8889ac050 100644
--- a/dmp-frontend/src/common/modules/sign-in-dialog/sign-in-dialog.component.html
+++ b/dmp-frontend/src/common/modules/sign-in-dialog/sign-in-dialog.component.html
@@ -1,5 +1,5 @@
-
+
Login with
diff --git a/dmp-frontend/src/styles.scss b/dmp-frontend/src/styles.scss
index 2c1749736..5917892a4 100644
--- a/dmp-frontend/src/styles.scss
+++ b/dmp-frontend/src/styles.scss
@@ -52,6 +52,18 @@
// @include angular-material-theme($theme);
// @include covalent-theme($theme);
+
+ :root {
+ --primary-color: #129d99;
+ --primary-color-2: #23bcba;
+ --primary-color-3: #00b29f;
+ --secondary-color: #f7dd72;
+ }
+
+ .cc-btn {
+ background-color: var(--primary-color-3) !important;
+ }
+
.snackbar-warning {
background-color: #f39010;
color: #f3efef;
@@ -68,7 +80,7 @@
}
.lightblue-btn {
- background-color: rgb(0, 178, 159) !important;
+ background-color: var(--primary-color-1) !important;
color: white !important;
// background-color: rgba(0, 112, 192, 1) !important;
}
@@ -110,7 +122,7 @@
border: 0.1em solid rgb(218, 227, 243);
border-radius: 10em;
background-color: rgb(236, 241, 249);
- color: rgb(0, 178, 159);
+ color: var(--primary-color-1);
// color: rgba(0, 112, 192, 1);
// color: rgb(68, 114, 196);
text-transform: uppercase;
@@ -245,7 +257,7 @@
.text-primary-blue{
- color: #129D99;
+ color: var(--primary-color);
}