MaDgIK
/
connect
13
0
Fork 0
Code Issues Pull Requests Projects Releases 12 Wiki Activity

[Connect|Library] 

community page: css changes, also applied in configuration

share in zenodo: make variable private to correct build error

beta properties; update last index date




git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@56920 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2019-08-29 09:44:51 +00:00
parent 4c60c0564c
commit 19f663ea61
7 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deploy/beta-properties.json
View File

@ -108,6 +108,6 @@
"reCaptchaSiteKey": "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P",
"admins" : ["rcd-helpdesk@openaire.eu"],
"lastIndexUpdate": "2019-05-16",
"lastIndexUpdate": "2019-08-07",
"indexInfoAPI": "http://beta.services.openaire.eu/openaire/info/"
}

2
src/app/claims/linking/linkingGeneric.component.ts
View File

@ -5,7 +5,7 @@ import {PiwikHelper} from "../../utils/piwikHelper";
@Component({
selector: 'openaire-linking-generic',
template: `<linking-generic [communityId]=communityId [piwikSiteId]="piwikSiteId" title="Linking"></linking-generic>`
template: `<linking-generic [communityId]=communityId [piwikSiteId]="piwikSiteId" pageTitle="Linking"></linking-generic>`
})
export class OpenaireLinkingComponent {

11
src/app/community/community.component.html
View File

@ -24,13 +24,13 @@
<div *ngIf="showAllDescription" class=""> {{community.description}}</div>
<div *ngIf="!showAllDescription && community.description.length > 300 "
class="uk-animation-fade uk-text-center uk-text-bold">
<a (click)="showAllDescription = !showAllDescription;">View More
<a (click)="showAllDescription = !showAllDescription;">View more
</a>
</div>
<div *ngIf="showAllDescription"
class="uk-text-center uk-text-bold">
<a (click)="showAllDescription = !showAllDescription;">
View Less
View less
</a>
</div>
</div>
@ -160,13 +160,13 @@
<div *ngIf="!showAllSubjects && community.subjects.length > 4 "
class="uk-animation-fade uk-text-center uk-text-bold">
<a (click)="showAllSubjects = !showAllSubjects;">
View All
View more
</a>
</div>
<div *ngIf="showAllSubjects"
class="uk-text-center uk-text-bold">
<a (click)="showAllSubjects = !showAllSubjects;">
View Less
View less
</a>
</div>
</div>
@ -326,7 +326,8 @@
(click)="show='analysis';">Graph Analysis
</button>-->
<mat-form-field>
<mat-label>Select View</mat-label>
<div class="uk-margin-small-bottom">Select view</div>
<!-- <mat-label>Select view</mat-label>-->
<mat-select [(value)]="show">
<mat-option value="overview">Overview</mat-option>
<mat-option value="analysis">Graph Analysis</mat-option>

2
src/app/deposit/zenodo/shareInZenodo.component.ts
View File

@ -29,7 +29,7 @@ export class ShareInZenodoComponent {
public piwikSiteId = null;
properties: EnvProperties;
private communityId: string = null;
communityId: string = null;
private community: CommunityInfo = null;
public pageContents = null;
public divContents = null;

5
src/app/utils/customization/CustomizationOptions.ts
View File

@ -3,7 +3,7 @@ export class CustomizationOptions {
secondaryColor: string;
panel: {
background: {
gradientDirection: string;
// gradientDirection: string;
borderStyle: string;
borderColor: string;
borderWidth: string;
@ -21,7 +21,7 @@ export class CustomizationOptions {
color: string;
family: string;
size: string;
decoration: string;
// decoration: string;
onHover: {
color: string;
}
@ -29,6 +29,7 @@ export class CustomizationOptions {
buttons: {
backgroundColor: string;
color: string;
fontWeight:string;
borderStyle: string;
borderColor: string;
borderWidth: string;

23
src/app/utils/customization/customization.component.ts
View File

@ -69,10 +69,7 @@ export class CustomizationComponent {
border-width: ` + (this.layout.panel.background.borderWidth != null ? this.layout.panel.background.borderWidth : '1px') + `;`+`
}
.communityPanelBackground, .communityPanelBackground .uk-section-primary {
background-image: linear-gradient(` +
(this.layout.panel.background.gradientDirection != null ? this.layout.panel.background.gradientDirection : 'to right') + `,` +
this.layout.mainColor + `,` +
this.layout.secondaryColor + `);
background-color: ` + this.layout.mainColor + `;
}
/*Panel fonts*/
@ -102,13 +99,12 @@ export class CustomizationComponent {
+ (this.layout.panel.links.color != null ? this.layout.panel.links.color : 'white') + ` !important;` +
(this.layout.panel.links.family != null ? ('font-family: ' + this.layout.panel.links.family + ' !important;') : '') +
(this.layout.panel.links.size != null ? ('font-size: ' + this.layout.panel.links.size + ' !important;') : '') +
(this.layout.panel.links.decoration != null ? ('text-decoration: ' + this.layout.panel.links.decoration + ';') : '') +
`
}
.communityPanelBackground .uk-link:not(.ignoreCommunityPanelBackground):hover, .communityPanelBackground a:not(.uk-button):not(.uk-button-text):not(.ignoreCommunityPanelBackground):hover, .portal-card a:hover {
color: `
+ (this.layout.panel.links.color != null ? this.layout.panel.links.color : `rgba(255, 255, 255, 0.8)`) + ` !important;` + `
+ (this.layout.panel.links.onHover.color != null ? this.layout.panel.links.onHover.color : `rgba(255, 255, 255, 0.5)`) + ` !important;` + `
}
.uk-link, a:not(.uk-button), .uk-navbar-dropdown-nav > li > a, .uk-navbar-nav > li > a, .loginLink,
@ -134,7 +130,13 @@ export class CustomizationComponent {
background-color: ` + (this.layout.panel.panelElements.backgroundColor != null ? this.layout.panel.panelElements.backgroundColor : `rgba(255, 255, 255, 0.5)`) + `;
border-color: ` + (this.layout.panel.panelElements.borderColor != null ? this.layout.panel.panelElements.borderColor : `rgba(255, 255, 255, 0.5)`) + `;
}
.communityPanelBackground .uk-label:not(.ignoreCommunityPanelBackground) a{
border-color: ` + (this.layout.panel.links.color != null ? this.layout.panel.links.color : `rgba(255, 255, 255, 0.8)`) + `;
border-bottom: 1px solid;
}
.communityPanelBackground .uk-label:not(.ignoreCommunityPanelBackground) a:hover{
border-color: ` + (this.layout.panel.links.onHover.color != null ? this.layout.panel.links.onHover.color : `rgba(255, 255, 255, 0.5)`) + `;
}
.communityPanelBackground .uk-card:not(.ignoreCommunityPanelBackground), .communityPanelBackground .uk-label:not(.ignoreCommunityPanelBackground) {
color: ` + (this.layout.panel.panelElements.color != null ? this.layout.panel.panelElements.color : `rgba(255, 255, 255, 0.5)`) + `;
}
@ -144,7 +146,7 @@ export class CustomizationComponent {
border-radius:` + (this.layout.buttons.borderRadius != null ? this.layout.buttons.borderRadius : `4px`) + `;
}
.uk-button:not(.uk-button-text):not(.uk-button-default):not(.uk-button-primary), .portal-button {
background-color:` + (this.layout.buttons.backgroundColor != null ? this.layout.buttons.backgroundColor : `var(--portal-main-color)`) + `;
background-color:` + (this.layout.buttons.backgroundColor != null ? this.layout.buttons.backgroundColor : `#003052`) + `;
color: ` + (this.layout.buttons.color != null ? this.layout.buttons.color : `white`) + `;
border-color: ` + (this.layout.buttons.borderColor != null ? this.layout.buttons.borderColor : `transparent`) + `;
border-style: ` + (this.layout.buttons.borderStyle != null ? this.layout.buttons.borderStyle : `solid`) + `;
@ -154,9 +156,9 @@ export class CustomizationComponent {
}
.uk-button:not(.uk-button-text):not(.uk-button-default):not(.uk-button-primary):hover, .portal-button:hover {
background-color: ` + (this.layout.buttons.onHover.backgroundColor != null ? this.layout.buttons.onHover.backgroundColor : `var(--portal-dark-color)`) + `;
background-color: ` + (this.layout.buttons.onHover.backgroundColor != null ? this.layout.buttons.onHover.backgroundColor : `#154B71`) + `;
color: ` + (this.layout.buttons.onHover.color != null ? this.layout.buttons.onHover.color : `white`) + `;
border-color: ` + (this.layout.buttons.onHover.color != null ? this.layout.buttons.onHover.color : `white`) + `;
border-color: ` + (this.layout.buttons.onHover.color != null ? this.layout.buttons.onHover.color : `transparent`) + `;
}
/*Buttons*/
@ -167,6 +169,7 @@ export class CustomizationComponent {
border-style: ` + (this.layout.panel.buttons.borderStyle != null ? this.layout.panel.buttons.borderStyle : `solid`) + ` !important;
border-width: ` + (this.layout.panel.buttons.borderWidth != null ? this.layout.panel.buttons.borderWidth : `1px`) + ` !important;
border-radius:` + (this.layout.panel.buttons.borderRadius != null ? this.layout.panel.buttons.borderRadius : `4px`) + ` !important;
font-weight:` + (this.layout.panel.buttons.fontWeight != null ? this.layout.panel.buttons.fontWeight : `600`) + `;
}

5
src/assets/customizationOptions.json
View File

@ -3,7 +3,6 @@
"secondaryColor": "#24857F",
"panel": {
"background": {
"gradientDirection": "to right",
"borderStyle": null,
"borderColor": null,
"borderWidth": null
@ -21,13 +20,13 @@
"color": "rgba(255, 255, 255, 0.98)",
"family": null,
"size": null,
"decoration": null,
"onHover": {
"color": "rgba(255, 255, 255, 0.8) "
"color": null
}
},
"buttons": {
"backgroundColor": "white",
"fontWeight": null,
"color": null,
"borderStyle": null,
"borderColor": null,