From 37606b0910a04b66cae8d43c8287d0cb52976fca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20P=C3=A9pin?= Date: Tue, 26 Jul 2016 21:19:37 +0200 Subject: [PATCH] =?UTF-8?q?M=C3=A9nage=20dans=20les=20templates?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Déplacement des templates des applications sous la racine des applications. - Suppression des templates inutiles dans /templates/admin : seule la page base_site.html comporte des modifications --- .../templates}/calendrier/changename.html | 2 +- .../templates}/calendrier/create.html | 2 +- .../templates}/calendrier/delete.html | 2 +- .../templates}/calendrier/home.html | 2 +- .../templates}/calendrier/reponse.html | 2 +- .../templates}/calendrier/resend.html | 2 +- .../templates}/calendrier/update.html | 2 +- .../templates}/calendrier/view_event.html | 2 +- .../templates}/gestion/base.html | 0 .../templates}/gestion/change.html | 2 +- .../templates}/gestion/changepasswd.html | 2 +- .../templates}/gestion/divers.html | 2 +- .../templates}/gestion/home.html | 2 +- .../templates}/gestion/login.html | 2 +- .../templates}/gestion/registration.html | 2 +- .../templates}/gestion/thanks.html | 2 +- gestion/views.py | 2 +- .../templates}/pads/create.html | 2 +- .../templates}/pads/delete.html | 2 +- {templates => pads/templates}/pads/liste.html | 2 +- .../templates}/pads/update.html | 2 +- .../templates}/partitions/conf_delete.html | 2 +- .../partitions/conf_delete_morc.html | 2 +- .../templates}/partitions/liste.html | 2 +- .../templates}/partitions/liste_item.html | 0 .../templates}/partitions/listepart.html | 2 +- .../templates}/partitions/new.html | 2 +- .../templates}/partitions/upload.html | 2 +- .../templates}/propositions/create.html | 2 +- .../templates}/propositions/delete.html | 2 +- .../templates}/propositions/liste.html | 2 +- .../templates}/propositions/reponse.html | 0 templates/admin/404.html | 12 --- templates/admin/500.html | 17 ---- templates/admin/actions.html | 16 --- templates/admin/app_index.html | 18 ---- templates/admin/auth/user/add_form.html | 14 --- .../admin/auth/user/change_password.html | 57 ----------- templates/admin/base.html | 82 ---------------- templates/admin/change_form.html | 85 ---------------- templates/admin/change_list.html | 98 ------------------- templates/admin/change_list_results.html | 38 ------- templates/admin/date_hierarchy.html | 10 -- templates/admin/delete_confirmation.html | 44 --------- .../admin/delete_selected_confirmation.html | 49 ---------- templates/admin/edit_inline/stacked.html | 30 ------ templates/admin/edit_inline/tabular.html | 81 --------------- templates/admin/filter.html | 8 -- templates/admin/includes/fieldset.html | 29 ------ templates/admin/index.html | 82 ---------------- templates/admin/invalid_setup.html | 13 --- templates/admin/login.html | 55 ----------- templates/admin/object_history.html | 42 -------- templates/admin/pagination.html | 12 --- templates/admin/popup_response.html | 9 -- templates/admin/prepopulated_fields_js.html | 27 ----- templates/admin/search_form.html | 17 ---- templates/admin/submit_line.html | 11 --- templates/registration/logged_out.html | 12 --- .../registration/password_change_done.html | 15 --- .../registration/password_change_form.html | 55 ----------- .../registration/password_reset_complete.html | 20 ---- .../registration/password_reset_confirm.html | 33 ------- .../registration/password_reset_done.html | 19 ---- .../registration/password_reset_email.html | 14 --- .../registration/password_reset_form.html | 22 ----- 66 files changed, 29 insertions(+), 1175 deletions(-) rename {templates => calendrier/templates}/calendrier/changename.html (92%) rename {templates => calendrier/templates}/calendrier/create.html (91%) rename {templates => calendrier/templates}/calendrier/delete.html (88%) rename {templates => calendrier/templates}/calendrier/home.html (97%) rename {templates => calendrier/templates}/calendrier/reponse.html (94%) rename {templates => calendrier/templates}/calendrier/resend.html (90%) rename {templates => calendrier/templates}/calendrier/update.html (85%) rename {templates => calendrier/templates}/calendrier/view_event.html (98%) rename {templates => gestion/templates}/gestion/base.html (100%) rename {templates => gestion/templates}/gestion/change.html (94%) rename {templates => gestion/templates}/gestion/changepasswd.html (92%) rename {templates => gestion/templates}/gestion/divers.html (87%) rename {templates => gestion/templates}/gestion/home.html (81%) rename {templates => gestion/templates}/gestion/login.html (95%) rename {templates => gestion/templates}/gestion/registration.html (93%) rename {templates => gestion/templates}/gestion/thanks.html (83%) rename {templates => pads/templates}/pads/create.html (91%) rename {templates => pads/templates}/pads/delete.html (90%) rename {templates => pads/templates}/pads/liste.html (94%) rename {templates => pads/templates}/pads/update.html (86%) rename {templates => partitions/templates}/partitions/conf_delete.html (91%) rename {templates => partitions/templates}/partitions/conf_delete_morc.html (92%) rename {templates => partitions/templates}/partitions/liste.html (96%) rename {templates => partitions/templates}/partitions/liste_item.html (100%) rename {templates => partitions/templates}/partitions/listepart.html (97%) rename {templates => partitions/templates}/partitions/new.html (93%) rename {templates => partitions/templates}/partitions/upload.html (94%) rename {templates => propositions/templates}/propositions/create.html (92%) rename {templates => propositions/templates}/propositions/delete.html (91%) rename {templates => propositions/templates}/propositions/liste.html (96%) rename {templates => propositions/templates}/propositions/reponse.html (100%) delete mode 100644 templates/admin/404.html delete mode 100644 templates/admin/500.html delete mode 100644 templates/admin/actions.html delete mode 100644 templates/admin/app_index.html delete mode 100644 templates/admin/auth/user/add_form.html delete mode 100644 templates/admin/auth/user/change_password.html delete mode 100644 templates/admin/base.html delete mode 100644 templates/admin/change_form.html delete mode 100644 templates/admin/change_list.html delete mode 100644 templates/admin/change_list_results.html delete mode 100644 templates/admin/date_hierarchy.html delete mode 100644 templates/admin/delete_confirmation.html delete mode 100644 templates/admin/delete_selected_confirmation.html delete mode 100644 templates/admin/edit_inline/stacked.html delete mode 100644 templates/admin/edit_inline/tabular.html delete mode 100644 templates/admin/filter.html delete mode 100644 templates/admin/includes/fieldset.html delete mode 100644 templates/admin/index.html delete mode 100644 templates/admin/invalid_setup.html delete mode 100644 templates/admin/login.html delete mode 100644 templates/admin/object_history.html delete mode 100644 templates/admin/pagination.html delete mode 100644 templates/admin/popup_response.html delete mode 100644 templates/admin/prepopulated_fields_js.html delete mode 100644 templates/admin/search_form.html delete mode 100644 templates/admin/submit_line.html delete mode 100644 templates/registration/logged_out.html delete mode 100644 templates/registration/password_change_done.html delete mode 100644 templates/registration/password_change_form.html delete mode 100644 templates/registration/password_reset_complete.html delete mode 100644 templates/registration/password_reset_confirm.html delete mode 100644 templates/registration/password_reset_done.html delete mode 100644 templates/registration/password_reset_email.html delete mode 100644 templates/registration/password_reset_form.html diff --git a/templates/calendrier/changename.html b/calendrier/templates/calendrier/changename.html similarity index 92% rename from templates/calendrier/changename.html rename to calendrier/templates/calendrier/changename.html index 7c5af03..b988ccf 100644 --- a/templates/calendrier/changename.html +++ b/calendrier/templates/calendrier/changename.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "gestion/base.html" %} {% block titre %}Modification du profil{% endblock %} {% block content %} diff --git a/templates/calendrier/create.html b/calendrier/templates/calendrier/create.html similarity index 91% rename from templates/calendrier/create.html rename to calendrier/templates/calendrier/create.html index d9177fd..c915e77 100644 --- a/templates/calendrier/create.html +++ b/calendrier/templates/calendrier/create.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "gestion/base.html" %} {% block titre%}Création d'Évènement{% endblock %} diff --git a/templates/calendrier/delete.html b/calendrier/templates/calendrier/delete.html similarity index 88% rename from templates/calendrier/delete.html rename to calendrier/templates/calendrier/delete.html index 0ab2aa9..c1d6a0b 100644 --- a/templates/calendrier/delete.html +++ b/calendrier/templates/calendrier/delete.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "gestion/base.html" %} {% block titre %}Suppression d'un événement{% endblock %} diff --git a/templates/calendrier/home.html b/calendrier/templates/calendrier/home.html similarity index 97% rename from templates/calendrier/home.html rename to calendrier/templates/calendrier/home.html index 097154c..a4e5b86 100644 --- a/templates/calendrier/home.html +++ b/calendrier/templates/calendrier/home.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "gestion/base.html" %} {% load staticfiles %} {% load frenchmonth %} {% load translate %} diff --git a/templates/calendrier/reponse.html b/calendrier/templates/calendrier/reponse.html similarity index 94% rename from templates/calendrier/reponse.html rename to calendrier/templates/calendrier/reponse.html index fc7a784..d52ecb2 100644 --- a/templates/calendrier/reponse.html +++ b/calendrier/templates/calendrier/reponse.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "gestion/base.html" %} {% block titre %}Participation à un événement{% endblock %} diff --git a/templates/calendrier/resend.html b/calendrier/templates/calendrier/resend.html similarity index 90% rename from templates/calendrier/resend.html rename to calendrier/templates/calendrier/resend.html index 946a530..4453625 100644 --- a/templates/calendrier/resend.html +++ b/calendrier/templates/calendrier/resend.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "gestion/base.html" %} {% block titre %}Renvoyer les mails{% endblock %} diff --git a/templates/calendrier/update.html b/calendrier/templates/calendrier/update.html similarity index 85% rename from templates/calendrier/update.html rename to calendrier/templates/calendrier/update.html index 8f4561b..5444ef5 100644 --- a/templates/calendrier/update.html +++ b/calendrier/templates/calendrier/update.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "gestion/base.html" %} {% block titre %}Modification{% endblock %} {% block content %} diff --git a/templates/calendrier/view_event.html b/calendrier/templates/calendrier/view_event.html similarity index 98% rename from templates/calendrier/view_event.html rename to calendrier/templates/calendrier/view_event.html index 71f0d6a..c4bc5dc 100644 --- a/templates/calendrier/view_event.html +++ b/calendrier/templates/calendrier/view_event.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "gestion/base.html" %} {% block titre %}{{ nom }}{% endblock %} diff --git a/templates/gestion/base.html b/gestion/templates/gestion/base.html similarity index 100% rename from templates/gestion/base.html rename to gestion/templates/gestion/base.html diff --git a/templates/gestion/change.html b/gestion/templates/gestion/change.html similarity index 94% rename from templates/gestion/change.html rename to gestion/templates/gestion/change.html index f62a9ff..fbda8ad 100644 --- a/templates/gestion/change.html +++ b/gestion/templates/gestion/change.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "gestion/base.html" %} {% block titre %}Modification du profil{% endblock %} {% block content %} diff --git a/templates/gestion/changepasswd.html b/gestion/templates/gestion/changepasswd.html similarity index 92% rename from templates/gestion/changepasswd.html rename to gestion/templates/gestion/changepasswd.html index 2177003..ba0bc39 100644 --- a/templates/gestion/changepasswd.html +++ b/gestion/templates/gestion/changepasswd.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "gestion/base.html" %} {% block titre %}Changement du mot de passe{% endblock %} {% block content %} diff --git a/templates/gestion/divers.html b/gestion/templates/gestion/divers.html similarity index 87% rename from templates/gestion/divers.html rename to gestion/templates/gestion/divers.html index a2e08a3..0b1bac0 100644 --- a/templates/gestion/divers.html +++ b/gestion/templates/gestion/divers.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "gestion/base.html" %} {% block titre %}Divers{% endblock %} {% block content %}

Divers

diff --git a/templates/gestion/home.html b/gestion/templates/gestion/home.html similarity index 81% rename from templates/gestion/home.html rename to gestion/templates/gestion/home.html index 84f7367..199e25a 100644 --- a/templates/gestion/home.html +++ b/gestion/templates/gestion/home.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "gestion/base.html" %} {% block titre %}L'Ernestophone{% endblock %} {% block content %}

L'Ernestophone, la fanfare de l'École normale supérieure

{% endblock %} diff --git a/templates/gestion/login.html b/gestion/templates/gestion/login.html similarity index 95% rename from templates/gestion/login.html rename to gestion/templates/gestion/login.html index 9bde3e0..a2e8eba 100644 --- a/templates/gestion/login.html +++ b/gestion/templates/gestion/login.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "gestion/base.html" %} {% block titre %}Connexion{% endblock %} {% block content %}

Connexion

diff --git a/templates/gestion/registration.html b/gestion/templates/gestion/registration.html similarity index 93% rename from templates/gestion/registration.html rename to gestion/templates/gestion/registration.html index ae6ed3c..2207496 100644 --- a/templates/gestion/registration.html +++ b/gestion/templates/gestion/registration.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "gestion/base.html" %} {% block titre %}L'Ernestophone - Inscription{% endblock %} {% block content %} diff --git a/templates/gestion/thanks.html b/gestion/templates/gestion/thanks.html similarity index 83% rename from templates/gestion/thanks.html rename to gestion/templates/gestion/thanks.html index b1ccb60..0858714 100644 --- a/templates/gestion/thanks.html +++ b/gestion/templates/gestion/thanks.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "gestion/base.html" %} {% block titre %}L'Ernestophone - Inscription{% endblock %} {% block content %}

Merci pour votre inscription.

{% if error %}

{{ error }}

{% endif %} diff --git a/gestion/views.py b/gestion/views.py index 3acdcfe..261ddd4 100644 --- a/gestion/views.py +++ b/gestion/views.py @@ -90,7 +90,7 @@ def login(request): {"error_type": "no_password"}) except User.DoesNotExist: pass - return django_login_view(request, template_name='login.html') + return django_login_view(request, template_name='gestion/login.html') @login_required diff --git a/templates/pads/create.html b/pads/templates/pads/create.html similarity index 91% rename from templates/pads/create.html rename to pads/templates/pads/create.html index ecf2261..06b5914 100644 --- a/templates/pads/create.html +++ b/pads/templates/pads/create.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "gestion/base.html" %} {%block titre %}Ajout d'un pad{% endblock %} diff --git a/templates/pads/delete.html b/pads/templates/pads/delete.html similarity index 90% rename from templates/pads/delete.html rename to pads/templates/pads/delete.html index aaf47d8..f11fd3b 100644 --- a/templates/pads/delete.html +++ b/pads/templates/pads/delete.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "gestion/base.html" %} {% block titre %}Suppression d'un pad{% endblock %} {% block content %}
diff --git a/templates/pads/liste.html b/pads/templates/pads/liste.html similarity index 94% rename from templates/pads/liste.html rename to pads/templates/pads/liste.html index d31f5e6..ce71191 100644 --- a/templates/pads/liste.html +++ b/pads/templates/pads/liste.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "gestion/base.html" %} {% load getresponse %} {% block titre %}Liste des pads{% endblock %} {% block content %}

Liste des pads

diff --git a/templates/pads/update.html b/pads/templates/pads/update.html similarity index 86% rename from templates/pads/update.html rename to pads/templates/pads/update.html index 0e08428..585468f 100644 --- a/templates/pads/update.html +++ b/pads/templates/pads/update.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "gestion/base.html" %} {% block titre %}Modification du pad{% endblock %} {% block content %} diff --git a/templates/partitions/conf_delete.html b/partitions/templates/partitions/conf_delete.html similarity index 91% rename from templates/partitions/conf_delete.html rename to partitions/templates/partitions/conf_delete.html index 49bb887..5a31b2d 100644 --- a/templates/partitions/conf_delete.html +++ b/partitions/templates/partitions/conf_delete.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "gestion/base.html" %} {% block titre %}Confirmation de suppression{% endblock %} {% block content %}

Confirmation de suppression

Voulez-vous vraiment supprimer cette partition ?

diff --git a/templates/partitions/conf_delete_morc.html b/partitions/templates/partitions/conf_delete_morc.html similarity index 92% rename from templates/partitions/conf_delete_morc.html rename to partitions/templates/partitions/conf_delete_morc.html index ad94de9..0d98348 100644 --- a/templates/partitions/conf_delete_morc.html +++ b/partitions/templates/partitions/conf_delete_morc.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "gestion/base.html" %} {% block titre %}Confirmation de suppression{% endblock %} {% block content %}

Confirmation de suppression

Voulez-vous vraiment supprimer {{ nom }}-{{ auteur }} et toutes les partitions qu'il contient ?

diff --git a/templates/partitions/liste.html b/partitions/templates/partitions/liste.html similarity index 96% rename from templates/partitions/liste.html rename to partitions/templates/partitions/liste.html index c83e890..1d19c99 100644 --- a/templates/partitions/liste.html +++ b/partitions/templates/partitions/liste.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "gestion/base.html" %} {% block titre %}Liste des partitions{% endblock %} diff --git a/templates/partitions/liste_item.html b/partitions/templates/partitions/liste_item.html similarity index 100% rename from templates/partitions/liste_item.html rename to partitions/templates/partitions/liste_item.html diff --git a/templates/partitions/listepart.html b/partitions/templates/partitions/listepart.html similarity index 97% rename from templates/partitions/listepart.html rename to partitions/templates/partitions/listepart.html index befb1ae..eb21125 100644 --- a/templates/partitions/listepart.html +++ b/partitions/templates/partitions/listepart.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "gestion/base.html" %} {% block titre %}{{ p }}{% endblock %} diff --git a/templates/partitions/new.html b/partitions/templates/partitions/new.html similarity index 93% rename from templates/partitions/new.html rename to partitions/templates/partitions/new.html index 34037e9..21d9728 100644 --- a/templates/partitions/new.html +++ b/partitions/templates/partitions/new.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "gestion/base.html" %} {% block titre %}Ajouter un morceau{% endblock %} {% block content %}

Ajouter un morceau

{% if sauvegarde %} diff --git a/templates/partitions/upload.html b/partitions/templates/partitions/upload.html similarity index 94% rename from templates/partitions/upload.html rename to partitions/templates/partitions/upload.html index baaf83d..27acd1f 100644 --- a/templates/partitions/upload.html +++ b/partitions/templates/partitions/upload.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "gestion/base.html" %} {% block titre %}Ajouter une partition{% endblock %} {% block content %}

Ajouter une partition

{% if sauvegarde %} diff --git a/templates/propositions/create.html b/propositions/templates/propositions/create.html similarity index 92% rename from templates/propositions/create.html rename to propositions/templates/propositions/create.html index bef2072..af560cf 100644 --- a/templates/propositions/create.html +++ b/propositions/templates/propositions/create.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "gestion/base.html" %} {%block titre %}Proposition de morceau{% endblock %} diff --git a/templates/propositions/delete.html b/propositions/templates/propositions/delete.html similarity index 91% rename from templates/propositions/delete.html rename to propositions/templates/propositions/delete.html index 1dfe550..1502cbd 100644 --- a/templates/propositions/delete.html +++ b/propositions/templates/propositions/delete.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "gestion/base.html" %} {% block titre %}Suppression d'une proposition{% endblock %} {% block content %} diff --git a/templates/propositions/liste.html b/propositions/templates/propositions/liste.html similarity index 96% rename from templates/propositions/liste.html rename to propositions/templates/propositions/liste.html index 0187d3b..129f307 100644 --- a/templates/propositions/liste.html +++ b/propositions/templates/propositions/liste.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "gestion/base.html" %} {% load getresponse %} {% block titre %}Propositions de morceau{% endblock %} {% block content %}

Liste des propositions

diff --git a/templates/propositions/reponse.html b/propositions/templates/propositions/reponse.html similarity index 100% rename from templates/propositions/reponse.html rename to propositions/templates/propositions/reponse.html diff --git a/templates/admin/404.html b/templates/admin/404.html deleted file mode 100644 index 9bf4293..0000000 --- a/templates/admin/404.html +++ /dev/null @@ -1,12 +0,0 @@ -{% extends "admin/base_site.html" %} -{% load i18n %} - -{% block title %}{% trans 'Page not found' %}{% endblock %} - -{% block content %} - -

{% trans 'Page not found' %}

- -

{% trans "We're sorry, but the requested page could not be found." %}

- -{% endblock %} diff --git a/templates/admin/500.html b/templates/admin/500.html deleted file mode 100644 index 4842faa..0000000 --- a/templates/admin/500.html +++ /dev/null @@ -1,17 +0,0 @@ -{% extends "admin/base_site.html" %} -{% load i18n %} - -{% block breadcrumbs %} -
-{% trans 'Home' %} -› {% trans 'Server error' %} -
-{% endblock %} - -{% block title %}{% trans 'Server error (500)' %}{% endblock %} - -{% block content %} -

{% trans 'Server Error (500)' %}

-

{% trans "There's been an error. It's been reported to the site administrators via email and should be fixed shortly. Thanks for your patience." %}

- -{% endblock %} diff --git a/templates/admin/actions.html b/templates/admin/actions.html deleted file mode 100644 index aaaa245..0000000 --- a/templates/admin/actions.html +++ /dev/null @@ -1,16 +0,0 @@ -{% load i18n %} -
- {% for field in action_form %}{% if field.label %}{% endif %}{% endfor %} - - {% if actions_selection_counter %} - - {{ selection_note }} - {% if cl.result_count != cl.result_list|length %} - {{ selection_note_all }} - - {% blocktrans with cl.result_count as total_count %}Select all {{ total_count }} {{ module_name }}{% endblocktrans %} - - {% trans "Clear selection" %} - {% endif %} - {% endif %} -
diff --git a/templates/admin/app_index.html b/templates/admin/app_index.html deleted file mode 100644 index 6868b49..0000000 --- a/templates/admin/app_index.html +++ /dev/null @@ -1,18 +0,0 @@ -{% extends "admin/index.html" %} -{% load i18n %} - -{% block bodyclass %}{{ block.super }} app-{{ app_label }}{% endblock %} - -{% if not is_popup %} -{% block breadcrumbs %} -
-{% trans 'Home' %} -› -{% for app in app_list %} -{{ app.name }} -{% endfor %} -
-{% endblock %} -{% endif %} - -{% block sidebar %}{% endblock %} diff --git a/templates/admin/auth/user/add_form.html b/templates/admin/auth/user/add_form.html deleted file mode 100644 index c8889eb..0000000 --- a/templates/admin/auth/user/add_form.html +++ /dev/null @@ -1,14 +0,0 @@ -{% extends "admin/change_form.html" %} -{% load i18n %} - -{% block form_top %} - {% if not is_popup %} -

{% trans "First, enter a username and password. Then, you'll be able to edit more user options." %}

- {% else %} -

{% trans "Enter a username and password." %}

- {% endif %} -{% endblock %} - -{% block after_field_sets %} - -{% endblock %} diff --git a/templates/admin/auth/user/change_password.html b/templates/admin/auth/user/change_password.html deleted file mode 100644 index cd11a2e..0000000 --- a/templates/admin/auth/user/change_password.html +++ /dev/null @@ -1,57 +0,0 @@ -{% extends "admin/base_site.html" %} -{% load i18n admin_static %} -{% load admin_urls %} - -{% block extrahead %}{{ block.super }} - -{% endblock %} -{% block extrastyle %}{{ block.super }}{% endblock %} -{% block bodyclass %}{{ block.super }} {{ opts.app_label }}-{{ opts.model_name }} change-form{% endblock %} -{% if not is_popup %} -{% block breadcrumbs %} -
-{% trans 'Home' %} -› {{ opts.app_config.verbose_name }} -› {{ opts.verbose_name_plural|capfirst }} -› {{ original|truncatewords:"18" }} -› {% trans 'Change password' %} -
-{% endblock %} -{% endif %} -{% block content %}
-{% csrf_token %}{% block form_top %}{% endblock %} -
-{% if is_popup %}{% endif %} -{% if form.errors %} -

- {% if form.errors.items|length == 1 %}{% trans "Please correct the error below." %}{% else %}{% trans "Please correct the errors below." %}{% endif %} -

-{% endif %} - -

{% blocktrans with username=original %}Enter a new password for the user {{ username }}.{% endblocktrans %}

- -
- -
- {{ form.password1.errors }} - {# TODO: get required class on label_tag #} - {{ form.password1 }} -
- -
- {{ form.password2.errors }} - {# TODO: get required class on label_tag #} - {{ form.password2 }} -

{% trans 'Enter the same password as above, for verification.' %}

-
- -
- -
- -
- - -
-
-{% endblock %} diff --git a/templates/admin/base.html b/templates/admin/base.html deleted file mode 100644 index d93128a..0000000 --- a/templates/admin/base.html +++ /dev/null @@ -1,82 +0,0 @@ -{% load admin_static %}{% load firstof from future %} - - -{% block title %}{% endblock %} - -{% block extrastyle %}{% endblock %} - -{% if LANGUAGE_BIDI %}{% endif %} - - -{% block extrahead %}{% endblock %} -{% block blockbots %}{% endblock %} - -{% load i18n %} - - - - -
- - {% if not is_popup %} - - - - {% block breadcrumbs %} -
- {% trans 'Home' %} - {% if title %} › {{ title }}{% endif %} -
- {% endblock %} - {% endif %} - - {% block messages %} - {% if messages %} - - {% endif %} - {% endblock messages %} - - -
- {% block pretitle %}{% endblock %} - {% block content_title %}{% if title %}

{{ title }}

{% endif %}{% endblock %} - {% block content %} - {% block object-tools %}{% endblock %} - {{ content }} - {% endblock %} - {% block sidebar %}{% endblock %} -
-
- - - {% block footer %}{% endblock %} -
- - - - diff --git a/templates/admin/change_form.html b/templates/admin/change_form.html deleted file mode 100644 index 7c7100f..0000000 --- a/templates/admin/change_form.html +++ /dev/null @@ -1,85 +0,0 @@ -{% extends "admin/base_site.html" %} -{% load i18n admin_urls admin_static admin_modify %} - -{% block extrahead %}{{ block.super }} - -{{ media }} -{% endblock %} - -{% block extrastyle %}{{ block.super }}{% endblock %} - -{% block coltype %}colM{% endblock %} - -{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} change-form{% endblock %} - -{% if not is_popup %} -{% block breadcrumbs %} -
-{% trans 'Home' %} -› {{ opts.app_config.verbose_name }} -› {% if has_change_permission %}{{ opts.verbose_name_plural|capfirst }}{% else %}{{ opts.verbose_name_plural|capfirst }}{% endif %} -› {% if add %}{% trans 'Add' %} {{ opts.verbose_name }}{% else %}{{ original|truncatewords:"18" }}{% endif %} -
-{% endblock %} -{% endif %} - -{% block content %}
-{% block object-tools %} -{% if change %}{% if not is_popup %} - -{% endif %}{% endif %} -{% endblock %} -
{% csrf_token %}{% block form_top %}{% endblock %} -
-{% if is_popup %}{% endif %} -{% if to_field %}{% endif %} -{% if save_on_top %}{% block submit_buttons_top %}{% submit_row %}{% endblock %}{% endif %} -{% if errors %} -

- {% if errors|length == 1 %}{% trans "Please correct the error below." %}{% else %}{% trans "Please correct the errors below." %}{% endif %} -

- {{ adminform.form.non_field_errors }} -{% endif %} - -{% block field_sets %} -{% for fieldset in adminform %} - {% include "admin/includes/fieldset.html" %} -{% endfor %} -{% endblock %} - -{% block after_field_sets %}{% endblock %} - -{% block inline_field_sets %} -{% for inline_admin_formset in inline_admin_formsets %} - {% include inline_admin_formset.opts.template %} -{% endfor %} -{% endblock %} - -{% block after_related_objects %}{% endblock %} - -{% block submit_buttons_bottom %}{% submit_row %}{% endblock %} - -{% if adminform and add %} - -{% endif %} - -{# JavaScript for prepopulated fields #} -{% prepopulated_fields_js %} - -
-
-{% endblock %} diff --git a/templates/admin/change_list.html b/templates/admin/change_list.html deleted file mode 100644 index ca0080e..0000000 --- a/templates/admin/change_list.html +++ /dev/null @@ -1,98 +0,0 @@ -{% extends "admin/base_site.html" %} -{% load i18n admin_urls admin_static admin_list %} - -{% block extrastyle %} - {{ block.super }} - - {% if cl.formset %} - - {% endif %} - {% if cl.formset or action_form %} - - {% endif %} - {{ media.css }} - {% if not actions_on_top and not actions_on_bottom %} - - {% endif %} -{% endblock %} - -{% block extrahead %} -{{ block.super }} -{{ media.js }} -{% if action_form %}{% if actions_on_top or actions_on_bottom %} - -{% endif %}{% endif %} -{% endblock %} - -{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} change-list{% endblock %} - -{% if not is_popup %} -{% block breadcrumbs %} -
-{% trans 'Home' %} -› {{ cl.opts.app_config.verbose_name }} -› {{ cl.opts.verbose_name_plural|capfirst }} -
-{% endblock %} -{% endif %} - -{% block coltype %}flex{% endblock %} - -{% block content %} -
- {% block object-tools %} - {% if has_add_permission %} - - {% endif %} - {% endblock %} - {% if cl.formset.errors %} -

- {% if cl.formset.total_error_count == 1 %}{% trans "Please correct the error below." %}{% else %}{% trans "Please correct the errors below." %}{% endif %} -

- {{ cl.formset.non_form_errors }} - {% endif %} -
- {% block search %}{% search_form cl %}{% endblock %} - {% block date_hierarchy %}{% date_hierarchy cl %}{% endblock %} - - {% block filters %} - {% if cl.has_filters %} -
-

{% trans 'Filter' %}

- {% for spec in cl.filter_specs %}{% admin_list_filter cl spec %}{% endfor %} -
- {% endif %} - {% endblock %} - -
{% csrf_token %} - {% if cl.formset %} -
{{ cl.formset.management_form }}
- {% endif %} - - {% block result_list %} - {% if action_form and actions_on_top and cl.full_result_count %}{% admin_actions %}{% endif %} - {% result_list cl %} - {% if action_form and actions_on_bottom and cl.full_result_count %}{% admin_actions %}{% endif %} - {% endblock %} - {% block pagination %}{% pagination cl %}{% endblock %} -
-
-
-{% endblock %} diff --git a/templates/admin/change_list_results.html b/templates/admin/change_list_results.html deleted file mode 100644 index 6368698..0000000 --- a/templates/admin/change_list_results.html +++ /dev/null @@ -1,38 +0,0 @@ -{% load i18n admin_static %}{% load cycle from future %} -{% if result_hidden_fields %} -
{# DIV for HTML validation #} -{% for item in result_hidden_fields %}{{ item }}{% endfor %} -
-{% endif %} -{% if results %} -
- - - -{% for header in result_headers %} -{% endfor %} - - - -{% for result in results %} -{% if result.form.non_field_errors %} - -{% endif %} -{% for item in result %}{{ item }}{% endfor %} -{% endfor %} - -
- {% if header.sortable %} - {% if header.sort_priority > 0 %} -
- - {% if num_sorted_fields > 1 %}{{ header.sort_priority }}{% endif %} - -
- {% endif %} - {% endif %} -
{% if header.sortable %}{{ header.text|capfirst }}{% else %}{{ header.text|capfirst }}{% endif %}
-
-
{{ result.form.non_field_errors }}
-
-{% endif %} diff --git a/templates/admin/date_hierarchy.html b/templates/admin/date_hierarchy.html deleted file mode 100644 index 0058510..0000000 --- a/templates/admin/date_hierarchy.html +++ /dev/null @@ -1,10 +0,0 @@ -{% if show %} -
-
-
-{% endif %} diff --git a/templates/admin/delete_confirmation.html b/templates/admin/delete_confirmation.html deleted file mode 100644 index 9d5172a..0000000 --- a/templates/admin/delete_confirmation.html +++ /dev/null @@ -1,44 +0,0 @@ -{% extends "admin/base_site.html" %} -{% load i18n admin_urls %} - -{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} delete-confirmation{% endblock %} - -{% block breadcrumbs %} -
-{% trans 'Home' %} -› {{ opts.app_config.verbose_name }} -› {{ opts.verbose_name_plural|capfirst|escape }} -› {{ object|truncatewords:"18" }} -› {% trans 'Delete' %} -
-{% endblock %} - -{% block content %} -{% if perms_lacking or protected %} - {% if perms_lacking %} -

{% blocktrans with escaped_object=object %}Deleting the {{ object_name }} '{{ escaped_object }}' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %}

- - {% endif %} - {% if protected %} -

{% blocktrans with escaped_object=object %}Deleting the {{ object_name }} '{{ escaped_object }}' would require deleting the following protected related objects:{% endblocktrans %}

- - {% endif %} -{% else %} -

{% blocktrans with escaped_object=object %}Are you sure you want to delete the {{ object_name }} "{{ escaped_object }}"? All of the following related items will be deleted:{% endblocktrans %}

- -
{% csrf_token %} -
- - -
-
-{% endif %} -{% endblock %} diff --git a/templates/admin/delete_selected_confirmation.html b/templates/admin/delete_selected_confirmation.html deleted file mode 100644 index 79ea977..0000000 --- a/templates/admin/delete_selected_confirmation.html +++ /dev/null @@ -1,49 +0,0 @@ -{% extends "admin/base_site.html" %} -{% load i18n l10n admin_urls %} - -{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} delete-confirmation delete-selected-confirmation{% endblock %} - -{% block breadcrumbs %} -
-{% trans 'Home' %} -› {{ opts.app_config.verbose_name }} -› {{ opts.verbose_name_plural|capfirst }} -› {% trans 'Delete multiple objects' %} -
-{% endblock %} - -{% block content %} -{% if perms_lacking or protected %} - {% if perms_lacking %} -

{% blocktrans %}Deleting the selected {{ objects_name }} would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %}

- - {% endif %} - {% if protected %} -

{% blocktrans %}Deleting the selected {{ objects_name }} would require deleting the following protected related objects:{% endblocktrans %}

- - {% endif %} -{% else %} -

{% blocktrans %}Are you sure you want to delete the selected {{ objects_name }}? All of the following objects and their related items will be deleted:{% endblocktrans %}

- {% for deletable_object in deletable_objects %} - - {% endfor %} -
{% csrf_token %} -
- {% for obj in queryset %} - - {% endfor %} - - - -
-
-{% endif %} -{% endblock %} diff --git a/templates/admin/edit_inline/stacked.html b/templates/admin/edit_inline/stacked.html deleted file mode 100644 index 79c052c..0000000 --- a/templates/admin/edit_inline/stacked.html +++ /dev/null @@ -1,30 +0,0 @@ -{% load i18n admin_static %} -
-

{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}

-{{ inline_admin_formset.formset.management_form }} -{{ inline_admin_formset.formset.non_form_errors }} - -{% for inline_admin_form in inline_admin_formset %}
-

{{ inline_admin_formset.opts.verbose_name|capfirst }}: {% if inline_admin_form.original %}{{ inline_admin_form.original }}{% else %}#{{ forloop.counter }}{% endif %} - {% if inline_admin_form.show_url %}{% trans "View on site" %}{% endif %} - {% if inline_admin_formset.formset.can_delete and inline_admin_form.original %}{{ inline_admin_form.deletion_field.field }} {{ inline_admin_form.deletion_field.label_tag }}{% endif %} -

- {% if inline_admin_form.form.non_field_errors %}{{ inline_admin_form.form.non_field_errors }}{% endif %} - {% for fieldset in inline_admin_form %} - {% include "admin/includes/fieldset.html" %} - {% endfor %} - {% if inline_admin_form.needs_explicit_pk_field %}{{ inline_admin_form.pk_field.field }}{% endif %} - {{ inline_admin_form.fk_field.field }} -
{% endfor %} -
- - diff --git a/templates/admin/edit_inline/tabular.html b/templates/admin/edit_inline/tabular.html deleted file mode 100644 index 9ef6e8f..0000000 --- a/templates/admin/edit_inline/tabular.html +++ /dev/null @@ -1,81 +0,0 @@ -{% load i18n admin_static admin_modify %}{% load cycle from future %} -
-
-{{ inline_admin_formset.formset.management_form }} -
-

{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}

- {{ inline_admin_formset.formset.non_form_errors }} - - - {% for field in inline_admin_formset.fields %} - {% if not field.widget.is_hidden %} - {{ field.label|capfirst }} - {% if field.help_text %} ({{ field.help_text|striptags }}){% endif %} - - {% endif %} - {% endfor %} - {% if inline_admin_formset.formset.can_delete %}{% endif %} - - - - {% for inline_admin_form in inline_admin_formset %} - {% if inline_admin_form.form.non_field_errors %} - - {% endif %} - - - {% for fieldset in inline_admin_form %} - {% for line in fieldset %} - {% for field in line %} - {% if not field.field.is_hidden %} - - {% if field.is_readonly %} -

{{ field.contents }}

- {% else %} - {{ field.field.errors.as_ul }} - {{ field.field }} - {% endif %} - - {% endif %} - {% endfor %} - {% endfor %} - {% endfor %} - {% if inline_admin_formset.formset.can_delete %} - - {% endif %} - - {% endfor %} - -
{% trans "Delete?" %}
{{ inline_admin_form.form.non_field_errors }}
- {% if inline_admin_form.original or inline_admin_form.show_url %}

- {% if inline_admin_form.original %} {{ inline_admin_form.original }}{% endif %} - {% if inline_admin_form.show_url %}{% trans "View on site" %}{% endif %} -

{% endif %} - {% if inline_admin_form.needs_explicit_pk_field %}{{ inline_admin_form.pk_field.field }}{% endif %} - {{ inline_admin_form.fk_field.field }} - {% spaceless %} - {% for fieldset in inline_admin_form %} - {% for line in fieldset %} - {% for field in line %} - {% if field.field.is_hidden %} {{ field.field }} {% endif %} - {% endfor %} - {% endfor %} - {% endfor %} - {% endspaceless %} - 		{% if inline_admin_form.original %}{{ inline_admin_form.deletion_field.field }}{% endif %}
-
-
-
- - diff --git a/templates/admin/filter.html b/templates/admin/filter.html deleted file mode 100644 index d4a61a1..0000000 --- a/templates/admin/filter.html +++ /dev/null @@ -1,8 +0,0 @@ -{% load i18n %} -

{% blocktrans with filter_title=title %} By {{ filter_title }} {% endblocktrans %}

- diff --git a/templates/admin/includes/fieldset.html b/templates/admin/includes/fieldset.html deleted file mode 100644 index c45e731..0000000 --- a/templates/admin/includes/fieldset.html +++ /dev/null @@ -1,29 +0,0 @@ -
- {% if fieldset.name %}

{{ fieldset.name }}

{% endif %} - {% if fieldset.description %} -
{{ fieldset.description|safe }}
- {% endif %} - {% for line in fieldset %} -
- {% if line.fields|length_is:'1' %}{{ line.errors }}{% endif %} - {% for field in line %} - - {% if not line.fields|length_is:'1' and not field.is_readonly %}{{ field.errors }}{% endif %} - {% if field.is_checkbox %} - {{ field.field }}{{ field.label_tag }} - {% else %} - {{ field.label_tag }} - {% if field.is_readonly %} -

{{ field.contents }}

- {% else %} - {{ field.field }} - {% endif %} - {% endif %} - {% if field.field.help_text %} -

{{ field.field.help_text|safe }}

- {% endif %} -
- {% endfor %} - - {% endfor %} -
diff --git a/templates/admin/index.html b/templates/admin/index.html deleted file mode 100644 index fcf269e..0000000 --- a/templates/admin/index.html +++ /dev/null @@ -1,82 +0,0 @@ -{% extends "admin/base_site.html" %} -{% load i18n admin_static %} - -{% block extrastyle %}{{ block.super }}{% endblock %} - -{% block coltype %}colMS{% endblock %} - -{% block bodyclass %}{{ block.super }} dashboard{% endblock %} - -{% block breadcrumbs %}{% endblock %} - -{% block content %} -
- -{% if app_list %} - {% for app in app_list %} -
- - - {% for model in app.models %} - - {% if model.admin_url %} - - {% else %} - - {% endif %} - - {% if model.add_url %} - - {% else %} - - {% endif %} - - {% if model.admin_url %} - - {% else %} - - {% endif %} - - {% endfor %} -
- {{ app.name }} -
{{ model.name }}{{ model.name }}{% trans 'Add' %} {% trans 'Change' %} 
-
- {% endfor %} -{% else %} -

{% trans "You don't have permission to edit anything." %}

-{% endif %} -
-{% endblock %} - -{% block sidebar %} -
-
-

{% trans 'Recent Actions' %}

-

{% trans 'My Actions' %}

- {% load log %} - {% get_admin_log 10 as admin_log for_user user %} - {% if not admin_log %} -

{% trans 'None available' %}

- {% else %} -
    - {% for entry in admin_log %} -
  • - {% if entry.is_deletion or not entry.get_admin_url %} - {{ entry.object_repr }} - {% else %} - {{ entry.object_repr }} - {% endif %} -
    - {% if entry.content_type %} - {% filter capfirst %}{% trans entry.content_type.name %}{% endfilter %} - {% else %} - {% trans 'Unknown content' %} - {% endif %} -
    • - {% endfor %} -
- {% endif %} -
-
-{% endblock %} diff --git a/templates/admin/invalid_setup.html b/templates/admin/invalid_setup.html deleted file mode 100644 index 7c71107..0000000 --- a/templates/admin/invalid_setup.html +++ /dev/null @@ -1,13 +0,0 @@ -{% extends "admin/base_site.html" %} -{% load i18n %} - -{% block breadcrumbs %} -
-{% trans 'Home' %} -› {{ title }} -
-{% endblock %} - -{% block content %} -

{% trans "Something's wrong with your database installation. Make sure the appropriate database tables have been created, and make sure the database is readable by the appropriate user." %}

-{% endblock %} diff --git a/templates/admin/login.html b/templates/admin/login.html deleted file mode 100644 index bf1b3f9..0000000 --- a/templates/admin/login.html +++ /dev/null @@ -1,55 +0,0 @@ -{% extends "admin/base_site.html" %} -{% load i18n admin_static %} - -{% block extrastyle %}{{ block.super }}{% endblock %} - -{% block bodyclass %}{{ block.super }} login{% endblock %} - -{% block nav-global %}{% endblock %} - -{% block content_title %}{% endblock %} - -{% block breadcrumbs %}{% endblock %} - -{% block content %} -{% if form.errors and not form.non_field_errors %} -

-{% if form.errors.items|length == 1 %}{% trans "Please correct the error below." %}{% else %}{% trans "Please correct the errors below." %}{% endif %} -

-{% endif %} - -{% if form.non_field_errors %} -{% for error in form.non_field_errors %} -

- {{ error }} -

-{% endfor %} -{% endif %} - -
-
{% csrf_token %} -
- {{ form.username.errors }} - {{ form.username }} -
-
- {{ form.password.errors }} - {{ form.password }} - -
- {% url 'admin_password_reset' as password_reset_url %} - {% if password_reset_url %} -
- {% trans 'Forgotten your password or username?' %} -
- {% endif %} -
- -
-
- - -
-{% endblock %} diff --git a/templates/admin/object_history.html b/templates/admin/object_history.html deleted file mode 100644 index cf3e7e2..0000000 --- a/templates/admin/object_history.html +++ /dev/null @@ -1,42 +0,0 @@ -{% extends "admin/base_site.html" %} -{% load i18n admin_urls %} - -{% block breadcrumbs %} -
-{% trans 'Home' %} -› {{ opts.app_config.verbose_name }} -› {{ module_name }} -› {{ object|truncatewords:"18" }} -› {% trans 'History' %} -
-{% endblock %} - -{% block content %} -
-
- -{% if action_list %} - - - - - - - - - - {% for action in action_list %} - - - - - - {% endfor %} - -
{% trans 'Date/time' %}{% trans 'User' %}{% trans 'Action' %}
{{ action.action_time|date:"DATETIME_FORMAT" }}{{ action.user.get_username }}{% if action.user.get_full_name %} ({{ action.user.get_full_name }}){% endif %}{{ action.change_message }}
-{% else %} -

{% trans "This object doesn't have a change history. It probably wasn't added via this admin site." %}

-{% endif %} -
-
-{% endblock %} diff --git a/templates/admin/pagination.html b/templates/admin/pagination.html deleted file mode 100644 index 3588132..0000000 --- a/templates/admin/pagination.html +++ /dev/null @@ -1,12 +0,0 @@ -{% load admin_list %} -{% load i18n %} -

-{% if pagination_required %} -{% for i in page_range %} - {% paginator_number cl i %} -{% endfor %} -{% endif %} -{{ cl.result_count }} {% ifequal cl.result_count 1 %}{{ cl.opts.verbose_name }}{% else %}{{ cl.opts.verbose_name_plural }}{% endifequal %} -{% if show_all_url %}  {% trans 'Show all' %}{% endif %} -{% if cl.formset and cl.result_count %}{% endif %} -

diff --git a/templates/admin/popup_response.html b/templates/admin/popup_response.html deleted file mode 100644 index 281f035..0000000 --- a/templates/admin/popup_response.html +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/templates/admin/prepopulated_fields_js.html b/templates/admin/prepopulated_fields_js.html deleted file mode 100644 index 0ff4d27..0000000 --- a/templates/admin/prepopulated_fields_js.html +++ /dev/null @@ -1,27 +0,0 @@ -{% load l10n %} - diff --git a/templates/admin/search_form.html b/templates/admin/search_form.html deleted file mode 100644 index c9b626d..0000000 --- a/templates/admin/search_form.html +++ /dev/null @@ -1,17 +0,0 @@ -{% load i18n admin_static %} -{% if cl.search_fields %} -
- -{% endif %} diff --git a/templates/admin/submit_line.html b/templates/admin/submit_line.html deleted file mode 100644 index 52baed3..0000000 --- a/templates/admin/submit_line.html +++ /dev/null @@ -1,11 +0,0 @@ -{% load i18n admin_urls %} -
-{% if show_save %}{% endif %} -{% if show_delete_link %} - {% url opts|admin_urlname:'delete' original.pk|admin_urlquote as delete_url %} -

{% trans "Delete" %}

-{% endif %} -{% if show_save_as_new %}{%endif%} -{% if show_save_and_add_another %}{% endif %} -{% if show_save_and_continue %}{% endif %} -
diff --git a/templates/registration/logged_out.html b/templates/registration/logged_out.html deleted file mode 100644 index 6a18186..0000000 --- a/templates/registration/logged_out.html +++ /dev/null @@ -1,12 +0,0 @@ -{% extends "admin/base_site.html" %} -{% load i18n %} - -{% block breadcrumbs %}
{% trans 'Home' %}
{% endblock %} - -{% block content %} - -

{% trans "Thanks for spending some quality time with the Web site today." %}

- -

{% trans 'Log in again' %}

- -{% endblock %} diff --git a/templates/registration/password_change_done.html b/templates/registration/password_change_done.html deleted file mode 100644 index 3e557eb..0000000 --- a/templates/registration/password_change_done.html +++ /dev/null @@ -1,15 +0,0 @@ -{% extends "admin/base_site.html" %} -{% load i18n %} -{% block userlinks %}{% url 'django-admindocs-docroot' as docsroot %}{% if docsroot %}{% trans 'Documentation' %} / {% endif %}{% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} -{% block breadcrumbs %} -
-{% trans 'Home' %} -› {% trans 'Password change' %} -
-{% endblock %} - -{% block title %}{{ title }}{% endblock %} -{% block content_title %}

{{ title }}

{% endblock %} -{% block content %} -

{% trans 'Your password was changed.' %}

-{% endblock %} diff --git a/templates/registration/password_change_form.html b/templates/registration/password_change_form.html deleted file mode 100644 index 7b3ae6f..0000000 --- a/templates/registration/password_change_form.html +++ /dev/null @@ -1,55 +0,0 @@ -{% extends "admin/base_site.html" %} -{% load i18n admin_static %} -{% block extrastyle %}{{ block.super }}{% endblock %} -{% block userlinks %}{% url 'django-admindocs-docroot' as docsroot %}{% if docsroot %}{% trans 'Documentation' %} / {% endif %} {% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} -{% block breadcrumbs %} -
-{% trans 'Home' %} -› {% trans 'Password change' %} -
-{% endblock %} - -{% block title %}{{ title }}{% endblock %} -{% block content_title %}

{{ title }}

{% endblock %} - -{% block content %}
- -
{% csrf_token %} -
-{% if form.errors %} -

- {% if form.errors.items|length == 1 %}{% trans "Please correct the error below." %}{% else %}{% trans "Please correct the errors below." %}{% endif %} -

-{% endif %} - - -

{% trans "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly." %}

- -
- -
- {{ form.old_password.errors }} - {{ form.old_password }} -
- -
- {{ form.new_password1.errors }} - {{ form.new_password1 }} -
- -
-{{ form.new_password2.errors }} - {{ form.new_password2 }} -
- -
- -
- -
- - -
-
- -{% endblock %} diff --git a/templates/registration/password_reset_complete.html b/templates/registration/password_reset_complete.html deleted file mode 100644 index 19f87a5..0000000 --- a/templates/registration/password_reset_complete.html +++ /dev/null @@ -1,20 +0,0 @@ -{% extends "admin/base_site.html" %} -{% load i18n %} - -{% block breadcrumbs %} -
-{% trans 'Home' %} -› {% trans 'Password reset' %} -
-{% endblock %} - -{% block title %}{{ title }}{% endblock %} -{% block content_title %}

{{ title }}

{% endblock %} - -{% block content %} - -

{% trans "Your password has been set. You may go ahead and log in now." %}

- -

{% trans 'Log in' %}

- -{% endblock %} diff --git a/templates/registration/password_reset_confirm.html b/templates/registration/password_reset_confirm.html deleted file mode 100644 index bd24806..0000000 --- a/templates/registration/password_reset_confirm.html +++ /dev/null @@ -1,33 +0,0 @@ -{% extends "admin/base_site.html" %} -{% load i18n %} - -{% block breadcrumbs %} -
-{% trans 'Home' %} -› {% trans 'Password reset confirmation' %} -
-{% endblock %} - -{% block title %}{{ title }}{% endblock %} -{% block content_title %}

{{ title }}

{% endblock %} -{% block content %} - -{% if validlink %} - -

{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}

- -
{% csrf_token %} -{{ form.new_password1.errors }} -

{{ form.new_password1 }}

-{{ form.new_password2.errors }} -

{{ form.new_password2 }}

-

-
- -{% else %} - -

{% trans "The password reset link was invalid, possibly because it has already been used. Please request a new password reset." %}

- -{% endif %} - -{% endblock %} diff --git a/templates/registration/password_reset_done.html b/templates/registration/password_reset_done.html deleted file mode 100644 index d157306..0000000 --- a/templates/registration/password_reset_done.html +++ /dev/null @@ -1,19 +0,0 @@ -{% extends "admin/base_site.html" %} -{% load i18n %} - -{% block breadcrumbs %} -
-{% trans 'Home' %} -› {% trans 'Password reset' %} -
-{% endblock %} - -{% block title %}{{ title }}{% endblock %} -{% block content_title %}

{{ title }}

{% endblock %} -{% block content %} - -

{% trans "We've emailed you instructions for setting your password. You should be receiving them shortly." %}

- -

{% trans "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder." %}

- -{% endblock %} diff --git a/templates/registration/password_reset_email.html b/templates/registration/password_reset_email.html deleted file mode 100644 index 01b3bcc..0000000 --- a/templates/registration/password_reset_email.html +++ /dev/null @@ -1,14 +0,0 @@ -{% load i18n %}{% autoescape off %} -{% blocktrans %}You're receiving this email because you requested a password reset for your user account at {{ site_name }}.{% endblocktrans %} - -{% trans "Please go to the following page and choose a new password:" %} -{% block reset_link %} -{{ protocol }}://{{ domain }}{% url 'password_reset_confirm' uidb64=uid token=token %} -{% endblock %} -{% trans "Your username, in case you've forgotten:" %} {{ user.get_username }} - -{% trans "Thanks for using our site!" %} - -{% blocktrans %}The {{ site_name }} team{% endblocktrans %} - -{% endautoescape %} diff --git a/templates/registration/password_reset_form.html b/templates/registration/password_reset_form.html deleted file mode 100644 index dc05cd0..0000000 --- a/templates/registration/password_reset_form.html +++ /dev/null @@ -1,22 +0,0 @@ -{% extends "admin/base_site.html" %} -{% load i18n %} - -{% block breadcrumbs %} -
-{% trans 'Home' %} -› {% trans 'Password reset' %} -
-{% endblock %} - -{% block title %}{{ title }}{% endblock %} -{% block content_title %}

{{ title }}

{% endblock %} -{% block content %} - -

{% trans "Forgotten your password? Enter your email address below, and we'll email instructions for setting a new one." %}

- -
{% csrf_token %} -{{ form.email.errors }} -

{{ form.email }}

-
- -{% endblock %}