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

[Connect|Trunk]: Fix bug with menu build before communities has been loaded. Remove blue background from Info cards on home page. 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@56392 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
k.triantafyllou 2019-07-08 09:59:21 +00:00
parent ca16e83c27
commit b29d3eac05
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,10 +79,12 @@ export class AppComponent {
this._communitiesService.updateCommunities(this.properties, this.properties.communitiesAPI); this._communitiesService.updateCommunities(this.properties, this.properties.communitiesAPI);
if(this.properties.environment == "development") { if(this.properties.environment == "development") {
this.route.queryParams.subscribe(data => { this.route.queryParams.subscribe(data => {
this.showMenu = false;
communityId = data['communityId']; communityId = data['communityId'];
this.buildMenu(communityId); this.buildMenu(communityId);
}); });
} else { } else {
this.showMenu = false;
communityId = ConnectHelper.getCommunityFromDomain(this.properties.domain); communityId = ConnectHelper.getCommunityFromDomain(this.properties.domain);
this.buildMenu(communityId); this.buildMenu(communityId);
} }
@ -103,9 +105,11 @@ export class AppComponent {
public buildMenu(communityId: string) { public buildMenu(communityId: string) {
var community = null; var community = null;
this.community = null; this.community = null;
this.showMenu = false;
this._communitiesService.getCommunitiesState().subscribe ( this._communitiesService.getCommunitiesState().subscribe (
communities => { communities => {
if(communities.length === 0 && communityId !== null && communityId !== '') {
return;
}
for(var com of communities){ for(var com of communities){
if( (communityId && communityId!="" && com.communityId == communityId if( (communityId && communityId!="" && com.communityId == communityId
&& community !=null) || && community !=null) ||

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

@ -89,7 +89,6 @@
} }
.connectInfoCard { .connectInfoCard {
background: #ECF3FD;
box-shadow: 3px 3px 10px rgba(0, 0, 0, 0.24); box-shadow: 3px 3px 10px rgba(0, 0, 0, 0.24);
} }

2
src/assets/env-properties.json
View File

@ -116,5 +116,5 @@
"reCaptchaSiteKey": "6LcVtFIUAAAAAB2ac6xYivHxYXKoUvYRPi-6_rLu", "reCaptchaSiteKey": "6LcVtFIUAAAAAB2ac6xYivHxYXKoUvYRPi-6_rLu",
"admins" : ["kostis30fylloy@gmail.com","argirok@di.uoa.gr"] "admins" : ["kostis30fylloy@gmail.com"]
} }

2
src/index.html
View File

@ -72,7 +72,7 @@ $(document).ready(function(){
<link rel="stylesheet" href="assets/common-assets/common/theme.css"> <link rel="stylesheet" href="assets/common-assets/common/theme.css">
<link rel="stylesheet" href="assets/common-assets/common/custom.css"> <link rel="stylesheet" href="assets/common-assets/common/custom.css">
<link rel="stylesheet" href="assets/common-assets/library.css?v=2"> <link rel="stylesheet" href="assets/common-assets/library.css?v=2">
<link rel="stylesheet" href="assets/connect-custom.css?v=2"> <link rel="stylesheet" href="assets/connect-custom.css?v=3">
<script src="assets/common-assets/clipboard.min.js"></script> <script src="assets/common-assets/clipboard.min.js"></script>