[Usage Counts | Trunk]: Fix some backgrounds

This commit is contained in:
k.triantafyllou 2020-09-16 09:33:56 +00:00
parent 29eed1cbfd
commit 17040a402b
11 changed files with 72 additions and 55 deletions

View File

@ -12,23 +12,21 @@
}
}
.about-background {
background-image: url("/assets/usage-statistics-assets/about/1.svg");
background-repeat: no-repeat;
background-position: 0 -30px;
background-size: contain;
position: relative;
}
@media only screen and (max-width: 959px) {
@media only screen and (min-width: 1200px) {
.about-background {
background-size: cover;
background-image: url("/assets/usage-statistics-assets/about/1.svg");
background-repeat: no-repeat;
background-position: 0 -30px;
background-size: contain;
position: relative;
}
}
.about-background a.next {
position: absolute;
bottom: 10%;
bottom: 10vh;
right: 10%;
color: var(--portal-main-color);
line-height: 24px;
@ -54,29 +52,30 @@
background-repeat: no-repeat;
background-position: 0 0;
background-size: contain;
height: 45vh;
height: 30vh;
}
@media only screen and (min-width: 1200px) {
.architecture {
position: relative;
background-size: 80% 70%;
height: 450px;
}
.architecture > div {
top: -30px;
right: -10vw;
width: 400px;
background-image: url("/assets/usage-statistics-assets/about/2.2.svg");
background-repeat: no-repeat;
background-position: 0 0;
background-size: contain;
position: absolute;
background-size: auto;
margin-top: -50px;
width: 30%;
}
}
@media only screen and (min-width: 1200px) {
.workflows img {
margin-left: -10%;
align-self: start;
}
}

View File

@ -14,8 +14,9 @@
<svg height="17.155" viewBox="0 0 17.155 17.155" width="17.155" class="uk-margin-left"
xmlns="http://www.w3.org/2000/svg">
<g data-name="Group 2442" id="Group_2442" transform="translate(-1221 -675)">
<path d="M14.405,4.3,6.022,12.68V9.055A1.011,1.011,0,0,0,4,9.055V15.12a1.009,1.009,0,0,0,1.011,1.01h6.065a1.011,1.011,0,1,0,0-2.022H7.451l8.383-8.383A1.011,1.011,0,0,0,14.405,4.3h0Z"
fill="#e95420" id="arrow-down-left2" transform="translate(1215.343 683.578) rotate(-45)"></path>
<path
d="M14.405,4.3,6.022,12.68V9.055A1.011,1.011,0,0,0,4,9.055V15.12a1.009,1.009,0,0,0,1.011,1.01h6.065a1.011,1.011,0,1,0,0-2.022H7.451l8.383-8.383A1.011,1.011,0,0,0,14.405,4.3h0Z"
fill="#e95420" id="arrow-down-left2" transform="translate(1215.343 683.578) rotate(-45)"></path>
</g>
</svg>
</a>
@ -32,12 +33,10 @@
<div id="architecture" class="uk-container uk-section">
<div class="uk-section uk-padding-remove-top">
<h2 class="uk-text-bold">Architecture</h2>
<div class="architecture uk-margin-large-top">
<div class="uk-visible@l">
<div class="uk-padding-large uk-padding-remove-bottom uk-padding-remove-right uk-margin-small-bottom">
UsageCounts service collects usage activity from OpenAIRE content providers for usage events related to
research products of the OpenAIRE graph, creates and deploys aggregated statistics for these products.
</div>
<div class="architecture uk-margin-large-top uk-flex uk-flex-right">
<div class="uk-visible@l uk-padding-large uk-padding-remove-bottom uk-padding-remove-right">
UsageCounts service collects usage activity from OpenAIRE content providers for usage events related to
research products of the OpenAIRE graph, creates and deploys aggregated statistics for these products.
</div>
</div>
<div class="uk-hidden@l uk-padding uk-margin-top">
@ -48,7 +47,8 @@
<div class="uk-section uk-margin-large-top workflows">
<h2 class="uk-text-bold">Architecture & Workflows</h2>
<div class="uk-flex uk-grid uk-child-width-1-2@l uk-margin-large-top" uk-grid>
<img src="assets/usage-statistics-assets/about/3.png" class="uk-margin-medium-top uk-width-3-5@l uk-height-max-medium">
<img src="assets/usage-statistics-assets/about/3.png"
class="uk-margin-medium-top uk-width-3-5@l">
<div>
<h3 class="uk-text-bold portal-color">Architecture functionalities</h3>
<div class="uk-margin-large-left">

View File

@ -1,4 +1,4 @@
import {Component, OnInit} from '@angular/core';
import {AfterViewChecked, Component, OnInit} from '@angular/core';
import {faqs} from './faqs';
import {ActivatedRoute} from '@angular/router';
import {Title} from '@angular/platform-browser';
@ -8,14 +8,20 @@ import {Title} from '@angular/platform-browser';
templateUrl: 'about.component.html',
styleUrls: ['about.component.css'],
})
export class AboutComponent implements OnInit{
export class AboutComponent implements OnInit {
faqs: any[] = faqs;
constructor(private title: Title) {
constructor(private title: Title,
private route: ActivatedRoute) {
}
ngOnInit() {
this.title.setTitle('OpenAIRE - UsageCounts | About');
this.route.fragment.subscribe(fragment => {
setTimeout(() => {
this.goTo(fragment);
}, 100);
});
}
goTo(id: string) {

View File

@ -5,7 +5,10 @@
<router-outlet></router-outlet>
</main>
</div>
<bottom *ngIf="!isHome" class="footer"
<bottom *ngIf="!isHome" class="footer uk-visible@m"
[showSocialButtons]="true" [showMenuItems]="true" [showOpenaire]="true"
[darkBackground]="false" [centered]="true"></bottom>
<bottom class="footer uk-hidden@m"
[showSocialButtons]="true" [showMenuItems]="true" [showOpenaire]="true"
[darkBackground]="false" [centered]="true"></bottom>
<cookie-law position="bottom">

View File

@ -34,10 +34,7 @@ const appRoutes: Routes = [
@NgModule({
imports: [RouterModule.forRoot(appRoutes, {
preloadingStrategy: PreloadAllModules,
anchorScrolling: 'enabled',
onSameUrlNavigation: 'reload',
scrollPositionRestoration: 'enabled',
scrollOffset: [0, 100]
scrollPositionRestoration: 'top'
})],
exports: [RouterModule]
})

View File

@ -24,11 +24,8 @@
<h2 class="uk-text-bold portal-color uk-text-right@m">Why OpenAIRE UsageCounts?</h2>
</div>
<div>
Register in OpenAIRE (via <a href="http://provide.openaire.eu" target="_blank">PROVIDE <span class="custom-icon custom-external"></span></a>),
share usage activity from your repository and receive cleaned and combined
statistics from aggregated usage data from sources around the world. Share
<a href="https://www.projectcounter.org/" target="_blank">COUNTER <span class="custom-icon custom-external"></span></a>
compliant reports via standard SUSHI-Lite APIs.
OpenAIRE UsageCounts is part of an Open Metrics framework which intends to standardize the sharing and exchange
of usage data (views and downloads) and develop trusted metrics to promote open science.
</div>
</div>
<div class="uk-grid uk-child-width-1-2@m uk-margin-top uk-padding" uk-grid uk-height-match="target: li">
@ -68,9 +65,13 @@
<div class="first-column">
<h5 class="uk-text-primary">Repository managers, publishers</h5>
<div class="uk-margin-top">
Register in OpenAIRE (via PROVIDE), share usage activity from your repository and receive cleaned and combined
statistics from aggregated usage data from sources around the world. Share COUNTER compliant reports via
standard SUSHI-Lite APIs.
Register in OpenAIRE (via <a href="http://provide.openaire.eu" target="_blank">PROVIDE <span
class="custom-icon custom-external"></span></a>),
share usage activity from your repository and receive cleaned and combined
statistics from aggregated usage data from sources around the world. Share
<a href="https://www.projectcounter.org/" target="_blank">COUNTER <span
class="custom-icon custom-external"></span></a>
compliant reports via standard SUSHI-Lite APIs.
</div>
<div class="uk-margin-medium-top uk-text-center">
<a class="uk-button uk-button-primary" routerLink="/resources">Learn More</a>
@ -79,9 +80,11 @@
</div>
<div>
<div class="second-column">
<h5 class="uk-text-primary">Research performing & funding organizations, research infrastructures, policy makers</h5>
<h5 class="uk-text-primary">Research performing & funding organizations, research infrastructures, policy
makers</h5>
<div class="uk-margin-top">
View research uptake, identify science trends based on user activity, examine the engagement and evolution or research popularity.
View research uptake, identify science trends based on user activity, examine the engagement and evolution
or research popularity.
</div>
<div class="uk-margin-medium-top uk-text-center">
<a class="uk-button uk-button-primary" routerLink="/resources/apis">Learn More</a>
@ -99,10 +102,13 @@
</div>
<div class="uk-width-2-3@m">
<ul class="light-blue-circle large">
<li>Provides standards for usage data exchange (<a href="https://openaire.github.io/usage-statistics-guidelines/" target="_blank">
OpenAIRE Usage Statistics Guidelines <span class="custom-icon custom-external"></span></a>)
<li>Provides standards for usage data exchange (<a
href="https://openaire.github.io/usage-statistics-guidelines/" target="_blank">
OpenAIRE Usage Statistics Guidelines <span class="custom-icon custom-external"></span></a>)
</li>
<li>Complies to <a href="https://www.projectcounter.org/" target="_blank">COUNTER <span
class="custom-icon custom-external"></span></a> Code of Practice for reliable and comparable reports
</li>
<li>Complies to <a href="https://www.projectcounter.org/" target="_blank">COUNTER <span class="custom-icon custom-external"></span></a> Code of Practice for reliable and comparable reports</li>
<li>Follows GDPR for trusted</li>
<li>Offers global coverage with partners in</li>
<li>Supports analysis via advanced visualizations</li>

View File

@ -30,7 +30,7 @@
.provide-background a.next {
position: absolute;
bottom: 10%;
bottom: 10vh;
right: 10%;
color: var(--portal-main-color);
line-height: 24px;

View File

@ -1,4 +1,4 @@
import {Component, OnInit} from '@angular/core';
import {AfterViewChecked, Component, OnInit} from '@angular/core';
import {Title} from '@angular/platform-browser';
import {ActivatedRoute} from '@angular/router';
@ -7,13 +7,19 @@ import {ActivatedRoute} from '@angular/router';
templateUrl: 'resources.component.html',
styleUrls: ['resources.component.css'],
})
export class ResourcesComponent implements OnInit{
constructor(private title: Title) {
export class ResourcesComponent implements OnInit {
constructor(private title: Title,
private route: ActivatedRoute) {
}
ngOnInit() {
this.title.setTitle('OpenAIRE - UsageCounts | Resources');
this.route.fragment.subscribe(fragment => {
setTimeout(() => {
this.goTo(fragment);
}, 100);
});
}
goTo(id: string) {

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 382 KiB

After

Width:  |  Height:  |  Size: 380 KiB

View File

@ -14,7 +14,7 @@ export let properties: EnvProperties = {
userInfoUrl: 'http://dl170.madgik.di.uoa.gr:8180/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=',
logoutUrl: 'https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=',
cookieDomain: '.di.uoa.gr',
cacheUrl: "http://mpagasas.di.uoa.gr:3200/get?url=",
cacheUrl: "https://demo.openaire.eu/cache/get?url=",
adminToolsAPIURL: 'http://duffy.di.uoa.gr:8080/uoa-admin-tools/',
reCaptchaSiteKey: '6LcVtFIUAAAAAB2ac6xYivHxYXKoUvYRPi-6_rLu',
admins: ['kostis30fylloy@gmail.com'],

View File

@ -87,7 +87,7 @@ ul.light-blue-circle li {
}
ul.light-blue-circle.large li {
margin: 0 0 50px 0;
margin: 0 0 40px 0;
}
ul.light-blue-circle li:last-child {