From b0a8594990d593d3959283a895d296ac7b3f8b57 Mon Sep 17 00:00:00 2001 From: paurosello Date: Mon, 3 Jun 2013 22:28:41 +0200 Subject: [PATCH] Trying to fix issue #173. Every block is finished with it's own name. --- .../actions/delete_selected_confirmation.html | 4 ++-- djadmin2/templates/admin2/bootstrap/app_index.html | 4 ++-- djadmin2/templates/admin2/bootstrap/auth/logout.html | 2 +- .../admin2/bootstrap/auth/password_change_done.html | 6 +++--- .../admin2/bootstrap/auth/password_change_form.html | 4 ++-- djadmin2/templates/admin2/bootstrap/base.html | 10 +++++----- .../admin2/bootstrap/model_confirm_delete.html | 6 +++--- djadmin2/templates/admin2/bootstrap/model_detail.html | 6 +++--- djadmin2/templates/admin2/bootstrap/model_list.html | 6 +++--- .../templates/admin2/bootstrap/model_update_form.html | 6 +++--- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/djadmin2/templates/admin2/bootstrap/actions/delete_selected_confirmation.html b/djadmin2/templates/admin2/bootstrap/actions/delete_selected_confirmation.html index 35408d5..9b61ac9 100644 --- a/djadmin2/templates/admin2/bootstrap/actions/delete_selected_confirmation.html +++ b/djadmin2/templates/admin2/bootstrap/actions/delete_selected_confirmation.html @@ -1,9 +1,9 @@ {% extends "admin2/bootstrap/base.html" %} {% load i18n %} -{% block title %}Are you sure?{% endblock %} +{% block title %}Are you sure?{% endblock title %} -{% block page_title %}Are you sure?{% endblock %} +{% block page_title %}Are you sure?{% endblock page_title %} {% block content %} diff --git a/djadmin2/templates/admin2/bootstrap/app_index.html b/djadmin2/templates/admin2/bootstrap/app_index.html index f6a7a36..bf1c0ec 100644 --- a/djadmin2/templates/admin2/bootstrap/app_index.html +++ b/djadmin2/templates/admin2/bootstrap/app_index.html @@ -4,9 +4,9 @@ {% block breadcrumbs %}
  • Home /
  • {{ app_label|title }}
    • -{% endblock %} +{% endblock breadcrumbs %} -{% block page_title %}{% blocktrans with app_label=app_label|title %}{{ app_label }} administration{% endblocktrans %}{% endblock %} +{% block page_title %}{% blocktrans with app_label=app_label|title %}{{ app_label }} administration{% endblocktrans %}{% endblock page_title %} {% block content %}
    diff --git a/djadmin2/templates/admin2/bootstrap/auth/logout.html b/djadmin2/templates/admin2/bootstrap/auth/logout.html index a9e9c05..7882926 100644 --- a/djadmin2/templates/admin2/bootstrap/auth/logout.html +++ b/djadmin2/templates/admin2/bootstrap/auth/logout.html @@ -6,7 +6,7 @@ {% block breadcrumbs %}
  • Home /
  • {% trans "Logout" %}
    • -{% endblock %} +{% endblock breadcrumbs %} {% block content %}
    diff --git a/djadmin2/templates/admin2/bootstrap/auth/password_change_done.html b/djadmin2/templates/admin2/bootstrap/auth/password_change_done.html index b238dce..a075f8e 100644 --- a/djadmin2/templates/admin2/bootstrap/auth/password_change_done.html +++ b/djadmin2/templates/admin2/bootstrap/auth/password_change_done.html @@ -3,13 +3,13 @@ {% load i18n %} {% load admin2_tags %} -{% block title %}{% trans 'Password change successful' %}{% endblock %} -{% block page_title %}{% trans 'Password change successful' %}{% endblock %} +{% block title %}{% trans 'Password change successful' %}{% endblock title %} +{% block page_title %}{% trans 'Password change successful' %}{% endblock page_title %} {% block breadcrumbs %}
  • Home /
  • {% trans "Password change successful" %}
    • -{% endblock %} +{% endblock breadcrumbs %} {% block content %}
    diff --git a/djadmin2/templates/admin2/bootstrap/auth/password_change_form.html b/djadmin2/templates/admin2/bootstrap/auth/password_change_form.html index 2439614..958a56c 100644 --- a/djadmin2/templates/admin2/bootstrap/auth/password_change_form.html +++ b/djadmin2/templates/admin2/bootstrap/auth/password_change_form.html @@ -3,13 +3,13 @@ {% load i18n %} {% load admin2_tags %} -{% block page_title %}{% trans "Password change" %}: {{ form.user }}{% endblock %} +{% block page_title %}{% trans "Password change" %}: {{ form.user }}{% endblock page_title %} {% block breadcrumbs %}
  • Home /
  • {% trans "Password change" %} /
  • {{ form.user }}
    • -{% endblock %} +{% endblock breadcrumbs %} {% block content %}
    diff --git a/djadmin2/templates/admin2/bootstrap/base.html b/djadmin2/templates/admin2/bootstrap/base.html index 6167490..d8e3401 100644 --- a/djadmin2/templates/admin2/bootstrap/base.html +++ b/djadmin2/templates/admin2/bootstrap/base.html @@ -3,7 +3,7 @@ - {% block title %}Site administration{% endblock %} | django-admin2 + {% block title %}Site administration{% endblock title %} | django-admin2 @@ -50,7 +50,7 @@
      {% block breadcrumbs %}
    • Home
      • - {% endblock %} + {% endblock breadcrumbs %}
    {% if messages %} @@ -64,15 +64,15 @@
    -

    {% block page_title %}{% trans "Site administration" %}{% endblock %}

    +

    {% block page_title %}{% trans "Site administration" %}{% endblock page_title %}

    - {% block content %}{% endblock %} + {% block content %}{% endblock content %}
    - {% block extrajs %}{% endblock %} + {% block extrajs %}{% endblock extrajs %} diff --git a/djadmin2/templates/admin2/bootstrap/model_confirm_delete.html b/djadmin2/templates/admin2/bootstrap/model_confirm_delete.html index cf98411..f653d97 100644 --- a/djadmin2/templates/admin2/bootstrap/model_confirm_delete.html +++ b/djadmin2/templates/admin2/bootstrap/model_confirm_delete.html @@ -1,9 +1,9 @@ {% extends "admin2/bootstrap/base.html" %} {% load admin2_tags i18n %} -{% block title %}{% trans "Are you sure?" %}{% endblock %} +{% block title %}{% trans "Are you sure?" %}{% endblock title %} -{% block page_title %}{% trans "Are you sure?" %}{% endblock %} +{% block page_title %}{% trans "Are you sure?" %}{% endblock page_title %} {% block breadcrumbs %}
  • Home /
    • @@ -11,7 +11,7 @@
  • {{ model_name_pluralized|title }} /
  • {{ object }} /
  • {% trans "Delete" %}
    • -{% endblock %} +{% endblock breadcrumbs %} {% block content %} diff --git a/djadmin2/templates/admin2/bootstrap/model_detail.html b/djadmin2/templates/admin2/bootstrap/model_detail.html index fa2e217..6b6ea43 100644 --- a/djadmin2/templates/admin2/bootstrap/model_detail.html +++ b/djadmin2/templates/admin2/bootstrap/model_detail.html @@ -2,16 +2,16 @@ {% load admin2_tags %} -{% block title %}{{ object }}{% endblock %} +{% block title %}{{ object }}{% endblock title %} -{% block page_title %}{{ object }}{% endblock %} +{% block page_title %}{{ object }}{% endblock page_title%} {% block breadcrumbs %}
  • Home /
  • {{ app_label|title }} /
  • {{ model_name_pluralized|title }} /
  • {{ object }}
    • -{% endblock %} +{% endblock breadcrumbs %} {% block content %} diff --git a/djadmin2/templates/admin2/bootstrap/model_list.html b/djadmin2/templates/admin2/bootstrap/model_list.html index cc8f058..c7c5131 100644 --- a/djadmin2/templates/admin2/bootstrap/model_list.html +++ b/djadmin2/templates/admin2/bootstrap/model_list.html @@ -1,9 +1,9 @@ {% extends "admin2/bootstrap/base.html" %} {% load admin2_tags i18n %} -{% block title %}{% blocktrans with model_name=model_name %}Select {{ model_name }} to change{% endblocktrans %}{% endblock %} +{% block title %}{% blocktrans with model_name=model_name %}Select {{ model_name }} to change{% endblocktrans %}{% endblock title %} -{% block page_title %}{% blocktrans with model_name=model_name %}Select {{ model_name }} to change{% endblocktrans %}{% endblock %} +{% block page_title %}{% blocktrans with model_name=model_name %}Select {{ model_name }} to change{% endblocktrans %}{% endblock page_title %} {% block extrajs %} @@ -13,7 +13,7 @@
  • Home /
  • {{ app_label|title }} /
  • {{ model_name_pluralized|title }}
    • -{% endblock %} +{% endblock breadcrumbs %} {% block content %} diff --git a/djadmin2/templates/admin2/bootstrap/model_update_form.html b/djadmin2/templates/admin2/bootstrap/model_update_form.html index a7e8d76..f8ef478 100644 --- a/djadmin2/templates/admin2/bootstrap/model_update_form.html +++ b/djadmin2/templates/admin2/bootstrap/model_update_form.html @@ -2,9 +2,9 @@ {% load admin2_tags i18n %} -{% block title %}{% blocktrans with action=action model_name=model_name %}{{ action }} {{ model_name }}{% endblocktrans %}{% endblock %} +{% block title %}{% blocktrans with action=action model_name=model_name %}{{ action }} {{ model_name }}{% endblocktrans %}{% endblock title %} -{% block page_title %}{% blocktrans with action=action model_name=model_name %}{{ action }} {{ model_name }}{% endblocktrans %}{% endblock %} +{% block page_title %}{% blocktrans with action=action model_name=model_name %}{{ action }} {{ model_name }}{% endblocktrans %}{% endblock page_title %} {% block breadcrumbs %}
  • Home /
    • @@ -17,7 +17,7 @@
  • {% trans 'Change' %}
    • {% endif %} -{% endblock %} +{% endblock breadcrumbs %} {% block content %}