Project

General

Profile

« Previous | Next » 

Revision 58825

Working on the new version of the oso. Work on the home page almost done

View differences:

data-view.component.html
1
<!--<ul class="uk-subnav uk-subnav-pill uk-text-center" data-uk-switcher="{connect:'#switcher-content-a-fade', animation: 'fade'}">-->
2
  <!--<li aria-expanded="true" class="{{activeView=='absolute' ? 'uk-active' : ''}}"><a (click)="changeView('absolute')">Absolute</a></li>-->
3
  <!--<li aria-expanded="false" class="{{activeView=='percentage' ? 'uk-active' : ''}}"><a (click)="changeView('percentage')">Percentage</a></li>-->
4
  <!--<li aria-expanded="false" class="{{activeView=='graph' ? 'uk-active' : ''}}"><a (click)="changeView('graph')">Graph</a></li>-->
5
<!--</ul>-->
6

  
7
<!--<hr>-->
8

  
9
<!--<ul id="switcher-content-a-fade" class="uk-switcher uk-margin">-->
10
  <!--<li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;">Hello!</li>-->
11
  <!--<li aria-hidden="true" style="animation-duration: 200ms;" class="">Hello again!</li>-->
12
  <!--<li aria-hidden="true" style="animation-duration: 200ms;" class="">Bazinga!</li>-->
13
<!--</ul>-->
14

  
15
<!--<div *ngIf="activeView=='absolute'" class="">-->
16
  <!--<app-countries-table [isPercentage]="false" [type]="type" [countries]="countries"></app-countries-table>-->
17
<!--</div>-->
18

  
19
<!--<div *ngIf="activeView=='percentage'" class="">-->
20
  <!--<app-countries-table [isPercentage]="true" [type]="type" [countries]="countries"></app-countries-table>-->
21
<!--</div>-->
22

  
23
<!--<div *ngIf="activeView=='graph'" class="">-->
24
  <!--Graphs here....-->
25
<!--</div>-->
26

  
27 1
<ul class="uk-subnav uk-subnav-pill dataView uk-flex uk-flex-center" data-uk-switcher="{connect:'#switcher-content-a-fade', animation: 'fade'}">
28 2
  <li aria-expanded="true" class="uk-active">
29 3
    <a href="#" (click)="changeView('absolute')">
......
41 15
    </a>
42 16
  </li>
43 17
</ul>
44
<div class="actionButtons uk-text-right">
45
  <!--<button class="md-btn md-btn-primary" (click)="printOverviewData('switcher-content-a-fade')"><i class="fas fa-print uk-margin-small-right"></i>Print report in PDF</button>-->
46
  <a class="" (click)="printOverviewData('switcher-content-a-fade')"><i class="fas fa-print uk-margin-small-right"></i>Print report in PDF</a>
47
  <!--<button class="md-btn md-btn-primary uk-margin-left"><i class="fas fa-download uk-margin-small-right"></i>Download report</button>-->
48
  <a class="uk-margin-left"><i class="fas fa-download uk-margin-small-right"></i>Download report</a>
18

  
19
<div class="goToDetailedViewLink uk-text-right">
20
  <a class="" [routerLink]="['/overview/' + 'europe']">Detailed View of OA in Europe<i class="fas fa-arrow-right uk-margin-small-left"></i></a>
49 21
</div>
50 22

  
51 23
<hr>
52 24

  
53 25
<ul id="switcher-content-a-fade" class="uk-switcher uk-margin" >
54 26
  <li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;">
55
    <!--<div class="dataContent">-->
56
      <!--<div class="actionButtons uk-text-right">-->
57
        <!--<button class="md-btn md-btn-secondary" (click)="printOverviewData('table-absolute')"><i class="fas fa-print uk-margin-small-right"></i>Print report in PDF</button>-->
58
        <!--<button class="md-btn md-btn-secondary uk-margin-left"><i class="fas fa-download uk-margin-small-right"></i>Download report</button>-->
59
      <!--</div>-->
60
    <!--</div>-->
61 27
    <div id="table-absolute" class="">
62
      <app-countries-table [isPercentage]="false" [type]="type" [countries]="countries"></app-countries-table>
28
      <div class="uk-margin-bottom">
29
        <label class="uk-margin-right">Show: </label>
30
        <select class="md-input" #selectContentAbsolute (change)="getContentAbsolute(selectContentAbsolute.value)" style="width: 230px; display: inline-block">
31
          <option value="affiliated">affiliated</option>
32
          <option value="affiliated_peer_reviewed">affiliated peer reviewed</option>
33
          <option value="deposited">deposited</option>
34
          <option value="deposited_peer_reviewed">deposited peer reviewed</option>
35
        </select>
36
        <!--<span class="md-input-bar"></span>-->
37
      </div>
38
      <div *ngIf="loading" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>
39
      <app-countries-table *ngIf="tableAbsoluteData" [isPercentage]="false" [countries]="tableAbsoluteData"></app-countries-table>
63 40
    </div>
64 41
  </li>
65 42
  <li aria-hidden="true" style="animation-duration: 200ms;" class="">
66
    <!--<div class="dataContent">-->
67
      <!--<div class="actionButtons uk-text-right">-->
68
        <!--<button class="md-btn md-btn-secondary" (click)="printOverviewData('table-percentage')"><i class="fas fa-print uk-margin-small-right"></i>Print report in PDF</button>-->
69
        <!--<button class="md-btn md-btn-secondary uk-margin-left"><i class="fas fa-download uk-margin-small-right"></i>Download report</button>-->
70
      <!--</div>-->
71
    <!--</div>-->
43

  
72 44
    <div id="table-percentage" class="">
73
      <app-countries-table [isPercentage]="true" [type]="type" [countries]="countries"></app-countries-table>
45
      <div class="uk-margin-bottom">
46
        <label class="uk-margin-right">Show: </label>
47
        <select class="md-input" #selectContentPercentage (change)="getContentPercentage(selectContentPercentage.value)" style="width: 230px; display: inline-block">
48
          <option value="affiliated">affiliated</option>
49
          <option value="affiliated_peer_reviewed">affiliated peer reviewed</option>
50
          <option value="deposited">deposited</option>
51
          <option value="deposited_peer_reviewed">deposited peer reviewed</option>
52
        </select>
53
        <!--<span class="md-input-bar"></span>-->
54
      </div>
55
      <app-countries-table *ngIf="tablePercentageData" [isPercentage]="true" [countries]="tablePercentageData"></app-countries-table>
74 56
    </div>
75 57
  </li>
76 58
  <li aria-hidden="true" style="animation-duration: 200ms;" class="">
77
    <!--<div class="dataContent">-->
78
      <!--<div class="actionButtons uk-text-right">-->
79
        <!--<button class="md-btn md-btn-secondary" (click)="printOverviewData('graphs')"><i class="fas fa-print uk-margin-small-right"></i>Print report in PDF</button>-->
80
        <!--&lt;!&ndash;<button class="md-btn md-btn-secondary uk-margin-left"><i class="fas fa-download uk-margin-small-right"></i>Download report</button>&ndash;&gt;-->
81
      <!--</div>-->
82
      <!--<div id="graphs">-->
83
        <!--<div *ngIf="type=='overview'" class="uk-grid uk-margin-top">-->
84
          <!--<div class="uk-width-1-2">-->
85
            <!--<iframe *ngIf="oaJournalsURL" width="100%" height="440" [src]="oaJournalsURL"></iframe>-->
86
          <!--</div>-->
87
          <!--<div class="uk-width-1-2">-->
88
            <!--<iframe *ngIf="oaRepositoriesURL" width="100%" height="440" [src]="oaRepositoriesURL"></iframe>-->
89
          <!--</div>-->
90
        <!--</div>-->
91
        <!--<div class="uk-grid uk-margin-top">-->
92
          <!--<div class="uk-width-1-2">-->
93
            <!--<iframe *ngIf="oaPublicationsURL" width="100%" height="440" [src]="oaPublicationsURL"></iframe>-->
94
          <!--</div>-->
95
          <!--<div class="uk-width-1-2">-->
96
            <!--<iframe *ngIf="oaDatasetsURL" width="100%" height="440" [src]="oaDatasetsURL"></iframe>-->
97
          <!--</div>-->
98
        <!--</div>-->
99
        <!--<div class="uk-grid uk-margin-top">-->
100
          <!--<div class="uk-width-1-2">-->
101
            <!--<iframe *ngIf="oaSoftwareURL" width="100%" height="440" [src]="oaSoftwareURL"></iframe>-->
102
          <!--</div>-->
103
          <!--<div class="uk-width-1-2">-->
104
            <!--<iframe *ngIf="oaOtherURL" width="100%" height="440" [src]="oaOtherURL"></iframe>-->
105
          <!--</div>-->
106
        <!--</div>-->
107
      <!--</div>-->
108
    <!--</div>-->
109 59
    <div id="graphs">
110 60
      <div *ngIf="type=='overview'" class="uk-grid uk-margin-top">
111 61
        <div class="uk-width-1-2">

Also available in: Unified diff