From 8946ea2fb7457a8a938479430c0087d90111c7d5 Mon Sep 17 00:00:00 2001 From: apapachristou Date: Fri, 23 Oct 2020 17:59:59 +0300 Subject: [PATCH] Changes style of title on dmp an dataset card --- .../src/app/ui/dashboard/dashboard.component.scss | 11 ++++++----- .../app/ui/dashboard/drafts/drafts.component.css | 11 ++++++----- .../app/ui/dashboard/drafts/drafts.component.html | 2 +- .../recent-edited-activity.component.css | 11 ++++++----- .../recent-edited-activity.component.html | 3 ++- .../recent-edited-dataset-activity.component.html | 3 ++- .../recent-edited-dataset-activity.component.scss | 11 ++++++----- .../recent-edited-dmp-activity.component.css | 11 ++++++----- .../dataset-listing-item.component.html | 13 +++++++------ .../dataset-listing-item.component.scss | 11 ++++++----- .../dataset-editor-details.component.ts | 2 +- .../src/app/ui/dmp/editor/dmp-editor.component.scss | 2 +- .../listing-item/dmp-listing-item.component.scss | 11 ++++++----- dmp-frontend/src/assets/i18n/de.json | 7 +++++-- dmp-frontend/src/assets/i18n/en.json | 7 +++++-- dmp-frontend/src/assets/i18n/es.json | 7 +++++-- dmp-frontend/src/assets/i18n/gr.json | 7 +++++-- dmp-frontend/src/assets/i18n/sk.json | 7 +++++-- dmp-frontend/src/assets/i18n/tr.json | 7 +++++-- 19 files changed, 86 insertions(+), 58 deletions(-) diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss b/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss index e30827c9e..59eacf94f 100644 --- a/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss +++ b/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss @@ -215,10 +215,10 @@ input[type="text"] { .dmp-title, .dataset-title { text-align: left; - font-weight: 500; + font-weight: 600; font-family: "Roboto", sans-serif; font-size: 1rem; - opacity: 0.81; + // opacity: 0.81; padding-top: 0.75rem; padding-bottom: 0.55rem; color: #212121; @@ -237,12 +237,13 @@ input[type="text"] { color: #848484; } -.dmp-title-draft { +.dmp-title-draft, +.dataset-title-draft { text-align: left; - font-weight: 500; + font-weight: 600; font-family: "Roboto", sans-serif; font-size: 1rem; - opacity: 0.81; + // opacity: 0.81; padding-top: 0.75rem; padding-bottom: 0.55rem; color: #f16868; diff --git a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.css b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.css index e443496e2..b7adab213 100644 --- a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.css +++ b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.css @@ -72,10 +72,10 @@ input[type="text"] { .dmp-title, .dataset-title { text-align: left; - font-weight: 500; + font-weight: 600; font-family: "Roboto", sans-serif; font-size: 1rem; - opacity: 0.81; + /* opacity: 0.81; */ padding-top: 0.75rem; padding-bottom: 0.55rem; color: #212121; @@ -94,12 +94,13 @@ input[type="text"] { color: #848484; } -.dmp-title-draft { +.dmp-title-draft, +.dataset-title-draft { text-align: left; - font-weight: 500; + font-weight: 600; font-family: "Roboto", sans-serif; font-size: 1rem; - opacity: 0.81; + /* opacity: 0.81; */ padding-top: 0.75rem; padding-bottom: 0.55rem; color: #f16868; diff --git a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html index bc740bf1a..810ca1c81 100644 --- a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html +++ b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html @@ -26,7 +26,7 @@
{{'DATASET-LISTING.DATASET-DESCRIPTION' | translate}}
{{'DATASET-LISTING.STATES.EDITED' | translate}}: {{activity.modified | date:"longDate"}}
-
{{activity.label}}
+
{{activity.label}}
{{ roleDisplay(activity.users) }} . diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css index 6c8c81403..718856adb 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css @@ -72,10 +72,10 @@ input[type="text"] { .dmp-title, .dataset-title { text-align: left; - font-weight: 500; + font-weight: 600; font-family: "Roboto", sans-serif; font-size: 1rem; - opacity: 0.81; + /* opacity: 0.81; */ padding-top: 0.75rem; padding-bottom: 0.55rem; color: #212121; @@ -94,12 +94,13 @@ input[type="text"] { color: #848484; } -.dmp-title-draft { +.dmp-title-draft, +.dataset-title-draft { text-align: left; - font-weight: 500; + font-weight: 600; font-family: "Roboto", sans-serif; font-size: 1rem; - opacity: 0.81; + /* opacity: 0.81; */ padding-top: 0.75rem; padding-bottom: 0.55rem; color: #f16868; diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html index 6e3d0c951..ebb4b805d 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html @@ -104,7 +104,8 @@
{{'DATASET-LISTING.STATES.EDITED' | translate}}: {{activity.modified | date:"longDate"}}
{{'DATASET-LISTING.STATES.PUBLISHED' | translate}}: {{activity.publishedAt | date:"longDate"}}
-
{{activity.title}}
+
{{activity.title}}
+
{{activity.title}}
{{ roleDisplay(activity.users) }} . diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html index 311a09f2a..46e5bfc25 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html @@ -28,7 +28,8 @@
{{'DATASET-LISTING.STATES.EDITED' | translate}}: {{activity.modified | date:"longDate"}}
{{'DATASET-LISTING.STATES.PUBLISHED' | translate}}: {{activity.dmpPublishedAt | date:"longDate"}}
-
{{activity.label}}
+
{{activity.label}}
+
{{activity.label}}
{{ roleDisplay(activity.users) }} . diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.scss b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.scss index 201221156..694669d45 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.scss +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.scss @@ -72,10 +72,10 @@ input[type="text"] { .dmp-title, .dataset-title { text-align: left; - font-weight: 500; + font-weight: 600; font-family: "Roboto", sans-serif; font-size: 1rem; - opacity: 0.81; + // opacity: 0.81; padding-top: 0.75rem; padding-bottom: 0.55rem; color: #212121; @@ -94,12 +94,13 @@ input[type="text"] { color: #848484; } -.dmp-title-draft { +.dmp-title-draft, +.dataset-title-draft { text-align: left; - font-weight: 500; + font-weight: 600; font-family: "Roboto", sans-serif; font-size: 1rem; - opacity: 0.81; + // opacity: 0.81; padding-top: 0.75rem; padding-bottom: 0.55rem; color: #f16868; diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.css b/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.css index c15a7e8df..5b58378c3 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.css +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.css @@ -69,10 +69,10 @@ input[type="text"] { .dmp-title, .dataset-title { text-align: left; - font-weight: 500; + font-weight: 600; font-family: "Roboto", sans-serif; font-size: 1rem; - opacity: 0.81; + /* opacity: 0.81; */ padding-top: 0.75rem; padding-bottom: 0.55rem; color: #212121; @@ -90,12 +90,13 @@ input[type="text"] { color: #848484; } -.dmp-title-draft { +.dmp-title-draft, +.dataset-title-draft { text-align: left; - font-weight: 500; + font-weight: 600; font-family: "Roboto", sans-serif; font-size: 1rem; - opacity: 0.81; + /* opacity: 0.81; */ padding-top: 0.75rem; padding-bottom: 0.55rem; color: #f16868; diff --git a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html index afc0ae8db..fa47c3acc 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html +++ b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html @@ -5,7 +5,8 @@
{{'DATASET-LISTING.STATES.EDITED' | translate}}: {{dataset.modified | date:"longDate"}}
{{'DATASET-LISTING.STATES.PUBLISHED' | translate}}: {{dataset.dmpPublishedAt | date:"longDate"}}
-
{{dataset.label}}
+
{{dataset.label}}
+
{{dataset.label}}
{{ roleDisplay(dataset.users) }} . @@ -66,11 +67,11 @@

{{ dataset.grantAbbreviation }}

--> - - + - - - diff --git a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.scss b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.scss index fe734b6d3..a5f986b6d 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.scss +++ b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.scss @@ -140,10 +140,10 @@ input[type="text"] { .dmp-title, .dataset-title { text-align: left; - font-weight: 500; + font-weight: 600; font-family: "Roboto", sans-serif; font-size: 1rem; - opacity: 0.81; + // opacity: 0.81; padding-top: 0.75rem; padding-bottom: 0.55rem; color: #212121; @@ -162,12 +162,13 @@ input[type="text"] { color: #848484; } -.dmp-title-draft { +.dmp-title-draft, +.dataset-title-draft { text-align: left; - font-weight: 500; + font-weight: 600; font-family: "Roboto", sans-serif; font-size: 1rem; - opacity: 0.81; + // opacity: 0.81; padding-top: 0.75rem; padding-bottom: 0.55rem; color: #f16868; diff --git a/dmp-frontend/src/app/ui/dmp/editor/dataset-editor-details/dataset-editor-details.component.ts b/dmp-frontend/src/app/ui/dmp/editor/dataset-editor-details/dataset-editor-details.component.ts index b9e187773..31338f977 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dataset-editor-details/dataset-editor-details.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/dataset-editor-details/dataset-editor-details.component.ts @@ -62,7 +62,7 @@ export class DatasetEditorDetailsComponent extends BaseComponent implements OnIn // isLinear = false; lock: LockModel; lockStatus: Boolean; - dmpText: string; + dmpText: string = null; @Input() formGroup: FormGroup; @Input() dmpId: string; diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss index e36d917d7..a833c7e0a 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss +++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.scss @@ -411,7 +411,7 @@ mat-icon.size-16 { .dmp-title { text-align: left; - font-weight: 500; + font-weight: 600; font-family: "Roboto", sans-serif; font-size: 1rem; opacity: 0.81; diff --git a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss index a52a473ae..7a0178156 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss +++ b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss @@ -173,10 +173,10 @@ input[type="text"] { .dmp-title, .dataset-title { text-align: left; - font-weight: 500; + font-weight: 600; font-family: "Roboto", sans-serif; font-size: 1rem; - opacity: 0.81; + // opacity: 0.81; padding-top: 0.75rem; padding-bottom: 0.55rem; color: #212121; @@ -195,12 +195,13 @@ input[type="text"] { color: #848484; } -.dmp-title-draft { +.dmp-title-draft, +.dataset-title-draft { text-align: left; - font-weight: 500; + font-weight: 600; font-family: "Roboto", sans-serif; font-size: 1rem; - opacity: 0.81; + // opacity: 0.81; padding-top: 0.75rem; padding-bottom: 0.55rem; color: #f16868; diff --git a/dmp-frontend/src/assets/i18n/de.json b/dmp-frontend/src/assets/i18n/de.json index cd5a241bb..3195a88fd 100644 --- a/dmp-frontend/src/assets/i18n/de.json +++ b/dmp-frontend/src/assets/i18n/de.json @@ -1366,7 +1366,9 @@ "NAME": "Name", "ORGANIZATION": "Organization", "ROLE": "Rolle", - "SELECT-ROLE": "Select Role" + "SELECT-ROLE": "Select Role", + "ACCOUNTS": "Accounts", + "EMAILS": "Emails" }, "ASSOCIATED-DMPS": "Zugehörige DMPs", "DMPS": { @@ -1397,7 +1399,8 @@ "OTHER": "Other" }, "ACTIONS": { - "SAVE": "Save" + "SAVE": "Save", + "ADD-NEW": "Add new" } }, "DATASET-REFERENCED-MODELS": { diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index a2a640099..db9f476b4 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -1366,7 +1366,9 @@ "NAME": "Name", "ORGANIZATION": "Organization", "ROLE": "Role", - "SELECT-ROLE": "Select Role" + "SELECT-ROLE": "Select Role", + "ACCOUNTS": "Accounts", + "EMAILS": "Emails" }, "ASSOCIATED-DMPS": "Associated DMPs", "DMPS": { @@ -1397,7 +1399,8 @@ "OTHER": "Other" }, "ACTIONS": { - "SAVE": "Save" + "SAVE": "Save", + "ADD-NEW": "Add new" } }, "DATASET-REFERENCED-MODELS": { diff --git a/dmp-frontend/src/assets/i18n/es.json b/dmp-frontend/src/assets/i18n/es.json index 5faa05dfd..c8edb246f 100644 --- a/dmp-frontend/src/assets/i18n/es.json +++ b/dmp-frontend/src/assets/i18n/es.json @@ -1366,7 +1366,9 @@ "NAME": "Name", "ORGANIZATION": "Organization", "ROLE": "Role", - "SELECT-ROLE": "Select Role" + "SELECT-ROLE": "Select Role", + "ACCOUNTS": "Accounts", + "EMAILS": "Emails" }, "ASSOCIATED-DMPS": "PGDs asociados", "DMPS": { @@ -1397,7 +1399,8 @@ "OTHER": "Other" }, "ACTIONS": { - "SAVE": "Save" + "SAVE": "Save", + "ADD-NEW": "Add new" } }, "DATASET-REFERENCED-MODELS": { diff --git a/dmp-frontend/src/assets/i18n/gr.json b/dmp-frontend/src/assets/i18n/gr.json index 901895a5c..604ae7388 100644 --- a/dmp-frontend/src/assets/i18n/gr.json +++ b/dmp-frontend/src/assets/i18n/gr.json @@ -1366,7 +1366,9 @@ "NAME": "Name", "ORGANIZATION": "Organization", "ROLE": "Ρόλος", - "SELECT-ROLE": "Select Role" + "SELECT-ROLE": "Select Role", + "ACCOUNTS": "Accounts", + "EMAILS": "Emails" }, "ASSOCIATED-DMPS": "Συσχετιζόμενα Σχέδια Διαχείρισης Δεδομένων", "DMPS": { @@ -1397,7 +1399,8 @@ "OTHER": "Other" }, "ACTIONS": { - "SAVE": "Save" + "SAVE": "Save", + "ADD-NEW": "Add new" } }, "DATASET-REFERENCED-MODELS": { diff --git a/dmp-frontend/src/assets/i18n/sk.json b/dmp-frontend/src/assets/i18n/sk.json index fbce175fd..ab38bcdd8 100644 --- a/dmp-frontend/src/assets/i18n/sk.json +++ b/dmp-frontend/src/assets/i18n/sk.json @@ -1366,7 +1366,9 @@ "NAME": "Name", "ORGANIZATION": "Organization", "ROLE": "Rola", - "SELECT-ROLE": "Select Role" + "SELECT-ROLE": "Select Role", + "ACCOUNTS": "Accounts", + "EMAILS": "Emails" }, "ASSOCIATED-DMPS": "Pridružené DMP", "DMPS": { @@ -1397,7 +1399,8 @@ "OTHER": "Other" }, "ACTIONS": { - "SAVE": "Save" + "SAVE": "Save", + "ADD-NEW": "Add new" } }, "DATASET-REFERENCED-MODELS": { diff --git a/dmp-frontend/src/assets/i18n/tr.json b/dmp-frontend/src/assets/i18n/tr.json index a0848126d..0b6040591 100644 --- a/dmp-frontend/src/assets/i18n/tr.json +++ b/dmp-frontend/src/assets/i18n/tr.json @@ -1366,7 +1366,9 @@ "NAME": "Name", "ORGANIZATION": "Organization", "ROLE": "Görev", - "SELECT-ROLE": "Select Role" + "SELECT-ROLE": "Select Role", + "ACCOUNTS": "Accounts", + "EMAILS": "Emails" }, "ASSOCIATED-DMPS": "İlişkili VYP'ları", "DMPS": { @@ -1397,7 +1399,8 @@ "OTHER": "Other" }, "ACTIONS": { - "SAVE": "Save" + "SAVE": "Save", + "ADD-NEW": "Add new" } }, "DATASET-REFERENCED-MODELS": {