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

This commit is contained in:
Daniel Greenfeld 2013-05-19 14:26:54 +02:00
commit 0e63bc8e7e
3 changed files with 60 additions and 21 deletions

View file

@ -0,0 +1,15 @@
/* Fixes a Bootstrap 2.3 bug. This can be removed when upgrading to Bootstrap v3. */
.text-right
{
text-align: right !important;
}
.text-center
{
text-align: center !important;
}
.text-left
{
text-align: left !important;
}

View file

@ -7,6 +7,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- Bootstrap -->
<link href="{{ STATIC_URL }}themes/bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
<link href="{{ STATIC_URL }}themes/bootstrap/css/bootstrap-custom.css" rel="stylesheet" media="screen">
</head>
<body>
<div class="navbar navbar-inverse navbar-static-top">

View file

@ -3,26 +3,49 @@
{% block content %}
<h3>Site administration</h3>
{% for app, registry in apps.items %}
<table class="table">
<thead>
<tr>
<th>
<a href="TODO {{ app.get_index_url }}">{{ app|title }}</a>
</th>
</tr>
</thead>
<tbody>
{% for model_class, model_admin in registry.items %}
<tr>
<td>
<a href="{{ model_admin.get_index_url }}">
{{ model_admin.verbose_name_plural|title }}
</a>
</td>
</tr>
<div class="row">
<div class="span7">
{% for app, registry in apps.items %}
<table class="table table-bordered table-condensed">
<thead>
<tr>
<th colspan="3">
<a href="TODO {{ app.get_index_url }}">{{ app|title }}</a>
</th>
</tr>
</thead>
<tbody>
{% for model_class, model_admin in registry.items %}
<tr>
<td width="40%">
<a href="{{ model_admin.get_index_url }}">
{{ model_admin.verbose_name_plural|title }}
</a>
</td>
<td class="text-right">
{# if has_add_permission #}
<a href="TODO">
<i class="icon-plus"></i>
Add
</a>
{# endif #}
</td>
<td class="text-right">
<a href="{{ model_admin.get_index_url }}">
<i class="icon-pencil"></i>
Change
</a>
</td>
</tr>
{% endfor %}
</tbody>
</table>
{% endfor %}
</tbody>
</table>
{% endfor %}
</div>
<div class="span5">
<h4>Recent Actions</h4>
<h5>My Actions</h5>
TODO
</div>
</div>
{% endblock content %}