From 4cb5f33e2ea21ca34669af63214056712892f8cc Mon Sep 17 00:00:00 2001 From: "argiro.kokogiannaki" Date: Mon, 3 Jul 2017 13:52:23 +0000 Subject: [PATCH] DP landing: add r3data / opendoar link, add english name | use svg instead of uk-icon=' icon: ...' attribute | changing layout for landing pages | add svg for statistics / metrics | first draft for git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@48265 d315682c-612b-4755-9ff5-7f18f6832af3 --- portal-2/src/app/app.component.ts | 4 +- .../claimContextSearchForm.component.ts | 40 ++- .../claimResultSearchForm.component.html | 10 +- .../displayClaims.component.html | 2 +- .../claims/claim-utils/startOver.component.ts | 2 +- .../linking/bulkClaim/bulkClaim.component.ts | 12 +- .../linking/linkingGeneric.component.ts | 16 +- .../claims/linking/linkingHome.component.ts | 57 ---- .../selected/selectedContexts.component.ts | 6 +- .../selected/selectedProjects.component.ts | 6 +- .../selected/selectedResults.component.ts | 16 +- .../depositBySubjectResult.component.ts | 6 +- .../app/deposit/depositResult.component.ts | 10 +- .../dataProvider/dataProvider.component.html | 90 +++--- .../dataProvider/dataProvider.service.ts | 13 +- .../dataProvider/tabs.component.ts | 8 +- .../dataset/dataset.component.html | 142 ++++++---- .../landingPages/dataset/dataset.component.ts | 6 +- .../landingPages/dataset/dataset.service.ts | 1 - .../citeThis/citeThis.component.ts | 25 +- .../src/app/landingPages/metrics.component.ts | 73 ++++- .../organization/organization.component.html | 97 +++---- .../project/project.component.html | 265 +++++++++--------- .../publication/publication.component.html | 156 ++++++----- .../publication/publication.component.ts | 4 +- .../landingPages/showIdentifiers.component.ts | 10 +- .../landingPages/showSubjects.component.ts | 55 ++-- .../app/landingPages/showTitle.component.ts | 21 +- .../app/searchPages/find/search.component.ts | 20 +- .../advancedSearchForm.component.ts | 6 +- .../advancedSearchPage.component.ts | 4 +- .../searchUtils/browseStatistic.component.ts | 11 +- .../searchUtils/searchDownload.component.ts | 2 +- .../searchUtils/searchFilter.component.ts | 13 +- .../searchUtils/searchForm.component.ts | 4 +- .../searchUtils/searchPage.component.ts | 41 ++- .../searchPageTableView.component.ts | 12 +- .../app/sharedComponents/bottom.component.ts | 37 +-- .../cookie-law/cookie-law.component.ts | 2 +- .../cookie-law/cookie-law.html | 4 +- .../app/utils/entities/dataProviderInfo.ts | 3 + .../entitiesAutoComplete.component.ts | 4 +- .../my-date-picker.component.html | 14 +- .../app/utils/pagingFormatter.component.ts | 8 +- .../utils/pagingFormatterNoLoad.component.ts | 6 +- .../staticAutoComplete.component.ts | 4 +- portal-2/src/assets/custom.css | 32 +++ portal-2/src/assets/dl119_files/custom.css | 29 +- portal-2/src/index.html | 2 + 49 files changed, 818 insertions(+), 593 deletions(-) delete mode 100644 portal-2/src/app/claims/linking/linkingHome.component.ts diff --git a/portal-2/src/app/app.component.ts b/portal-2/src/app/app.component.ts index dc666d11..1a142aaf 100644 --- a/portal-2/src/app/app.component.ts +++ b/portal-2/src/app/app.component.ts @@ -54,7 +54,9 @@ export class XLargeDirective { OpenAIRE uses cookies in order to function properly.
Cookies are small pieces of data that websites store in your browser to allow us to give you the best browsing experience possible. - By using the OpenAIRE portal you accept our use of cookies. Read more + By using the OpenAIRE portal you accept our use of cookies. Read more + +
diff --git a/portal-2/src/app/claims/claim-utils/claimContextSearchForm.component.ts b/portal-2/src/app/claims/claim-utils/claimContextSearchForm.component.ts index 801a8636..d6161611 100644 --- a/portal-2/src/app/claims/claim-utils/claimContextSearchForm.component.ts +++ b/portal-2/src/app/claims/claim-utils/claimContextSearchForm.component.ts @@ -35,40 +35,52 @@ import {ErrorCodes} from '../../login/utils/guardHelper.class';
Or Browse through categories
Publisher: {{result.publisher}}({{result.year}})
Authors: {{author.name}}{{(i < (result.authors.slice(0,10).length-1))?"; ":""}}{{(i == result.authors.slice(0,10).length-1 && result.authors.length > 10)?"...":""}}
diff --git a/portal-2/src/app/claims/claim-utils/displayClaims/displayClaims.component.html b/portal-2/src/app/claims/claim-utils/displayClaims/displayClaims.component.html index cda6dab9..128ae3ca 100644 --- a/portal-2/src/app/claims/claim-utils/displayClaims/displayClaims.component.html +++ b/portal-2/src/app/claims/claim-utils/displayClaims/displayClaims.component.html @@ -49,7 +49,7 @@
- +
diff --git a/portal-2/src/app/claims/claim-utils/startOver.component.ts b/portal-2/src/app/claims/claim-utils/startOver.component.ts index df38d17f..eb0acb2e 100644 --- a/portal-2/src/app/claims/claim-utils/startOver.component.ts +++ b/portal-2/src/app/claims/claim-utils/startOver.component.ts @@ -6,7 +6,7 @@ import {AlertModal} from '../../utils/modal/alert'; @Component({ selector: 'start-over', template: ` - + `, diff --git a/portal-2/src/app/claims/linking/bulkClaim/bulkClaim.component.ts b/portal-2/src/app/claims/linking/bulkClaim/bulkClaim.component.ts index de08f89f..c31831a5 100644 --- a/portal-2/src/app/claims/linking/bulkClaim/bulkClaim.component.ts +++ b/portal-2/src/app/claims/linking/bulkClaim/bulkClaim.component.ts @@ -16,11 +16,17 @@ import {ClaimResult} from '../../claim-utils/claimEntities.class';