From 7df383d956c0e6d2c1a3dffc2faf1ac4e31ce609 Mon Sep 17 00:00:00 2001 From: "argiro.kokogiannaki" Date: Wed, 21 Dec 2016 11:29:45 +0000 Subject: [PATCH] A few changes for uikit classes in main search page and simple search pages git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@45020 d315682c-612b-4755-9ff5-7f18f6832af3 --- .../claims/claimsAdmin.component.ts | 2 +- .../linking/selected/selected.component.ts | 22 +++--- .../selected/selectedContexts.component.ts | 4 +- .../selected/selectedDatasets.component.ts | 4 +- .../selected/selectedProjects.component.ts | 4 +- .../selectedPublications.component.ts | 4 +- .../selected/selectedResults.component.ts | 6 +- .../claimPages/myClaims/myClaims.component.ts | 2 +- .../app/deposit/depositResult.component.ts | 2 +- portal-2/src/app/home/home.component.ts | 69 +++-------------- .../dataProvider/datasetsTab.component.ts | 2 +- .../dataProvider/datasourcesTab.component.ts | 2 +- .../dataProvider/projectsTab.component.ts | 2 +- .../dataProvider/publicationsTab.component.ts | 2 +- .../dataset/dataset.component.html | 2 +- .../organization/organization.component.html | 2 +- .../landingPages/person/person.component.html | 4 +- .../project/project.component.html | 6 +- .../publication/publication.component.html | 26 +++---- .../landingPages/showSubjects.component.ts | 4 +- .../app/landingPages/tabPaging.component.ts | 4 +- .../app/searchPages/find/search.component.ts | 75 ++++++++++--------- .../advancedSearchForm.component.ts | 2 +- .../advancedSearchPage.component.ts | 2 +- .../searchUtils/searchDownload.component.ts | 4 +- .../searchUtils/searchFilter.component.ts | 62 ++++++--------- .../searchUtils/searchForm.component.ts | 9 +-- .../searchUtils/searchPage.component.ts | 38 +++++----- .../searchUtils/searchPaging.component.ts | 6 +- .../searchUtils/searchResult.component.ts | 10 +-- portal-2/src/app/test/test.component.ts | 26 ++++++- .../utils/entitiesAutoComplete.component.ts | 2 +- .../app/utils/pagingFormatter.component.ts | 12 ++- .../utils/pagingFormatterNoLoad.component.ts | 11 ++- .../app/utils/staticAutoComplete.component.ts | 2 +- portal-2/src/index.html | 19 +++-- 36 files changed, 202 insertions(+), 253 deletions(-) diff --git a/portal-2/src/app/claimPages/claims/claimsAdmin.component.ts b/portal-2/src/app/claimPages/claims/claimsAdmin.component.ts index 8f5c58d2..404817cc 100644 --- a/portal-2/src/app/claimPages/claims/claimsAdmin.component.ts +++ b/portal-2/src/app/claimPages/claims/claimsAdmin.component.ts @@ -10,7 +10,7 @@ import {Observable} from 'rxjs/Observable';

Claims Administrator

-
Add more Links?
+
Add more Links?
diff --git a/portal-2/src/app/claimPages/linking/selected/selected.component.ts b/portal-2/src/app/claimPages/linking/selected/selected.component.ts index fc907da9..4a9eb2fc 100644 --- a/portal-2/src/app/claimPages/linking/selected/selected.component.ts +++ b/portal-2/src/app/claimPages/linking/selected/selected.component.ts @@ -12,11 +12,11 @@ import {ClaimResult,ClaimProject, ClaimContext} from '../../../utils/entities/cl
@@ -117,7 +117,7 @@ Let us know how we are doing!

-
View all {{searchDatasetsComponent.searchUtils.totalResults}} results
+
View all {{searchDatasetsComponent.searchUtils.totalResults}} results
diff --git a/portal-2/src/app/landingPages/publication/publication.component.html b/portal-2/src/app/landingPages/publication/publication.component.html index aeeb8966..e62ca602 100644 --- a/portal-2/src/app/landingPages/publication/publication.component.html +++ b/portal-2/src/app/landingPages/publication/publication.component.html @@ -52,7 +52,7 @@
-
+
@@ -275,7 +275,7 @@
  • Collected from
    -
    +
    View less @@ -285,12 +285,12 @@ {{item['name']}}
    -
    +
    View less
    -
    +
    View more @@ -300,7 +300,7 @@
  • Download from
    -
    +
    View less @@ -320,12 +320,12 @@
    • -
    +
    View less
    -
    +
    View more @@ -335,7 +335,7 @@
  • Published in
    -
    +
    View less @@ -355,12 +355,12 @@
    -
    +
    View less
    -
    +
    View more @@ -371,7 +371,7 @@
  • Funded By
    -
    +
    View less @@ -396,12 +396,12 @@
    -
    +
    View less
    -
    +
    View more diff --git a/portal-2/src/app/landingPages/showSubjects.component.ts b/portal-2/src/app/landingPages/showSubjects.component.ts index 10635b4a..f2ad2a30 100644 --- a/portal-2/src/app/landingPages/showSubjects.component.ts +++ b/portal-2/src/app/landingPages/showSubjects.component.ts @@ -34,11 +34,11 @@ import {Component, Input} from '@angular/core';
    Show additional classifications - +
    Hide additional classifications - +
    diff --git a/portal-2/src/app/landingPages/tabPaging.component.ts b/portal-2/src/app/landingPages/tabPaging.component.ts index 3f59be6d..beff2ec4 100644 --- a/portal-2/src/app/landingPages/tabPaging.component.ts +++ b/portal-2/src/app/landingPages/tabPaging.component.ts @@ -6,11 +6,11 @@ import {Component, Input, Output, EventEmitter} from '@angular/core';
    -
    view all {{length}}
    +
    view all {{length}}
    - ` + ` }) export class TabPagingComponent { diff --git a/portal-2/src/app/searchPages/find/search.component.ts b/portal-2/src/app/searchPages/find/search.component.ts index 74f04620..22de21fa 100644 --- a/portal-2/src/app/searchPages/find/search.component.ts +++ b/portal-2/src/app/searchPages/find/search.component.ts @@ -23,7 +23,7 @@ import {OpenaireProperties} from '../../utils/properties/openaireProperties'; selector: 'search-find', template: ` -
    +

    {{pageTitle}}

    @@ -31,68 +31,70 @@ import {OpenaireProperties} from '../../utils/properties/openaireProperties'; +
    -
    - - -
    -
    -
    View all {{searchProjectsComponent.searchUtils.totalResults}} results
    +
    • +
  • +
    View all {{searchProjectsComponent.searchUtils.totalResults}} results
    - -
    -
    View all {{searchDataProvidersComponent.searchUtils.totalResults}} results
    +
    • +
  • +
    View all {{searchDataProvidersComponent.searchUtils.totalResults}} results
    - -
    -
    View all {{searchOrganizationsComponent.searchUtils.totalResults}} results
    +
    • +
  • +
    View all {{searchOrganizationsComponent.searchUtils.totalResults}} results
    - -
    -
    View all {{searchPeopleComponent.searchUtils.totalResults}} results
    +
    • +
  • +
    View all {{searchPeopleComponent.searchUtils.totalResults}} results
    - - +
    • + ` @@ -211,6 +213,7 @@ public subPub;public subData;public subProjects;public subOrg;public subPeople; } } private searchProjects() { + console.info("Here!!!"); this.activeTab = "projects"; if(this.reloadProjects) { this.reloadProjects = false; diff --git a/portal-2/src/app/searchPages/searchUtils/advancedSearchForm.component.ts b/portal-2/src/app/searchPages/searchUtils/advancedSearchForm.component.ts index 89bce8e3..1a9cfc62 100644 --- a/portal-2/src/app/searchPages/searchUtils/advancedSearchForm.component.ts +++ b/portal-2/src/app/searchPages/searchUtils/advancedSearchForm.component.ts @@ -72,7 +72,7 @@ import {Dates} from '../../utils/string-utils.class'; diff --git a/portal-2/src/app/searchPages/searchUtils/advancedSearchPage.component.ts b/portal-2/src/app/searchPages/searchUtils/advancedSearchPage.component.ts index 9bc11543..433bea6a 100644 --- a/portal-2/src/app/searchPages/searchUtils/advancedSearchPage.component.ts +++ b/portal-2/src/app/searchPages/searchUtils/advancedSearchPage.component.ts @@ -35,7 +35,7 @@ import {SearchUtilsClass} from './searchUtils.class'; [(selectedFields)]="selectedFields" (queryChange)="queryChanged($event)"> - + diff --git a/portal-2/src/app/searchPages/searchUtils/searchDownload.component.ts b/portal-2/src/app/searchPages/searchUtils/searchDownload.component.ts index 19b41c8b..5f44b6d2 100644 --- a/portal-2/src/app/searchPages/searchUtils/searchDownload.component.ts +++ b/portal-2/src/app/searchPages/searchUtils/searchDownload.component.ts @@ -6,13 +6,13 @@ import {AlertModal} from '../../utils/modal/alert'; selector: 'search-download', template: `
    -
    +
    Download report (CSV)
    -
    +
    Download report (CSV) diff --git a/portal-2/src/app/searchPages/searchUtils/searchFilter.component.ts b/portal-2/src/app/searchPages/searchUtils/searchFilter.component.ts index 79272043..93de28dd 100644 --- a/portal-2/src/app/searchPages/searchUtils/searchFilter.component.ts +++ b/portal-2/src/app/searchPages/searchUtils/searchFilter.component.ts @@ -6,55 +6,35 @@ import { Filter, Value} from './searchHelperClasses.class'; @Component({ selector: 'search-filter', template: ` -
    - {{_formatTitle(filter.title,filter.values.length)}} - - - -
    -
    -
    -

    + +

    +

    {{_formatTitle(filter.title,filter.values.length)}} +

    +
    - ` }) diff --git a/portal-2/src/app/searchPages/searchUtils/searchForm.component.ts b/portal-2/src/app/searchPages/searchUtils/searchForm.component.ts index 3ddedc85..e9c5138b 100644 --- a/portal-2/src/app/searchPages/searchUtils/searchForm.component.ts +++ b/portal-2/src/app/searchPages/searchUtils/searchForm.component.ts @@ -4,14 +4,9 @@ import {Observable} from 'rxjs/Observable'; @Component({ selector: 'search-form', template: ` -
    -
    - - - + + - -
    ` }) diff --git a/portal-2/src/app/searchPages/searchUtils/searchPage.component.ts b/portal-2/src/app/searchPages/searchUtils/searchPage.component.ts index a514207d..225a8783 100644 --- a/portal-2/src/app/searchPages/searchUtils/searchPage.component.ts +++ b/portal-2/src/app/searchPages/searchUtils/searchPage.component.ts @@ -11,45 +11,43 @@ import {DOI} from '../../utils/string-utils.class'; selector: 'search-page', template: ` -
    -
    +
    +

    {{pageTitle}} {{type}}

    -
    -
    -
    - +
    +
    -
    +
    Keywords: - {{searchUtils.keyword}} + {{searchUtils.keyword}} - {{filter.title}}: - - {{value.name}} - , + {{filter.title}}: + + {{value.name}} + , + - Clear Filters + Clear Filters
    -
    -
    -
    -

    - -

    +
    +
    +
    -
    +
    + +
    diff --git a/portal-2/src/app/searchPages/searchUtils/searchPaging.component.ts b/portal-2/src/app/searchPages/searchUtils/searchPaging.component.ts index 2ed3a4f2..2dde1f77 100644 --- a/portal-2/src/app/searchPages/searchUtils/searchPaging.component.ts +++ b/portal-2/src/app/searchPages/searchUtils/searchPaging.component.ts @@ -4,11 +4,11 @@ import {Observable} from 'rxjs/Observable'; @Component({ selector: 'search-paging', template: ` -
    -
    +
    +
    -
    +
    {{searchUtils.totalResults}} documents, page {{searchUtils.page}} of {{(totalPages())}}
    diff --git a/portal-2/src/app/searchPages/searchUtils/searchResult.component.ts b/portal-2/src/app/searchPages/searchUtils/searchResult.component.ts index 01ef22f4..f93e3fda 100644 --- a/portal-2/src/app/searchPages/searchUtils/searchResult.component.ts +++ b/portal-2/src/app/searchPages/searchUtils/searchResult.component.ts @@ -5,11 +5,11 @@ import { ErrorCodes} from '../../utils/properties/openaireProperties'; @Component({ selector: 'search-result', template: ` -
      - - - - +
        + + + +

      • diff --git a/portal-2/src/app/test/test.component.ts b/portal-2/src/app/test/test.component.ts index 79ecd56a..938d1e1e 100644 --- a/portal-2/src/app/test/test.component.ts +++ b/portal-2/src/app/test/test.component.ts @@ -17,7 +17,7 @@ import {SearchFields} from '../utils/properties/searchFields'; template: `
        Ready:{{ready}}
        - +
        @@ -652,12 +652,30 @@ import {SearchFields} from '../utils/properties/searchFields';

        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

    +
    + +

    Heading 1

    + + +

    Heading 2

    + + +

    Heading 3

    + + +
    ` }) export class TestComponent { - public lan; + public lan; public countries; public types; public projectId:string = "arc_________::000dc863f894b1664a9d5f868b7bde9f"; public url =('http://vaggelas.athenarc.gr/stats/merge.php?com=query&data=[{"table":"project_stats_monthly","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"id","agg":"sum"},"group":"month","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":0,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"untitled","yaxisheaders":["sum of views"],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"id","values":["'+this.projectId+'"],"to":"-1"}]}]&info_types=["spline"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true'); @@ -676,8 +694,8 @@ ngAfterViewChecked(){ } ngOnInit() { // this.lan = this._vocabulariesService.getLanguages(); - // this.lan = this._vocabulariesService.getVocabularyFromService("dnet:languages.json"); - // this.countries = this._vocabulariesService.getVocabularyFromService("dnet:countries.json"); + this.lan = this._vocabulariesService.getVocabularyFromService("dnet:languages.json"); + this.countries = this._vocabulariesService.getVocabularyFromService("dnet:countries.json"); var year ="1000"; console.info(year+" "+ Dates.isValidYear(year)); year ="600a.j"; diff --git a/portal-2/src/app/utils/entitiesAutoComplete.component.ts b/portal-2/src/app/utils/entitiesAutoComplete.component.ts index deda35b2..88afb460 100644 --- a/portal-2/src/app/utils/entitiesAutoComplete.component.ts +++ b/portal-2/src/app/utils/entitiesAutoComplete.component.ts @@ -18,7 +18,7 @@ import {EntitiesSearchService} from '../services/entitySearch.service';
    {{showItem(item)}} - +
    diff --git a/portal-2/src/app/utils/pagingFormatter.component.ts b/portal-2/src/app/utils/pagingFormatter.component.ts index 94dcc661..75fb595b 100644 --- a/portal-2/src/app/utils/pagingFormatter.component.ts +++ b/portal-2/src/app/utils/pagingFormatter.component.ts @@ -7,29 +7,27 @@ import {DomSanitizer} from '@angular/platform-browser'; selector: 'paging', template: ` - - ` }) diff --git a/portal-2/src/app/utils/pagingFormatterNoLoad.component.ts b/portal-2/src/app/utils/pagingFormatterNoLoad.component.ts index 90a5696e..7d70810c 100644 --- a/portal-2/src/app/utils/pagingFormatterNoLoad.component.ts +++ b/portal-2/src/app/utils/pagingFormatterNoLoad.component.ts @@ -6,26 +6,25 @@ import {Component, Input, Output, EventEmitter} from '@angular/core'; @Component({ selector: 'paging-no-load', template: ` - + ` }) diff --git a/portal-2/src/app/utils/staticAutoComplete.component.ts b/portal-2/src/app/utils/staticAutoComplete.component.ts index c55c240d..83e974e4 100644 --- a/portal-2/src/app/utils/staticAutoComplete.component.ts +++ b/portal-2/src/app/utils/staticAutoComplete.component.ts @@ -16,7 +16,7 @@ import {RefineFieldResultsService} from '../services/refineFieldResults.service'
    {{showItem(item)}} - +
    diff --git a/portal-2/src/index.html b/portal-2/src/index.html index 1197e43b..76cf7106 100644 --- a/portal-2/src/index.html +++ b/portal-2/src/index.html @@ -28,8 +28,8 @@ - - + + @@ -37,8 +37,12 @@ - - + + + + + + @@ -69,11 +73,14 @@