Merge pull request #39 from audreyr/master

Now using the Bootstrap theme stub as per #9
This commit is contained in:
Daniel Greenfeld 2013-05-18 05:00:45 -07:00
commit e59857d955
3 changed files with 4 additions and 4 deletions

View file

@ -4,7 +4,7 @@
<title>django-admin2</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- Bootstrap -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="screen">
<link href="{{ STATIC_URL }}themes/bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
</head>
<body>
<div class="container-fluid">
@ -12,7 +12,7 @@
</div>
<script src="http://code.jquery.com/jquery.js"></script>
<script src="js/bootstrap.min.js"></script>
<script src="{{ STATIC_URL }}themes/bootstrap/js/bootstrap.min.js"></script>
{% block extrajs %}{% endblock %}
</body>

View file

@ -1,4 +1,4 @@
{% extends "admin/base.html" %}
{% extends "admin2/bootstrap/base.html" %}
{% block content %}
<h1>Index</h1>

View file

@ -152,4 +152,4 @@ LOGGING = {
}
ADMIN2_THEME_DIRECTORY = "admin2/monkey/"
ADMIN2_THEME_DIRECTORY = "admin2/bootstrap/"