Hopiu/django-admin2
1
0
Fork 0
mirror of https://github.com/jazzband/django-admin2.git synced 2026-05-24 06:43:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
AUTHORS.rst
View file

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

3
djadmin2/templates/admin2/bootstrap/auth/login.html
View file

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

4
djadmin2/templates/admin2/bootstrap/base.html
View file

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