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

Merge branch 'master' of code-repo.d4science.org:MaDgIK/connect

This commit is contained in:
Konstantinos Triantafyllou 2021-11-30 18:24:38 +02:00
parent 7266faaada 27fadef2bb
commit 3697bd305c
5 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/app.component.ts
View File

@ -169,7 +169,7 @@ export class AppComponent {
this.configurationService.initCommunityInformation(this.properties, (communityId) ? communityId : this.properties.adminToolsPortalType);
}
initLayout(communityId){
if(!this.layout) {
if(!this.layout && location.pathname.indexOf("/preview") == -1) {
this._layoutService.getLayout(this.properties, communityId).subscribe(
layout => {
if (layout) {

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

@ -631,7 +631,7 @@
</div>
</div>
</div>
<ng-container *ngIf="properties.environment == 'development' && communityId == 'enermaps'">
<ng-container *ngIf="communityId == 'enermaps'">
<div class="uk-section uk-container uk-container-large tm-middle">
<div class="">
<h3 class="uk-margin-large-top uk-text-center uk-text-muted uk-text-bold">
@ -642,9 +642,6 @@
<div class="icon-wrapper uk-flex uk-flex-center uk-flex-middle">
<img src="assets/connect-assets/home/website.svg">
</div>
<!-- <div class="text uk-margin-medium-top">
<a href="https://enermaps.eu/" target="_blank" class="uk-text-bolder uk-text-uppercase">Project Website <span uk-icon="icon: arrow-right" class="uk-icon"></span></a>
</div> -->
<div class="uk-margin-medium-top">
<a href="https://enermaps.eu/" target="_blank" class="uk-button uk-button-text uk-text-bolder custom-text">Project Website</a>
</div>
@ -654,23 +651,23 @@
<img src="assets/connect-assets/home/map.svg">
</div>
<div class="uk-margin-medium-top">
<a href="https://lab.idiap.ch/enermaps/" target="_blank" class="uk-button uk-button-text uk-text-bolder custom-text">Open Data Management Tool <span class="uk-text-capitalize">(Prototype)</span></a>
<a href="https://lab.idiap.ch/enermaps/" target="_blank" class="uk-button uk-button-text uk-text-bolder custom-text">Open Data Management Tool</a>
</div>
</div>
<div class="uk-flex uk-flex-column uk-flex-middle">
<div class="icon-wrapper uk-flex uk-flex-center uk-flex-middle">
<img src="assets/connect-assets/home/wiki.svg">
</div>
<div class="uk-margin-medium-top" uk-tooltip="Coming soon">
<a target="_blank" class="uk-button uk-button-text uk-disabled uk-text-bolder custom-text coming-soon-link" title="Coming soon">Wiki</a>
<div class="uk-margin-medium-top">
<a href="https://enermaps-wiki.herokuapp.com/" target="_blank" class="uk-button uk-button-text uk-text-bolder custom-text">Wiki</a>
</div>
</div>
<div class="uk-flex uk-flex-column uk-flex-middle">
<div class="icon-wrapper uk-flex uk-flex-center uk-flex-middle">
<img src="assets/connect-assets/home/training.svg">
</div>
<div class="uk-margin-medium-top" uk-tooltip="Coming soon">
<a target="_blank" class="uk-button uk-button-text uk-disabled uk-text-bolder custom-text coming-soon-link">Training</a>
<div class="uk-margin-medium-top">
<a href="https://www.youtube.com/watch?v=fHBeaKWS8Ss&list=PLhwt57nEFA8n295WJq_ickGCIBYHDcjm3&ab_channel=REVOLVE" target="_blank" class="uk-button uk-button-text uk-text-bolder custom-text">Training</a>
</div>
</div>
</div>

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

@ -62,15 +62,19 @@ export class CustomizationComponent {
:root {
--portal-main-color: ` + this.layout.identity.mainColor+`;
--portal-dark-color: ` + this.layout.identity.secondaryColor+`;
--background-light-color:` + this.layout.backgrounds.light.color+`;
}
`;
//Search SVG
let search = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2000 532"><defs><style>.cls-1{isolation:isolate;}.cls-2{fill:{{color}};mix-blend-mode:multiply;}</style></defs><title>Asset 3</title><g class="cls-1"><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-2" d="M0,431s362,109,841,62,632,68,1159-9V0H0Z"/><path class="cls-2" d="M0,514s1401,71,2000-69V0H0Z"/></g></g></g></svg>`;;
let svg = 'data:image/svg+xml,' + encodeURIComponent(search.replace('{{color}}', this.layout.backgrounds.form.color));
this.customizationCss = this.customizationCss.concat('.generalSearchForm,.publicationsSearchForm,.projectsSearchForm, .projectsTableSearchForm,.organizationsSearchForm,.datasourcesSearchForm {');
this.customizationCss = this.customizationCss.concat(' background: ' + "url('" + svg + "') transparent no-repeat center bottom; ");
this.customizationCss = this.customizationCss.concat(" background-size: cover !important; ");
this.customizationCss = this.customizationCss.concat(" height: inherit; }");
console.log(" create form css " , this.layout.backgrounds.form)
//Search SVG
let search = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2000 532"><defs><style>.cls-1{isolation:isolate;}.cls-2{fill:{{color}};mix-blend-mode:multiply;}</style></defs><title>Asset 3</title><g class="cls-1"><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-2" d="M0,431s362,109,841,62,632,68,1159-9V0H0Z"/><path class="cls-2" d="M0,514s1401,71,2000-69V0H0Z"/></g></g></g></svg>`;
;
let svg = 'data:image/svg+xml,' + encodeURIComponent(search.replace('{{color}}', this.layout.backgrounds.form.color));
this.customizationCss = this.customizationCss.concat('.generalSearchForm,.publicationsSearchForm,.projectsSearchForm, .projectsTableSearchForm,.organizationsSearchForm,.datasourcesSearchForm {');
this.customizationCss = this.customizationCss.concat(' background: '
+ "url('" + (this.layout.backgrounds.form.imageFile?(this.properties.utilsService + '/download/' +this.layout.backgrounds.form.imageFile): svg) + "') transparent no-repeat "+this.layout.backgrounds.form.position+" ;");
this.customizationCss = this.customizationCss.concat(" background-size: cover !important; ");
this.customizationCss = this.customizationCss.concat(" height: inherit; }");
//Button link SVG
let arrow = `<svg width="23" height="11" viewBox="0 0 23 11" xmlns="http://www.w3.org/2000/svg"><polyline fill="none" stroke="{{color}}" points="17 1 22 5.5 17 10 " /><line fill="none" stroke="{{color}}" x1="0" y1="5.5" x2="22.4" y2="5.5" /></svg>`;;

3
src/app/utils/piwikHelper.ts
View File

@ -24,7 +24,8 @@ export class PiwikHelper{
"gotriple":490,
"neanias-underwater":474,
"inspired-ris":530,
"citizen-science":538
"citizen-science":538,
"eut":558
};
public static getSiteId(communityId:string, environment:string){
return this.siteIDs[communityId];

3
src/assets/connect-custom.css
View File

@ -291,9 +291,6 @@ a:hover .user-circle-background {
.custom-text {
font-size: 14px !important;
}
.coming-soon-link:hover {
cursor: default;
}
.uk-text-bolder {
font-weight: 600 !important;
}