From 2ccb399c11b5c0fc569d88a2f4b1539f14c17de2 Mon Sep 17 00:00:00 2001 From: Douglas Miranda Date: Mon, 10 Jun 2013 02:02:10 -0400 Subject: [PATCH 1/2] fix navbar and breadcrumb on the login page - issue #196 --- djadmin2/templates/admin2/bootstrap/auth/login.html | 3 +++ djadmin2/templates/admin2/bootstrap/base.html | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/djadmin2/templates/admin2/bootstrap/auth/login.html b/djadmin2/templates/admin2/bootstrap/auth/login.html index 1aa2aa3..d5e376e 100644 --- a/djadmin2/templates/admin2/bootstrap/auth/login.html +++ b/djadmin2/templates/admin2/bootstrap/auth/login.html @@ -3,6 +3,9 @@ {% load i18n %} {% load admin2_tags %} +{% block navbar %}{% endblock navbar %} +{% block breacrumbs %}{% endblock breacrumbs %} + {% block content %}
diff --git a/djadmin2/templates/admin2/bootstrap/base.html b/djadmin2/templates/admin2/bootstrap/base.html index 0462eb8..399af60 100644 --- a/djadmin2/templates/admin2/bootstrap/base.html +++ b/djadmin2/templates/admin2/bootstrap/base.html @@ -12,6 +12,7 @@ {% endblock css %} + {% block navbar %}
@@ -48,12 +49,15 @@
+ {% endblock navbar %} + {% block breacrumbs %}
    {% block breadcrumbs %}
  • Home
    • {% endblock breadcrumbs %}
+ {% endblock breacrumbs %} {% if messages %}
    From ab31053e9d50683ccc3c29937f758d1dfa66fa6e Mon Sep 17 00:00:00 2001 From: Daniel Greenfeld Date: Mon, 10 Jun 2013 13:11:14 +0300 Subject: [PATCH 2/2] add douglas miranda to authors --- AUTHORS.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.rst b/AUTHORS.rst index 7c2510d..44195f7 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -24,3 +24,4 @@ Developers * the5fire (@the5fire) * Andrews Medina (@andrewsmedina / andrewsmedina@gmail.com) * Wade Austin (@waustin) +* Douglas Miranda