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 d6161611..9cf839fd 100644 --- a/portal-2/src/app/claims/claim-utils/claimContextSearchForm.component.ts +++ b/portal-2/src/app/claims/claim-utils/claimContextSearchForm.component.ts @@ -33,6 +33,7 @@ import {ErrorCodes} from '../../login/utils/guardHelper.class'; +
Or Browse through categories
- +
diff --git a/portal-2/src/app/claims/linking/linkingGeneric.component.ts b/portal-2/src/app/claims/linking/linkingGeneric.component.ts index c4da230f..0b89b902 100644 --- a/portal-2/src/app/claims/linking/linkingGeneric.component.ts +++ b/portal-2/src/app/claims/linking/linkingGeneric.component.ts @@ -38,7 +38,7 @@ declare var UIkit:any;
  • Select Research Results ({{results.length}})
  • Review metadata
    • - + diff --git a/portal-2/src/app/landingPages/dataProvider/dataProvider.component.html b/portal-2/src/app/landingPages/dataProvider/dataProvider.component.html index a0c01d08..c04ccea7 100644 --- a/portal-2/src/app/landingPages/dataProvider/dataProvider.component.html +++ b/portal-2/src/app/landingPages/dataProvider/dataProvider.component.html @@ -1,7 +1,7 @@
    - - - + + +
    diff --git a/portal-2/src/app/landingPages/dataset/dataset.component.html b/portal-2/src/app/landingPages/dataset/dataset.component.html index 81df17bb..8d382647 100644 --- a/portal-2/src/app/landingPages/dataset/dataset.component.html +++ b/portal-2/src/app/landingPages/dataset/dataset.component.html @@ -1,8 +1,8 @@
    - - - + + +
    diff --git a/portal-2/src/app/landingPages/metrics.component.ts b/portal-2/src/app/landingPages/metrics.component.ts index f5781277..8eb948fe 100644 --- a/portal-2/src/app/landingPages/metrics.component.ts +++ b/portal-2/src/app/landingPages/metrics.component.ts @@ -31,7 +31,7 @@ import {ErrorCodes} from '../utils/properties/openaireProperties';
    -
    +
    Page Views
    {{pageViews}}
    -
    +
    Total views
    Total Publication Views
    @@ -67,7 +67,7 @@ import {ErrorCodes} from '../utils/properties/openaireProperties';
    -
    +
    Total Downloads
    Total Publication Downloads
    @@ -89,37 +89,6 @@ import {ErrorCodes} from '../utils/properties/openaireProperties';
    -

    The information is available from the following content providers:

    diff --git a/portal-2/src/app/landingPages/organization/organization.component.html b/portal-2/src/app/landingPages/organization/organization.component.html index d3b1ea45..bc50ddb2 100644 --- a/portal-2/src/app/landingPages/organization/organization.component.html +++ b/portal-2/src/app/landingPages/organization/organization.component.html @@ -1,7 +1,7 @@
    - - - + + +
    diff --git a/portal-2/src/app/landingPages/project/project.component.html b/portal-2/src/app/landingPages/project/project.component.html index 69f985af..c705c2f2 100644 --- a/portal-2/src/app/landingPages/project/project.component.html +++ b/portal-2/src/app/landingPages/project/project.component.html @@ -1,7 +1,7 @@ -
    - - - +
    + + +
    diff --git a/portal-2/src/app/landingPages/publication/publication.component.html b/portal-2/src/app/landingPages/publication/publication.component.html index 1d7cd49e..81b52963 100644 --- a/portal-2/src/app/landingPages/publication/publication.component.html +++ b/portal-2/src/app/landingPages/publication/publication.component.html @@ -1,8 +1,8 @@
    - - - + + +
    diff --git a/portal-2/src/app/searchPages/searchUtils/searchResult.component.ts b/portal-2/src/app/searchPages/searchUtils/searchResult.component.ts index f90f6825..09008061 100644 --- a/portal-2/src/app/searchPages/searchUtils/searchResult.component.ts +++ b/portal-2/src/app/searchPages/searchUtils/searchResult.component.ts @@ -126,7 +126,7 @@ import {RouterHelper} from '../../utils/routerHelper.class'; Countries: {{country}}{{(i < ( result['countries'].slice(0,10).length-1))?", ":""}}{{(i == result['countries'].slice(0,10).length-1 && result['countries'].length > 10)?"...":""}}
    - Subjects {{subject}}{{(i < ( result['subjects'].slice(0,10).length-1))?", ":""}}{{(i == result['subjects'].slice(0,10).length-1 && result['subjects'].length > 10)?"...":""}} + Subjects: {{subject}}{{(i < ( result['subjects'].slice(0,10).length-1))?", ":""}}{{(i == result['subjects'].slice(0,10).length-1 && result['subjects'].length > 10)?"...":""}}
    diff --git a/portal-2/src/app/utils/entities/publicationInfo.ts b/portal-2/src/app/utils/entities/publicationInfo.ts index da2ce23c..bb6c8f38 100644 --- a/portal-2/src/app/utils/entities/publicationInfo.ts +++ b/portal-2/src/app/utils/entities/publicationInfo.ts @@ -21,7 +21,7 @@ export class PublicationInfo { fundedByProjects: { "id": string, "acronym": string, "title": string, "funderShortname": string, "funderName": string, "funding": string, "code": string, "provenanceAction": string, - inline: boolean}[]; + "inline": boolean}[]; bioentities: Map>; //> software: { "name": string, "url": string}[]; //> //relatedPublications: { "name": string, "url": string, "date": string, "trust": number}[]; diff --git a/portal-2/src/app/utils/properties/openaireProperties.ts b/portal-2/src/app/utils/properties/openaireProperties.ts index 295968cf..e2c9fe44 100644 --- a/portal-2/src/app/utils/properties/openaireProperties.ts +++ b/portal-2/src/app/utils/properties/openaireProperties.ts @@ -44,18 +44,18 @@ export class OpenaireProperties { private static claimsAPIURL_pm = "https://beta.services.openaire.eu/claims/rest/claimsService/"; private static searchAPIURLLAst_pm = "https://beta.services.openaire.eu/search/v2/api/"; - private static searchAPIURLLAst = "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/"; + private static searchAPIURLLAst = "https://beta.services.openaire.eu/search/v2/api/"; // private static searchAPIURLLAst = "http://scoobydoo.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/"; private static searchResourcesAPIURL_pm = "https://beta.services.openaire.eu/search/v2/api/resources"; - private static searchResourcesAPIURL = "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/resources"; + private static searchResourcesAPIURL = "https://beta.services.openaire.eu/search/v2/api/resources"; // private static searchResourcesAPIURL = "http://scoobydoo.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/resources"; private static csvAPIURL_pm = "https://beta.services.openaire.eu/search/v2/api/";//publications?format=csv - private static csvAPIURL = "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/";//publications?format=csv + // private static csvAPIURL = "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/";//publications?format=csv -// private static csvAPIURL = "http://scoobydoo.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/";//publications?format=csv + private static csvAPIURL = "https://beta.services.openaire.eu/search/v2/api/";//publications?format=csv private static searchCrossrefAPIURL = "https://api.crossref.org/works"; // private static searchDataciteAPIURL = "https://search.datacite.org/api"; diff --git a/portal-2/src/assets/custom.css b/portal-2/src/assets/custom.css index 1cf743b7..3205ca20 100644 --- a/portal-2/src/assets/custom.css +++ b/portal-2/src/assets/custom.css @@ -124,11 +124,15 @@ height: 500px; } + + + .filterItem span { display: inline-flex; } .filterItem .filterName { max-width: 71%; + } .browseFilters .filterItem .filterName { max-width: 68%; @@ -141,16 +145,23 @@ width: 20%; white-space: nowrap; } - +.browseFilters .filterItem span div { + min-width: 45px; +} .filterItem span div { overflow: hidden; text-overflow: ellipsis; +min-width: 65px; } + .browseFilters{ overflow-y: auto; overflow-x: hidden; max-height:265px; } + + + .custom-offcanvas-close { position: relative; right: 0; @@ -226,3 +237,20 @@ max-height:265px; color: #f0506e; } + + +/* +li span { + display: inline-flex; +} + +.item span { + width: 100px; + margin-left: 1em; + white-space: nowrap; +} + +.item span div { + overflow: hidden; + text-overflow: ellipsis; +}*/ diff --git a/portal-2/src/index.html b/portal-2/src/index.html index 150bc5cd..7a99fdfe 100644 --- a/portal-2/src/index.html +++ b/portal-2/src/index.html @@ -30,20 +30,6 @@ console.log("********UIKIT Error ***********"); $.getScript("assets/dl119_files/uikit.js"); $.getScript("assets/dl119_files/uikit-icons-max.js"); - // location.reload(); - // var script= document.createElement('script'); - // script.type= 'text/javascript'; - // script.src= 'assets/dl119_files/uikit.js'; - // head.appendChild(script); - // console.log("LOOOOOOOOOOOOOOOOOOOAD"); - -// jQuery.loadScript = function (url, callback) { -// jQuery.ajax({ -// url: url, -// dataType: 'script', -// });} -// $.loadScript("assets/dl119_files/uikit.js", function(){ -// console.log("LOOOOOOOOOOOOOOOOOOOAD");}); } }