Project

General

Profile

« Previous | Next » 

Revision 58917

Finished the charts for the home page and for the overview tab of the europe page

View differences:

continent-overview.component.html
495 495
                <div class="uk-grid-margin">
496 496
                  <div class="md-card chartCard">
497 497
                    <div class="md-card-content">
498
                      <app-treemap-highchart *ngIf="publicationsByFunderData" [chartTitle]="'Funders for publications'"
498
                      <app-treemap-highchart *ngIf="publicationsByFunderData" [chartTitle]="'Publications by funder'"
499 499
                                             [chartData]="publicationsByFunderData" [color]="'#F181AE'"></app-treemap-highchart>
500 500
                    </div>
501 501
                  </div>
......
504 504
                <div class="uk-grid-margin">
505 505
                  <div class="md-card chartCard">
506 506
                    <div class="md-card-content">
507
                      <app-treemap-highchart *ngIf="datasetsByFunderData" [chartTitle]="'Funders for datasets'"
507
                      <app-treemap-highchart *ngIf="datasetsByFunderData" [chartTitle]="'Datasets by funder'"
508 508
                                             [chartData]="datasetsByFunderData" [color]="'#BB9CE6'"></app-treemap-highchart>
509 509
                    </div>
510 510
                  </div>
......
513 513
                <div class="uk-grid-margin">
514 514
                  <div class="md-card chartCard">
515 515
                    <div class="md-card-content">
516
                      <app-treemap-highchart *ngIf="softwareByFunderData" [chartTitle]="'Funders for software'"
516
                      <app-treemap-highchart *ngIf="softwareByFunderData" [chartTitle]="'Software by funder'"
517 517
                                             [chartData]="softwareByFunderData" [color]="'#C2155A'"></app-treemap-highchart>
518 518
                    </div>
519 519
                  </div>
......
522 522
                <div class="uk-grid-margin">
523 523
                  <div class="md-card chartCard">
524 524
                    <div class="md-card-content">
525
                      <app-treemap-highchart *ngIf="otherByFunderData" [chartTitle]="'Funders for other research products'"
525
                      <app-treemap-highchart *ngIf="otherByFunderData" [chartTitle]="'Other research products by funder'"
526 526
                                             [chartData]="otherByFunderData" [color]="'#00CCCC'"></app-treemap-highchart>
527 527
                    </div>
528 528
                  </div>
......
543 543

  
544 544
              <ul class="uk-subnav uk-subnav-pill dataView uk-flex uk-flex-center" data-uk-switcher="{connect:'#switcher-content-a-fade', animation: 'fade'}">
545 545
                <li aria-expanded="true" class="uk-active">
546
                  <a class="publicationsSubnav" (click)="changeView('publications')">
546
                  <a class="publicationsSubnav" (click)="changeInnerView('publications')" uk-tooltip="title: Publication; duration: 2000">
547 547
                    <img src="../../../assets/img/icons/publications-icon.svg" width="15">
548 548
                  </a>
549 549
                </li>
550 550
                <li aria-expanded="false" class="">
551
                  <a class="datasetsSubnav" (click)="changeView('datasets')">
551
                  <a class="datasetsSubnav" (click)="changeInnerView('datasets')" uk-tooltip="title: Datasets; duration: 2000">
552 552
                    <img src="../../../assets/img/icons/datasets-icon.svg" width="15">
553 553
                  </a>
554 554
                </li>
555 555
                <li aria-expanded="false" class="">
556
                  <a class="softwareSubnav" (click)="changeView('software')">
556
                  <a class="softwareSubnav" (click)="changeInnerView('software')" uk-tooltip="title: Software; duration: 2000">
557 557
                    <img src="../../../assets/img/icons/software-icon.svg" width="15">
558 558
                  </a>
559 559
                </li>
560 560
                <li aria-expanded="false" class="">
561
                  <a class="otherSubnav" (click)="changeView('other')">
561
                  <a class="otherSubnav" (click)="changeInnerView('other')" uk-tooltip="title: Other research products; duration: 2000">
562 562
                    <img src="../../../assets/img/icons/other-icon.svg" width="15">
563 563
                  </a>
564 564
                </li>

Also available in: Unified diff