diff --git a/src/app/service/appconfig.service.ts b/src/app/service/appconfig.service.ts
index 25ba60af7bccda5f4441cb7237112842ec0d019b..46e77329d2aee5953b8563cf0114e2411917296e 100644
--- a/src/app/service/appconfig.service.ts
+++ b/src/app/service/appconfig.service.ts
@@ -67,5 +67,9 @@ export class AppConfigService {
public getTestInstanceModalKey(): string {
return 'test_instance_modal';
-}
+ }
+
+ public getLandingProfile(): string {
+ return this.config.landing || ''
+ }
}
diff --git a/src/app/welcome/welcome.component.html b/src/app/welcome/welcome.component.html
index 2ec556ef09d36c7e75637b739d05dd5f2c69e1ac..208243487aa52f6d623042b0fdf11fa2c7fb060c 100644
--- a/src/app/welcome/welcome.component.html
+++ b/src/app/welcome/welcome.component.html
@@ -1,200 +1,254 @@
<div *ngIf="autoLogout" class="banner flex-center">
<div style="display: grid">
- <span class="text-center">{{'WELCOME.TIME_EXPIRED' | translate}}
+ <span class="text-center">{{'WELCOME.TIME_EXPIRED' | translate}}
<a class=""
style="width:3rem; height: 3rem; color: white; cursor: pointer" (click)="autoLogout=false">
- <em class="pi pi-times"></em>
- </a>
- </span>
+ <em class="pi pi-times"></em>
+ </a>
+ </span>
</div>
</div>
-<div class="container-fluid" onresize="this.onResize();">
- <div class="row">
- <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12" id="welcome-container"
- style="text-align: justify; font-size: large; padding: 0">
- <div class="col-lg-12">
- <section class="flex" style="justify-content: space-between; align-items: center; margin-top: 70px">
- <div class=" w-40" style="margin-left:200px; padding-right: 100px">
- <img src="assets/images/landing/VirtualNOC.png" width="80%">
- <p class="margin2">
- sample headline
- </p>
- <a href="https://vnoc.docs.nmaas.eu/" class="button margin2">
- Learn more
- </a>
- </div>
- <div class="flex w-40" style="justify-content: end">
- <img src="assets/images/landing/g1.png" width="100%">
+
+<div *ngIf="landingProfile === 'VNOC'; else elseBlock">
+
+ <div class="container-fluid" >
+ <div class="row">
+ <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12" id="welcome-container"
+ style="text-align: justify; font-size: large; padding: 0">
+ <div class="col-lg-12">
+ <section class="flex" style="justify-content: space-between; align-items: center; margin-top: 70px">
+ <div class=" w-40" style="margin-left:200px; padding-right: 100px">
+ <img src="assets/images/landing/VirtualNOC.png" width="80%">
+ <p class="margin2">
+ sample headline
+ </p>
+ <a href="https://vnoc.docs.nmaas.eu/" class="button margin2">
+ Learn more
+ </a>
+ </div>
+ <div class="flex w-40" style="justify-content: end">
+ <img src="assets/images/landing/g1.png" width="100%">
+ </div>
+ </section>
+ </div>
+ <!-- <div class="col-lg-offset-2 col-md-offset-2 col-sm-offset-2 col-lg-8 col-md-8 col-sm-8 col-xs-12">-->
+ <!-- <div style="display: block;" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 panel-body">-->
+ <!-- <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12" style="padding-bottom: 20px;">-->
+ <!-- <h2><strong>{{ 'WELCOME.TITLE1' | translate }}</strong> (<a href="https://www.geant.org/NMaaS"-->
+ <!-- target="_blank"-->
+ <!-- rel="noopener noreferrer">NMaaS</a>)-->
+ <!-- {{ 'WELCOME.TITLE2'| translate }}</h2>-->
+ <!-- </div>-->
+ <!-- <div style="padding-left: 10px;" class="col-lg-6 col-md-12 col-sm-12 col-xs-12">-->
+ <!-- <p>-->
+ <!-- {{ 'WELCOME.INTRO_TEXT' | translate }}-->
+ <!-- </p>-->
+ <!-- </div>-->
+ <!-- <div class="col-lg-6 col-md-12 col-sm-12 col-xs-12 ">-->
+ <!-- <img src="../../assets/images/landing/nmaas_schema_simple_text.png"-->
+ <!-- class="center-block glyphicon-align-center landing-img-sm"-->
+ <!-- style="width: 100%; height: 100%; max-width: 800px; max-height: 600px;" alt="NMaaS Schema">-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- <br>-->
+ <!-- <div style="display: block;" class="col-lg-12 panel-body landing-block-padding">-->
+ <!-- <div class="col-lg-3 col-md-4 col-sm-12 col-xs-12 ">-->
+ <!-- <img src="../../assets/images/landing/people_2.png" alt="Users"-->
+ <!-- class="center-block landing-img-sm landing-img-left">-->
+ <!-- </div>-->
+ <!-- <div style="padding-left: 10px;" class="col-lg-9 col-md-8 col-sm-12 col-xs-12">-->
+ <!-- <h3>{{ 'WELCOME.TARGET_USERS_HEADER' | translate }}</h3>-->
+ <!-- <p>-->
+ <!-- {{ 'WELCOME.TARGET_USERS_TEXT' | translate }}-->
+ <!-- </p>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- <br>-->
+ <!-- <div style="display: block;" class="col-lg-12 panel-body landing-block-padding">-->
+ <!-- <div style="padding-left: 10px;" class="col-lg-8 col-md-12 col-sm-12 col-xs-12">-->
+ <!-- <h3>{{ 'WELCOME.MARKETPLACE_HEADER' | translate }}</h3>-->
+ <!-- <p>{{ 'WELCOME.MARKETPLACE_TEXT' | translate }}</p>-->
+ <!-- </div>-->
+ <!-- <div class="col-lg-3 col-md-12 col-sm-12 col-xs-12">-->
+ <!-- <img src="../../assets/images/landing/shop_2.png" alt="Marketplace icon"-->
+ <!-- class="glyphicon-align-center center-block landing-img-sm landing-img-right">-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- <br>-->
+ <!-- <div style="display: block;" class="col-lg-12 panel-body landing-block-padding">-->
+ <!-- <div class="col-lg-3 col-md-3 col-sm-12 col-xs-12">-->
+ <!-- <img src="../../assets/images/landing/costs_3.png" alt="Cost reduction icon"-->
+ <!-- class="center-block landing-img-sm landing-img-left">-->
+ <!-- </div>-->
+ <!-- <div style="padding-left: 10px;" class="col-lg-9 col-md-9 col-sm-12 col-xs-12">-->
+ <!-- <h3>{{ 'WELCOME.COST_REDUCTION_HEADER' | translate }}</h3>-->
+ <!-- <p>{{ 'WELCOME.COST_REDUCTION_TEXT' | translate }}</p>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- <div style="display: block;" class="col-lg-12 panel-body landing-block-padding">-->
+ <!-- <div style="padding-left: 10px;" class="col-lg-9 col-md-9 col-sm-12 col-xs-12">-->
+ <!-- <h3>{{ 'WELCOME.SECURITY_HEADER' | translate }}</h3>-->
+ <!-- <p>{{ 'WELCOME.SECURITY_TEXT' | translate }}</p>-->
+ <!-- </div>-->
+ <!-- <div class="col-lg-3 col-md-3 col-sm-12 col-xs-12">-->
+ <!-- <img src="../../assets/images/landing/security.png" alt="Security icon"-->
+ <!-- class="center-block landing-img-sm landing-img-right"/>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- <br>-->
+ <!-- </div>-->
+ <!-- <div class="col-lg-offset-2 col-md-offset-2 col-sm-offset-2 col-lg-8 col-md-8 col-sm-8 col-xs-12"-->
+ <!-- style="border-top: solid 1px #6c757d; margin-top: 20px;">-->
+ <!-- <div class="col-lg-offset-4 col-lg-4 col-md-offset-2 col-md-8 col-sm-offset-1 col-sm-10 text-center features-bottom-padding features-top-padding">-->
+ <!-- <h2>{{ 'WELCOME.NMAAS_FEATURES_HEADER' | translate }}</h2>-->
+ <!-- </div>-->
+ <!-- <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 features-bottom-padding features-top-padding">-->
+ <!-- <div class="col-lg-offset-1 col-md-offset-1 col-lg-5 col-md-5 col-sm-6 col-xs-12">-->
+ <!-- <h3>{{ 'WELCOME.APP_MARKET_HEADER' | translate }}</h3>-->
+ <!-- <p>{{ 'WELCOME.APP_MARKET_TEXT' | translate }}</p>-->
+ <!-- </div>-->
+ <!-- <div class="col-lg-5 col-md-5 col-sm-6 col-xs-12">-->
+ <!-- <h3>{{ 'WELCOME.OWN_APPS_HEADER' | translate }}</h3>-->
+ <!-- <p>{{ 'WELCOME.OWN_APPS_TEXT' | translate }}</p>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 features-bottom-padding features-top-padding">-->
+ <!-- <div class="col-lg-offset-1 col-md-offset-1 col-lg-5 col-md-5 col-sm-6 col-xs-12">-->
+ <!-- <h3>{{ 'WELCOME.EDUGAIN_SUPPORT_HEADER' | translate }}</h3>-->
+ <!-- <p>{{ 'WELCOME.EDUGAIN_SUPPORT_TEXT' | translate }}-->
+ <!-- <p>-->
+ <!-- </div>-->
+ <!-- <div class="col-lg-5 col-md-5 col-sm-6 col-xs-12">-->
+ <!-- <h3>{{ 'WELCOME.FAST_DEPLOYMENT_HEADER' | translate }}</h3>-->
+ <!-- <p>{{ 'WELCOME.FAST_DEPLOYMENT_TEXT' | translate }}</p>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 features-bottom-padding features-top-padding">-->
+ <!-- <div class="col-lg-offset-1 col-md-offset-1 col-lg-5 col-md-5 col-sm-6 col-xs-12">-->
+ <!-- <h3>{{ 'WELCOME.WEB_PORTAL_HEADER' | translate }}</h3>-->
+ <!-- <p>{{ 'WELCOME.WEB_PORTAL_TEXT' | translate }}</p>-->
+ <!-- </div>-->
+ <!-- <div class="col-lg-5 col-md-5 col-sm-6 col-xs-12">-->
+ <!-- <h3>{{ 'WELCOME.KUBERNETES_HEADER' | translate }}</h3>-->
+ <!-- <p>{{ 'WELCOME.KUBERNETES_TEXT' | translate }}</p>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- <div class="col-lg-offset-2 col-md-offset-2 col-sm-offset-2 col-lg-8 col-md-8 col-sm-8 col-xs-12"-->
+ <!-- style="border-top: solid 1px #6c757d; margin-top: 20px;">-->
+ <!-- <div class="col-lg-offset-4 col-lg-4 col-md-offset-4 col-md-4 col-sm-offset-2 col-sm-8 col-xs-12 text-center"-->
+ <!-- style="padding-top: 15px;-->
+ <!-- padding-bottom: 10px;"><h2>{{ 'WELCOME.TECHNOLOGIES_USED_HEADER' | translate }}</h2></div>-->
+ <!-- <div class="center-block col-lg-12 col-md-12 col-sm-12 col-xs-12">-->
+ <!-- <div class="col-lg-3 col-md-4 col-sm-6 col-xs-6">-->
+ <!-- <a href="https://angular.io/" target="_blank" rel="noopener noreferrer nofollow">-->
+ <!-- <img src="../../assets/images/logo/angular.png" alt="Angular logo" class="landing-img-logo"></a>-->
+ <!-- </div>-->
+ <!-- <div class="col-lg-3 col-md-4 col-sm-6 col-xs-6">-->
+ <!-- <a href="https://getbootstrap.com/" target="_blank" rel="noopener noreferrer nofollow">-->
+ <!-- <img src="../../assets/images/logo/bootstrap.png" alt="Bootstrap logo"-->
+ <!-- class="landing-img-logo"></a>-->
+ <!-- </div>-->
+ <!-- <div class="col-lg-3 col-md-4 col-sm-6 col-xs-6">-->
+ <!-- <a href="https://spring.io/" target="_blank" rel="noopener noreferrer nofollow">-->
+ <!-- <img src="../../assets/images/logo/spring.png" alt="Spring logo"-->
+ <!-- class="landing-img-logo"></a>-->
+ <!-- </div>-->
+ <!-- <div class="col-lg-3 col-md-4 col-sm-6 col-xs-6">-->
+ <!-- <a href="https://www.postgresql.org/" target="_blank" rel="noopener noreferrer nofollow">-->
+ <!-- <img src="../../assets/images/logo/postgres.png" alt="PostgreSQL logo"-->
+ <!-- class="landing-img-logo"></a>-->
+ <!-- </div>-->
+ <!-- <div class="col-lg-3 col-md-4 col-sm-6 col-xs-6">-->
+ <!-- <a href="https://www.docker.com/" target="_blank" rel="noopener noreferrer nofollow">-->
+ <!-- <img src="../../assets/images/logo/docker.png" alt="Docker logo"-->
+ <!-- class="landing-img-logo"></a>-->
+ <!-- </div>-->
+ <!-- <div class="col-lg-3 col-md-4 col-sm-6 col-xs-6">-->
+ <!-- <a href="https://kubernetes.io/" target="_blank" rel="noopener noreferrer nofollow">-->
+ <!-- <img src="../../assets/images/logo/kuber.png" alt="Kubernetes logo"-->
+ <!-- class="landing-img-logo"></a>-->
+ <!-- </div>-->
+ <!-- <div class="col-lg-3 col-md-4 col-sm-6 col-xs-6">-->
+ <!-- <a href="https://about.gitlab.com/" target="_blank" rel="noopener noreferrer nofollow">-->
+ <!-- <img src="../../assets/images/logo/gitlab.png" alt="Gitlab logo"-->
+ <!-- class="landing-img-logo"></a>-->
+ <!-- </div>-->
+ <!-- <div class="col-lg-3 col-md-4 col-sm-6 col-xs-6">-->
+ <!-- <a href="https://www.ansible.com/" target="_blank" rel="noopener noreferrer nofollow">-->
+ <!-- <img src="../../assets/images/logo/ansible.png" alt="Ansible logo" class="landing-img-logo"></a>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <div id="login-register-panel" class="col-lg-3 col-md-5 col-sm-6 col-xs-12 pull-right login-vertical-offset"
+ [ngClass]="router.url.startsWith('/welcome/login?ssoUserId=') ? '' : 'collapse'"
+ style="z-index: 800; position: fixed; right: 1px; margin-top: -15px; max-height: 50vh; font-size: 14px;">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ </div>
+ <div class="panel-body" id="login-out" style="overflow-y: auto;">
+ <ul class="nav nav-tabs nav-justified">
+ <li role="login" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:false}">
+ <a [routerLink]="['login']">{{ 'WELCOME.LOGIN' | translate }}</a></li>
+ <li role="registration" [routerLinkActive]="['active']"
+ [routerLinkActiveOptions]="{exact:true}"><a
+ [routerLink]="['registration']">{{ 'WELCOME.REGISTER' | translate }}</a></li>
+ </ul>
+ <router-outlet></router-outlet>
+ </div>
</div>
- </section>
+ </div>
</div>
-<!-- <div class="col-lg-offset-2 col-md-offset-2 col-sm-offset-2 col-lg-8 col-md-8 col-sm-8 col-xs-12">-->
-<!-- <div style="display: block;" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 panel-body">-->
-<!-- <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12" style="padding-bottom: 20px;">-->
-<!-- <h2><strong>{{ 'WELCOME.TITLE1' | translate }}</strong> (<a href="https://www.geant.org/NMaaS"-->
-<!-- target="_blank"-->
-<!-- rel="noopener noreferrer">NMaaS</a>)-->
-<!-- {{ 'WELCOME.TITLE2'| translate }}</h2>-->
-<!-- </div>-->
-<!-- <div style="padding-left: 10px;" class="col-lg-6 col-md-12 col-sm-12 col-xs-12">-->
-<!-- <p>-->
-<!-- {{ 'WELCOME.INTRO_TEXT' | translate }}-->
-<!-- </p>-->
-<!-- </div>-->
-<!-- <div class="col-lg-6 col-md-12 col-sm-12 col-xs-12 ">-->
-<!-- <img src="../../assets/images/landing/nmaas_schema_simple_text.png"-->
-<!-- class="center-block glyphicon-align-center landing-img-sm"-->
-<!-- style="width: 100%; height: 100%; max-width: 800px; max-height: 600px;" alt="NMaaS Schema">-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <br>-->
-<!-- <div style="display: block;" class="col-lg-12 panel-body landing-block-padding">-->
-<!-- <div class="col-lg-3 col-md-4 col-sm-12 col-xs-12 ">-->
-<!-- <img src="../../assets/images/landing/people_2.png" alt="Users"-->
-<!-- class="center-block landing-img-sm landing-img-left">-->
-<!-- </div>-->
-<!-- <div style="padding-left: 10px;" class="col-lg-9 col-md-8 col-sm-12 col-xs-12">-->
-<!-- <h3>{{ 'WELCOME.TARGET_USERS_HEADER' | translate }}</h3>-->
-<!-- <p>-->
-<!-- {{ 'WELCOME.TARGET_USERS_TEXT' | translate }}-->
-<!-- </p>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <br>-->
-<!-- <div style="display: block;" class="col-lg-12 panel-body landing-block-padding">-->
-<!-- <div style="padding-left: 10px;" class="col-lg-8 col-md-12 col-sm-12 col-xs-12">-->
-<!-- <h3>{{ 'WELCOME.MARKETPLACE_HEADER' | translate }}</h3>-->
-<!-- <p>{{ 'WELCOME.MARKETPLACE_TEXT' | translate }}</p>-->
-<!-- </div>-->
-<!-- <div class="col-lg-3 col-md-12 col-sm-12 col-xs-12">-->
-<!-- <img src="../../assets/images/landing/shop_2.png" alt="Marketplace icon"-->
-<!-- class="glyphicon-align-center center-block landing-img-sm landing-img-right">-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <br>-->
-<!-- <div style="display: block;" class="col-lg-12 panel-body landing-block-padding">-->
-<!-- <div class="col-lg-3 col-md-3 col-sm-12 col-xs-12">-->
-<!-- <img src="../../assets/images/landing/costs_3.png" alt="Cost reduction icon"-->
-<!-- class="center-block landing-img-sm landing-img-left">-->
-<!-- </div>-->
-<!-- <div style="padding-left: 10px;" class="col-lg-9 col-md-9 col-sm-12 col-xs-12">-->
-<!-- <h3>{{ 'WELCOME.COST_REDUCTION_HEADER' | translate }}</h3>-->
-<!-- <p>{{ 'WELCOME.COST_REDUCTION_TEXT' | translate }}</p>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div style="display: block;" class="col-lg-12 panel-body landing-block-padding">-->
-<!-- <div style="padding-left: 10px;" class="col-lg-9 col-md-9 col-sm-12 col-xs-12">-->
-<!-- <h3>{{ 'WELCOME.SECURITY_HEADER' | translate }}</h3>-->
-<!-- <p>{{ 'WELCOME.SECURITY_TEXT' | translate }}</p>-->
-<!-- </div>-->
-<!-- <div class="col-lg-3 col-md-3 col-sm-12 col-xs-12">-->
-<!-- <img src="../../assets/images/landing/security.png" alt="Security icon"-->
-<!-- class="center-block landing-img-sm landing-img-right"/>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <br>-->
-<!-- </div>-->
-<!-- <div class="col-lg-offset-2 col-md-offset-2 col-sm-offset-2 col-lg-8 col-md-8 col-sm-8 col-xs-12"-->
-<!-- style="border-top: solid 1px #6c757d; margin-top: 20px;">-->
-<!-- <div class="col-lg-offset-4 col-lg-4 col-md-offset-2 col-md-8 col-sm-offset-1 col-sm-10 text-center features-bottom-padding features-top-padding">-->
-<!-- <h2>{{ 'WELCOME.NMAAS_FEATURES_HEADER' | translate }}</h2>-->
-<!-- </div>-->
-<!-- <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 features-bottom-padding features-top-padding">-->
-<!-- <div class="col-lg-offset-1 col-md-offset-1 col-lg-5 col-md-5 col-sm-6 col-xs-12">-->
-<!-- <h3>{{ 'WELCOME.APP_MARKET_HEADER' | translate }}</h3>-->
-<!-- <p>{{ 'WELCOME.APP_MARKET_TEXT' | translate }}</p>-->
-<!-- </div>-->
-<!-- <div class="col-lg-5 col-md-5 col-sm-6 col-xs-12">-->
-<!-- <h3>{{ 'WELCOME.OWN_APPS_HEADER' | translate }}</h3>-->
-<!-- <p>{{ 'WELCOME.OWN_APPS_TEXT' | translate }}</p>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 features-bottom-padding features-top-padding">-->
-<!-- <div class="col-lg-offset-1 col-md-offset-1 col-lg-5 col-md-5 col-sm-6 col-xs-12">-->
-<!-- <h3>{{ 'WELCOME.EDUGAIN_SUPPORT_HEADER' | translate }}</h3>-->
-<!-- <p>{{ 'WELCOME.EDUGAIN_SUPPORT_TEXT' | translate }}-->
-<!-- <p>-->
-<!-- </div>-->
-<!-- <div class="col-lg-5 col-md-5 col-sm-6 col-xs-12">-->
-<!-- <h3>{{ 'WELCOME.FAST_DEPLOYMENT_HEADER' | translate }}</h3>-->
-<!-- <p>{{ 'WELCOME.FAST_DEPLOYMENT_TEXT' | translate }}</p>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 features-bottom-padding features-top-padding">-->
-<!-- <div class="col-lg-offset-1 col-md-offset-1 col-lg-5 col-md-5 col-sm-6 col-xs-12">-->
-<!-- <h3>{{ 'WELCOME.WEB_PORTAL_HEADER' | translate }}</h3>-->
-<!-- <p>{{ 'WELCOME.WEB_PORTAL_TEXT' | translate }}</p>-->
-<!-- </div>-->
-<!-- <div class="col-lg-5 col-md-5 col-sm-6 col-xs-12">-->
-<!-- <h3>{{ 'WELCOME.KUBERNETES_HEADER' | translate }}</h3>-->
-<!-- <p>{{ 'WELCOME.KUBERNETES_TEXT' | translate }}</p>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- <div class="col-lg-offset-2 col-md-offset-2 col-sm-offset-2 col-lg-8 col-md-8 col-sm-8 col-xs-12"-->
-<!-- style="border-top: solid 1px #6c757d; margin-top: 20px;">-->
-<!-- <div class="col-lg-offset-4 col-lg-4 col-md-offset-4 col-md-4 col-sm-offset-2 col-sm-8 col-xs-12 text-center"-->
-<!-- style="padding-top: 15px;-->
-<!-- padding-bottom: 10px;"><h2>{{ 'WELCOME.TECHNOLOGIES_USED_HEADER' | translate }}</h2></div>-->
-<!-- <div class="center-block col-lg-12 col-md-12 col-sm-12 col-xs-12">-->
-<!-- <div class="col-lg-3 col-md-4 col-sm-6 col-xs-6">-->
-<!-- <a href="https://angular.io/" target="_blank" rel="noopener noreferrer nofollow">-->
-<!-- <img src="../../assets/images/logo/angular.png" alt="Angular logo" class="landing-img-logo"></a>-->
-<!-- </div>-->
-<!-- <div class="col-lg-3 col-md-4 col-sm-6 col-xs-6">-->
-<!-- <a href="https://getbootstrap.com/" target="_blank" rel="noopener noreferrer nofollow">-->
-<!-- <img src="../../assets/images/logo/bootstrap.png" alt="Bootstrap logo"-->
-<!-- class="landing-img-logo"></a>-->
-<!-- </div>-->
-<!-- <div class="col-lg-3 col-md-4 col-sm-6 col-xs-6">-->
-<!-- <a href="https://spring.io/" target="_blank" rel="noopener noreferrer nofollow">-->
-<!-- <img src="../../assets/images/logo/spring.png" alt="Spring logo"-->
-<!-- class="landing-img-logo"></a>-->
-<!-- </div>-->
-<!-- <div class="col-lg-3 col-md-4 col-sm-6 col-xs-6">-->
-<!-- <a href="https://www.postgresql.org/" target="_blank" rel="noopener noreferrer nofollow">-->
-<!-- <img src="../../assets/images/logo/postgres.png" alt="PostgreSQL logo"-->
-<!-- class="landing-img-logo"></a>-->
-<!-- </div>-->
-<!-- <div class="col-lg-3 col-md-4 col-sm-6 col-xs-6">-->
-<!-- <a href="https://www.docker.com/" target="_blank" rel="noopener noreferrer nofollow">-->
-<!-- <img src="../../assets/images/logo/docker.png" alt="Docker logo"-->
-<!-- class="landing-img-logo"></a>-->
-<!-- </div>-->
-<!-- <div class="col-lg-3 col-md-4 col-sm-6 col-xs-6">-->
-<!-- <a href="https://kubernetes.io/" target="_blank" rel="noopener noreferrer nofollow">-->
-<!-- <img src="../../assets/images/logo/kuber.png" alt="Kubernetes logo"-->
-<!-- class="landing-img-logo"></a>-->
-<!-- </div>-->
-<!-- <div class="col-lg-3 col-md-4 col-sm-6 col-xs-6">-->
-<!-- <a href="https://about.gitlab.com/" target="_blank" rel="noopener noreferrer nofollow">-->
-<!-- <img src="../../assets/images/logo/gitlab.png" alt="Gitlab logo"-->
-<!-- class="landing-img-logo"></a>-->
-<!-- </div>-->
-<!-- <div class="col-lg-3 col-md-4 col-sm-6 col-xs-6">-->
-<!-- <a href="https://www.ansible.com/" target="_blank" rel="noopener noreferrer nofollow">-->
-<!-- <img src="../../assets/images/logo/ansible.png" alt="Ansible logo" class="landing-img-logo"></a>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
- <div id="login-register-panel" class="col-lg-3 col-md-5 col-sm-6 col-xs-12 pull-right login-vertical-offset"
- [ngClass]="router.url.startsWith('/welcome/login?ssoUserId=') ? '' : 'collapse'"
- style="z-index: 800; position: fixed; right: 1px; margin-top: -15px; max-height: 50vh; font-size: 14px;">
- <div class="panel panel-default">
- <div class="panel-heading">
+ </div>
+ </div>
+</div>
+<ng-template #elseBlock>
+ <div>
+ <div class="container-fluid" >
+ <div class="row">
+ <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12" id="welcome-container"
+ style="text-align: justify; font-size: large; padding: 0">
+ <div class="col-lg-12">
+ <section class="flex" style="justify-content: space-between; align-items: center; margin-top: 70px">
+ <div class=" w-40" style="margin-left:200px; padding-right: 100px">
+ <img src="assets/images/landing/VirtualNOC.png" width="80%">
+ <p class="margin2">
+ sample headline NOT VNOC
+ </p>
+ <a href="https://vnoc.docs.nmaas.eu/" class="button margin2">
+ Learn more
+ </a>
+ </div>
+ <div class="flex w-40" style="justify-content: end">
+ <img src="assets/images/landing/g1.png" width="100%">
+ </div>
+ </section>
</div>
- <div class="panel-body" id="login-out" style="overflow-y: auto;">
- <ul class="nav nav-tabs nav-justified">
- <li role="login" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:false}">
- <a [routerLink]="['login']">{{ 'WELCOME.LOGIN' | translate }}</a></li>
- <li role="registration" [routerLinkActive]="['active']"
- [routerLinkActiveOptions]="{exact:true}"><a
- [routerLink]="['registration']">{{ 'WELCOME.REGISTER' | translate }}</a></li>
- </ul>
- <router-outlet></router-outlet>
+ <div id="login-register-panel" class="col-lg-3 col-md-5 col-sm-6 col-xs-12 pull-right login-vertical-offset"
+ [ngClass]="router.url.startsWith('/welcome/login?ssoUserId=') ? '' : 'collapse'"
+ style="z-index: 800; position: fixed; right: 1px; margin-top: -15px; max-height: 50vh; font-size: 14px;">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ </div>
+ <div class="panel-body" id="login-out" style="overflow-y: auto;">
+ <ul class="nav nav-tabs nav-justified">
+ <li role="login" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:false}">
+ <a [routerLink]="['login']">{{ 'WELCOME.LOGIN' | translate }}</a></li>
+ <li role="registration" [routerLinkActive]="['active']"
+ [routerLinkActiveOptions]="{exact:true}"><a
+ [routerLink]="['registration']">{{ 'WELCOME.REGISTER' | translate }}</a></li>
+ </ul>
+ <router-outlet></router-outlet>
+ </div>
+ </div>
</div>
</div>
</div>
- </div>
+ </div>
</div>
-</div>
+
+
+
+
+
+</ng-template>
diff --git a/src/app/welcome/welcome.component.ts b/src/app/welcome/welcome.component.ts
index 28a252852de68582390c0fcde4c17816a6b153be..6e8a863fd7e15aad123a0844796c5ecf508c537b 100644
--- a/src/app/welcome/welcome.component.ts
+++ b/src/app/welcome/welcome.component.ts
@@ -14,6 +14,8 @@ export class WelcomeComponent implements OnInit, AfterViewChecked, AfterContentC
public autoLogout = false;
+ public landingProfile = '';
+
constructor(private appConfig: AppConfigService,
public router: Router,
private serviceHealth: ServiceUnavailableService,
@@ -32,36 +34,42 @@ export class WelcomeComponent implements OnInit, AfterViewChecked, AfterContentC
if (!this.serviceHealth.isServiceAvailable) {
this.router.navigate(['/service-unavailable']);
}
- this.onResize();
+ // this.onResize();
+
+ this.landingProfile = this.appConfig.getLandingProfile();
+ console.log("Landing profile = ", this.landingProfile)
}
ngAfterContentChecked() {
- this.onResize();
+ // this.onResize();
}
ngAfterViewChecked() {
- this.onResize();
+ // this.onResize();
}
public onCloseBanner() {
this.autoLogout = false;
this.router.navigate(['welcome/login']);
}
+
+ // As the comment belove said, its very old solution ( working, but may produce problems) If we rebuild the landing page completly,
+ //I would advice to not use onRize // kbeyrowski
- onResize() {
- // TODO
- // rewrite this code, use css instead of js for better performance
- this.height = document.getElementById('global-footer').offsetHeight;
- const navHeight = document.getElementById('navbar').offsetHeight;
- // document.getElementById("welcome-container").style.marginBottom = `${this.height}px`;
- // document.getElementById("welcome-container").style.marginTop = `${navHeight + 2}px`;
- document.getElementById('login-out').style.maxHeight = `calc(95vh - ${this.height + navHeight + 10}px)`;
- // document.getElementById('login-out').style.paddingTop = `${navHeight}`;
- if (this.height > 90) {
- document.getElementById('global-footer').style.textAlign = 'center';
- document.getElementById('login-out').style.maxHeight = `calc(94vh - ${this.height + navHeight + 10}px)`;
- } else {
- document.getElementById('global-footer').style.textAlign = 'right';
- }
- }
+ // onResize() {
+ // // TODO
+ // // rewrite this code, use css instead of js for better performance
+ // this.height = document.getElementById('global-footer').offsetHeight;
+ // const navHeight = document.getElementById('navbar').offsetHeight;
+ // // document.getElementById("welcome-container").style.marginBottom = `${this.height}px`;
+ // // document.getElementById("welcome-container").style.marginTop = `${navHeight + 2}px`;
+ // document.getElementById('login-out').style.maxHeight = `calc(95vh - ${this.height + navHeight + 10}px)`;
+ // // document.getElementById('login-out').style.paddingTop = `${navHeight}`;
+ // if (this.height > 90) {
+ // document.getElementById('global-footer').style.textAlign = 'center';
+ // document.getElementById('login-out').style.maxHeight = `calc(94vh - ${this.height + navHeight + 10}px)`;
+ // } else {
+ // document.getElementById('global-footer').style.textAlign = 'right';
+ // }
+ // }
}
diff --git a/src/config.json b/src/config.json
index fcc2368efb15cb4f860abf0938afec2160a9a9f8..3b4e008b3f93a80b48bfe1b62a590d6efd354817 100644
--- a/src/config.json
+++ b/src/config.json
@@ -9,6 +9,7 @@
},
"captchaKey": "6LeJgbQUAAAAAAs5pVoY3ZTRimQKNYmyC_QyQ4Yg",
"showGitInfo": true,
- "showChangelog": true
+ "showChangelog": true,
+ "landing" :"VNOC"
}