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:

home.component.html
121 121
                </div>
122 122

  
123 123
                <div class="uk-text-center uk-margin-medium-top">
124
                  <!--<button [routerLink]="['/countryDashboard/' + countrySelectedName]" class="md-btn md-btn-primary">View Details</button>-->
125
                  <button [routerLink]="['/countryDashboard/' + selectedCountry.code]" class="md-btn md-btn-primary">View Details</button>
126
                  <!--<a class="" [routerLink]="['/countryDashboard/' + countrySelectedName]">Detailed View <i class="fas fa-arrow-right uk-margin-small-left"></i></a>-->
124
                  <!--<button [routerLink]="['/countryDashboard/' + selectedCountry.code]" class="md-btn md-btn-primary">View Details</button>-->
125
                  <button [routerLink]="['/countryDashboard' , selectedCountry.code]" class="md-btn md-btn-primary">View Details</button>
127 126
                </div>
128 127

  
129 128
              </div>
......
308 307
      <!--</div>-->
309 308

  
310 309
      <div class="uk-margin-top">
311
        <div class="uk-autocomplete uk-form uk-search uk-search-default searchForCountry" data-uk-autocomplete="{source:'https://getuikit.com/v2/tests/components/_autocomplete.json'}">
312
          <span uk-search-icon></span>
313
          <input class="uk-search-input" type="search" placeholder="Search for a country...">
314
          <!--<input type="text">-->
310

  
311
        <div class="uk-autocomplete uk-form uk-search uk-search-default searchForCountry">
312
          <span id="search-icon" uk-search-icon></span>
313
          <ng-autocomplete
314
            [data]="countriesCollection"
315
            [searchKeyword]="keyword"
316
            placeHolder="Search for a country..."
317
            (selected)='selectCountryFromAutocompleteEvent($event)'
318
            (inputChanged)='onChangeSearch($event)'
319
            (inputFocused)='onFocused($event)'
320
            historyIdentifier="countriesCollection"
321
            [itemTemplate]="itemTemplate"
322
            [notFoundTemplate]="notFoundTemplate">
323
          </ng-autocomplete>
324

  
325
          <ng-template #itemTemplate let-item>
326
            <a [innerHTML]="item.name"></a>
327
          </ng-template>
328

  
329
          <ng-template #notFoundTemplate let-notFound>
330
            <div [innerHTML]="notFound"></div>
331
          </ng-template>
315 332
        </div>
333

  
334

  
335

  
336
        <!--<div class="uk-autocomplete uk-form uk-search uk-search-default searchForCountry" data-uk-autocomplete="{source:'https://getuikit.com/v2/tests/components/_autocomplete.json'}">-->
337
          <!--<span uk-search-icon></span>-->
338
          <!--<input class="uk-search-input" type="search" placeholder="Search for a country...">-->
339
          <!--&lt;!&ndash;<input type="text">&ndash;&gt;-->
340
        <!--</div>-->
341

  
316 342
      </div>
317 343

  
318 344

  
......
433 459

  
434 460
        <div *ngFor="let data of leadingOpenScienceData" class="uk-margin-small-top">
435 461
          <div class="md-card leadingOpenScienceCard">
436
            <a [routerLink]="['/countryDashboard/' + data.code]" class="el-link uk-position-cover uk-margin-remove-adjacent"></a>
462
            <a [routerLink]="['/countryDashboard', data.code]" class="el-link uk-position-cover uk-margin-remove-adjacent"></a>
437 463
            <div class="md-card-content">
438 464
              <div class="uk-flex">
439 465
                <img src="../../../assets/img/flags/{{data.code | lowercase}}-flag.svg" width="15">
......
463 489
  <section class="section">
464 490
    <div class="uk-container uk-container-expand uk-container-center ">
465 491
      <div class="goToDetailedViewLink">
466
        <a class="" [routerLink]="['/overview/' + 'europe']">Detailed View of OA in Europe<i class="fas fa-arrow-right uk-margin-small-left"></i></a>
492
        <a class="" [routerLink]="['/overview' , 'europe']">Detailed View of OA in Europe<i class="fas fa-arrow-right uk-margin-small-left"></i></a>
467 493
      </div>
468 494
    </div>
469 495
  </section>

Also available in: Unified diff