diff --git a/static/css/footer.css b/static/css/footer.css index 61bca94..23fbc04 100644 --- a/static/css/footer.css +++ b/static/css/footer.css @@ -1,6 +1,4 @@ footer { - position: absolute; - bottom: 0; background-color: #f5f5f5; } diff --git a/templates/base.html b/templates/base.html index 88ac035..5307718 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,4 +1,9 @@ + +{% load i18n %} +{% load static %} +{% load staticfiles %} + diff --git a/templates/login.html b/templates/login.html index 948c0f8..463ea05 100644 --- a/templates/login.html +++ b/templates/login.html @@ -2,34 +2,30 @@ {% load i18n %} {% block content %} -

SIK Admin

-
{% csrf_token %} -
- -
- -
+
+
+

SIK Admin

-
- -
- -
+
+ {% csrf_token %} +
+ + +
+
+ + +
+
+ {% trans "Forgot password?" %} +
+
+
{{ error }}
+
+
+ +
+
-
-
- Forgot password? -
-
-
-
-
{{ error }}
-
-
-
-
- -
-
- +
{% endblock content %} diff --git a/templates/login_base.html b/templates/login_base.html index 1aa3b9e..d0b0a8f 100644 --- a/templates/login_base.html +++ b/templates/login_base.html @@ -1,38 +1,22 @@ - +{% extends "base.html" %} {% load i18n %} {% load static %} - - - SIK - Login - +{% block body %} +{% block header %} +
+ {% include "sik_header.html" %} +
+{% endblock %} - - - - - - - - - - - {% block header %} -
- {% include "sik_header.html" %} -
- {% endblock %} - -
- {% block content %} - {% endblock %} -
-
- {% block footer %} - {% include "footer.html" %} - {% endblock footer %} -
- - - \ No newline at end of file +
+ {% block content %} + {% endblock %} +
+
+ {% block footer %} + {% include "footer.html" %} + {% endblock footer %} +
+{% endblock %} diff --git a/webapp/templates/webapp_base.html b/webapp/templates/webapp_base.html index 6e9dfd7..1744f55 100644 --- a/webapp/templates/webapp_base.html +++ b/webapp/templates/webapp_base.html @@ -4,6 +4,7 @@ {% load static %} {% load staticfiles %} +{% block body %}
@@ -34,3 +35,4 @@
+{% endblock %}