From 93be8b11720c184092d1b270816ff00e6e698a8c Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 6 Mar 2013 15:58:01 +0000 Subject: [PATCH] Move all templates to a templates directory This should allow the templates to be found and swapped out more easily. Signed-off-by: Paul Eggleton --- README | 4 ++-- settings.py | 2 +- 404.html => templates/404.html | 0 500.html => templates/500.html | 0 {admin => templates/admin}/base_site.html | 0 base.html => templates/base.html | 0 {layerindex => templates/layerindex}/about.html | 0 {layerindex => templates/layerindex}/deleteconfirm.html | 0 {layerindex => templates/layerindex}/detail.html | 0 {layerindex => templates/layerindex}/editlayer.html | 0 {layerindex => templates/layerindex}/editlayernote.html | 0 {layerindex => templates/layerindex}/index.html | 2 +- {layerindex => templates/layerindex}/machines.html | 0 {layerindex => templates/layerindex}/rawrecipes.txt | 0 {layerindex => templates/layerindex}/recipedetail.html | 0 {layerindex => templates/layerindex}/recipes.html | 0 {layerindex => templates/layerindex}/submitemail.txt | 0 {layerindex => templates/layerindex}/submitlayer.html | 0 {layerindex => templates/layerindex}/submitthanks.html | 0 pagination.html => templates/pagination.html | 0 {registration => templates/registration}/activate.html | 0 {registration => templates/registration}/activation_email.txt | 0 .../registration}/activation_email_subject.txt | 0 {registration => templates/registration}/login.html | 0 {registration => templates/registration}/logout.html | 0 .../registration}/password_change_done.html | 0 .../registration}/password_change_form.html | 0 .../registration}/password_reset_complete.html | 0 .../registration}/password_reset_confirm.html | 0 .../registration}/password_reset_done.html | 0 .../registration}/password_reset_email.html | 0 .../registration}/password_reset_form.html | 0 .../registration}/registration_complete.html | 0 .../registration}/registration_form.html | 0 34 files changed, 4 insertions(+), 4 deletions(-) rename 404.html => templates/404.html (100%) rename 500.html => templates/500.html (100%) rename {admin => templates/admin}/base_site.html (100%) rename base.html => templates/base.html (100%) rename {layerindex => templates/layerindex}/about.html (100%) rename {layerindex => templates/layerindex}/deleteconfirm.html (100%) rename {layerindex => templates/layerindex}/detail.html (100%) rename {layerindex => templates/layerindex}/editlayer.html (100%) rename {layerindex => templates/layerindex}/editlayernote.html (100%) rename {layerindex => templates/layerindex}/index.html (98%) rename {layerindex => templates/layerindex}/machines.html (100%) rename {layerindex => templates/layerindex}/rawrecipes.txt (100%) rename {layerindex => templates/layerindex}/recipedetail.html (100%) rename {layerindex => templates/layerindex}/recipes.html (100%) rename {layerindex => templates/layerindex}/submitemail.txt (100%) rename {layerindex => templates/layerindex}/submitlayer.html (100%) rename {layerindex => templates/layerindex}/submitthanks.html (100%) rename pagination.html => templates/pagination.html (100%) rename {registration => templates/registration}/activate.html (100%) rename {registration => templates/registration}/activation_email.txt (100%) rename {registration => templates/registration}/activation_email_subject.txt (100%) rename {registration => templates/registration}/login.html (100%) rename {registration => templates/registration}/logout.html (100%) rename {registration => templates/registration}/password_change_done.html (100%) rename {registration => templates/registration}/password_change_form.html (100%) rename {registration => templates/registration}/password_reset_complete.html (100%) rename {registration => templates/registration}/password_reset_confirm.html (100%) rename {registration => templates/registration}/password_reset_done.html (100%) rename {registration => templates/registration}/password_reset_email.html (100%) rename {registration => templates/registration}/password_reset_form.html (100%) rename {registration => templates/registration}/registration_complete.html (100%) rename {registration => templates/registration}/registration_form.html (100%) diff --git a/README b/README index cd6d6a6..5b12c98 100644 --- a/README +++ b/README @@ -61,8 +61,8 @@ Setup instructions: "Submit Layer" feature within the interface itself (easiest) or the admin interface to do this. -5. You may wish to customise layerindex/about.html to suit your - installation. +5. You may wish to customise templates/layerindex/about.html to suit + your installation. Usage diff --git a/settings.py b/settings.py index f9da685..2343885 100644 --- a/settings.py +++ b/settings.py @@ -124,7 +124,7 @@ TEMPLATE_DIRS = ( # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". # Always use forward slashes, even on Windows. # Don't forget to use absolute paths, not relative paths. - BASE_DIR + BASE_DIR + "/templates" ) INSTALLED_APPS = ( diff --git a/404.html b/templates/404.html similarity index 100% rename from 404.html rename to templates/404.html diff --git a/500.html b/templates/500.html similarity index 100% rename from 500.html rename to templates/500.html diff --git a/admin/base_site.html b/templates/admin/base_site.html similarity index 100% rename from admin/base_site.html rename to templates/admin/base_site.html diff --git a/base.html b/templates/base.html similarity index 100% rename from base.html rename to templates/base.html diff --git a/layerindex/about.html b/templates/layerindex/about.html similarity index 100% rename from layerindex/about.html rename to templates/layerindex/about.html diff --git a/layerindex/deleteconfirm.html b/templates/layerindex/deleteconfirm.html similarity index 100% rename from layerindex/deleteconfirm.html rename to templates/layerindex/deleteconfirm.html diff --git a/layerindex/detail.html b/templates/layerindex/detail.html similarity index 100% rename from layerindex/detail.html rename to templates/layerindex/detail.html diff --git a/layerindex/editlayer.html b/templates/layerindex/editlayer.html similarity index 100% rename from layerindex/editlayer.html rename to templates/layerindex/editlayer.html diff --git a/layerindex/editlayernote.html b/templates/layerindex/editlayernote.html similarity index 100% rename from layerindex/editlayernote.html rename to templates/layerindex/editlayernote.html diff --git a/layerindex/index.html b/templates/layerindex/index.html similarity index 98% rename from layerindex/index.html rename to templates/layerindex/index.html index 461252a..0899813 100644 --- a/layerindex/index.html +++ b/templates/layerindex/index.html @@ -4,7 +4,7 @@ {% comment %} - layerindex-web - main layer index page template + layerindex-web - layer list page template Copyright (C) 2013 Intel Corporation Licensed under the MIT license, see COPYING.MIT for details diff --git a/layerindex/machines.html b/templates/layerindex/machines.html similarity index 100% rename from layerindex/machines.html rename to templates/layerindex/machines.html diff --git a/layerindex/rawrecipes.txt b/templates/layerindex/rawrecipes.txt similarity index 100% rename from layerindex/rawrecipes.txt rename to templates/layerindex/rawrecipes.txt diff --git a/layerindex/recipedetail.html b/templates/layerindex/recipedetail.html similarity index 100% rename from layerindex/recipedetail.html rename to templates/layerindex/recipedetail.html diff --git a/layerindex/recipes.html b/templates/layerindex/recipes.html similarity index 100% rename from layerindex/recipes.html rename to templates/layerindex/recipes.html diff --git a/layerindex/submitemail.txt b/templates/layerindex/submitemail.txt similarity index 100% rename from layerindex/submitemail.txt rename to templates/layerindex/submitemail.txt diff --git a/layerindex/submitlayer.html b/templates/layerindex/submitlayer.html similarity index 100% rename from layerindex/submitlayer.html rename to templates/layerindex/submitlayer.html diff --git a/layerindex/submitthanks.html b/templates/layerindex/submitthanks.html similarity index 100% rename from layerindex/submitthanks.html rename to templates/layerindex/submitthanks.html diff --git a/pagination.html b/templates/pagination.html similarity index 100% rename from pagination.html rename to templates/pagination.html diff --git a/registration/activate.html b/templates/registration/activate.html similarity index 100% rename from registration/activate.html rename to templates/registration/activate.html diff --git a/registration/activation_email.txt b/templates/registration/activation_email.txt similarity index 100% rename from registration/activation_email.txt rename to templates/registration/activation_email.txt diff --git a/registration/activation_email_subject.txt b/templates/registration/activation_email_subject.txt similarity index 100% rename from registration/activation_email_subject.txt rename to templates/registration/activation_email_subject.txt diff --git a/registration/login.html b/templates/registration/login.html similarity index 100% rename from registration/login.html rename to templates/registration/login.html diff --git a/registration/logout.html b/templates/registration/logout.html similarity index 100% rename from registration/logout.html rename to templates/registration/logout.html diff --git a/registration/password_change_done.html b/templates/registration/password_change_done.html similarity index 100% rename from registration/password_change_done.html rename to templates/registration/password_change_done.html diff --git a/registration/password_change_form.html b/templates/registration/password_change_form.html similarity index 100% rename from registration/password_change_form.html rename to templates/registration/password_change_form.html diff --git a/registration/password_reset_complete.html b/templates/registration/password_reset_complete.html similarity index 100% rename from registration/password_reset_complete.html rename to templates/registration/password_reset_complete.html diff --git a/registration/password_reset_confirm.html b/templates/registration/password_reset_confirm.html similarity index 100% rename from registration/password_reset_confirm.html rename to templates/registration/password_reset_confirm.html diff --git a/registration/password_reset_done.html b/templates/registration/password_reset_done.html similarity index 100% rename from registration/password_reset_done.html rename to templates/registration/password_reset_done.html diff --git a/registration/password_reset_email.html b/templates/registration/password_reset_email.html similarity index 100% rename from registration/password_reset_email.html rename to templates/registration/password_reset_email.html diff --git a/registration/password_reset_form.html b/templates/registration/password_reset_form.html similarity index 100% rename from registration/password_reset_form.html rename to templates/registration/password_reset_form.html diff --git a/registration/registration_complete.html b/templates/registration/registration_complete.html similarity index 100% rename from registration/registration_complete.html rename to templates/registration/registration_complete.html diff --git a/registration/registration_form.html b/templates/registration/registration_form.html similarity index 100% rename from registration/registration_form.html rename to templates/registration/registration_form.html