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

Add new Content Page, add property in order to add or not the link in bottom menu 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@52452 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2018-06-12 11:33:29 +00:00
parent 18a2caa6e4
commit 9d0a640539
6 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
connect-production-properties.json
View File

@ -2,6 +2,7 @@
"enablePiwikTrack" : true,
"enableHelper" : true,
"useCache" : true,
"showContent" : false,
"metricsAPIURL" : "https://beta.services.openaire.eu/usagestats/",
"framesAPIURL" : "https://beta.openaire.eu/stats3/",
"statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/",

1
prepareDeploy.sh
View File

@ -1,6 +1,7 @@
cp connect-production-properties.json src/assets/env-properties.json;
rm -rf src/assets/common-assets/.svn/;
rm -rf src/app/openaireLibrary/.svn/;
pico src/app/openaireLibrary/utils/properties/environment-specific.service.ts;
npm run build:dynamic;
rm -rf src node_modules .idea/ connect-production-properties.json installOpenaireLib.sh;
echo 'Ready!';

1
src/app/app-routing.module.ts
View File

@ -12,6 +12,7 @@ const routes: Routes = [
// { path: 'communities', loadChildren: './communities/communities.module#CommunitiesModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'my-communities', loadChildren: './my-communities/communities.module#MyCommunitiesModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'about', loadChildren: './htmlPages/about/aboutPage.module#AboutPageModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'content', loadChildren: './content/contentPage.module#ContentPageModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'organizations', loadChildren: './htmlPages/organizations/organizationsPage.module#OrganizationsPageModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'monitor', loadChildren: './statistics/statistics.module#StatisticsModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'search/publication', loadChildren: './landingPages/publication/libPublication.module#LibPublicationModule', resolve: { envSpecific: EnvironmentSpecificResolver }},

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

@ -36,7 +36,7 @@ import {ConnectHelper} from './openaireLibrary/connect/connectHelper';
</span></a>
</cookie-law>
<bottom *ngIf= "isClient && showMenu && !community" [menuItems]=bottomMenuItems></bottom>
<bottom *ngIf= "isClient && community" [showSocialButton] = "false" [showMenu]=false [showDnet] =false showOpenaire=true [(communityId)]="community.id" [(APIUrl)]="properties.adminToolsAPIURL" ></bottom>
<bottom *ngIf= "isClient && community" [showSocialButton] = "false" [showMenu]=true [showDnet] =false showOpenaire=true [(communityId)]="community.id" [(APIUrl)]="properties.adminToolsAPIURL" [menuItems]=bottomMenuItems ></bottom>
`
@ -116,9 +116,18 @@ export class AppComponent {
new MenuItem("","Blog","https://blogs.openaire.eu/","",false,[],[],{}),
new MenuItem("","Contact us","https://beta.openaire.eu/contact-us","",false,[],[],{})
];
if(this.properties.showContent){
this.bottomMenuItems.push(new MenuItem("","Content Policy","","/content",false,[],[],{}));
}
}else{
this.bottomMenuItems = []
this.bottomMenuItems = [
new MenuItem("","About","","/about",false,[],["/about"],(typeof document !== 'undefined' && ConnectHelper.isProduction(document.location.hostname))?{}:{communityId:community.communityId}),
new MenuItem("","Organizations","","/organizations",false,[],["/organizations"],(typeof document !== 'undefined' && ConnectHelper.isProduction(document.location.hostname))?{}:{communityId:community.communityId})
];
if(this.properties.showContent){
this.bottomMenuItems.push(new MenuItem("","Content Policy","","/content",false,[],[],{}));
}
}
this.showMenu = true;

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

@ -24,7 +24,7 @@
</blockquote>
<div *ngIf="community.subjects != null">
<span *ngFor="let subject of community.subjects.slice(0,10) let i=index">
<span *ngIf="subject != ''" class="uk-label">{{subject}}</span>
<span *ngIf="subject != ''" class="uk-label uk-margin-small-bottom">{{subject}}</span>
<!-- <span *ngIf=" i<9 && i<(community.subjects.length-1)">&nbsp;</span> -->
</span>
<span *ngIf="showAll">

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

@ -2,6 +2,7 @@
"enablePiwikTrack" : false,
"enableHelper" : true,
"useCache" : false,
"showContent" : true,
"metricsAPIURL" : "https://beta.services.openaire.eu/usagestats/",
"framesAPIURL" : "https://beta.openaire.eu/stats3/",
"statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/",
@ -55,7 +56,7 @@
"cacheUrl" :"http://scoobydoo.di.uoa.gr:3000/get?url=",
"adminToolsAPIURL" :"http://duffy.di.uoa.gr:8080/uoa-admin-tools",
"adminToolsAPIURL" :"http://scoobydoo.di.uoa.gr:8080/uoa-admin-tools",
"adminToolsCommunity" :"openaire",