From 4b5eaa40cfb55aa39a06861c077c2d66a685d2ce Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@d315682c-612b-4755-9ff5-7f18f6832af3>
Date: Fri, 2 Aug 2019 08:20:54 +0000
Subject: [PATCH] [Connect]: Community page: Add select of material. Align View
 More and View All on center. Communities Page: Remove height match from card
 body and make browse all and view all text-small.

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@56833 d315682c-612b-4755-9ff5-7f18f6832af3
---
 .../browse-community.component.html           |  4 +-
 .../communities/communities.component.html    |  6 +-
 src/app/community/community.component.html    | 84 +++++++++++--------
 src/app/community/community.module.ts         |  3 +-
 src/assets/env-properties.json                |  2 +-
 5 files changed, 55 insertions(+), 44 deletions(-)

diff --git a/src/app/communities/browseCommunity/browse-community.component.html b/src/app/communities/browseCommunity/browse-community.component.html
index 777036f..d264e26 100644
--- a/src/app/communities/browseCommunity/browse-community.component.html
+++ b/src/app/communities/browseCommunity/browse-community.component.html
@@ -41,7 +41,7 @@
       </div>
     </a>
   </div>
-  <div class="uk-card-body uk-padding-remove-horizontal uk-padding-remove-top uk-margin-small-top community">
+  <div class="uk-card-body uk-padding-small uk-padding-remove-horizontal uk-padding-remove-top uk-margin-small-top uk-margin-bottom">
     <div class="uk-text-center uk-text-bold " [ngClass]="(showDescription)?'uk-margin-bottom':''">
       <a *ngIf="directLink" [href]="getCommunityPageUrl()" target="_blank">
         <span *ngIf="community.title">
@@ -71,7 +71,7 @@
     </div>
   </div>
   <div>
-    <div class="uk-text-right">
+    <div class="uk-position-small uk-position-bottom-right">
       <a *ngIf="directLink" [href]="getCommunityPageUrl()" target="_blank" class="portal-link uk-text-uppercase uk-text-bold">
         Visit
       </a>
diff --git a/src/app/communities/communities.component.html b/src/app/communities/communities.component.html
index 943ad9d..c90d9c6 100644
--- a/src/app/communities/communities.component.html
+++ b/src/app/communities/communities.component.html
@@ -27,7 +27,7 @@
                   </div>
                 </div>
                 <div *ngIf="managerOfCommunities.length > 3" class="uk-text-right uk-width-1-1 uk-margin-top">
-                  <a [queryParams]="{role: quote('manager')}" class="portal-link uk-text-uppercase uk-text-bold"
+                  <a [queryParams]="{role: quote('manager')}" class="portal-link uk-text-uppercase uk-text-bold uk-text-small"
                      routerLinkActive="router-link-active" routerLink="/search/find/communities">
                     <div>View all ({{managerOfCommunities.length | number}}) ></div>
                   </a>
@@ -55,7 +55,7 @@
                   </div>
                 </div>
                 <div *ngIf="subscriberOfCommunities.length > 3" class="uk-text-right uk-width-1-1 uk-margin-top">
-                  <a [queryParams]="{status: quote('subscribed')}" class="portal-link uk-text-uppercase uk-text-bold"
+                  <a [queryParams]="{status: quote('subscribed')}" class="portal-link uk-text-uppercase uk-text-bold uk-text-small"
                      routerLinkActive="router-link-active" routerLink="/search/find/communities">
                     <div>View all ({{subscriberOfCommunities.length | number}}) ></div>
                   </a>
@@ -275,7 +275,7 @@
 
   </div>
   <div class="uk-text-right uk-margin-top">
-    <a *ngIf="researchCommunities.length > 5" class="portal-link uk-text-uppercase uk-text-bold"
+    <a *ngIf="researchCommunities.length > 5" class="portal-link uk-text-uppercase uk-text-bold uk-text-small"
        routerLinkActive="router-link-active" routerLink="/search/find/communities">
       Browse All >
     </a>
diff --git a/src/app/community/community.component.html b/src/app/community/community.component.html
index 6843583..572d324 100644
--- a/src/app/community/community.component.html
+++ b/src/app/community/community.component.html
@@ -16,18 +16,19 @@
           </div>
           <div *ngIf="community.description != null" class="uk-margin ">
             <div *ngIf="!showAllDescription" class="">
-              {{community.description.substring(0,300)}}{{community.description.length>300?'...':''}}</div>
-            <div *ngIf="showAllDescription"  class=""> {{community.description}}</div>
-            <span *ngIf="!showAllDescription && community.description.length > 300 " class="uk-animation-fade">
-                    <a (click)="showAllDescription = !showAllDescription;">
-                      view all
-                    </a>
-                </span>
-            <span *ngIf="showAllDescription">
-                    <a (click)="showAllDescription = !showAllDescription;">
-                      view less
-                    </a>
-                </span>
+              {{community.description.substring(0, 300)}}{{community.description.length > 300 ? '...' : ''}}</div>
+            <div *ngIf="showAllDescription" class=""> {{community.description}}</div>
+            <div *ngIf="!showAllDescription && community.description.length > 300 "
+                 class="uk-animation-fade uk-text-center uk-text-bold">
+              <a (click)="showAllDescription = !showAllDescription;">View More
+              </a>
+            </div>
+            <div *ngIf="showAllDescription"
+                 class="uk-text-center uk-text-bold">
+              <a (click)="showAllDescription = !showAllDescription;">
+                View Less
+              </a>
+            </div>
           </div>
         </div>
         <div class="uk-width-3-5@m uk-width-1-1@s">
@@ -152,16 +153,18 @@
                     </span>
                 </span>
               <br>
-              <span *ngIf="!showAllSubjects && community.subjects.length > 4 ">
+              <div *ngIf="!showAllSubjects && community.subjects.length > 4 "
+                    class="uk-animation-fade uk-text-center uk-text-bold">
                     <a (click)="showAllSubjects = !showAllSubjects;">
-                      view all
+                      View All
                     </a>
-                </span>
-              <span *ngIf="showAllSubjects">
+              </div>
+              <div *ngIf="showAllSubjects"
+                    class="uk-text-center uk-text-bold">
                     <a (click)="showAllSubjects = !showAllSubjects;">
-                      view less
+                      View Less
                     </a>
-                </span>
+              </div>
             </div>
           </div>
         </div>
@@ -191,12 +194,12 @@
             !statisticsDisplay.entities[entity].numbers.map['total'][showIn] && !statisticsDisplay.entities[entity].numbers.map['project'][showIn] &&
              !statisticsDisplay.entities[entity].numbers.map['open'][showIn] && !statisticsDisplay.entities[entity].numbers.map['closed'][showIn] &&
             !statisticsDisplay.entities[entity].numbers.map['embargo'][showIn] && !statisticsDisplay.entities[entity].numbers.map['restricted'][showIn]"
-            class="uk-alert uk-alert-primary">
+                 class="uk-alert uk-alert-primary">
               No graphs available
             </div>
             <div *ngIf="statisticsSum && statisticsDisplay &&
                         statisticsSum[entity].total>0"
-                 class="uk-grid uk-child-width-1-3@l uk-child-width-1-2@m uk-child-width-1-2@s" >
+                 class="uk-grid uk-child-width-1-3@l uk-child-width-1-2@m uk-child-width-1-2@s">
               <div *ngIf="statisticsDisplay.entities[entity].numbers.map['total'][showIn]" class="uk-padding-remove">
                 <div class="uk-card portal-card uk-text-right  uk-margin-left  uk-margin-bottom uk-padding-small">
                   <div
@@ -311,27 +314,34 @@
 
           </ng-template>
           <div class="uk-text-center">
-           <!-- <button [class]="'uk-button  '+((show == 'overview')?'uk-disabled ':' uk-button-default  ')"
-                    (click)="show='overview'">Overview
-            </button>
-            {{" "}}
-            <button [class]="'uk-button '+((show != 'overview')?'uk-disabled ':' uk-button-default ')"
-                    (click)="show='analysis';">Graph Analysis
-            </button>-->
-            <select [(ngModel)]="show" class="uk-select uk-text-bold uk-width-small">
-              <option value="overview"  >Overview</option>
-              <option value="analysis"  >Graph Analysis</option>
-            </select>
-<!--            <select   [(ngModel)]="sortBy"      class="uk-select  uk-margin-small-bottom uk-width-1-2 uk-padding-remove"  name="select_order"   >-->
-<!--              <option  value="num"  >Sort by results number</option>-->
-<!--              <option  value="name"  >Sort by name</option>-->
-<!--            </select>-->
+            <!-- <button [class]="'uk-button  '+((show == 'overview')?'uk-disabled ':' uk-button-default  ')"
+                     (click)="show='overview'">Overview
+             </button>
+             {{" "}}
+             <button [class]="'uk-button '+((show != 'overview')?'uk-disabled ':' uk-button-default ')"
+                     (click)="show='analysis';">Graph Analysis
+             </button>-->
+            <mat-form-field>
+              <mat-label>Select View</mat-label>
+              <mat-select [(value)]="show">
+                <mat-option value="overview">Overview</mat-option>
+                <mat-option value="analysis">Graph Analysis</mat-option>
+              </mat-select>
+            </mat-form-field>
+            <!--<select [(ngModel)]="show" class="uk-select uk-text-bold uk-width-small">
+              <option value="overview">Overview</option>
+              <option value="analysis">Graph Analysis</option>
+            </select>-->
+            <!--            <select   [(ngModel)]="sortBy"      class="uk-select  uk-margin-small-bottom uk-width-1-2 uk-padding-remove"  name="select_order"   >-->
+            <!--              <option  value="num"  >Sort by results number</option>-->
+            <!--              <option  value="name"  >Sort by name</option>-->
+            <!--            </select>-->
           </div>
 
           <div class="uk-margin-top  customTabs">
 
 
-            <ul class="   uk-margin-remove uk-flex-center"
+            <ul class="uk-margin-remove uk-flex-center"
                 data-uk-tab="{connect: '#resultTabs'">
               <li *ngIf="isEntityEnabled('publication')" (click)="searchPublications()" class="uk-active"><a
                 href="#">publications</a></li>
@@ -383,7 +393,7 @@
                                 [properties]="properties"
                                 class=""></results-comp>
                 </div>
-                <div *ngIf="show!='overview' && activeTab == 'dataset'" >
+                <div *ngIf="show!='overview' && activeTab == 'dataset'">
                   <ng-container *ngTemplateOutlet="stats; context: { entity: 'dataset', entityName:
                             'research data' , statisticsSum:statistics.statisticsSum, statisticsDisplay:statistics.statisticsDisplay,
                             allowedEntities: statistics.allowedEntitiesMode['showInMonitor'],
diff --git a/src/app/community/community.module.ts b/src/app/community/community.module.ts
index 8b62c64..530fb40 100644
--- a/src/app/community/community.module.ts
+++ b/src/app/community/community.module.ts
@@ -24,13 +24,14 @@ import {SearchResearchResultsServiceModule} from "../openaireLibrary/services/se
 import {SearchResultsModule} from "../openaireLibrary/searchPages/searchUtils/searchResults.module";
 import {CuratorsModule} from "../curators/curators.module";
 import {AffiliationsModule} from "../affiliations/affiliations.module";
+import {MatSelectModule} from "@angular/material";
 
 @NgModule({
   imports: [
     CommonModule, FormsModule, RouterModule,
     SubscribeModule, StatisticsModule, ManageModule, InviteModule,
     SearchZenodoCommunitiesServiceModule, ZenodoCommunitiesServiceModule, SearchFormModule, SearchDataprovidersServiceModule, SearchProjectsServiceModule,
-    SearchResearchResultsServiceModule, SearchResultsModule, CuratorsModule, AffiliationsModule
+    SearchResearchResultsServiceModule, SearchResultsModule, CuratorsModule, AffiliationsModule, MatSelectModule
 
   ],
   declarations: [
diff --git a/src/assets/env-properties.json b/src/assets/env-properties.json
index ebfbea2..faea4e0 100644
--- a/src/assets/env-properties.json
+++ b/src/assets/env-properties.json
@@ -47,7 +47,7 @@
 
   "cacheUrl" :"http://scoobydoo.di.uoa.gr:3000/get?url=",
 
-  "adminToolsAPIURL" :"http://duffy.di.uoa.gr:8080/uoa-admin-tools",
+  "adminToolsAPIURL" :"http://mpagasas.di.uoa.gr:8080/uoa-admin-tools",
 
   "adminToolsCommunity" :"connect",
   "datasourcesAPI": "https://beta.services.openaire.eu/openaire/ds/search/",