From d4a2c1f8792f52fec0c881ab38c91635840a50c0 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Tue, 7 Apr 2015 22:20:53 +0100 Subject: Integrate 'django.contrib.staticfiles' Rather than providing a custom solution for serving static files, use the solution provided in the upstream Django source. This allows us to remove the top-level 'urls.py' file. Signed-off-by: Stephen Finucane Signed-off-by: Jeremy Kerr --- templates/base.html | 9 +++++---- templates/patchwork/bundle.html | 13 ++++--------- templates/patchwork/bundles.html | 6 ++++-- templates/patchwork/filters.html | 5 +++-- templates/patchwork/list.html | 1 + templates/patchwork/patch-list.html | 31 ++++++++++++++++++++++++++----- 6 files changed, 43 insertions(+), 22 deletions(-) (limited to 'templates') diff --git a/templates/base.html b/templates/base.html index f04d6e1..3d289fb 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,12 +1,13 @@ -{% load pwurl %} {% block title %}Patchwork{% endblock %} - Patchwork - - + + {% block headers %}{% endblock %} diff --git a/templates/patchwork/bundle.html b/templates/patchwork/bundle.html index d47cf13..4a96b6b 100644 --- a/templates/patchwork/bundle.html +++ b/templates/patchwork/bundle.html @@ -1,17 +1,12 @@ {% extends "base.html" %} {% load person %} +{% load static %} {% block headers %} - - - + + + {% endblock %} {% block title %}{{project.name}}{% endblock %} {% block heading %}bundle: {{bundle.owner.username}} / diff --git a/templates/patchwork/bundles.html b/templates/patchwork/bundles.html index a725d95..11fb89d 100644 --- a/templates/patchwork/bundles.html +++ b/templates/patchwork/bundles.html @@ -1,5 +1,7 @@ {% extends "base.html" %} +{% load static %} + {% block title %}Bundles{% endblock %} {% block heading %}Bundles{% endblock %} @@ -27,7 +29,7 @@ {{ bundle.n_patches }} downloaddownload
diff --git a/templates/patchwork/filters.html b/templates/patchwork/filters.html index e2b7585..10ca587 100644 --- a/templates/patchwork/filters.html +++ b/templates/patchwork/filters.html @@ -1,3 +1,4 @@ +{% load static %}