Project

General

Profile

« Previous | Next » 

Revision 56966

[mergeResultLandingPages | Library]: Merging Trunk into branch 56883:56965

View differences:

modules/uoa-services-library/branches/mergeResultLandingPages/ng-openaire-library/src/app/searchPages/searchUtils/searchPage.component.html
105 105
                    </div>
106 106

  
107 107
                  </div>
108
                  <div *ngIf="filters.length === 0 && searchUtils.keyword.length === 0" class="uk-margin-top">
108
                  <div *ngIf="filters.length === 0 && searchUtils.keyword.length === 0 && results.length > 0" class="uk-margin-top">
109 109
                    <span class="uk-text-meta">No filters available</span>
110 110
                  </div>
111 111
                  <div class="uk-text-large">Filter By:</div>
......
168 168
                  <a  *ngIf= "showUnknownFilters" class = "  portal-link" (click) = "clearFilters() " >Try new Query</a>
169 169
                </div>
170 170
               </div>
171
               <div *ngIf="filters.length === 0 && searchUtils.keyword.length === 0" class="uk-margin-top">
171
               <div *ngIf="filters.length === 0 && searchUtils.keyword.length === 0 && results.length > 0" class="uk-margin-top">
172 172
                 <span class="uk-text-meta">No filters available</span>
173 173
               </div>
174 174
               <search-filter  *ngFor="let filter of filters " [filterValuesNum]="filterValuesNum" [showMoreInline]="showMoreFilterValuesInline" [isDisabled]="disableForms" [filter]="filter"  [showResultCount]=showResultCount (onFilterChange)="filterChanged($event)"  ></search-filter>
modules/uoa-services-library/branches/mergeResultLandingPages/ng-openaire-library/src/app/searchPages/searchUtils/searchFilter.component.html
5 5
    </h5>
6 6
    <div  aria-expanded="false">
7 7
      <div [class]="showMoreInline ? '' : 'searchFilterBoxValues' ">
8
        <div *ngFor = "let value of getSelectedValues(filter,'num')"  class = "uk-animation-fade filterItem">
8
        <div *ngFor = "let value of getSelectedValues(filter,'num')"  class="uk-animation-fade filterItem">
9 9
              <div title = "{{value.name}}">
10 10
                <input *ngIf="!filter.valueIsUnique" [(ngModel)]="value.selected" type="checkbox" (ngModelChange)="filterChange(value.selected)" />
11 11
                <input *ngIf="filter.valueIsUnique" type="radio" (click)="uniqueFilterChange(value)"
modules/uoa-services-library/branches/mergeResultLandingPages/ng-openaire-library/src/app/landingPages/landing-utils/parsingFunctions.class.ts
499 499
  }
500 500

  
501 501
  parseContexts(_contexts: any): {"labelContext": string, "labelCategory": string,
502
                                  "labelConcept": string, inline:boolean}[] {
502
    "labelConcept": string, inline:boolean}[] {
503 503
    let contexts = new Array<{"labelContext": string, "labelCategory": string,
504
                              "labelConcept": string, inline:boolean}>();
504
      "labelConcept": string, inline:boolean}>();
505 505

  
506 506
    let position = 0;
507 507
    let labels = "";
......
512 512

  
513 513
      if(context.hasOwnProperty("type") && (context['type'] == "community" || context['type'] == "ri")) {
514 514
        if(context.hasOwnProperty("category")) {
515
          if(context['category'].hasOwnProperty("concept")) {
516
            let categoryConcept;
517
            let length1 = Array.isArray(context['category']['concept']) ? context['category']['concept'].length : 1;
518
            for(let j=0; j<length1; j++) {
519
              categoryConcept = Array.isArray(context['category']['concept']) ? context['category']['concept'][j] : context['category']['concept'];
515
          let category;
516
          let length2 = Array.isArray(context['category']) ? context['category'].length : 1;
517
          for (let z = 0; z < length2; z++) {
518
            category = Array.isArray(context['category']) ? context['category'][z] : context['category'];
519
            if (category.hasOwnProperty("concept")) {
520
              let categoryConcept;
521
              let length1 = Array.isArray(category['concept']) ? category['concept'].length : 1;
522
              for (let j = 0; j < length1; j++) {
523
                categoryConcept = Array.isArray(category['concept']) ? category['concept'][j] : category['concept'];
520 524

  
521
              contexts[position] = {"labelContext": "", "labelCategory": "", "labelConcept": "", inline: false };
525
                contexts[position] = {"labelContext": "", "labelCategory": "", "labelConcept": "", inline: false};
526
                contexts[position]['labelContext'] = context.label;
527
                contexts[position]['labelCategory'] = category.label;
528
                contexts[position]['labelConcept'] = categoryConcept.label;
529

  
530
                position++;
531
              }
532
            } else {
533
              contexts[position] = {"labelContext": "", "labelCategory": "", "labelConcept": "", inline: false};
522 534
              contexts[position]['labelContext'] = context.label;
523
              contexts[position]['labelCategory'] = context['category'].label;
524
              contexts[position]['labelConcept'] = categoryConcept.label;
525

  
535
              contexts[position]['labelCategory'] = category.label;
536
              contexts[position]['labelConcept'] = null;
526 537
              position++;
527 538
            }
528
          } else {
529
            contexts[position] = {"labelContext": "", "labelCategory": "", "labelConcept": "", inline: false};
530
            contexts[position]['labelContext'] = context.label;
531
            contexts[position]['labelCategory'] = context['category'].label;
532
            contexts[position]['labelConcept'] = null;
533
            position++;
534 539
          }
535
        } else {
536
          contexts[position] = {"labelContext": "", "labelCategory": "", "labelConcept": "", inline: false};
537
          contexts[position]['labelContext'] = context.label;
538
          contexts[position]['labelCategory'] = null;
539
          contexts[position]['labelConcept'] = null;
540
          contexts[position]['new'] = false;
541
          position++;
542 540
        }
541
      } else {
542
        contexts[position] = {"labelContext": "", "labelCategory": "", "labelConcept": "", inline: false};
543
        contexts[position]['labelContext'] = context.label;
544
        contexts[position]['labelCategory'] = null;
545
        contexts[position]['labelConcept'] = null;
546
        contexts[position]['new'] = false;
547
        position++;
543 548
      }
544 549
    }
545 550
    return contexts;
modules/uoa-services-library/branches/mergeResultLandingPages/ng-openaire-library/src/app/utils/authors/showAuthors.component.ts
20 20
            <b class="uk-margin-top">{{author.fullName}}</b>
21 21

  
22 22
            <div>
23
              <div class="uk-text-muted">ORCID</div>
23
              <div class="uk-text-muted uk-margin-small-bottom uk-margin-small-top">ORCID</div>
24 24
              <span><code class="uk-padding-small" [id]="'orcid_clipboard_auhtor_'+i">{{author.orcid}}</code></span>{{" "}}
25 25
              <span>
26 26
                <button [class]="'uk-icon-clipboard uk-button uk-button-primary uk-button-small orcid_clipboard_btn_auhtor_'+i"
modules/uoa-services-library/branches/mergeResultLandingPages/ng-openaire-library/src/app/utils/properties/env-properties.ts
89 89
  //base url for OpenAIRE portal
90 90
  baseOpenaireLink;
91 91

  
92
  // after login redirect Link
93
  afterLoginRedirectLink;
94

  
92 95
  //landing Pages
93 96

  
94 97
  searchLinkToPublication;
modules/uoa-services-library/branches/mergeResultLandingPages/ng-openaire-library/src/app/utils/properties/environment-specific.service.ts
22 22
  public envSpecificNull: EnvProperties = null;
23 23
  testBrowser: boolean;
24 24
  private envSpecificSubject: BehaviorSubject<EnvProperties> = new BehaviorSubject<EnvProperties>(null);
25
  private propertiesUrl = "/assets/env-properties.json";
25
  private propertiesUrl = "/assets/env-properties.json?v=1";
26 26

  
27 27
  constructor(private http: HttpClient,  @Inject(PLATFORM_ID) private platformId: string, /*private injector: Injector,*/
28 28
              @Optional() @Inject(REQUEST) private request: Request) {
modules/uoa-services-library/branches/mergeResultLandingPages/ng-openaire-library/src/app/login/userMini.component.ts
81 81
    @Input() logInUrl;
82 82
    @Input() logOutUrl;
83 83
    @Input() cookieDomain;
84
    public redirectUrl: string = "";
84
    @Input() redirectUrl: string;
85 85
    sub:any;
86 86

  
87 87
    constructor( private router: Router, private  route: ActivatedRoute, private location: Location) {}
......
99 99

  
100 100
    }
101 101
    ngOnDestroy(){
102
      this.sub.unsubscribe();
102
      if(this.sub) {
103
        this.sub.unsubscribe();
104
      }
103 105
    }
104 106

  
105 107
    initialize(){
106
      this.redirectUrl = this.location.path();
108
      if(!this.redirectUrl && location) {
109
        this.redirectUrl = location.pathname;
110
      }
107 111
      if(Session.isLoggedIn()){
108 112
          this.loggedIn = true;
109 113
          this.user = Session.getUser();
......
133 137
    }
134 138

  
135 139
    logIn(){
136
      Session.setReloadUrl(location.protocol +"//"+location.host, location.pathname, location.search);
137
      window.location.href = this.logInUrl
140
      Session.setReloadUrl(location.protocol +"//"+location.host, this.redirectUrl, location.search);
141
      window.location.href = this.logInUrl;
138 142
    }
139 143

  
140 144
    onClick(id: string) {
modules/uoa-services-library/branches/mergeResultLandingPages/ng-openaire-library/src/app/claims/claim-utils/claimResultSearchForm.component.ts
12 12
import {DOI, StringUtils} from '../../utils/string-utils.class';
13 13
import {EnvProperties} from '../../utils/properties/env-properties';
14 14
import {Filter, Value} from "../../searchPages/searchUtils/searchHelperClasses.class";
15

  
15
import {Observable, forkJoin} from "rxjs";
16
import 'rxjs/add/observable/forkJoin'
16 17
@Component({
17 18
  selector: 'claim-result-search-form',
18 19
  templateUrl: 'claimResultSearchForm.component.html',
......
652 653
  private getDataciteResults(term: string, size: number, page: number) {
653 654
    this.dataciteStatus = this.errorCodes.LOADING;
654 655
    if (this.DOIs.length > 0) {
655
      this._searchDataciteService.getDataciteResultByDOI(term, this.properties, true).subscribe(
656
      let doiObservables: Array<Observable<any>> = new Array();
657
      for(let doi of this.DOIs){
658
        let ob = this._searchDataciteService.getDataciteResultByDOI(doi, this.properties, true);
659
        doiObservables.push(ob);
660

  
661
      }
662
      Observable.forkJoin(doiObservables).subscribe(
656 663
        data => {
657
          this.dataciteResults = data[1];
664
          //if DOI not found or an error occured the result will be null -- remove null values
665
          for(let result of data){
666
            if(result){
667
              this.dataciteResults.push(result)
668
            }
669
          }
658 670
          this.datacitePage = page;
659
          this.dataciteResultsNum = data[0];
671
          this.dataciteResultsNum = this.dataciteResults.length;
660 672
          this.dataciteStatus = this.errorCodes.DONE;
661 673
          if (this.dataciteResultsNum == 0) {
662 674
            this._searchDataciteService.searchDataciteResults(term, size, page, this.properties, true).subscribe(
......
678 690
                ClaimResultSearchFormComponent.handleError("Error getting datacite results for term: " + term, err);
679 691
              });
680 692
          }
693
        }
681 694

  
682
        },
683
        err => {
684
          if (err.status == "404") {
685
            this._searchDataciteService.searchDataciteResults(term, size, page, this.properties, true).subscribe(
686
              data => {
687
                this.dataciteResults = data[1];
688
                this.datacitePage = page;
689
                this.dataciteResultsNum = data[0];
690
                this.dataciteStatus = this.errorCodes.DONE;
691
                if (this.dataciteResultsNum == 0) {
692
                  this.dataciteStatus = this.errorCodes.NONE;
693
                }
694

  
695
              },
696
              err => {
697

  
698
                this.dataciteStatus = this.errorCodes.ERROR;
699

  
700
                console.log(err);
701
                ClaimResultSearchFormComponent.handleError("Error getting datacite results for term: " + term, err);
702
              });
703
          } else {
704
            this.dataciteStatus = this.errorCodes.ERROR;
705
            //console.log(err);
706
            ClaimResultSearchFormComponent.handleError("Error getting datacite results for term: " + term, err);
707
          }
708

  
709

  
710
         });
695
        );
711 696
    } else {
712 697

  
713 698

  
modules/uoa-services-library/branches/mergeResultLandingPages/ng-openaire-library/src/app/claims/claim-utils/service/searchDatacite.service.ts
1
import {throwError as observableThrowError} from 'rxjs';
1
import {Observable, throwError as observableThrowError} from 'rxjs';
2 2
import {Injectable} from '@angular/core';
3 3
import {Response} from '@angular/http';
4 4
import {HttpClient} from '@angular/common/http';
5 5
import {EnvProperties} from '../../../utils/properties/env-properties';
6 6
import {ClaimEntity, ClaimResult} from '../claimHelper.class';
7 7
import {map} from "rxjs/operators";
8

  
8
import 'rxjs/add/operator/catch';
9
import 'rxjs/add/observable/of';
9 10
@Injectable()
10 11
export class SearchDataciteService {
11 12
  constructor(private http: HttpClient ) {}
......
25 26
    let key = url;
26 27

  
27 28
    return this.http.get((properties.useCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url)
28
      .pipe(map(request =>  [1, (parse ? SearchDataciteService.parse(request["data"]) : request)]));
29
      .pipe(map(request =>  (parse ? SearchDataciteService.parse([request["data"]])[0] : request))).catch(e => Observable.of(null));
29 30
  }
30 31

  
31 32

  
modules/uoa-services-library/branches/mergeResultLandingPages/ng-openaire-library/src/app/claims/directLinking/directLinking.component.html
1 1
<linking-generic *ngIf="validInput" [localStoragePrefix]="localStoragePrefix" [results]="results" [sources]="sources"
2 2
                 [communityId]="communityId" [inlineEntity]="inlineEntity"  [showOptions]="showOptions"
3
                 [piwikSiteId]="piwikSiteId" title="Direct Linking">
3
                 [piwikSiteId]="piwikSiteId" pageTitle="Direct Linking">
4 4
</linking-generic>
5 5

  
6
<div *ngIf="!validInput" id="tm-main" class=" uk-section  uk-margin-small-top tm-middle">
6
<div *ngIf="validInput== false" id="tm-main" class=" uk-section  uk-margin-small-top uk-padding-remove-top tm-middle">
7 7
  <div class="uk-grid">
8 8
    <div class="tm-main uk-width-1-1@s uk-width-1-1@m  uk-width-1-1@l uk-row-first ">
9 9
      <div class="uk-container uk-margin-top">
10 10
        <div class="uk-article-title custom-article-title">
11
          Link
11
          Link to
12 12
        </div>
13 13
        <div class="uk-width-1-1">
14 14
        </div>
modules/uoa-services-library/branches/mergeResultLandingPages/ng-openaire-library/src/app/claims/linking/bulkClaim/bulkClaim.component.ts
130 130
    this.enableUpload = false;
131 131
    this.showReport = false;
132 132
    this.errorMessage = "";
133
    console.log(this.filesToUpload);
133 134
    if (this.filesToUpload.length == 0) {
134 135
      this.errorMessage = "There is no selected file to upload.";
135 136
      return;
136 137
    } else {
137
      if (this.filesToUpload[0].name.indexOf(".csv") == -1 || this.filesToUpload[0].type != "text/csv") {
138
      if (this.filesToUpload[0].name.indexOf(".csv") == -1 ||
139
        (this.filesToUpload[0].type != "text/csv" && this.filesToUpload[0].type != "application/vnd.ms-excel")) {
138 140
        this.errorMessage = "No valid file type. The required type is CSV";
139 141
        return;
140 142
      }
......
271 273

  
272 274
  searchInDatacite(id: string, accessMode: string, date: string, row: number) {
273 275
    this._searchDataciteService.getDataciteResultByDOI(id, this.properties, true).subscribe(
274
      items => {
276
      result => {
275 277

  
276
        if (items[1].length > 0) {
277
          var result = items[1][0];
278

  
278
        if (result) {
279 279
          this.foundIds.push(id);
280 280
          result.result.accessRights = accessMode;
281 281
          result.result.embargoEndDate = date;
modules/uoa-services-library/branches/mergeResultLandingPages/ng-openaire-library/src/app/claims/linking/selected/selectedResults.component.ts
8 8
})
9 9
export class ClaimSelectedResultsComponent {
10 10
  @Input() results: ClaimEntity[];
11
  @Input() title: string = "Research Results";
11
  @Input() sectionTitle: string = "Research Results";
12 12
  @Input() localStoragePrefix: string = "";
13 13
  @Input() enableRemove:boolean = true;
14 14

  
modules/uoa-services-library/branches/mergeResultLandingPages/ng-openaire-library/src/app/claims/linking/selected/metadataPreview.component.html
1
<div class="uk-section uk-padding-remove-top uk-padding-remove-bottom communityToolBarSection">
2
  <div class="linkingToolbar uk-padding-small uk-margin-small-top">
1
<div class="uk-section uk-padding-remove-top uk-padding-remove-bottom ">
2
  <div
3
    [class]="((defaultColors)?'linkingToolbar':'communityPanelBackground')+' uk-padding-small uk-margin-small-top'">
3 4
    <div class="uk-container  uk-container-large uk-margin-small-top uk-padding-small">
4 5
      <div class="uk-grid">
5
        <div class="uk-padding-remove-left uk-margin-auto-vertical back">
6
        <div class="uk-padding-remove-left uk-margin-auto-vertical back uk-link">
6 7
          <span
7 8
            (click)="showOptions.showLinkTo()"
8 9
            style="cursor:pointer">
......
21 22
        </div>
22 23
        <claim-insert [results]="results" [sources]="sources" [inlineEntity]="inlineEntity"
23 24
                      [properties]=properties [localStoragePrefix]=localStoragePrefix
24
                      class=" " [errors]="errors" (insertFinished)="runValidation(false); updateLocalStorage();">
25
                      class=" " [errors]="errors" (insertFinished)="runValidation(false); updateLocalStorage();"
26
                      [defaultColors]="defaultColors">
25 27
        </claim-insert>
26 28
      </div>
27 29
    </div>
modules/uoa-services-library/branches/mergeResultLandingPages/ng-openaire-library/src/app/claims/linking/selected/metadataPreview.component.ts
24 24
  @Input() showOptions:ShowOptions;
25 25
  @Input() public properties: EnvProperties;
26 26
  @Input() pageContents;
27

  
27
  @Input() defaultColors:boolean=true;
28 28
  @ViewChild(AlertModal) alertApplyAll;
29 29
  @Input() localStoragePrefix: string = "";
30 30
  errors:ClaimsErrorMessage[] = [];
modules/uoa-services-library/branches/mergeResultLandingPages/ng-openaire-library/src/app/claims/linking/insertClaim/insertClaim.component.ts
37 37

  
38 38
        <div>
39 39
          <div *ngIf="!claiming  " (click)="insert()" style="width: 350px;"
40
               [class]="(((sources.length>0||inlineEntity) && results.length > 0 && (!claiming  && errors.length == 0))?'linksbaskettitlesPortalColor ':'uk-disabled')+ ' linksbaskettitles uk-padding-small uk-text-center'">CONFIRM LINKING
41
            <span class="uk-icon uk-float-right uk-text-bold uk-margin-small-right">
40
               [class]="getButtonClass()">CONFIRM LINKING
41
            <span [class]="(defaultColors?'':' uk-margin-small-top ')+'uk-icon uk-float-right uk-text-bold uk-margin-small-right'">
42 42
                          <svg width="30" height="30" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"
43 43
                               icon="chevron-right" ratio="1.5"><polyline fill="none" stroke="#000" stroke-width="1.03"
44 44
                                                                          points="7 4 13 10 7 16"></polyline></svg>
......
71 71
  @ViewChild(AlertModal) alert;
72 72
  @Input() errors: ClaimsErrorMessage[];
73 73
  @Output() insertFinished = new EventEmitter();
74
  @Input() defaultColors:boolean;
74 75

  
75 76
  public claiming = false;
76 77

  
......
491 492

  
492 493
    console.error("Insert Claim (component): " + message, error);
493 494
  }
495

  
496
  getButtonClass(){
497
  //   [class]="(((sources.length>0||inlineEntity) && results.length > 0 && (!claiming  && errors.length == 0))?' ':'uk-disabled')+ ' uk-button  uk-button-large uk-text-center'+((defaultColors)?'':'')">CONFIRM LINKING
498
  //   <span class="  uk-margin-small-top uk-icon uk-float-right uk-text-bold uk-margin-small-right">  }
499
  // [class]="(((sources.length>0||inlineEntity) && results.length > 0 && (!claiming  && errors.length == 0))?'linksbaskettitlesPortalColor ':'uk-disabled')+ ' linksbaskettitles uk-padding-small uk-text-center'">CONFIRM LINKING
500
  // <span class="uk-icon uk-float-right uk-text-bold uk-margin-small-right">
501
    let buttonClass= "";
502
    if((this.sources.length>0||this.inlineEntity) && this.results.length > 0 && (!this.claiming  && this.errors.length == 0)){
503
      if(this.defaultColors){
504
        buttonClass+=" linksbaskettitlesPortalColor ";
505
      }
506
    }else{
507
      buttonClass+=" uk-disabled ";
508

  
509
    }
510
    if(this.defaultColors){
511
      buttonClass+=" linksbaskettitles  uk-padding-small ";
512
    }else{
513
      buttonClass+="  uk-button  uk-button-large  ";
514
    }
515
    return buttonClass + "uk-text-center ";
516
  }
494 517
}
518

  
modules/uoa-services-library/branches/mergeResultLandingPages/ng-openaire-library/src/app/claims/linking/linkingGeneric.component.html
1 1
<metadata-preview *ngIf="showOptions.show=='claim' && properties" class="uk-margin-top"
2 2
                  [results]="results" [sources]="sources"
3 3
                  [localStoragePrefix]="localStoragePrefix" [inlineEntity]="inlineEntity"
4
                  [showOptions]="showOptions" [properties]=properties [pageContents]="pageContents">
4
                  [showOptions]="showOptions" [properties]=properties [pageContents]="pageContents"
5
                  [defaultColors]="(communityId?false:true)"
6
>
5 7
</metadata-preview>
6 8
<div id="tm-main" class="uk-section  uk-padding-remove-top tm-middle" *ngIf="showOptions.show != 'claim'">
7 9
  <div class="uk-grid">
......
213 215
                                   class="uk-alert uk-alert-warning uk-text-center">
214 216
                                Basket reached the size limit. No more entities can be added.
215 217
                              </div>
216
                              <claim-selected-results title="Selected Results" [results]="results"
218
                              <claim-selected-results sectionTitle="Selected Results" [results]="results"
217 219
                                                      [localStoragePrefix]="localStoragePrefix+'results'">
218 220
                              </claim-selected-results>
219 221
                              <div *ngIf="(results.length) == 0 " class="uk-alert no-selected-message uk-text-center">
modules/uoa-services-library/branches/mergeResultLandingPages/ng-openaire-library/src/app/claims/linking/linkingGeneric.component.ts
21 21
})
22 22
export class LinkingGenericComponent {
23 23
  @Input() piwikSiteId = null;
24
  @Input() title: string = null;
24
  @Input() pageTitle: string = null;
25 25
  piwiksub:any;
26 26

  
27 27
  @Input() communityId:string= null;
......
64 64
         this.url = data.envSpecific.baseLink+this._router.url;
65 65

  
66 66
        var description = "Openaire, linking, claim, publication, research data, software, other research product, project, community";
67
        this.updateTitle(this.title);
67
        this.updateTitle(this.pageTitle);
68 68
        this.updateDescription(description);
69 69
        this.updateUrl(this.url);
70 70

  
71 71
        this.seoService.createLinkForCanonicalURL(this.url, false);
72 72

  
73 73
        if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){
74
          this.piwiksub = this._piwikService.trackView(this.properties, this.title, this.piwikSiteId).subscribe();
74
          this.piwiksub = this._piwikService.trackView(this.properties, this.pageTitle, this.piwikSiteId).subscribe();
75 75
        }
76 76

  
77 77
        this.helper.getPageHelpContents(this._router.url, this.properties, this.communityId).subscribe(contents => {
modules/uoa-services-library/branches/mergeResultLandingPages/ng-openaire-library/src/app/sharedComponents/other-portals/other-portals.component.html
1
<div uk-grid="" class="uk-grid uk-margin-large-top uk-margin-large-bottom">
1
<div *ngIf="properties" uk-grid="" class="uk-grid uk-margin-large-top uk-margin-large-bottom">
2 2
  <div *ngIf="portal !== 'explore'" class="uk-width-expand@m uk-width-1-2@s uk-dark uk-grid-item-match uk-first-column explore">
3 3
    <div class="uk-margin uk-panel uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
4 4
      <h4 class="el-title uk-margin uk-h4">
modules/uoa-services-library/branches/mergeResultLandingPages/ng-openaire-library/src/app/sharedComponents/navigationBar.component.html
69 69
                    </ng-container>
70 70
                  </ng-container>
71 71
                      <ng-container *ngIf="userMenu">
72
                       <user-mini  mobileView=true [userMenuItems]=userMenuItems [logInUrl]=properties.loginUrl [logOutUrl]=properties.logoutUrl [cookieDomain]=properties.cookieDomain></user-mini>
72
                       <user-mini  mobileView=true [redirectUrl]="(communityId)?null:properties.afterLoginRedirectLink" [userMenuItems]=userMenuItems [logInUrl]=properties.loginUrl [logOutUrl]=properties.logoutUrl [cookieDomain]=properties.cookieDomain></user-mini>
73 73
                     </ng-container>
74 74
                  </ul>
75 75
               </div>
......
196 196
            <!-- </div> -->
197 197
            <!-- <div  *ngIf="userMenu" class="uk-navbar-right"> -->
198 198
            <!-- <div  *ngIf="userMenu" class="uk-navbar-right"> -->
199
                  <user-mini  *ngIf="userMenu"  [userMenuItems]=userMenuItems [logInUrl]=properties.loginUrl [logOutUrl]=properties.logoutUrl [cookieDomain]=properties.cookieDomain></user-mini>
199
                  <user-mini  *ngIf="userMenu" [redirectUrl]="(communityId)?null:properties.afterLoginRedirectLink" [userMenuItems]=userMenuItems [logInUrl]=properties.loginUrl [logOutUrl]=properties.logoutUrl [cookieDomain]=properties.cookieDomain></user-mini>
200 200

  
201 201
            </div>
202 202
         </nav>

Also available in: Unified diff