Skip to content
Snippets Groups Projects

Resolve "Re-work login and registration views based on new landing page design"

Merged Resolve "Re-work login and registration views based on new landing page design"
217-re-work-login-and-registration-views-based-on-new-landing-page-design into develop
Merged Joanna Kaźmierczak requested to merge 217-re-work-login-and-registration-views-based-on-new-landing-page-design into develop
Viewing commit 92b3210b
Prev Next
Show latest version
1 file
+ 45
− 103
Compare changes
  • Side-by-side
  • Inline
src/app/welcome/welcome.component.html
+ 45
− 103
@@ -12,7 +12,7 @@
@@ -12,7 +12,7 @@
<div *ngIf="landingProfile === 'VNOC'; else elseBlock">
<div *ngIf="landingProfile === 'VNOC'; else elseBlock">
<div class="row">
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12" id="welcome-container"
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12" id="welcome-container"
style="text-align: justify; padding: 0">
style="text-align: justify; padding: 0">
<div class="col-lg-12" style="padding: 0">
<div class="col-lg-12" style="padding: 0">
<section class="flex" style="justify-content: space-between; align-items: center;">
<section class="flex" style="justify-content: space-between; align-items: center;">
<div class="flex flex-column w-50" style="padding-left:160px; align-items: center">
<div class="flex flex-column w-50" style="padding-left:160px; align-items: center">
@@ -42,16 +42,29 @@
@@ -42,16 +42,29 @@
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</section>
<br>
</div>
<div style="display: block;" class="col-lg-12 panel-body landing-block-padding">
<div class="panel-group" id="accordion">
<div style="padding-left: 10px;" class="col-lg-8 col-md-12 col-sm-12 col-xs-12">
<div class="panel panel-default" style="border:none">
<h3>{{ 'WELCOME.MARKETPLACE_HEADER' | translate }}</h3>
<div id="login-panel" class="col-lg-3 col-md-5 col-sm-6 col-xs-12 pull-right login-vertical-offset panel-collapse collapse"
<p>{{ 'WELCOME.MARKETPLACE_TEXT' | translate }}</p>
[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-body" id="login-out" style="overflow-y: auto;">
 
<nmaas-login></nmaas-login>
 
</div>
 
</div>
</div>
</div>
<div class="col-lg-3 col-md-12 col-sm-12 col-xs-12">
</div>
<img src="../../assets/images/landing/shop_2.png" alt="Marketplace icon"
<div class="panel panel-default" style="border:none" >
class="glyphicon-align-center center-block landing-img-sm landing-img-right">
<div id="register-panel" class="col-lg-3 col-md-5 col-sm-6 col-xs-12 pull-right login-vertical-offset panel-collapse collapse"
 
[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-body" id="login-out" style="overflow-y: auto;">
 
<nmaas-registration></nmaas-registration>
 
</div>
 
</div>
</div>
</div>
</div>
</div>
</div>
</div>
@@ -132,102 +145,31 @@
@@ -132,102 +145,31 @@
</div>
</div>
</section>
</section>
</div>
</div>
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 features-bottom-padding features-top-padding">
<div class="panel-group" id="accordion">
<div class="col-lg-offset-1 col-md-offset-1 col-lg-5 col-md-5 col-sm-6 col-xs-12">
<div class="panel panel-default" style="border:none">
<h3>{{ 'WELCOME.APP_MARKET_HEADER' | translate }}</h3>
<div id="login-panel" class="col-lg-3 col-md-5 col-sm-6 col-xs-12 pull-right login-vertical-offset panel-collapse collapse"
<p>{{ 'WELCOME.APP_MARKET_TEXT' | translate }}</p>
[ngClass]="router.url.startsWith('/welcome/login?ssoUserId=') ? '' : 'collapse'"
</div>
style="z-index: 800; position: fixed; right: 1px; margin-top: -15px; max-height: 50vh; font-size: 14px;">
<div class="col-lg-5 col-md-5 col-sm-6 col-xs-12">
<div class="panel panel-default ">
<h3>{{ 'WELCOME.OWN_APPS_HEADER' | translate }}</h3>
<div class="panel-body" id="login-out" style="overflow-y: auto;">
<p>{{ 'WELCOME.OWN_APPS_TEXT' | translate }}</p>
<nmaas-login></nmaas-login>
</div>
</div>
</div>
</div>
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 features-bottom-padding features-top-padding">
</div>
<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 class="panel-body" id="login-out" style="overflow-y: auto;">
<div class="panel panel-default" style="border:none" >
<ul class="nav nav-tabs nav-justified">
<div id="register-panel" class="col-lg-3 col-md-5 col-sm-6 col-xs-12 pull-right login-vertical-offset panel-collapse collapse"
<li role="login" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:false}">
[ngClass]="router.url.startsWith('/welcome/login?ssoUserId=') ? '' : 'collapse'"
<a [routerLink]="['login']">{{ 'WELCOME.LOGIN' | translate }}</a></li>
style="z-index: 800; position: fixed; right: 1px; margin-top: -15px; max-height: 50vh; font-size: 14px;">
<li role="registration" [routerLinkActive]="['active']"
<div class="panel panel-default">
[routerLinkActiveOptions]="{exact:true}"><a
<div class="panel-body" id="login-out" style="overflow-y: auto;">
[routerLink]="['registration']">{{ 'WELCOME.REGISTER' | translate }}</a></li>
<nmaas-registration></nmaas-registration>
</ul>
</div>
<router-outlet></router-outlet>
</div>
 
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</ng-template>