Revision 58958
Added by Stefania Martziou almost 4 years ago
| modules/open-science-observatory-ui/trunk/src/app/pages/countrypage/country-page.component.html | ||
|---|---|---|
| 27 | 27 |
</div> |
| 28 | 28 |
</div> |
| 29 | 29 |
|
| 30 |
<div class="actionButtonsCountryPage uk-text-right"> |
|
| 31 |
<a class=""><i class="fas fa-code uk-margin-small-right"></i>Embed</a> |
|
| 32 |
<!--<a class="uk-margin-left"><i class="fas fa-download uk-margin-small-right"></i>Download CSV</a>--> |
|
| 33 |
<a class="uk-margin-left"><i class="fas fa-file-pdf uk-margin-small-right"></i>Download PDF</a> |
|
| 34 |
</div> |
|
| 30 |
// TODO uncomment when implemented |
|
| 31 |
<!--<div class="actionButtonsCountryPage uk-text-right">--> |
|
| 32 |
<!--<a class=""><i class="fas fa-code uk-margin-small-right"></i>Embed</a>--> |
|
| 33 |
<!--<!–<a class="uk-margin-left"><i class="fas fa-download uk-margin-small-right"></i>Download CSV</a>–>--> |
|
| 34 |
<!--<a class="uk-margin-left"><i class="fas fa-file-pdf uk-margin-small-right"></i>Download PDF</a>--> |
|
| 35 |
<!--</div>--> |
|
| 35 | 36 |
</div> |
| 36 | 37 |
</div> |
| 37 | 38 |
|
| modules/open-science-observatory-ui/trunk/src/app/pages/continentoverview/continent-overview.component.html | ||
|---|---|---|
| 135 | 135 |
<div class="publicationsDot uk-inline"></div> |
| 136 | 136 |
<div class="uk-inline uk-margin-left"> |
| 137 | 137 |
<span> |
| 138 |
<ng-container *ngIf="europeOverviewData.publications?.oa"><span class="number uk-margin-small-right">{{europeOverviewData.publications?.oa | number}}</span> OA</ng-container><br>
|
|
| 139 |
<ng-container *ngIf="europeOverviewData.publications?.total"><span class="number uk-margin-small-right">{{europeOverviewData.publications?.total | number}}</span> total</ng-container>
|
|
| 138 |
<ng-container *ngIf="europeOverviewData.publications?.oa">OA: <span class="number">{{europeOverviewData.publications?.oa | number}}</span></ng-container><br>
|
|
| 139 |
<ng-container *ngIf="europeOverviewData.publications?.total">Total: <span class="number">{{europeOverviewData.publications?.total | number}}</span></ng-container>
|
|
| 140 | 140 |
</span> |
| 141 | 141 |
</div> |
| 142 | 142 |
</div> |
| ... | ... | |
| 144 | 144 |
<div class="datasetsDot"></div> |
| 145 | 145 |
<div class="uk-inline uk-margin-left"> |
| 146 | 146 |
<span> |
| 147 |
<ng-container *ngIf="europeOverviewData.datasets?.oa"><span class="number uk-margin-small-right">{{europeOverviewData.datasets?.oa | number}}</span> OA</ng-container><br>
|
|
| 148 |
<ng-container *ngIf="europeOverviewData.datasets?.total"><span class="number uk-margin-small-right">{{europeOverviewData.datasets?.total | number}}</span> total</ng-container>
|
|
| 147 |
<ng-container *ngIf="europeOverviewData.datasets?.oa">OA: <span class="number">{{europeOverviewData.datasets?.oa | number}}</span></ng-container><br>
|
|
| 148 |
<ng-container *ngIf="europeOverviewData.datasets?.total">Total: <span class="number">{{europeOverviewData.datasets?.total | number}}</span></ng-container>
|
|
| 149 | 149 |
</span> |
| 150 | 150 |
</div> |
| 151 | 151 |
</div> |
| ... | ... | |
| 153 | 153 |
<div class="softwareDot"></div> |
| 154 | 154 |
<div class="uk-inline uk-margin-left"> |
| 155 | 155 |
<span> |
| 156 |
<ng-container *ngIf="europeOverviewData.software?.oa"><span class="number uk-margin-small-right">{{europeOverviewData.software?.oa | number}}</span> OA</ng-container><br>
|
|
| 157 |
<ng-container *ngIf="europeOverviewData.software?.total"><span class="number uk-margin-small-right">{{europeOverviewData.software?.total | number}}</span> total</ng-container>
|
|
| 156 |
<ng-container *ngIf="europeOverviewData.software?.oa">OA: <span class="number">{{europeOverviewData.software?.oa | number}}</span></ng-container><br>
|
|
| 157 |
<ng-container *ngIf="europeOverviewData.software?.total">Total: <span class="number">{{europeOverviewData.software?.total | number}}</span></ng-container>
|
|
| 158 | 158 |
</span> |
| 159 | 159 |
</div> |
| 160 | 160 |
</div> |
| ... | ... | |
| 162 | 162 |
<div class="otherDot"></div> |
| 163 | 163 |
<div class="uk-inline uk-margin-left"> |
| 164 | 164 |
<span> |
| 165 |
<ng-container *ngIf="europeOverviewData.other?.oa"><span class="number uk-margin-small-right">{{europeOverviewData.other?.oa | number}}</span> OA</ng-container><br>
|
|
| 166 |
<ng-container *ngIf="europeOverviewData.other?.total"><span class="number uk-margin-small-right">{{europeOverviewData.other?.total | number}}</span> total</ng-container>
|
|
| 165 |
<ng-container *ngIf="europeOverviewData.other?.oa">OA: <span class="number">{{europeOverviewData.other?.oa | number}}</span></ng-container><br>
|
|
| 166 |
<ng-container *ngIf="europeOverviewData.other?.total">Total: <span class="number">{{europeOverviewData.other?.total | number}}</span></ng-container>
|
|
| 167 | 167 |
</span> |
| 168 | 168 |
</div> |
| 169 | 169 |
</div> |
| modules/open-science-observatory-ui/trunk/src/app/pages/home/countries-table.component.html | ||
|---|---|---|
| 136 | 136 |
<span *ngIf="isSortedBy && isSortedBy=='licence' && !isDescending"><img src="../../../assets/img/icons/sort-ascending.svg"></span> |
| 137 | 137 |
Licence |
| 138 | 138 |
</th> |
| 139 |
<th class="uk-text-center" width="20%" (click)="sortBy('gold')">
|
|
| 139 |
<th *ngIf="entity==='publication'" class="uk-text-center" width="20%" (click)="sortBy('gold')">
|
|
| 140 | 140 |
<span *ngIf="!isSortedBy || isSortedBy!='gold'" class="uk-margin-small-right"><img src="../../../assets/img/icons/sort.svg"></span> |
| 141 | 141 |
<span *ngIf="isSortedBy && isSortedBy=='gold' && isDescending"><img src="../../../assets/img/icons/sort-descending.svg"></span> |
| 142 | 142 |
<span *ngIf="isSortedBy && isSortedBy=='gold' && !isDescending"><img src="../../../assets/img/icons/sort-ascending.svg"></span> |
| 143 | 143 |
Gold |
| 144 | 144 |
</th> |
| 145 |
<th class="uk-text-center" width="20%" (click)="sortBy('green')">
|
|
| 145 |
<th *ngIf="entity==='publication'" class="uk-text-center" width="20%" (click)="sortBy('green')">
|
|
| 146 | 146 |
<span *ngIf="!isSortedBy || isSortedBy!='green'" class="uk-margin-small-right"><img src="../../../assets/img/icons/sort.svg"></span> |
| 147 | 147 |
<span *ngIf="isSortedBy && isSortedBy=='green' && isDescending"><img src="../../../assets/img/icons/sort-descending.svg"></span> |
| 148 | 148 |
<span *ngIf="isSortedBy && isSortedBy=='green' && !isDescending"><img src="../../../assets/img/icons/sort-ascending.svg"></span> |
| ... | ... | |
| 167 | 167 |
<ng-container *ngIf="!isPercentage">{{countryOverview.licence.oa | number}}</ng-container>
|
| 168 | 168 |
</ng-container> |
| 169 | 169 |
</td> |
| 170 |
<td class="uk-text-center"> |
|
| 170 |
<td *ngIf="entity==='publication'" class="uk-text-center">
|
|
| 171 | 171 |
<ng-container *ngIf="countryOverview.gold===null">--</ng-container> |
| 172 | 172 |
<ng-container *ngIf="countryOverview.gold!=null"> |
| 173 | 173 |
<ng-container *ngIf="isPercentage">{{countryOverview.gold.percentage | number :'1.0-1'}}%</ng-container>
|
| 174 | 174 |
<ng-container *ngIf="!isPercentage">{{countryOverview.gold.oa | number}}</ng-container>
|
| 175 | 175 |
</ng-container> |
| 176 | 176 |
</td> |
| 177 |
<td class="uk-text-center"> |
|
| 177 |
<td *ngIf="entity==='publication'" class="uk-text-center">
|
|
| 178 | 178 |
<ng-container *ngIf="countryOverview.green===null">--</ng-container> |
| 179 | 179 |
<ng-container *ngIf="countryOverview.green!=null"> |
| 180 | 180 |
<ng-container *ngIf="isPercentage">{{countryOverview.green.percentage | number :'1.0-1'}}%</ng-container>
|
| modules/open-science-observatory-ui/trunk/src/app/pages/home/home.component.html | ||
|---|---|---|
| 2 | 2 |
<div class="uk-visible@m"> |
| 3 | 3 |
<!--MAP AND OVERVIEW NUMBERS SECTION--> |
| 4 | 4 |
<section class="section greySection" id="sect-overview"> |
| 5 |
<div class="uk-container uk-container-large uk-container-center uk-scrollspy-init-inview uk-scrollspy-inview uk-animation-scale-up uk-padding-remove uk-margin-bottom" data-uk-scrollspy="{cls:'uk-animation-scale-up uk-invisible',delay:300,topoffset:-100}">
|
|
| 5 |
<div class="uk-container uk-container-expand uk-container-center uk-scrollspy-init-inview uk-scrollspy-inview uk-animation-scale-up uk-margin-bottom" data-uk-scrollspy="{cls:'uk-animation-scale-up uk-invisible',delay:300,topoffset:-100}">
|
|
| 6 | 6 |
|
| 7 | 7 |
<div class="uk-grid uk-grid-small uk-margin-bottom uk-grid-match" uk-height-viewport="offset-bottom: 25"> |
| 8 | 8 |
|
| modules/open-science-observatory-ui/trunk/src/app/shared/topmenu/top-menu.component.html | ||
|---|---|---|
| 6 | 6 |
<div class="tm-header-mobile uk-hidden@m"> |
| 7 | 7 |
|
| 8 | 8 |
<ng-container *ngIf="isHomeRoute() ; else smallHeader"> |
| 9 |
<div class="uk-hidden@m"> |
|
| 10 |
<a href="/"><img alt="BETA" class="medium-beta-indication-nonFixed" src="../../../assets/img/beta_flag.svg"></a> |
|
| 11 |
</div> |
|
| 9 | 12 |
<nav class="uk-navbar-container uk-navbar" uk-navbar> |
| 10 | 13 |
<div class="uk-navbar-right"> |
| 11 | 14 |
|
| ... | ... | |
| 21 | 24 |
<li class="uk-active"><a [routerLink]="['/overview','europe']">OA in Europe</a></li> |
| 22 | 25 |
<!--<li class="uk-active"><a href="#">About</a></li>--> |
| 23 | 26 |
<li class="uk-active"><a routerLink="/methodology">Methodology</a></li> |
| 24 |
<li class="uk-nav-divider"></li>
|
|
| 25 |
<li class="uk-active"><a routerLink="/home">Sign In</a></li>
|
|
| 27 |
<!--<li class="uk-nav-divider"></li>-->
|
|
| 28 |
<!--<li class="uk-active"><a routerLink="/home">Sign In</a></li>-->
|
|
| 26 | 29 |
</ul> |
| 27 | 30 |
</div> |
| 28 | 31 |
</li> |
| ... | ... | |
| 41 | 44 |
</ng-container> |
| 42 | 45 |
|
| 43 | 46 |
<ng-template #smallHeader> |
| 47 |
<div class="uk-hidden@m"> |
|
| 48 |
<a href="/"><img alt="BETA" class="medium-beta-indication-fixed" src="../../../assets/img/beta_flag.svg"></a> |
|
| 49 |
</div> |
|
| 44 | 50 |
<nav class="uk-navbar-container uk-navbar smallHeader" uk-navbar> |
| 45 | 51 |
<div class="uk-navbar-left"> |
| 46 | 52 |
<a class="uk-navbar-item uk-logo" routerLink="/home"> |
| ... | ... | |
| 94 | 100 |
<li class="uk-active"><a [routerLink]="['/overview', 'europe']">OA in Europe</a></li> |
| 95 | 101 |
<!--<li class="uk-active"><a href="#">About</a></li>--> |
| 96 | 102 |
<li class="uk-active"><a routerLink="/methodology">Methodology</a></li> |
| 97 |
<li class="uk-nav-divider"></li>
|
|
| 98 |
<li class="uk-active"><a routerLink="/home">Sign In</a></li>
|
|
| 103 |
<!--<li class="uk-nav-divider"></li>-->
|
|
| 104 |
<!--<li class="uk-active"><a routerLink="/home">Sign In</a></li>-->
|
|
| 99 | 105 |
</ul> |
| 100 | 106 |
</div> |
| 101 | 107 |
</li> |
| ... | ... | |
| 111 | 117 |
|
| 112 | 118 |
|
| 113 | 119 |
<!--LAPTOP & PAD LANDSCAPE--> |
| 120 |
<div class="uk-visible@m"> |
|
| 121 |
<a href="/"><img alt="BETA" class="large-beta-indication" src="../../../assets/img/beta_flag.svg"></a> |
|
| 122 |
</div> |
|
| 114 | 123 |
<div class="tm-header uk-visible@m tm-header-transparent" uk-header=""> |
| 115 | 124 |
<div class="uk-navbar-container uk-sticky uk-navbar-transparent" uk-sticky="top:0" media="768" |
| 116 | 125 |
cls-active="uk-active uk-navbar-sticky" style="" animation="uk-animation-slide-top" |
| ... | ... | |
| 141 | 150 |
Methodology |
| 142 | 151 |
</a> |
| 143 | 152 |
</li> |
| 144 |
<li class="uk-parent" [routerLinkActive]="['uk-active']">
|
|
| 145 |
<a routerLink="/home" [routerLinkActive]="['uk-active']">
|
|
| 146 |
Sign In
|
|
| 147 |
</a>
|
|
| 148 |
</li>
|
|
| 153 |
<!--<li class="uk-parent" [routerLinkActive]="['uk-active']">-->
|
|
| 154 |
<!--<a routerLink="/home" [routerLinkActive]="['uk-active']">-->
|
|
| 155 |
<!--Sign In-->
|
|
| 156 |
<!--</a>-->
|
|
| 157 |
<!--</li>-->
|
|
| 149 | 158 |
|
| 150 | 159 |
</ul> |
| 151 | 160 |
|
| modules/open-science-observatory-ui/trunk/src/app/domain/countries-lat-lon.ts | ||
|---|---|---|
| 185 | 185 |
.set('RE', {latitude: -21.1, longitude: 55.6})
|
| 186 | 186 |
.set('RO', {latitude: 46, longitude: 25})
|
| 187 | 187 |
.set('RS', {latitude: 44, longitude: 21})
|
| 188 |
.set('RU', {latitude: 60, longitude: 100})
|
|
| 188 |
// .set('RU', {latitude: 60, longitude: 100})
|
|
| 189 |
.set('RU', {latitude: 55, longitude: 40})
|
|
| 189 | 190 |
.set('RW', {latitude: -2, longitude: 30})
|
| 190 | 191 |
.set('SA', {latitude: 25, longitude: 45})
|
| 191 | 192 |
.set('SB', {latitude: -8, longitude: 159})
|
| modules/open-science-observatory-ui/trunk/src/assets/css/os-observatory-custom.css | ||
|---|---|---|
| 41 | 41 |
color: #000; |
| 42 | 42 |
} |
| 43 | 43 |
|
| 44 |
.large-beta-indication {
|
|
| 45 |
height: 83px; |
|
| 46 |
position: fixed; |
|
| 47 |
top: 0; |
|
| 48 |
left: 0; |
|
| 49 |
z-index: 10000; |
|
| 50 |
} |
|
| 51 |
|
|
| 52 |
.medium-beta-indication-nonFixed {
|
|
| 53 |
height: 65px; |
|
| 54 |
position: absolute; |
|
| 55 |
top: 0; |
|
| 56 |
left: 0; |
|
| 57 |
z-index: 10000; |
|
| 58 |
} |
|
| 59 |
|
|
| 60 |
.medium-beta-indication-fixed {
|
|
| 61 |
height: 65px; |
|
| 62 |
position: fixed; |
|
| 63 |
top: 0; |
|
| 64 |
left: 0; |
|
| 65 |
z-index: 10000; |
|
| 66 |
} |
|
| 67 |
|
|
| 44 | 68 |
/*#sect-overview, #sect-tabs {*/
|
| 45 | 69 |
/*padding: 20px 0;*/ |
| 46 | 70 |
/*}*/ |
| ... | ... | |
| 363 | 387 |
} |
| 364 | 388 |
|
| 365 | 389 |
.dataView.uk-subnav-pill > * > * {
|
| 366 |
padding: 6px 10px; |
|
| 390 |
width: 16px; |
|
| 391 |
height: 16px; |
|
| 392 |
padding: 8px; |
|
| 367 | 393 |
border-radius: 50%; |
| 368 | 394 |
border: 1px solid; |
| 395 |
display: inline-block; |
|
| 369 | 396 |
} |
| 370 | 397 |
|
| 371 | 398 |
.tabContent hr {
|
| ... | ... | |
| 457 | 484 |
background: #CCF4F4; |
| 458 | 485 |
} |
| 459 | 486 |
|
| 487 |
/*a.publicationsSubnav, a.datasetsSubnav, a.softwareSubnav, a.otherSubnav {*/
|
|
| 488 |
/*width: 16px;*/ |
|
| 489 |
/*height: 16px;*/ |
|
| 490 |
/*padding: 8px;*/ |
|
| 491 |
/*!*border-radius: 50%;*!*/ |
|
| 492 |
/*!*border: 1px solid;*!*/ |
|
| 493 |
/*display: inline-block;*/ |
|
| 494 |
/*}*/ |
|
| 460 | 495 |
|
| 496 |
a.publicationsSubnav img, a.datasetsSubnav img, a.softwareSubnav img, a.otherSubnav img {
|
|
| 497 |
vertical-align: baseline; |
|
| 498 |
} |
|
| 499 |
|
|
| 500 |
|
|
| 461 | 501 |
/**************** HEADER ****************/ |
| 462 | 502 |
|
| 463 | 503 |
/*.tm-header .uk-navbar-container {*/
|
Also available in: Unified diff
Fixed some small css issues and added a beta label to the logo