Merge branch 'develop' of github.com:twoscoops/django-admin2 into develop

This commit is contained in:
Daniel Greenfeld 2013-06-11 21:54:58 +02:00
commit edcdb00fbd
3 changed files with 8 additions and 0 deletions

View file

@ -24,3 +24,4 @@ Developers
* the5fire (@the5fire)
* Andrews Medina (@andrewsmedina / andrewsmedina@gmail.com)
* Wade Austin (@waustin)
* Douglas Miranda

View file

@ -3,6 +3,9 @@
{% load i18n %}
{% load admin2_tags %}
{% block navbar %}{% endblock navbar %}
{% block breacrumbs %}{% endblock breacrumbs %}
{% block content %}
<div class="row">
<div class="span12">

View file

@ -12,6 +12,7 @@
{% endblock css %}
</head>
<body>
{% block navbar %}
<div class="navbar navbar-inverse navbar-static-top">
<div class="navbar-inner">
<div class="container-fluid">
@ -48,12 +49,15 @@
</div>
</div>
</div>
{% endblock navbar %}
{% block breacrumbs %}
<ul class="breadcrumb">
{% block breadcrumbs %}
<li class="active">Home</li>
{% endblock breadcrumbs %}
</ul>
{% endblock breacrumbs %}
{% if messages %}
<ul class="messages">