From 7beefa537f58467fed5ca0030809e7dc5d31943f Mon Sep 17 00:00:00 2001 From: Valentin Samir Date: Fri, 20 Nov 2015 16:00:26 +0100 Subject: [PATCH] Template factorisation --- cas_server/static/cas_server/favicon.ico | Bin 0 -> 7196 bytes cas_server/templates/cas_server/base.html | 22 ++++++++++++++++++-- cas_server/templates/cas_server/logged.html | 14 +------------ cas_server/templates/cas_server/login.html | 14 +------------ cas_server/templates/cas_server/logout.html | 14 +------------ cas_server/templates/cas_server/warn.html | 15 ++----------- 6 files changed, 25 insertions(+), 54 deletions(-) create mode 100644 cas_server/static/cas_server/favicon.ico diff --git a/cas_server/static/cas_server/favicon.ico b/cas_server/static/cas_server/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..7a85a16a05364a93f1740c15fddc3c6eed5bd8c1 GIT binary patch literal 7196 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 Wu^`EEMXzG*0IDxF6|3Ye!~O$M)_Z#Z literal 0 HcmV?d00001 diff --git a/cas_server/templates/cas_server/base.html b/cas_server/templates/cas_server/base.html index 30c134c..581f3fd 100644 --- a/cas_server/templates/cas_server/base.html +++ b/cas_server/templates/cas_server/base.html @@ -1,6 +1,24 @@ {% extends 'bootstrap3/bootstrap3.html' %} {% block bootstrap3_title %}{% block title %}{% endblock %}{% endblock %} -{% load url from future %} - +{% load staticfiles %} {% load bootstrap3 %} + +{% block bootstrap3_extra_head %} + + +{% endblock %} + +{% block bootstrap3_content %} +
+
+
+
+{% bootstrap_messages %} +{% block content %} +{% endblock %} +
+
+
+
+{% endblock %} diff --git a/cas_server/templates/cas_server/logged.html b/cas_server/templates/cas_server/logged.html index bb82c0d..7eb0378 100644 --- a/cas_server/templates/cas_server/logged.html +++ b/cas_server/templates/cas_server/logged.html @@ -2,20 +2,8 @@ {% load bootstrap3 %} {% load staticfiles %} {% load i18n %} -{% block bootstrap3_extra_head %} - -{% endblock %} -{% block bootstrap3_content %} -
-
-
-
-{% bootstrap_messages %} +{% block content %} {% bootstrap_button _('Logout') size='lg' button_class="btn-danger btn-block" href="logout" %} -
-
-
-
{% endblock %} diff --git a/cas_server/templates/cas_server/login.html b/cas_server/templates/cas_server/login.html index 64d7567..419c71e 100644 --- a/cas_server/templates/cas_server/login.html +++ b/cas_server/templates/cas_server/login.html @@ -2,24 +2,12 @@ {% load bootstrap3 %} {% load staticfiles %} {% load i18n %} -{% block bootstrap3_extra_head %} - -{% endblock %} -{% block bootstrap3_content %} -
-
-
-
-{% bootstrap_messages %} +{% block content %} -
-
-
-
{% endblock %} diff --git a/cas_server/templates/cas_server/logout.html b/cas_server/templates/cas_server/logout.html index 7b5fdba..9de1276 100644 --- a/cas_server/templates/cas_server/logout.html +++ b/cas_server/templates/cas_server/logout.html @@ -2,19 +2,7 @@ {% load bootstrap3 %} {% load staticfiles %} {% load i18n %} -{% block bootstrap3_extra_head %} - -{% endblock %} -{% block bootstrap3_content %} -
-
-
-
-{% bootstrap_messages %} +{% block content %} -
-
-
-
{% endblock %} diff --git a/cas_server/templates/cas_server/warn.html b/cas_server/templates/cas_server/warn.html index 768d8cf..9463992 100644 --- a/cas_server/templates/cas_server/warn.html +++ b/cas_server/templates/cas_server/warn.html @@ -2,19 +2,8 @@ {% load bootstrap3 %} {% load staticfiles %} {% load i18n %} -{% block bootstrap3_extra_head %} - -{% endblock %} -{% block bootstrap3_content %} -
-
-
-
-{% bootstrap_messages %} + +{% block content %} {% bootstrap_button _('Connect to the service') size='lg' button_class="btn-primary btn-block" href=service_ticket_url %} -
-
-
-
{% endblock %}