Project

General

Profile

« Previous | Next » 

Revision 48849

Minor Changes, fixes for user menu | comment linking box in publication landing | set Logout url

View differences:

userMini.component.ts
13 13
<ul *ngIf="!mobileView"  class="uk-navbar-nav">
14 14
   <li class="uk-parent">
15 15

  
16
  <a   class="" aria-expanded="false">
17
    <span  *ngIf="loggedIn" >
18
      <span>{{user.fullname}}</span>
19
    </span>
20
    <span  *ngIf="!loggedIn">
21
        <a  class="loginLink" [href]="loginUrl"  >Sign in | Register</a>
22
   </span>
23
   <span class="uk-margin-small-right uk-icon" ><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="9.9" cy="6.4" r="4.4"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M1.5,19 C2.3,14.5 5.8,11.2 10,11.2 C14.2,11.2 17.7,14.6 18.5,19.2"></path></svg></span>
24
  </a>
16
  <a   *ngIf="loggedIn" >
17
       <span>{{user.fullname+" "}} <span class="uk-margin-small-right uk-icon" ><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="9.9" cy="6.4" r="4.4"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M1.5,19 C2.3,14.5 5.8,11.2 10,11.2 C14.2,11.2 17.7,14.6 18.5,19.2"></path></svg></span></span>
18
     </a>
19
         <a  *ngIf="!loggedIn" class="loginLink" [href]="loginUrl"  >Sign in | Register <span class="uk-margin-small-right uk-icon" ><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="9.9" cy="6.4" r="4.4"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M1.5,19 C2.3,14.5 5.8,11.2 10,11.2 C14.2,11.2 17.7,14.6 18.5,19.2"></path></svg> </span>
20
       </a>
21

  
22

  
25 23
  <div *ngIf="loggedIn" class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left"   id="userMenu" (click)="onClick('userMenu')"  >
26 24
     <div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid="">
27 25
        <div class="uk-first-column">
......
39 37
<li *ngIf="mobileView" class="uk-nav-header uk-parent " >
40 38

  
41 39
    <span  *ngIf="loggedIn" >
42
      <span>{{user.fullname}}</span>
40
      <span>{{user.fullname+" "}}<span class="uk-margin-small-right uk-icon" ><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="9.9" cy="6.4" r="4.4"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M1.5,19 C2.3,14.5 5.8,11.2 10,11.2 C14.2,11.2 17.7,14.6 18.5,19.2"></path></svg></span></span>
43 41
    </span>
44 42
    <span  *ngIf="!loggedIn">
45
        <a  class="loginLink" [href]="loginUrl"  >Sign in | Register</a>
43
        <a  class="loginLink" [href]="loginUrl"  >Sign in | Register <span class="uk-margin-small-right uk-icon" ><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="9.9" cy="6.4" r="4.4"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M1.5,19 C2.3,14.5 5.8,11.2 10,11.2 C14.2,11.2 17.7,14.6 18.5,19.2"></path></svg></span>
44
        </a>
46 45
   </span>
47
   <span class="uk-margin-small-right uk-icon" ><svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" ratio="1"><circle fill="none" stroke="#000" stroke-width="1.1" cx="9.9" cy="6.4" r="4.4"></circle><path fill="none" stroke="#000" stroke-width="1.1" d="M1.5,19 C2.3,14.5 5.8,11.2 10,11.2 C14.2,11.2 17.7,14.6 18.5,19.2"></path></svg></span>
48 46

  
49 47
  <ul *ngIf="loggedIn" class="uk-nav-sub">
50 48
  <li><a href="" >My profile</a></li>
......
118 116
    logOut(){
119 117
      if(Session.isLoggedIn()){
120 118
        Session.removeUser();
119
        window.location.href = OpenaireProperties.getLogoutURL()+ location.href;
120

  
121 121
      }
122 122
      this.loggedIn = false;
123 123
       this.isAuthorized = false;

Also available in: Unified diff