Merge branch 'master' of github.com:pydanny/django-admin2

This commit is contained in:
Daniel Greenfeld 2013-05-18 12:57:11 +02:00
commit 44ae271a2e
9 changed files with 51 additions and 6 deletions

5
.gitignore vendored
View file

@ -49,4 +49,7 @@ lp-cache
_data
# PostgreSQL
logfile
logfile
# SQLite
*.db

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

File diff suppressed because one or more lines are too long

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>
{{ object_list }}
@ -8,6 +9,4 @@
<tr><td>{{ obj.app_name }}</td></tr>
{% endfor %}
</table>
</body>
</html>
{% endblock content %}

Binary file not shown.