Skip to content
Snippets Groups Projects
Commit 92b3210b authored by Joanna Kaźmierczak's avatar Joanna Kaźmierczak
Browse files

fixed landing page

parent 97f35150
No related branches found
No related tags found
1 merge request!23Resolve "Re-work login and registration views based on new landing page design"
This commit is part of merge request !23. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
src/app/welcome/welcome.component.html
+ 45
− 103
View file @ 92b3210b
......@@ -12,7 +12,7 @@
<div *ngIf="landingProfile === 'VNOC'; else elseBlock">
<div class="row">
<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">
<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">
......@@ -42,16 +42,29 @@
</div>
</div>
</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>
</section>
</div>
<div class="panel-group" id="accordion">
<div class="panel panel-default" style="border:none">
<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"
[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 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 class="panel panel-default" style="border:none" >
<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>
......@@ -132,102 +145,31 @@
</div>
</section>
</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 class="panel-group" id="accordion">
<div class="panel panel-default" style="border:none">
<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"
[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="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 class="panel panel-default" style="border:none" >
<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>
</div>
</ng-template>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment