MaDgIK
/
connect-admin
13
0
Fork 0
Code Issues Pull Requests Projects Releases 8 Wiki Activity

[Admin|Trunk] 

merging branch newlinking into trunk 56306:56718
adding margins after theme update




git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-admin-portal/trunk@56723 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2019-07-23 12:51:41 +00:00
parent 01b24acdff
commit 25ceec0d6a
6 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deploy/beta-properties.json
View File

@ -101,5 +101,7 @@
"showLastIndexInformationLink" : true, "showLastIndexInformationLink" : true,
"widgetLink" : "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", "widgetLink" : "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
"claimsInformationLink": "https://beta.openaire.eu/linking" "claimsInformationLink": "https://beta.openaire.eu/linking",
"lastIndexUpdate": "2019-05-16",
"indexInfoAPI": "http://beta.services.openaire.eu/openaire/info/"
} }

7
src/app/app.component.html
View File

@ -2,11 +2,12 @@
[homeurl] = false [userMenuItems]=userMenuItems [menuItems]=menuItems [properties]=properties [homeurl] = false [userMenuItems]=userMenuItems [menuItems]=menuItems [properties]=properties
[community]=community class="adminMenu"></navbar> [community]=community class="adminMenu"></navbar>
<div id="wrapper" class="uk-section uk-margin-top uk-padding-remove-bottom"> <div id="wrapper" class="uk-section uk-padding-remove">
<div class="uk-grid-collapse" uk-height-viewport="expand: true" uk-grid> <div class="uk-grid-collapse" uk-height-viewport="expand: true" uk-grid>
<sidebar *ngIf="showSidebar" [menuItems]="sideMenuItems" class="uk-width-1-5 uk-light sidebar uk-margin-top"></sidebar> <sidebar *ngIf="showSidebar" [menuItems]="sideMenuItems" class="uk-width-1-5 uk-light sidebar "></sidebar>
<div class="uk-width-expand uk-margin-top uk-overflow-auto" [ngClass]="(!wellcome)?'uk-container uk-container-large uk-padding':''" <div class="uk-width-expand uk-overflow-auto" [ngClass]="(!wellcome)?'uk-container uk-container-large uk-padding':''"
[ngStyle]="{height: (!wellcome)?'85vh':'90vh'}"> [ngStyle]="{height: (!wellcome)?'85vh':'90vh'}">
<router-outlet></router-outlet> <router-outlet></router-outlet>
</div> </div>
<!-- <!--

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

@ -192,13 +192,13 @@ export class AppComponent implements OnInit{
ukIcon: 'cog' ukIcon: 'cog'
}); });
this.sideMenuItems.push( { this.sideMenuItems.push( {
rootItem: new MenuItem('communities', 'Manage Explore', '', rootItem: new MenuItem('communities', 'Explore', '',
'/dashboard', false, [], [], {communityId: 'openaire'}), '/dashboard', false, [], [], {communityId: 'openaire'}),
items: [], items: [],
ukIcon: 'cog' ukIcon: 'cog'
}); });
this.sideMenuItems.push( { this.sideMenuItems.push( {
rootItem: new MenuItem('communities', 'Manage Connect', '', rootItem: new MenuItem('communities', 'Connect', '',
'/dashboard', false, [], [], {communityId: 'connect'}), '/dashboard', false, [], [], {communityId: 'connect'}),
items: [], items: [],
ukIcon: 'cog' ukIcon: 'cog'

4
src/app/pages/dashboard/dashboard.component.html
View File

@ -12,8 +12,8 @@
Edit community information, change logo url, add community managers or organizations related to community. Edit community information, change logo url, add community managers or organizations related to community.
</div> </div>
<div> <div>
<a routerLink="/community-edit-form" [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">Edit Community Profile</a><br> <a routerLink="/community-edit-form" [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">Community Profile</a><br>
<a routerLink="/organizations" [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">Edit Community Organizations</a> <a routerLink="/organizations" [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">Community Organizations</a>
</div> </div>
</div> </div>
<div *ngIf="communityId != 'openaire' && this.communityId !== 'connect'" class="uk-card uk-card-default uk-card-body uk-card-hover"> <div *ngIf="communityId != 'openaire' && this.communityId !== 'connect'" class="uk-card uk-card-default uk-card-body uk-card-hover">

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

@ -27,7 +27,7 @@ import {HelperFunctions} from '../../openaireLibrary/utils/HelperFunctions.class
<div *ngIf="communities.length > 0" class="uk-container uk-container-large uk-section"> <div *ngIf="communities.length > 0" class="uk-container uk-container-large uk-section">
<div class="uk-container"> <div class="uk-container">
<div class="uk-grid-match uk-grid-small uk-child-width-1-4@m uk-child-width-1-2@s uk-child-width-1-1@xs <div class="uk-grid-match uk-grid-small uk-child-width-1-4@m uk-child-width-1-2@s uk-child-width-1-1@xs
uk-text-center" uk-grid> uk-text-center uk-margin-large-top" uk-grid>
<div *ngFor="let community of communities;"> <div *ngFor="let community of communities;">
<div class="uk-padding-small uk-height-max-medium uk-card uk-card-default communityCard"> <div class="uk-padding-small uk-height-max-medium uk-card uk-card-default communityCard">
<div class="uk-container" *ngIf="community"> <div class="uk-container" *ngIf="community">

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

@ -102,5 +102,7 @@
"showLastIndexInformationLink" : false, "showLastIndexInformationLink" : false,
"widgetLink" : "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", "widgetLink" : "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
"claimsInformationLink": "https://www.openaire.eu/linking-beta" "claimsInformationLink": "https://www.openaire.eu/linking-beta",
"lastIndexUpdate": "2019-05-16",
"indexInfoAPI": "http://beta.services.openaire.eu/openaire/info/"
} }