diff --git a/landingPages/dataProvider/dataProvider.component.html b/landingPages/dataProvider/dataProvider.component.html index 810a9df4..7ccd25d6 100644 --- a/landingPages/dataProvider/dataProvider.component.html +++ b/landingPages/dataProvider/dataProvider.component.html @@ -80,9 +80,9 @@
  • Publications - - {{fetchPublications.searchUtils.totalResults | number}} - + + ({{fetchPublications.searchUtils.totalResults | number}}) +
  • Research Data - - {{fetchDatasets.searchUtils.totalResults | number}} - + + ({{fetchDatasets.searchUtils.totalResults | number}}) +

    @@ -109,9 +109,9 @@

  • Software - - {{fetchSoftware.searchUtils.totalResults | number}} - + + ({{fetchSoftware.searchUtils.totalResults | number}}) +
    Other Research Products - - {{fetchOrps.searchUtils.totalResults | number}} - + + ({{fetchOrps.searchUtils.totalResults | number}}) +
    Projects - - {{fetchProjects.searchUtils.totalResults | number}} - + + ({{fetchProjects.searchUtils.totalResults | number}}) +
  • Content Providers - - {{fetchDataproviders.searchUtils.totalResults | number}} - + + ({{fetchDataproviders.searchUtils.totalResults | number}}) +
  • Organizations - - {{dataProviderInfo.organizations.length | number}} - + + ({{dataProviderInfo.organizations.length | number}}) +
    • +
    {{datasetInfo.description}} @@ -87,9 +88,9 @@ {{relatedResearchResultsNum | number}} --> - - {{relatedResearchResultsNum | number}} - + + ({{relatedResearchResultsNum | number}}) +
    -
    {{provenanceaction}}
    +
    {{provenanceaction}}
    @@ -113,9 +114,9 @@ {{datasetInfo.similarResearchResults.length | number}} --> - - {{datasetInfo.similarResearchResults.length | number}} - + + ({{datasetInfo.similarResearchResults.length | number}}) +
    - - - -
    @@ -259,7 +160,7 @@ -
      +
      • @@ -296,43 +197,46 @@
      • -
          -
        • -
          - Cite this research data -
          -
          - -
          -
          • -
        + +
        + Cite this research data +
        +
        + +
        +
        • - -
      + +
      + +
    @@ -345,7 +249,7 @@ -
    diff --git a/landingPages/landing-utils/addThis.component.ts b/landingPages/landing-utils/addThis.component.ts index 6e8726db..a4fca625 100644 --- a/landingPages/landing-utils/addThis.component.ts +++ b/landingPages/landing-utils/addThis.component.ts @@ -29,10 +29,14 @@ export class AddThisComponent { if (typeof document !== 'undefined' && typeof addthis !== 'undefined') { try{ + console.log("AddThis: try load"); addthis.init(); addthis.layers.refresh(); }catch (e) { console.log("AddThis may didn't load properly"); + addthis.init(); + addthis.layers.refresh(); + console.log("AddThis: one more"); } } }); diff --git a/landingPages/landing-utils/citeThis/citeThis.component.ts b/landingPages/landing-utils/citeThis/citeThis.component.ts index cadc0eb6..b713dec6 100644 --- a/landingPages/landing-utils/citeThis/citeThis.component.ts +++ b/landingPages/landing-utils/citeThis/citeThis.component.ts @@ -13,9 +13,10 @@ declare var Sys:any;
    -
    +
    @@ -23,7 +24,7 @@ declare var Sys:any; }) export class CiteThisComponent { private sub:any; - public selectedStyle:string; + public selectedStyle:string="0"; public citationText:string; public citation:Citation = new Citation(); // public cite: any; @@ -35,7 +36,7 @@ export class CiteThisComponent { constructor(private route: ActivatedRoute) { - this.selectedStyle = this.citation.templates[0]; + // this.selectedStyle = this.citation.templates[0]; } ngOnInit() { @@ -138,7 +139,7 @@ export class CiteThisComponent { } }; - var citeproc = new CSL.Engine(new Sys(this.citation.locale, this.data ), this.citation[this.selectedStyle]); + var citeproc = new CSL.Engine(new Sys(this.citation.locale, this.data ), this.citation[(this.selectedStyle == "0")?this.citation.templates[0]:this.selectedStyle]); citeproc.updateItems([this.data.id]); this.citationText = citeproc.makeBibliography(); this.citationText = ((this.citationText != null) && (this.citationText.length > 1) && (this.citationText[1].length > 0)) ? this.citationText[1][0] : ''; diff --git a/landingPages/landing-utils/fundedBy.component.ts b/landingPages/landing-utils/fundedBy.component.ts index e39a9790..a9a55210 100644 --- a/landingPages/landing-utils/fundedBy.component.ts +++ b/landingPages/landing-utils/fundedBy.component.ts @@ -78,7 +78,7 @@ export class FundedByComponent { public buildFundingTooltip(item: { "id": string, "acronym": string, "title": string, "funderShortname": string, "funderName": string, "funding": string, "code": string, "provenanceAction": string, inline: boolean}) { - let tooltipContent: string = "
    "; + let tooltipContent: string = "
    "; if(item.title) { tooltipContent += "
    "+item.title+"
    "; diff --git a/landingPages/organization/organization.component.html b/landingPages/organization/organization.component.html index 1352a74a..21059ce7 100644 --- a/landingPages/organization/organization.component.html +++ b/landingPages/organization/organization.component.html @@ -19,9 +19,9 @@
  • Publications - - {{fetchPublications.searchUtils.totalResults | number}} - + + ({{fetchPublications.searchUtils.totalResults | number}}) +
    @@ -69,9 +69,9 @@
  • Projects - - {{fetchProjects.searchUtils.totalResultsNoFilters | number}} - + + ({{fetchProjects.searchUtils.totalResultsNoFilters | number}}) +
    @@ -81,9 +81,9 @@
  • Content Providers - - {{fetchDataproviders.searchUtils.totalResults | number}} - + + ({{fetchDataproviders.searchUtils.totalResults | number}}) +
    diff --git a/landingPages/orp/orp.component.html b/landingPages/orp/orp.component.html index 6ea1a57b..5a128c1d 100644 --- a/landingPages/orp/orp.component.html +++ b/landingPages/orp/orp.component.html @@ -56,7 +56,7 @@
    -
    {{provenanceaction}}
    +
    {{provenanceaction}}
    diff --git a/landingPages/project/project.component.html b/landingPages/project/project.component.html index dd067a24..23eea1b3 100644 --- a/landingPages/project/project.component.html +++ b/landingPages/project/project.component.html @@ -83,9 +83,9 @@
  • Publications - - {{fetchPublications.searchUtils.totalResults | number}} - + + ({{fetchPublications.searchUtils.totalResults | number}}) +
    @@ -108,9 +108,9 @@
  • Research Data - - {{fetchDatasets.searchUtils.totalResults | number}} - + + ({{fetchDatasets.searchUtils.totalResults | number}}) +
    @@ -134,9 +134,9 @@
  • Software - - {{fetchSoftware.searchUtils.totalResults | number}} - + + ({{fetchSoftware.searchUtils.totalResults | number}}) +
    @@ -160,9 +160,9 @@
  • Other Research Products - - {{fetchOrps.searchUtils.totalResults | number}} - + + ({{fetchOrps.searchUtils.totalResults | number}}) +
    @@ -419,12 +419,17 @@
    - + + +
    + +
    +
    • -
    + +
    - + diff --git a/landingPages/publication/publication.component.html b/landingPages/publication/publication.component.html index ec579a8c..2046afe7 100644 --- a/landingPages/publication/publication.component.html +++ b/landingPages/publication/publication.component.html @@ -77,7 +77,7 @@ - +
    {{publicationInfo.description}}
    @@ -121,9 +121,9 @@ {{publicationInfo.references.length | number}} --> - - {{publicationInfo.references.length | number}} - + + ({{publicationInfo.references.length | number}}) +
    - - {{relatedResearchResultsNum | number}} - + + ({{relatedResearchResultsNum | number}}) +
    -
    {{provenanceaction}}
    +
    {{provenanceaction}}
    @@ -185,9 +185,9 @@ {{publicationInfo.similarResearchResults.length | number}} --> - - {{publicationInfo.similarResearchResults.length | number}} - + + ({{publicationInfo.similarResearchResults.length | number}}) +
    - - {{publicationInfo.organizations.length | number}} - + + ({{publicationInfo.organizations.length | number}}) +
    - - {{bioentitiesNum | number}} - + + ({{bioentitiesNum | number}}) +
    @@ -308,9 +308,9 @@ {{publicationInfo.software.length | number}} --> - - {{publicationInfo.software.length | number}} - + + ({{publicationInfo.software.length | number}}) +
    @@ -354,292 +354,6 @@ - - - - -
    @@ -651,7 +365,7 @@ -
      +
        • @@ -684,20 +398,47 @@
      • -
          -
        • -
          - Cite this publication -
          -
          + +
          + Cite this publication +
          +
          -
          • -
        -
      + + + +
      + +
    +
    @@ -724,7 +465,7 @@
    -
    +
    diff --git a/landingPages/software/software.component.html b/landingPages/software/software.component.html index 5a599a34..dba6f9ef 100644 --- a/landingPages/software/software.component.html +++ b/landingPages/software/software.component.html @@ -51,7 +51,7 @@ - +
    {{softwareInfo.description}}
    @@ -81,7 +81,7 @@
    --> -
    diff --git a/searchPages/advanced/advancedSearchDataProviders.component.ts b/searchPages/advanced/advancedSearchDataProviders.component.ts index 2fc0866d..39e3f836 100644 --- a/searchPages/advanced/advancedSearchDataProviders.component.ts +++ b/searchPages/advanced/advancedSearchDataProviders.component.ts @@ -24,7 +24,8 @@ import{EnvProperties} from '../../utils/properties/env-properties'; [csvParams]="csvParams" csvPath="datasources" simpleSearchLink="/search/find/dataproviders" [disableForms]="disableForms" [loadPaging]="loadPaging" - [oldTotalResults]="oldTotalResults" [piwikSiteId]=piwikSiteId> + [oldTotalResults]="oldTotalResults" [piwikSiteId]=piwikSiteId + searchFormClass="datasourcesSearchForm"> ` diff --git a/searchPages/advanced/advancedSearchDatasets.component.ts b/searchPages/advanced/advancedSearchDatasets.component.ts index 84b4304d..660143bc 100644 --- a/searchPages/advanced/advancedSearchDatasets.component.ts +++ b/searchPages/advanced/advancedSearchDatasets.component.ts @@ -23,7 +23,8 @@ import{EnvProperties} from '../../utils/properties/env-properties'; [csvParams]="csvParams" csvPath="datasets" simpleSearchLink="/search/find/datasets" [disableForms]="disableForms" [loadPaging]="loadPaging" - [oldTotalResults]="oldTotalResults" [(connectCommunityId)]=connectCommunityId [piwikSiteId]=piwikSiteId > + [oldTotalResults]="oldTotalResults" [(connectCommunityId)]=connectCommunityId [piwikSiteId]=piwikSiteId + searchFormClass="datasetsSearchForm"> ` diff --git a/searchPages/advanced/advancedSearchOrganizations.component.ts b/searchPages/advanced/advancedSearchOrganizations.component.ts index d314058e..36c8efdf 100644 --- a/searchPages/advanced/advancedSearchOrganizations.component.ts +++ b/searchPages/advanced/advancedSearchOrganizations.component.ts @@ -23,7 +23,8 @@ import{EnvProperties} from '../../utils/properties/env-properties'; [csvParams]="csvParams" csvPath="organizations" simpleSearchLink="/search/find/organizations" [disableForms]="disableForms" [loadPaging]="loadPaging" - [oldTotalResults]="oldTotalResults" [piwikSiteId]=piwikSiteId> + [oldTotalResults]="oldTotalResults" [piwikSiteId]=piwikSiteId + searchFormClass="organizationsSearchForm"> ` diff --git a/searchPages/advanced/advancedSearchOrps.component.ts b/searchPages/advanced/advancedSearchOrps.component.ts index cb42b12a..8d45ddc6 100644 --- a/searchPages/advanced/advancedSearchOrps.component.ts +++ b/searchPages/advanced/advancedSearchOrps.component.ts @@ -23,7 +23,8 @@ import{EnvProperties} from '../../utils/properties/env-properties'; [csvParams]="csvParams" csvPath="other" simpleSearchLink="/search/find/other" [disableForms]="disableForms" [loadPaging]="loadPaging" - [oldTotalResults]="oldTotalResults" [(connectCommunityId)]=connectCommunityId [piwikSiteId]=piwikSiteId > + [oldTotalResults]="oldTotalResults" [(connectCommunityId)]=connectCommunityId [piwikSiteId]=piwikSiteId + searchFormClass="orpsSearchForm"> ` diff --git a/searchPages/advanced/advancedSearchProjects.component.ts b/searchPages/advanced/advancedSearchProjects.component.ts index de555f9e..3323e24e 100644 --- a/searchPages/advanced/advancedSearchProjects.component.ts +++ b/searchPages/advanced/advancedSearchProjects.component.ts @@ -22,7 +22,8 @@ import{EnvProperties} from '../../utils/properties/env-properties'; [csvParams]="csvParams" csvPath="projects" simpleSearchLink="/search/find/projects" [disableForms]="disableForms" [loadPaging]="loadPaging" - [oldTotalResults]="oldTotalResults" [piwikSiteId]=piwikSiteId> + [oldTotalResults]="oldTotalResults" [piwikSiteId]=piwikSiteId + searchFormClass="projectsSearchForm"> ` diff --git a/searchPages/advanced/advancedSearchPublications.component.ts b/searchPages/advanced/advancedSearchPublications.component.ts index 66649c38..fab45653 100644 --- a/searchPages/advanced/advancedSearchPublications.component.ts +++ b/searchPages/advanced/advancedSearchPublications.component.ts @@ -25,7 +25,8 @@ import{EnvProperties} from '../../utils/properties/env-properties'; [loadPaging]="loadPaging" [oldTotalResults]="oldTotalResults" [(openaireLink)]=openaireLink - [(connectCommunityId)]=connectCommunityId [piwikSiteId]=piwikSiteId> + [(connectCommunityId)]=connectCommunityId [piwikSiteId]=piwikSiteId + searchFormClass="publicationsSearchForm"> ` }) diff --git a/searchPages/advanced/advancedSearchSoftware.component.ts b/searchPages/advanced/advancedSearchSoftware.component.ts index ef036a2f..d9789958 100644 --- a/searchPages/advanced/advancedSearchSoftware.component.ts +++ b/searchPages/advanced/advancedSearchSoftware.component.ts @@ -23,7 +23,8 @@ import{EnvProperties} from '../../utils/properties/env-properties'; [csvParams]="csvParams" csvPath="software" simpleSearchLink="/search/find/software" [disableForms]="disableForms" [loadPaging]="loadPaging" - [oldTotalResults]="oldTotalResults" [(connectCommunityId)]=connectCommunityId [piwikSiteId]=piwikSiteId> + [oldTotalResults]="oldTotalResults" [(connectCommunityId)]=connectCommunityId [piwikSiteId]=piwikSiteId + searchFormClass="softwareSearchForm"> ` diff --git a/searchPages/find/search.component.html b/searchPages/find/search.component.html index 7d48dcbb..c4440af6 100644 --- a/searchPages/find/search.component.html +++ b/searchPages/find/search.component.html @@ -1,70 +1,79 @@ +
    +
    +
    +
    +
    -
    - +
    +
    +
    + + +
    +
    -
    -
    -
    - - Advanced search for {{activeTab}} - - - -
    -
    -
    diff --git a/searchPages/searchUtils/advancedSearchForm.component.html b/searchPages/searchUtils/advancedSearchForm.component.html index 462115ae..909d8ef4 100644 --- a/searchPages/searchUtils/advancedSearchForm.component.html +++ b/searchPages/searchUtils/advancedSearchForm.component.html @@ -1,5 +1,14 @@ -
    + +
    + {{pageTitle}} +
    + Simple search + + @@ -52,8 +61,10 @@
    Search for:
    -
    - +
    +
    diff --git a/searchPages/searchUtils/advancedSearchForm.component.ts b/searchPages/searchUtils/advancedSearchForm.component.ts index 51f098fc..822a39e7 100644 --- a/searchPages/searchUtils/advancedSearchForm.component.ts +++ b/searchPages/searchUtils/advancedSearchForm.component.ts @@ -18,7 +18,8 @@ export class AdvancedSearchFormComponent { @Input() fieldIdsMap; @Input() selectedFields:AdvancedField[]; @Input() isDisabled: boolean = false; - + @Input() simpleSearchLink; + @Input() pageTitle; @Output() queryChange = new EventEmitter(); newFieldId:string; newFieldName:string; diff --git a/searchPages/searchUtils/advancedSearchForm.module.ts b/searchPages/searchUtils/advancedSearchForm.module.ts index 1ee2f437..264b01f7 100644 --- a/searchPages/searchUtils/advancedSearchForm.module.ts +++ b/searchPages/searchUtils/advancedSearchForm.module.ts @@ -1,6 +1,7 @@ import { NgModule} from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; +import { RouterModule } from '@angular/router'; import{AdvancedSearchFormComponent} from './advancedSearchForm.component'; import {EntitiesAutocompleteModule} from '../../utils/entitiesAutoComplete/entitiesAutoComplete.module'; @@ -10,7 +11,7 @@ import {DateFilterModule} from './dateFilter.module'; @NgModule({ imports: [ - CommonModule, FormsModule, EntitiesAutocompleteModule, StaticAutocompleteModule, DateFilterModule + CommonModule, FormsModule, RouterModule, EntitiesAutocompleteModule, StaticAutocompleteModule, DateFilterModule ], declarations: [ AdvancedSearchFormComponent, diff --git a/searchPages/searchUtils/advancedSearchPage.component.html b/searchPages/searchUtils/advancedSearchPage.component.html index c4ca7ab2..803dff47 100644 --- a/searchPages/searchUtils/advancedSearchPage.component.html +++ b/searchPages/searchUtils/advancedSearchPage.component.html @@ -1,29 +1,41 @@ -
    +
    +
    +
    +
    +
    + + +
    + + +
    +
    +
    +
    +
    + + + +
    -
    -
    - {{pageTitle}} -
    +
    +
    - Simple search - - - - +
    -
    +
    diff --git a/searchPages/searchUtils/advancedSearchPage.component.ts b/searchPages/searchUtils/advancedSearchPage.component.ts index 1991cf0e..43cfe876 100644 --- a/searchPages/searchUtils/advancedSearchPage.component.ts +++ b/searchPages/searchUtils/advancedSearchPage.component.ts @@ -40,6 +40,7 @@ export class AdvancedSearchPageComponent { @Input() oldTotalResults: number = 0; @Input() openaireLink: string; @Input() connectCommunityId: string; + @Input() searchFormClass: string = "searchForm"; piwiksub: any; public parameterNames:string[] =[]; public parameterValues:string[] =[]; @@ -275,7 +276,7 @@ export class AdvancedSearchPageComponent { if(this.fieldIdsMap[id]["param"] == parameter){ return this.fieldIdsMap[id]["operator"]; } - } + } } // for loading public openLoading(){ diff --git a/searchPages/searchUtils/browseStatistic.component.html b/searchPages/searchUtils/browseStatistic.component.html index ba8b952c..a6f6906b 100644 --- a/searchPages/searchUtils/browseStatistic.component.html +++ b/searchPages/searchUtils/browseStatistic.component.html @@ -7,8 +7,8 @@
    {{_formatName(value)}}
    ({{value.number | number}})     -
  • - View more diff --git a/searchPages/searchUtils/searchFilter.component.html b/searchPages/searchUtils/searchFilter.component.html index 56d84dd3..15e82629 100644 --- a/searchPages/searchUtils/searchFilter.component.html +++ b/searchPages/searchUtils/searchFilter.component.html @@ -1,17 +1,17 @@
    • -
      {{_formatTitle(filter.title,filter.values.length)}} +
      {{_formatTitle(filter.title,filter.values.length)}}
      • - +