From 762c5cd50650dcc580adca5f410e71f1b3ec95e6 Mon Sep 17 00:00:00 2001 From: "argiro.kokogiannaki" Date: Thu, 6 Jun 2019 14:49:43 +0000 Subject: [PATCH] [Connect|Trunk] Community Page: update layout according to mocks git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@56015 d315682c-612b-4755-9ff5-7f18f6832af3 --- src/app/app.component.ts | 9 +- src/app/community/community.component.html | 366 +++++++++++------- .../subscribe/invite/invite.component.html | 1 + .../utils/subscribe/subscribe.component.ts | 6 +- src/assets/connect-custom.css | 62 +++ 5 files changed, 294 insertions(+), 150 deletions(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index d142987..ad7865f 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -18,7 +18,7 @@ import {SubscribeService} from './openaireLibrary/utils/subscribe/subscribe.serv styles: [` `], template: ` - +
- - - + + +
` }) @@ -279,6 +279,7 @@ export class AppComponent { if(communityId && communityId!="" && com.communityId == communityId){ community = com; + document.documentElement.style.setProperty('--portal-main-color', "#4C9CD5"); // this._layoutService.getLayout(com.communityId, // this.properties.adminToolsAPIURL + '/').subscribe ( // layout => { diff --git a/src/app/community/community.component.html b/src/app/community/community.component.html index aad6849..bc73fdd 100644 --- a/src/app/community/community.component.html +++ b/src/app/community/community.component.html @@ -1,29 +1,29 @@
-
-
-
- - - -
-
-
-
-
-
- - - -
-
-
-
-
-
-
+ + + + + + + + + + + + + + + + + + + + +
+
+
+ +
+
+ +
+ {{community.title}} +
+
+ {{community.shortTitle}} +
+
+

{{community.description}}

-
-
+
+
+ {{" "}} + +
+
@@ -59,7 +73,7 @@
- {{publicationTotal|number}} + {{publicationTotal|number}}

publications
@@ -68,7 +82,7 @@
- {{researchDataTotal|number}} + {{researchDataTotal|number}}

research data
@@ -76,7 +90,7 @@
- {{softwareTotal|number}} + {{softwareTotal|number}}

software
@@ -85,7 +99,7 @@
- {{orpTotal|number}} + {{orpTotal|number}}

other products
@@ -95,7 +109,7 @@
- {{projectTotal|number}} + {{projectTotal|number}}

projects
@@ -104,33 +118,33 @@
- {{contentProviderTotal|number}} + {{contentProviderTotal|number}}

content providers
-
Subjects related to community
-
- +
Subjects
+
+ {{subject}} - - + {{" "}} - + {{subject}} - + {{" "}} - + view all @@ -147,128 +161,194 @@
-
-
-
-
-
-
- No community chosen -
-
+ +
+
+
+
- - -
-
-
-
- Other Graphs -
-
- - +
+
+ +
+ +
+ + + +
+
+ +
+
+
Created {{community.date | date:'dd-MM-yyyy'}}
+ + +
+
+
+ Cuartors Section +
Curated by: + {{manager.substr(0, manager.indexOf('@'))}}{{manager}}, + +
+
+
- -
-
- -
-
- - -
+
+
+
+
+ Related Organizations.... +
+
+ +
+
+ +
+
+
+
+
+ No community chosen +
+
+ +
+
+
- -
- -
- diff --git a/src/app/utils/subscribe/invite/invite.component.html b/src/app/utils/subscribe/invite/invite.component.html index f572b68..1296a68 100644 --- a/src/app/utils/subscribe/invite/invite.component.html +++ b/src/app/utils/subscribe/invite/invite.component.html @@ -193,6 +193,7 @@
separate with commas
+ {{" "}} diff --git a/src/app/utils/subscribe/subscribe.component.ts b/src/app/utils/subscribe/subscribe.component.ts index e612002..3151d67 100644 --- a/src/app/utils/subscribe/subscribe.component.ts +++ b/src/app/utils/subscribe/subscribe.component.ts @@ -23,12 +23,12 @@ declare var UIkit: any;

Please login first to subscribe

- Subscribe - Unsubscribe + + - Members: {{subscribers}} + Members {{subscribers}} diff --git a/src/assets/connect-custom.css b/src/assets/connect-custom.css index 3d66f47..07e9211 100644 --- a/src/assets/connect-custom.css +++ b/src/assets/connect-custom.css @@ -18,6 +18,10 @@ --connect-portal-lower-tone: #b48536; --develop-portal-lower-tone: #9f4e7e; + --community_main_color: #4C9CD5; + --community_secondary_color:#24857F; + --community_main_dark_color:#2276B9; + } @@ -103,3 +107,61 @@ height:100%; border:0; } + + +/* Community Page +community_main_color +community_secondary_color +community_main_dark_color + +*/ + +.communityPanelBackground /*, div:not(.connect_App).uk-section-primary*/{ + background-image: linear-gradient(to right, var(--community_main_color) , var(--community_secondary_color)); + color:white; +} +div:not(.connect_App) bottom .uk-totop{ + background-color: transparent !important; +} +/*div:not(.connectApp).uk-section-primary{ + background-image: linear-gradient(to right, var(--community_main_color) , var(--community_secondary_color)) !important; + color:white !important; + }*/ + +.communityPanelBackground .uk-h5, .communityPanelBackground .uk-link, .communityPanelBackground a:not(.uk-button){ + color:white; +} + +.communityPanelBackground .uk-card, .communityPanelBackground .uk-label{ + background-color:rgb(255,255,255,0.5); + border-color:rgb(255,255,255,0.5); +} + .communityPanelBackground .uk-link, .communityPanelBackground a:not(.uk-button){ + color:white; + text-decoration: underline; +} +.communityPanelBackground .uk-label{ + border-radius: 20px; + padding: 12px 22px; +} +.communityPanelBackground .lowOpacityColor{ + color:rgb(255,255,255,0.5); +} + +/*div:not(.connect_App) .uk-link, div:not(.connect_App) a { + + color:var(--community_main_dark_color); +} +div:not(.connect_App) .uk-link:hover, div:not(.connect_App) a:hover { + color:var(--community_main_color); +} + +div:not(.connect_App) .search-results > li:nth-child(2) { + + border-top-color:var(--community_main_color) !important; + +} +div:not(.connect_App) .portal-button { + + background-color: var(--community-main-color) !important; +}*/