diff --git a/benefits/templates/admin/agency-base.html b/benefits/templates/admin/agency-base.html index 0ec2067e0..fc4a982e6 100644 --- a/benefits/templates/admin/agency-base.html +++ b/benefits/templates/admin/agency-base.html @@ -5,16 +5,13 @@ {% endblock dark-mode-vars %} {% block extrastyle %} - + {% include "admin/includes/favicon.html" %} - - + {% include "admin/includes/bootstrap.html" %} + {% include "admin/includes/style-admin.html" %} {% include "core/includes/analytics.html" with api_key=analytics.api_key uid=analytics.uid did=analytics.did %} {% endblock extrastyle %} @@ -31,50 +28,28 @@

{{ site_header }}

{% endblock branding %} {% block usertools %} - {% if has_permission %} -
- {% block welcome-msg %} - - Welcome, - {% firstof user.get_short_name user.get_username %}. - {% endblock welcome-msg %} - {% block userlinks %} - {% if user.is_active and user.is_staff %} - {% url 'django-admindocs-docroot' as docsroot %} - {% if docsroot %}Documentation /{% endif %} - {% endif %} - {% if user.has_usable_password %} - Change password / - {% endif %} - -
- {% csrf_token %} - -
- {% endblock userlinks %} -
- {% endif %} - {% endblock usertools %} + {% include "admin/includes/usertools.html" %} +{% endblock usertools %} - {% block coltype %} - w-100 - {% endblock coltype %} +{% block coltype %} + w-100 +{% endblock coltype %} - {% block bodyclass %} - {{ block.super }} dashboard - {% endblock bodyclass %} +{% block bodyclass %} + {{ block.super }} dashboard +{% endblock bodyclass %} - {% block nav-breadcrumbs %} - {% endblock nav-breadcrumbs %} +{% block nav-breadcrumbs %} +{% endblock nav-breadcrumbs %} - {% block nav-sidebar %} - {% endblock nav-sidebar %} +{% block nav-sidebar %} +{% endblock nav-sidebar %} - {% block content_title %} - {% endblock content_title %} +{% block content_title %} +{% endblock content_title %} - {% block content %} - {% endblock content %} +{% block content %} +{% endblock content %} - {% block sidebar %} - {% endblock sidebar %} +{% block sidebar %} +{% endblock sidebar %} diff --git a/benefits/templates/admin/includes/bootstrap.html b/benefits/templates/admin/includes/bootstrap.html new file mode 100644 index 000000000..5b0ef6048 --- /dev/null +++ b/benefits/templates/admin/includes/bootstrap.html @@ -0,0 +1,4 @@ + diff --git a/benefits/templates/admin/includes/branding-login.html b/benefits/templates/admin/includes/branding-login.html new file mode 100644 index 000000000..c5d3472c1 --- /dev/null +++ b/benefits/templates/admin/includes/branding-login.html @@ -0,0 +1,9 @@ +{% load i18n static %} + +
+ California Integrated Travel Project: Benefits logo (large) +
+ +
+

{{ site_header }}

+
diff --git a/benefits/templates/admin/includes/favicon.html b/benefits/templates/admin/includes/favicon.html new file mode 100644 index 000000000..3b3f07a83 --- /dev/null +++ b/benefits/templates/admin/includes/favicon.html @@ -0,0 +1,3 @@ +{% load i18n static %} + + diff --git a/benefits/templates/admin/includes/style-admin.html b/benefits/templates/admin/includes/style-admin.html new file mode 100644 index 000000000..8586acbc0 --- /dev/null +++ b/benefits/templates/admin/includes/style-admin.html @@ -0,0 +1,3 @@ +{% load i18n static %} + + diff --git a/benefits/templates/admin/includes/usertools.html b/benefits/templates/admin/includes/usertools.html new file mode 100644 index 000000000..b0ff961a3 --- /dev/null +++ b/benefits/templates/admin/includes/usertools.html @@ -0,0 +1,26 @@ +{% load i18n static %} + +{% if has_permission %} +
+ {% block welcome-msg %} + + Welcome, + {% firstof user.get_short_name user.get_username %}. + + {% endblock welcome-msg %} + {% block userlinks %} + {% if user.is_active and user.is_staff %} + {% url 'django-admindocs-docroot' as docsroot %} + {% if docsroot %}Documentation /{% endif %} + {% endif %} + {% if user.has_usable_password %} + Change password / + {% endif %} + +
+ {% csrf_token %} + +
+ {% endblock userlinks %} +
+{% endif %} diff --git a/benefits/templates/admin/login.html b/benefits/templates/admin/login.html index 3ce8bc7f8..4cfad7774 100644 --- a/benefits/templates/admin/login.html +++ b/benefits/templates/admin/login.html @@ -6,20 +6,11 @@ {% block extrastyle %} {% comment %} Overriding instead of extending agency-base here to remove jQuery declaration, which admin/login.html includes on its own {% endcomment %} - - - + {% include "admin/includes/favicon.html" %} + {% include "admin/includes/bootstrap.html" %} + {% include "admin/includes/style-admin.html" %} {% endblock extrastyle %} {% block branding %} -
- California Integrated Travel Project: Benefits logo (large) -
- -
-

{{ site_header }}

-
+ {% include "admin/includes/branding-login.html" %} {% endblock branding %} diff --git a/benefits/templates/registration/logged_out.html b/benefits/templates/registration/logged_out.html index 83a65bc3e..e76a49893 100644 --- a/benefits/templates/registration/logged_out.html +++ b/benefits/templates/registration/logged_out.html @@ -15,13 +15,7 @@ {% endblock bodyclass %} {% block branding %} -
- California Integrated Travel Project: Benefits logo (large) -
- -
-

{{ site_header }}

-
+ {% include "admin/includes/branding-login.html" %} {% endblock branding %} {% block content %}