diff --git a/dal/dal/templates/base.html b/dal/dal/templates/base.html
index a71ac4e..4c8a6ed 100644
--- a/dal/dal/templates/base.html
+++ b/dal/dal/templates/base.html
@@ -72,7 +72,7 @@
</div>
<!-- with 'hosting/img/card-'|add:hosting|add:'.png' as image_static %}
<div class="col-lg-5 col-sm-pull-6 col-sm-6">
- <img class="img-responsive" src="{% static image_static %}" alt="">
+ <img class="img-responsive" src=" static image_static %}" alt="">
</div>
endwith %}-->
</div>
diff --git a/dal/dal/templates/base_short.html b/dal/dal/templates/base_short.html
new file mode 100644
index 0000000..0dbe8bf
--- /dev/null
+++ b/dal/dal/templates/base_short.html
@@ -0,0 +1,118 @@
+{% load staticfiles i18n %} <!--cms_tags sekizai_tags %}-->
+
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <meta name="description" content="">
+ <meta name="author" content="">
+
+ <title>ungleich</title>
+
+ <!-- Bootstrap Core CSS -->
+ <link href="{% static 'datacenterlight/css/bootstrap-3.3.7.min.css' %}" rel="stylesheet">
+
+ <!-- Custom CSS -->
+ <link href="{% static 'hosting/css/landing-page.css' %}" rel="stylesheet">
+<!-- <link href="{% static 'hosting/css/user_keys.css' %}" rel="stylesheet">
+ <link href="{% static 'hosting/css/payment.css' %}" rel="stylesheet">
+ <link href="{% static 'hosting/css/order.css' %}" rel="stylesheet">
+ <link href="{% static 'hosting/css/orders.css' %}" rel="stylesheet">-->
+ <link href="{% static 'hosting/css/commons.css' %}" rel="stylesheet">
+ <!-- <link href="{% static 'hosting/css/virtual-machine.css' %}" rel="stylesheet">-->
+ <link href="{% static 'hosting/css/dashboard.css' %}" rel="stylesheet">
+<!-- <link href="{% static 'hosting/css/price_calculator.css' %}" rel="stylesheet">-->
+ {% block css_extra %}
+ {% endblock css_extra %}
+
+ <!-- render_block "css" postprocessor "compressor.contrib.sekizai.compress" %}
+ render_block "js" postprocessor "compressor.contrib.sekizai.compress" %}-->
+
+ <!-- Custom Fonts -->
+ <link href='//fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'>
+ <link href="{% static 'datacenterlight/font-awesome/css/font-awesome.min.css' %}" rel="stylesheet" type="text/css">
+ <link href="//fonts.googleapis.com/css?family=Lato:300,400,500,700,300italic,400italic,700italic" rel="stylesheet" type="text/css">
+ <link rel="shortcut icon" href="{% static 'datacenterlight/img/favicon.ico' %}" type="image/x-icon" />
+
+ <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+ <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+ <!--[if lt IE 9]>
+ <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+ <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+ <![endif]-->
+
+ <!-- Google analytics -->
+ <!-- include "google_analytics.html" %}-->
+ <!-- End Google Analytics -->
+</head>
+
+<body>
+ <!-- cms_toolbar %}-->
+
+ {% block navbar %}
+ {% include "includes/_navbar_transparent.html" %}
+ {% endblock navbar %}
+
+ <div class="{% if request.user.is_authenticated %}content-dashboard{% endif %}">
+ {% block content %}
+ {% endblock %}
+ </div>
+
+ <!-- Footer -->
+ {% if request.user.is_authenticated %}
+ <footer class="footer-vm">
+ <div class="container">
+ <p class="copyright text-muted small">Copyright © ungleich glarus ag {% now "Y" %}. {% trans "All Rights Reserved" %}</p>
+ </div>
+ </footer>
+ {% else %}
+ <div class="footer-light">
+ {% include "includes/_footer.html" %}
+ </div>
+ {% endif %}
+ <!-- jQuery -->
+ <script src="{% static 'datacenterlight/js/jquery-2.2.4.min.js' %}"></script>
+ <script src="//cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.16.0/jquery.validate.min.js"></script>
+ <script src="//cdnjs.cloudflare.com/ajax/libs/1000hz-bootstrap-validator/0.11.9/validator.min.js"></script>
+ <!-- Copy Clipboard -->
+ <script src="//cdnjs.cloudflare.com/ajax/libs/clipboard.js/1.5.10/clipboard.min.js"></script>
+ <!-- Bootstrap Core JavaScript -->
+ <script src="{% static 'datacenterlight/js/bootstrap-3.3.7.min.js' %}"></script>
+
+ <!-- Virtual Machine Detail Javascript -->
+ <script src="{% static 'hosting/js/virtual_machine_detail.js' %}"></script>
+
+ <!-- Create Virtual Machine Javascript -->
+ <script src="{% static 'hosting/js/createvm.js' %}"></script>
+
+ <!-- Init JavaScript -->
+ <script src="{% static 'hosting/js/initial.js' %}"></script>
+
+ {% block js_extra %}
+ {% comment %}
+ this block is above some files, because on stripe error scripts below the stripe
+ script are not properly executed.
+ {% endcomment %}
+ {% endblock js_extra %}
+
+<!-- <script src="https://js.stripe.com/v3/"></script>
+<script src="https://js.stripe.com/v2/"></script>-->
+ <!-- Stripe Lib -->
+
+ <!-- Proccess payment lib -->
+ <script type="text/javascript" src="{% static 'hosting/js/payment.js' %}"></script>
+
+ <!-- Gen SSH Key lib -->
+ <script type="text/javascript" src="{% static 'hosting/js/gen-ssh-key.js' %}"></script>
+
+ <!-- Moment -->
+ <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.18.1/moment.min.js"></script>
+ <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.18.1/moment-with-locales.js"></script>
+
+</body>
+
+</html>
diff --git a/dal/dal/templates/hosting_login.html b/dal/dal/templates/hosting_login.html
new file mode 100644
index 0000000..9545cdd
--- /dev/null
+++ b/dal/dal/templates/hosting_login.html
@@ -0,0 +1,43 @@
+{% extends "hosting/base_short.html" %}
+{% load i18n staticfiles bootstrap3%}
+
+{% block navbar %}
+ {% include 'hosting/includes/_navbar_transparent.html' %}
+{% endblock navbar %}
+
+{% block content %}
+ <div class="auth-container">
+ <div class="auth-bg"></div>
+ <div class="auth-center">
+ <div class="auth-content">
+ <div class="auth-box">
+ <h1 class="section-heading allcaps">{% trans "Log in" %}</h1>
+ {% include 'hosting/includes/_messages.html' %}
+ <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 class="red">{{form.non_field_errors|striptags}}</p>
+ <div class="text-center">
+ <button type="submit" class="btn choice-btn">
+ {% trans "Log in" %}
+ </button>
+ </div>
+ <input type='hidden' name='next' value='{{request.GET.next}}'/>
+ </form>
+ <div class="auth-footer">
+ <div>
+ {% trans "Don't have an account yet ?" %}
+ <a href="{% url 'hosting:signup' %}">{% trans "Sign up" %}</a>
+ </div>
+ <div>
+ or <a href="{% url 'hosting:reset_password' %}">{% trans "Forgot your password ?" %}</a><br>
+ or <a href="{% url 'hosting:resend_activation_link' %}">{% trans "Resend activation link" %}</a>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+{% endblock %}
diff --git a/dal/dal/templates/includes/_footer.html b/dal/dal/templates/includes/_footer.html
index a74e529..e61ed59 100644
--- a/dal/dal/templates/includes/_footer.html
+++ b/dal/dal/templates/includes/_footer.html
@@ -1,11 +1,22 @@
{% load i18n %}
+<style>
+.col-lg-12 {
+ background-color: grey;
+ color: white;
+}
+.list-inline {
+ background-color: grey;
+ color: white;
+}
+</style>
+
<footer>
<div class="container">
<div class="row">
<div class="col-lg-12">
<ul class="list-inline">
- <li>
+ <li class="col-lg-12">
<a href="#">Home</a>
</li>
<li class="footer-menu-divider">⋅</li>
diff --git a/dal/dal/templates/includes/_navbar_transparent.html b/dal/dal/templates/includes/_navbar_transparent.html
index 8a97ae1..e413ace 100644
--- a/dal/dal/templates/includes/_navbar_transparent.html
+++ b/dal/dal/templates/includes/_navbar_transparent.html
@@ -1,13 +1,19 @@
{% load static i18n %}
+<style>
+.container {
+ background-color: lightgrey;
+ color: black;
+}
+</style>
<nav class="navbar navbar-default topnav navbar-transparent" role="navigation">
<div class="container">
<div class="topnav">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
- <a id="logoWhite" class="navbar-brand topnav" href="{% url 'datacenterlight:index' %}"><img src="{% static 'datacenterlight/img/logo_white.svg' %}"></a>
+ <a id="logoWhite" class="navbar-brand topnav" href="{% url 'index' %}"><img src="{% static 'datacenterlight/img/logo_white.svg' %}"></a>
</div>
</div>
<!-- /.container -->
</div>
-</nav>
\ No newline at end of file
+</nav>
diff --git a/dal/dal/templates/landing.html b/dal/dal/templates/landing.html
index 5e3f29d..6bd3c45 100644
--- a/dal/dal/templates/landing.html
+++ b/dal/dal/templates/landing.html
@@ -1,20 +1,27 @@
-{% extends "base.html" %}
+{% extends "base_short.html" %}
{% load staticfiles %}
{% block content %}
+<style>
+.auth-footer {
+ color: black;
+}
+</style>
<div class="auth_container">
<div class="auth_bg"></div>
<div class="auth_center">
<div class="auth_content">
<div class="auth-box">
- <h2 class="section-heading"> Log in </h2>
- <form action={% url 'index' %} method="post"> <!-- class="form" nonvalidated>-->
+ <h2 class="section-heading"> Login </h2>
+ {% include 'includes/_messages.html' %}
+ <form action={% url 'index' %} method="post" class="form" nonvalidated>
{% csrf_token %}
- <br>Username:<br><input type="text" name="username" id="username">
- <br>Password:<br><input type="password" name="password" id="password">
<div class="text-center">
+ <br>Username:<br><input type="text" name="username" id="username">
+ <br>Password:<br><input type="password" name="password" id="password">
+ <br><br>
<button type="submit" class="btn choice-btn"> Log in </button>
</div>
</form>