Merge pull request #30 from audreyr/master

index.html now extends base.html
This commit is contained in:
Audrey Roy 2013-05-18 03:52:05 -07:00
commit b7087aa320
2 changed files with 23 additions and 5 deletions

View file

@ -0,0 +1,19 @@
<!DOCTYPE html>
<html>
<head>
<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">
</head>
<body>
<div class="container-fluid">
{% block content %}{% endblock %}
</div>
<script src="http://code.jquery.com/jquery.js"></script>
<script src="js/bootstrap.min.js"></script>
{% block extrajs %}{% endblock %}
</body>
</html>

View file

@ -1,5 +1,6 @@
<html>
<body>
{% extends "admin/base.html" %}
{% block content %}
<h1>Index</h1>
<table>
@ -7,6 +8,4 @@
<tr><td>{{ obj. }}</td></tr>
{% endfor %}
</table>
</body>
</html>
{% endblock content %}