From 92c3e736081c297e749ee9c37af1cca293cf7378 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@d315682c-612b-4755-9ff5-7f18f6832af3>
Date: Fri, 7 Aug 2020 14:38:47 +0000
Subject: [PATCH] [Connect | Trunk]: Align message with from and to

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@59238 d315682c-612b-4755-9ff5-7f18f6832af3
---
 .../subscribe/invite/invite.component.html    | 47 ++++++++-----------
 src/environments/environment.ts               |  2 +-
 2 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/src/app/utils/subscribe/invite/invite.component.html b/src/app/utils/subscribe/invite/invite.component.html
index 5c286e4..00a84f1 100644
--- a/src/app/utils/subscribe/invite/invite.component.html
+++ b/src/app/utils/subscribe/invite/invite.component.html
@@ -2,7 +2,8 @@
 
 <div *ngIf="longView == true" class="">
   <div class="uk-section uk-padding-remove-top tm-middle" id="tm-main">
-    <breadcrumbs addClass="uk-margin-large-left uk-margin-remove-bottom uk-margin-small-top" [breadcrumbs]="breadcrumbs"></breadcrumbs>
+    <breadcrumbs addClass="uk-margin-large-left uk-margin-remove-bottom uk-margin-small-top"
+                 [breadcrumbs]="breadcrumbs"></breadcrumbs>
 
     <div class="uk-container  uk-margin-bottom">
       <helper *ngIf="pageContents && pageContents['top'] && pageContents['top'].length > 0"
@@ -30,7 +31,7 @@
             </tr> -->
             <tr>
               <td for="from" class="uk-text-bold uk-width-1-4 uk-text-right">From <span
-                class="uk-text-danger uk-text-bold">*</span> :
+                  class="uk-text-danger uk-text-bold">*</span> :
               </td>
               <td class="uk-text-left uk-width-expand">
                 <input placeholder="Type your name" type="text" (click)="resetMessages()"
@@ -42,7 +43,7 @@
             </tr>
             <tr>
               <td for="recipients" class="uk-text-bold uk-text-right">To <span
-                class="uk-text-danger uk-text-bold">*</span> :
+                  class="uk-text-danger uk-text-bold">*</span> :
               </td>
               <td class="uk-text-left">
                 <input placeholder="email" type="text" (click)="resetMessages(); areValid=true"
@@ -63,25 +64,11 @@
             </tbody>
           </table>
           <div class="boundary-align uk-panel uk-placeholder">
-
             <table class="uk-table uk-align-center">
               <tbody>
-              <!-- <tr>
-                 <td class="uk-text-bold uk-width-1-4@xl uk-width-1-4@m uk-width-1-4@s uk-text-right"></td>
-                 <td class="uk-text-left">
-                      <{{body.salutation}}<br>-->
-              <!-- <span *ngIf="body.fromName == ''" class="uk-text-muted">
-                      <i>{{body.fromMessage}}...</i>
-              </span>
-              <span *ngIf="body.fromName !=''">
-                      {{body.fromMessage}}
-                      <b>{{body.fromName}}</b>
-              </span>
-         </td>
-      </tr> -->
               <tr>
-                <td for="email.body" class="uk-text-bold uk-text-right">Message:</td>
-                <td *ngIf="allowEdit()" class="uk-text-left">
+                <td for="email.body" class="uk-text-bold uk-width-1-4 uk-text-right">Message:</td>
+                <td *ngIf="allowEdit()" class="uk-width-expand uk-text-left">
                   <ckeditor (click)="resetMessages()"
                             class="form-control" [(ngModel)]="body.paragraphs" id="message"
                             debounce="400"
@@ -132,7 +119,7 @@
               <td class="uk-text-right"></td>
               <td>
                 <div
-                  class="uk-grid-margin uk-first-column uk-align-center uk-text-left uk-padding uk-padding-remove-top uk-padding-remove-bottom">
+                    class="uk-grid-margin uk-first-column uk-align-center uk-text-left uk-padding uk-padding-remove-top uk-padding-remove-bottom">
                   <button class="uk-button portal-button" (click)="invite()">Invite</button>
                 </div>
               </td>
@@ -155,11 +142,13 @@
   </div>
 </div>
 <div *ngIf="!longView" class="uk-margin-small-top">
-  <button [class]=" ((buttonSizeSmall)?'uk-button-small':'') + ' uk-button  portal-button uk-button-small uk-width-1-1'">
+  <button
+      [class]=" ((buttonSizeSmall)?'uk-button-small':'') + ' uk-button  portal-button uk-button-small uk-width-1-1'">
     <span class="uk-icon uk-flex uk-flex-middle">
       <svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24">
         <path d="M0 0h24v24H0z" fill="none"></path>
-        <path d="M8 10H5V7H3v3H0v2h3v3h2v-3h3v-2zm10 1c1.66 0 2.99-1.34 2.99-3S19.66 5 18 5c-.32 0-.63.05-.91.14.57.81.9 1.79.9 2.86s-.34 2.04-.9 2.86c.28.09.59.14.91.14zm-5 0c1.66 0 2.99-1.34 2.99-3S14.66 5 13 5c-1.66 0-3 1.34-3 3s1.34 3 3 3zm6.62 2.16c.83.73 1.38 1.66 1.38 2.84v2h3v-2c0-1.54-2.37-2.49-4.38-2.84zM13 13c-2 0-6 1-6 3v2h12v-2c0-2-4-3-6-3z"></path>
+        <path
+            d="M8 10H5V7H3v3H0v2h3v3h2v-3h3v-2zm10 1c1.66 0 2.99-1.34 2.99-3S19.66 5 18 5c-.32 0-.63.05-.91.14.57.81.9 1.79.9 2.86s-.34 2.04-.9 2.86c.28.09.59.14.91.14zm-5 0c1.66 0 2.99-1.34 2.99-3S14.66 5 13 5c-1.66 0-3 1.34-3 3s1.34 3 3 3zm6.62 2.16c.83.73 1.38 1.66 1.38 2.84v2h3v-2c0-1.54-2.37-2.49-4.38-2.84zM13 13c-2 0-6 1-6 3v2h12v-2c0-2-4-3-6-3z"></path>
       </svg>
       <span class="space">Invite users</span>
     </span>
@@ -188,15 +177,19 @@
            required>
     <div class="uk-width-medium uk-text-muted uk-text-small">separate with commas</div>
     <div class="uk-margin-small-top uk-text-center ">
-      <button class=" uk-button portal-button ignoreCommunityPanelBackground uk-button-small " (click)="invite()">Invite</button>
+      <button class=" uk-button portal-button ignoreCommunityPanelBackground uk-button-small " (click)="invite()">
+        Invite
+      </button>
       {{" "}}
-      <a class=" uk-button uk-button-default uk-button-small ignoreCommunityPanelBackground " [queryParams]="communityIdParam"
+      <a class=" uk-button uk-button-default uk-button-small ignoreCommunityPanelBackground "
+         [queryParams]="communityIdParam"
          routerLinkActive="router-link-active" routerLink="/invite">
                         <span class="uk-margin-xsmall-left uk-icon">
-                            <svg width="16" height="16" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="cog"
+                            <svg width="16" height="16" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"
+                                 icon="cog"
                                  ratio="0.8"><circle fill="none" stroke="#000" cx="9.997" cy="10" r="3.31"></circle><path
-                              fill="none" stroke="#000"
-                              d="M18.488,12.285 L16.205,16.237 C15.322,15.496 14.185,15.281 13.303,15.791 C12.428,16.289 12.047,17.373 12.246,18.5 L7.735,18.5 C7.938,17.374 7.553,16.299 6.684,15.791 C5.801,15.27 4.655,15.492 3.773,16.237 L1.5,12.285 C2.573,11.871 3.317,10.999 3.317,9.991 C3.305,8.98 2.573,8.121 1.5,7.716 L3.765,3.784 C4.645,4.516 5.794,4.738 6.687,4.232 C7.555,3.722 7.939,2.637 7.735,1.5 L12.263,1.5 C12.072,2.637 12.441,3.71 13.314,4.22 C14.206,4.73 15.343,4.516 16.225,3.794 L18.487,7.714 C17.404,8.117 16.661,8.988 16.67,10.009 C16.672,11.018 17.415,11.88 18.488,12.285 L18.488,12.285 Z"></path></svg>
+                                fill="none" stroke="#000"
+                                d="M18.488,12.285 L16.205,16.237 C15.322,15.496 14.185,15.281 13.303,15.791 C12.428,16.289 12.047,17.373 12.246,18.5 L7.735,18.5 C7.938,17.374 7.553,16.299 6.684,15.791 C5.801,15.27 4.655,15.492 3.773,16.237 L1.5,12.285 C2.573,11.871 3.317,10.999 3.317,9.991 C3.305,8.98 2.573,8.121 1.5,7.716 L3.765,3.784 C4.645,4.516 5.794,4.738 6.687,4.232 C7.555,3.722 7.939,2.637 7.735,1.5 L12.263,1.5 C12.072,2.637 12.441,3.71 13.314,4.22 C14.206,4.73 15.343,4.516 16.225,3.794 L18.487,7.714 C17.404,8.117 16.661,8.988 16.67,10.009 C16.672,11.018 17.415,11.88 18.488,12.285 L18.488,12.285 Z"></path></svg>
 
                           </span>
         Customize
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 53e38b9..205438e 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -52,7 +52,7 @@ export let properties: EnvProperties = {
   piwikBaseUrl: 'https://analytics.openaire.eu/piwik.php?idsite=',
   piwikSiteId: '80',
   loginUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/openid_connect_login',
-  userInfoUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=',
+  userInfoUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUser',
   registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/',
   logoutUrl: 'https://openaire-dev.aai-dev.grnet.gr/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=',
   cookieDomain: '.di.uoa.gr',