From dab31aa8537c476f908be92e2ddffedaf01ed8eb Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Mon, 18 Feb 2019 22:03:51 +0100
Subject: [PATCH] Remove unwanted code / refactor code

---
 dal/templates/includes/_footer.html           | 32 --------
 .../includes/_navbar_transparent.html         |  1 -
 dal/templates/landing.html                    | 73 +++++++++----------
 3 files changed, 35 insertions(+), 71 deletions(-)

diff --git a/dal/templates/includes/_footer.html b/dal/templates/includes/_footer.html
index e61ed59..800f7dc 100644
--- a/dal/templates/includes/_footer.html
+++ b/dal/templates/includes/_footer.html
@@ -1,41 +1,9 @@
 {% 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 class="col-lg-12">
-                        <a href="#">Home</a>
-                    </li>
-                    <li class="footer-menu-divider">&sdot;</li>
-                    <li>
-                        <a href="#about">How it works</a></li>
-                    <li class="footer-menu-divider">&sdot;</li>
-                    <li>
-                        <a href="#about">Your infrastructure</a></li>
-                    <li>&sdot;</li>
-                    <li>
-                        <a href="#about">Our infrastructure</a></li>
-                    <li class="footer-menu-divider">&sdot;</li>
-                    <li>
-                        <a href="#services">Pricing</a>
-                    </li>
-                    <li class="footer-menu-divider">&sdot;</li>
-                    <li>
-                        <a href="#contact">Contact</a>
-                    </li>
                 </ul>
                 <p class="copyright text-muted small">Copyright &copy; ungleich glarus ag {% now "Y" %}. {% trans "All Rights Reserved" %}</p>
             </div>
diff --git a/dal/templates/includes/_navbar_transparent.html b/dal/templates/includes/_navbar_transparent.html
index e413ace..1af4bcb 100644
--- a/dal/templates/includes/_navbar_transparent.html
+++ b/dal/templates/includes/_navbar_transparent.html
@@ -2,7 +2,6 @@
 
 <style>
 .container {
-	background-color: lightgrey;
 	color: black;
 }
 </style>
diff --git a/dal/templates/landing.html b/dal/templates/landing.html
index f56d2bb..6f31087 100644
--- a/dal/templates/landing.html
+++ b/dal/templates/landing.html
@@ -1,43 +1,40 @@
 {% extends "base_short.html" %}
-{% load staticfiles  %}
+{% load i18n staticfiles bootstrap3 %}
 
 
 {% block content %}
-
-<style>
-.auth-footer {
-	color: black;
-}
-a:link { color: #000000 }
-</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 allcaps"> Login </h2>
-		{% include 'includes/_messages.html' %}
-		<form action={% url 'index' %} method="post" class="form" nonvalidated>
-			{% csrf_token %}
-			<div class="text-center">
-				<div class="form-group"><label class="sr-only control-label" for="username">Username</label><input class="form-control" type="text" name="username" id="username" placeholder="Username"></div>
-				<div class="form-group"><label class="sr-only control-label" for="password">Password</label><input class="form-control" type="password" name="password" id="password" placeholder="Password"></div>
-			   <br><br>
-			   <button type="submit" class="btn choice-btn"> Log in </button>
-			</div>
-		</form>
-		<div class="auth-footer">
-		   <div>
-		       Don't have an account yet?&nbsp;
-		       <a href={% url 'register' %}> Sign up </a>
-		   </div>
-		   <div>
-		       or <a href={% url 'reset_password' %}> Reset your password </a>
-		   </div>
-		</div>
-	     </div>
-	 </div>
-   </div>
-</div>
-
+    <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 'includes/_messages.html' %}
+                    <form action="{% url 'index' %}" 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 ?" %}&nbsp;
+{#                            <a href="{% url 'signup' %}">{% trans "Sign up" %}</a>#}
+                        </div>
+                        <div>
+                            or <a href="{% url 'reset_password' %}">{% trans "Forgot your password ?" %}</a><br>
+{#                            or <a href="{% url 'resend_activation_link' %}">{% trans "Resend activation link" %}</a>#}
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
 {% endblock %}