moep/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' into hosting_i18n

Browse source
This commit is contained in:
modulos 2017-05-30 15:10:22 +02:00
commit 9416586d0b
15 changed files with 418 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hosting/static/hosting/css/commons.css
View file

@ -1,5 +1,5 @@
.dashboard-container {
padding-top:5%; padding-bottom: 11%;
padding-top:70px; padding-bottom: 11%;
}
.borderless td {

148
hosting/static/hosting/css/landing-page.css
View file

@ -82,24 +82,25 @@ h6 {
text-align: center;
color: #f8f8f8;
position: relative;
padding-bottom: 25%;
padding-top: 10%;
}
.intro-login {
background: url(../img/login-bg.jpg) no-repeat center center;
background: url(../img/intro-bg.jpg) no-repeat center center;
background-size: cover;
height: 100%;
}
.intro-signup {
background: url(../img/signup-bg.png) no-repeat center center;
background: url(../img/intro-bg.jpg) no-repeat center center;
background-size: cover;
height: 100%;
display: flex;
justify-content: center;
align-items: center;
}
.intro-reset-password {
background: url(../img/signup-bg.png) no-repeat center center;
background: url(../img/intro-bg.jpg) no-repeat center center;
background-size: cover;
height: 100%;
}
@ -193,6 +194,128 @@ h6 {
float: right;
margin-top: 0;
}
/*------Auth section---------*/
.auth-container{
height: 100vh;
position: relative;
}
.auth-bg{
background: url(../img/auth-bg.jpg);
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100vh;
background-repeat: no-repeat;
background-position: center center;
background-size: cover;
background-attachment: fixed;
}
.auth-bg::before{
content: "";
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
background: rgba(75, 75, 101, 0.55);
z-index: 1;
}
.auth-container .container{
z-index: 1000;
}
.auth-container .auth-content{
width: 80%;
margin: 0 auto;
max-width: 390px;
margin-top: 60px;
}
.auth-container .auth-title{
margin-top: 40px;
}
.auth-container .auth-title h2{
color: #fff;
font-family: 'Montserrat-Bold';
font-size: 44px;
text-align: center;
width: 425px;
margin: 0 auto;
margin-bottom: 30px;
position: relative;
}
.auth-container .auth-title h2::after{
content: "";
position: absolute;
bottom: -20px;
background: #fff;
height: 7px;
width: 70px;
left: 50%;
transform: translate(-50%, 0);
}
.auth-box{
background: #fff;
padding: 0;
padding-bottom: 30px;
box-sizing: border-box;
box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23);
border-radius: 4px;
z-index: 10;
}
.auth-box .section-heading{
color: #5a5a5a;
padding-top: 20px;
padding-bottom: 5px;
text-align: center;
text-transform: uppercase;
letter-spacing: 3px;
font-size: 20px;
border-radius: 3px 3px 0px 0px;
margin: 0 auto;
font-family: 'Montserrat-Medium';
}
.auth-box .form{
padding: 20px;
width: 80%;
margin: 0 auto;
}
.auth-box .form .red{
color: #ea3a3a;
}
.auth-box .form .btn{
box-shadow: 0 0px 9px rgba(0,0,0,0.19), 0 3px 5px rgba(0,0,0,0.23);
letter-spacing: 3px;
font-size: 17px;
text-transform: uppercase;
}
.auth-box .form .form-control{
height: 44px;
font-size: 16px;
}
.auth-box .auth-footer {
text-align: center;
padding: 10px;
}
.auth-box .auth-footer .text{
color: #777;
}
.auth-box .auth-footer .links a{
color: #1e94cc;
}
.auth-box .auth-footer .links a:hover{
color: #1e94cc;
}
.auth-box.sign-up{
padding-bottom: 5px;
}
.auth-box.sign-up .form{
padding: 15px 20px 0 20px;
}
@media (max-width: 1199px) {
ul.banner-social-buttons {
@ -218,7 +341,17 @@ h6 {
margin-bottom: 0;
}
}
@media (max-width: 540px) {
.auth-container .auth-title h2{
font-size: 32px;
width: 90%;
margin-bottom: 50px;
}
.auth-box .form {
padding: 15px;
width: 90%;
}
}
footer {
padding: 2%;
background-color: #f8f8f8;
@ -250,4 +383,5 @@ a.unlink {
a.unlink:hover {
color: inherit;
}
}

2
hosting/static/hosting/css/order.css
View file

@ -1,4 +1,4 @@
.order-detail-container {padding-top:5%; padding-bottom: 11%;}
.order-detail-container {padding-top: 70px; padding-bottom: 11%;}
.order-detail-container .invoice-title h2, .invoice-title h3 {
display: inline-block;

2
hosting/static/hosting/css/orders.css
View file

@ -1,4 +1,4 @@
.orders-container {padding-top:5%; padding-bottom: 11%;}
.orders-container {padding-top:70px; padding-bottom: 11%;}
.orders-container .table > tbody > tr > td {
vertical-align: middle;

2
hosting/static/hosting/css/payment.css
View file

@ -1,5 +1,5 @@
.payment-container {padding-top:5%; padding-bottom: 11%;}
.payment-container {padding-top:70px; padding-bottom: 11%;}
.creditcard-box .panel-title {display: inline;font-weight: bold; font-size:17px;}
.creditcard-box .checkbox.pull-right { margin: 0; }
.creditcard-box .pl-ziro { padding-left: 0px; }

BIN
hosting/static/hosting/img/auth-bg.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 685 KiB

42
hosting/templates/hosting/base_short.html
View file

@ -44,6 +44,7 @@
<!-- Navigation -->
{% if request.user.is_authenticated %}
<nav class="navbar navbar-default navbar-fixed-top topnav" role="navigation">
<div class="container topnav">
<!-- Brand and toggle get grouped for better mobile display -->
@ -61,7 +62,7 @@
<ul class="nav navbar-nav navbar-right">
{% if request.user.is_authenticated %}
<li>
<a href="{% url 'hosting:virtual_machines' %}">
<i class="fa fa-server" aria-hidden="true"></i> {% trans "My Virtual Machines"%}
@ -89,7 +90,7 @@
<li><a href="{% url 'hosting:logout' %}"><i class="glyphicon glyphicon-lock"></i>{% trans "Logout"%} </a></li>
</ul>
</li>
{% else %}
<!--
<li>
<a href="{{ request.session.hosting_url}}#how">{% trans "How it works"%}</a>
</li>
@ -107,8 +108,7 @@
</li>
<li>
<a href="{% url 'hosting:login' %}?next={{request.current_path}}">{% trans "Login"%}</a>
</li>
{% endif %}
</li> -->
</ul>
</div>
<!-- /.navbar-collapse -->
@ -116,6 +116,7 @@
<!-- /.container -->
</nav>
{% endif %}
<!-- Header -->
<a name="about"></a>
@ -123,6 +124,7 @@
{% endblock %}
<!-- Footer -->
{% if request.user.is_authenticated %}
<footer class="navbar-fixed-bottom">
<div class="container">
<div class="row">
@ -133,20 +135,28 @@
</li>
<li class="footer-menu-divider">&sdot;</li>
<li>
<a href="{{ request.session.hosting_url}}#how">{% trans "How it works"%}</a>
<li class="footer-menu-divider">&sdot;</li>
<li>
<a href="{{ request.session.hosting_url }}#your">{% trans "Your infrastructure"%}</a></li>
<li>&sdot;</li>
<li>
<a href="{{ request.session.hosting_url }}#our">{% trans "Our inftrastructure"%}</a></li>
<li class="footer-menu-divider">&sdot;</li>
<li>
<a href="{{ request.session.hosting_url }}#services">{% trans "Pricing"%}</a>
<a href="{% url 'hosting:virtual_machines' %}">
{% trans "My Virtual Machines"%}
</a>
</li>
<li class="footer-menu-divider">&sdot;</li>
<li>
<a href="{{ request.session.hosting_url }}#contact">{% trans "Contact"%}</a>
<a href="{% url 'hosting:orders' %}">
{% trans "My Orders"%}
</a>
</li>
<li>&sdot;</li>
<li>
<li>
<a href="{% url 'hosting:key_pair' %}">
{% trans "Keys"%}
</a>
</li>
<li class="footer-menu-divider">&sdot;</li>
<li>
<a href="{% url 'hosting:notifications' %}">
{% trans "Notifications "%}
</a>
</li>
</ul>
@ -155,7 +165,7 @@
</div>
</div>
</footer>
{% endif %}
<!-- jQuery -->
<script src="{% static 'hosting/js/jquery.js' %}"></script>
<script type="text/javascript" src="//cdn.jsdelivr.net/jquery.validation/1.13.1/jquery.validate.min.js"></script>

38
hosting/templates/hosting/login.html
View file

@ -3,12 +3,16 @@
{% load staticfiles bootstrap3%}
{% block content %}
<div class="intro-auth intro-login">
<div class="auth-container">
<div class="auth-bg"></div>
<div class="container">
<div class="col-md-4 col-md-offset-4">
<div class="auth-title">
<h2>{% trans "Your VM hosted in Switzerland"%}</h2>
</div>
<div class="auth-content">
{% if messages %}
<ul class="list-unstyled">
<ul class="list-unstyled" style="color: #fff">
{% for message in messages %}
<li>{{ message }}</li>
{% endfor %}
@ -23,31 +27,33 @@
</div>
{% endif %}
{% endblock %}
<div class="intro-message">
<div class="intro-message auth-box">
<h2 class="section-heading">{% trans "Login"%}</h2>
<form action="{% url 'hosting:login' %}" method="post" class="form" novalidated>
{% csrf_token %}
{% for field in form %}
{% bootstrap_field field show_label=False type='fields'%}
{% endfor %}
<p>{{form.non_field_errors|striptags}}</p>
<p class="red">{{form.non_field_errors|striptags}}</p>
{% buttons %}
<button type="submit" class="btn btn-default">
<button type="submit" class="btn btn-block btn-success">
{% trans "Login"%}
</button>
{% endbuttons %}
<input type='hidden' name='next' value='{{request.GET.next}}'/>
</form>
<span>{% trans "Don't have an account yet ? "%}<a class="unlink" href="{% url 'hosting:signup' %}">{% trans "Sign up"%}</a></span>
<br/>
<span> <a class="unlink" href="{% url 'hosting:reset_password' %}">{% trans "Forgot your password ? "%}</a></span>
<ul class="list-inline intro-social-buttons">
</ul>
<div class="auth-footer">
<div class="text">
<span>{% trans "Don't have an account yet ? "%}</span>
</div>
<div class="links">
<a class="unlink" href="{% url 'hosting:signup' %}">{% trans "Sign up"%}</a>
<span class="text"> or </span>
<a class="unlink" href="{% url 'hosting:reset_password' %}">{% trans "Forgot your password ? "%}</a>
</div>
</div>
</div>
</div>
</div>

31
hosting/templates/hosting/reset_password.html
View file

@ -3,29 +3,36 @@
{% load i18n %}
{% block content %}
<div class="intro-auth intro-reset-password">
<div class="container">
<div class="col-md-4">&nbsp;</div>
<div class="col-md-4">
<div class="intro-message">
<div class="auth-container">
<div class="auth-bg"></div>
<div class="container">
<div class="auth-title">
<h2>{% trans "Your VM hosted in Switzerland"%}</h2>
</div>
<div class="auth-content">
<div class="intro-message auth-box sign-up">
<h2 class="section-heading">{% trans "Reset your password"%}</h2>
<form action="{% url 'hosting:reset_password' %}" method="post" class="form" novalidate>
{% csrf_token %}
{% for field in form %}
{% bootstrap_field field show_label=False %}
{% endfor %}
{% buttons %}
<button type="submit" class="btn btn-default">
<button type="submit" class="btn btn-block btn-success">
{% trans "Reset"%}
</button>
{% endbuttons %}
</form>
<span>{% trans "Already have an account ?"%} <a class="unlink" href="{% url 'hosting:login' %}">{% trans "Login"%} </a></span>
<ul class="list-inline intro-social-buttons">
</ul>
</div>
</div>
<div class="auth-footer">
<div class="text">
<span>{% trans "Already have an account ?"%}</span>
</div>
<div class="links">
<a class="unlink" href="{% url 'hosting:login' %}">{% trans "Login"%}</a>
</div>
</div>
</div>
</div>
</div>
</div>
{% endblock %}

31
hosting/templates/hosting/signup.html
View file

@ -2,29 +2,36 @@
{% load staticfiles bootstrap3 i18n %}
{% block content %}
<div class="intro-auth intro-signup">
<div class="container">
<div class="col-md-4 col-sm-4 col-xs-4">&nbsp;</div>
<div class="col-md-4 col-sm-6 col-xs-6">
<div class="intro-message">
<div class="auth-container">
<div class="auth-bg"></div>
<div class="container">
<div class="auth-title">
<h2>{% trans "Your VM hosted in Switzerland"%}</h2>
</div>
<div class="auth-content">
<div class="intro-message auth-box sign-up">
<h2 class="section-heading">{% trans "Sign up"%}</h2>
<form action="{% url 'hosting:signup' %}" method="post" class="form" novalidate>
{% csrf_token %}
{% for field in form %}
{% bootstrap_field field show_label=False %}
{% endfor %}
{% buttons %}
<button type="submit" class="btn btn-default">
<button type="submit" class="btn btn-block btn-info">
{% trans "Sign up"%}
</button>
{% endbuttons %}
</form>
<span>{% trans "Already have an account ?"%} <a class="unlink" href="{% url 'hosting:login' %}">{% trans "Login"%}</a></span>
<ul class="list-inline intro-social-buttons">
</ul>
</div>
</div>
<div class="auth-footer">
<div class="text">
<span>{% trans "Already have an account ?"%}</span>
</div>
<div class="links">
<a class="unlink" href="{% url 'hosting:login' %}">{% trans "Login"%}</a>
</div>
</div>
</div>
</div>
</div>
</div>
{% endblock %}