Project

General

Profile

« Previous | Next » 

Revision 58912

Working on the new version of the oso - started incorporating charts and created a treemap highcharts component

View differences:

top-menu.component.html
17 17
                </a>
18 18
                <div class="uk-navbar-dropdown">
19 19
                  <ul class="uk-nav uk-navbar-dropdown-nav">
20
                    <li class="uk-active"><a [routerLink]="['/home']">Home</a></li>
21
                    <li class="uk-active"><a [routerLink]="['/overview/' + 'europe']">OA in Europe</a></li>
20
                    <li class="uk-active"><a routerLink="/home">Home</a></li>
21
                    <li class="uk-active"><a [routerLink]="['/overview','europe']">OA in Europe</a></li>
22 22
                    <!--<li class="uk-active"><a href="#">About</a></li>-->
23
                    <li class="uk-active"><a [routerLink]="['/methodology']">Methodology</a></li>
23
                    <li class="uk-active"><a routerLink="/methodology">Methodology</a></li>
24 24
                    <li class="uk-nav-divider"></li>
25
                    <li class="uk-active"><a [routerLink]="['home']">Sign In</a></li>
25
                    <li class="uk-active"><a routerLink="/home">Sign In</a></li>
26 26
                  </ul>
27 27
                </div>
28 28
              </li>
......
33 33

  
34 34
        <nav class="uk-navbar-container uk-navbar" uk-navbar="">
35 35
          <div class="uk-navbar-center">
36
            <a class="uk-navbar-item uk-logo" [routerLink]="['/home']">
36
            <a class="uk-navbar-item uk-logo" routerLink="/home">
37 37
              <img src="../../../assets/img/OS_Logo_Vertical.svg" alt="Open Science Observatory" width="161"
38 38
                   class="uk-responsive-height"> </a>
39 39
          </div>
......
43 43
      <ng-template #smallHeader>
44 44
        <nav class="uk-navbar-container uk-navbar smallHeader" uk-navbar>
45 45
          <div class="uk-navbar-left">
46
            <a class="uk-navbar-item uk-logo" [routerLink]="['/home']">
46
            <a class="uk-navbar-item uk-logo" routerLink="/home">
47 47
              <img src="../../../assets/img/OS_Logo_small.svg" alt="Open Science Observatory" width="36"
48 48
                   class="uk-responsive-height"> </a>
49 49
          </div>
50 50

  
51 51
          <div class="uk-navbar-center">
52
            <div class="uk-autocomplete uk-form uk-search uk-search-default searchForCountry" data-uk-autocomplete="{source:'https://getuikit.com/v2/tests/components/_autocomplete.json'}">
53
              <span uk-search-icon></span>
54
              <input class="uk-search-input" type="search" placeholder="Search for a country...">
55
              <!--<input type="text">-->
52

  
53
            <div class="uk-autocomplete uk-form uk-search uk-search-default searchForCountry">
54
              <span id="search-icon" uk-search-icon></span>
55
              <ng-autocomplete
56
                [data]="countriesCollection"
57
                [searchKeyword]="keyword"
58
                placeHolder="Search for a country..."
59
                (selected)='selectCountryFromAutocompleteEvent($event)'
60
                (inputChanged)='onChangeSearch($event)'
61
                (inputFocused)='onFocused($event)'
62
                historyIdentifier="countriesCollection"
63
                [itemTemplate]="itemTemplate"
64
                [notFoundTemplate]="notFoundTemplate">
65
              </ng-autocomplete>
66

  
67
              <ng-template #itemTemplate let-item>
68
                <a [innerHTML]="item.name"></a>
69
              </ng-template>
70

  
71
              <ng-template #notFoundTemplate let-notFound>
72
                <div [innerHTML]="notFound"></div>
73
              </ng-template>
56 74
            </div>
75

  
76
            <!--<div class="uk-autocomplete uk-form uk-search uk-search-default searchForCountry" data-uk-autocomplete="{source:'https://getuikit.com/v2/tests/components/_autocomplete.json'}">-->
77
            <!--<span uk-search-icon></span>-->
78
            <!--<input class="uk-search-input" type="search" placeholder="Search for a country...">-->
79
            <!--&lt;!&ndash;<input type="text">&ndash;&gt;-->
80
            <!--</div>-->
81

  
57 82
          </div>
58 83

  
59 84
          <div class="uk-navbar-right">
......
65 90
                </a>
66 91
                <div class="uk-navbar-dropdown">
67 92
                  <ul class="uk-nav uk-navbar-dropdown-nav">
68
                    <li class="uk-active"><a [routerLink]="['/home']">Home</a></li>
69
                    <li class="uk-active"><a [routerLink]="['/overview/' + 'europe']">OA in Europe</a></li>
93
                    <li class="uk-active"><a routerLink="/home">Home</a></li>
94
                    <li class="uk-active"><a [routerLink]="['/overview', 'europe']">OA in Europe</a></li>
70 95
                    <!--<li class="uk-active"><a href="#">About</a></li>-->
71
                    <li class="uk-active"><a [routerLink]="['/methodology']">Methodology</a></li>
96
                    <li class="uk-active"><a routerLink="/methodology">Methodology</a></li>
72 97
                    <li class="uk-nav-divider"></li>
73
                    <li class="uk-active"><a [routerLink]="['home']">Sign In</a></li>
98
                    <li class="uk-active"><a routerLink="/home">Sign In</a></li>
74 99
                  </ul>
75 100
                </div>
76 101
              </li>
......
93 118
        <div class="uk-container uk-container-expand">
94 119
          <nav class="uk-navbar" uk-navbar="{&quot;align&quot;:&quot;left&quot;}">
95 120
            <div class="uk-navbar-left">
96
              <a [routerLink]="['home']" class="uk-logo uk-navbar-item">
121
              <a routerLink="/home" class="uk-logo uk-navbar-item">
97 122
                <img src="../../../assets/img/OS_Logo_Horizontal.svg" alt="Open Science Observatory" class="uk-responsive-height">
98 123
              </a>
99 124
            </div>
......
102 127

  
103 128
              <ul class="uk-navbar-nav" >
104 129
                <li class="uk-parent" [routerLinkActive]="['uk-active']">
105
                  <a [routerLink]="['home']" [routerLinkActive]="['uk-active']">
130
                  <a routerLink="/home" [routerLinkActive]="['uk-active']">
106 131
                    Home
107 132
                  </a>
108 133
                </li>
109 134
                <li class="uk-parent" [routerLinkActive]="['uk-active']">
110
                  <a [routerLink]="['/overview/' + 'europe']" [routerLinkActive]="['uk-active']">
135
                  <a [routerLink]="['/overview', 'europe']" [routerLinkActive]="['uk-active']">
111 136
                    OA in Europe
112 137
                  </a>
113 138
                </li>
114 139
                <li class="uk-parent" [routerLinkActive]="['uk-active']">
115
                  <a [routerLink]="['/methodology']" [routerLinkActive]="['uk-active']">
140
                  <a routerLink="/methodology" [routerLinkActive]="['uk-active']">
116 141
                    Methodology
117 142
                  </a>
118 143
                </li>
119 144
                <li class="uk-parent" [routerLinkActive]="['uk-active']">
120
                  <a [routerLink]="['home']" [routerLinkActive]="['uk-active']">
145
                  <a routerLink="/home" [routerLinkActive]="['uk-active']">
121 146
                    Sign In
122 147
                  </a>
123 148
                </li>

Also available in: Unified diff