template changes

This commit is contained in:
Kenneth Love 2013-07-18 17:40:51 -07:00
parent af11cb012e
commit 738e3a9dd8
3 changed files with 28 additions and 24 deletions

View file

@ -3,13 +3,13 @@
{% block content %}
<div class="row">
<div class="span7">
<div class="row-fluid">
<div class="span8">
{% for app_label, registry in apps.items %}
{% include 'djadmin2theme_default/includes/app_model_list.html' %}
{% endfor %}
</div>
<div class="span5">
<div class="span4 well pull-right">
<h4>{% trans "Recent Actions" %}</h4>
<h5>{% trans "My Actions" %}</h5>
{% action_history %}

View file

@ -32,24 +32,28 @@
History for {{ object }}
{% endblocktrans %}
<table class="table table-striped table-bordered">
<thead>
<tr>
<th>{% trans "Date/Time" %}</th>
<th>{% trans "User" %}</th>
<th>{% trans "Action" %}</th>
<th>{% trans "Message" %}</th>
</tr>
</thead>
<tbody>
{% for log in object_list %}
<tr>
<td>{{ log.action_time }}</td>
<td>{{ log.user }}</td>
<td>{{ log.action_flag }}</td>
<td>{{ log.change_message }}</td>
</tr>
{% endfor %}
</tbody>
</table>
{% if object_list %}
<table class="table table-striped table-bordered">
<thead>
<tr>
<th>{% trans "Date/Time" %}</th>
<th>{% trans "User" %}</th>
<th>{% trans "Action" %}</th>
<th>{% trans "Message" %}</th>
</tr>
</thead>
<tbody>
{% for log in object_list %}
<tr>
<td>{{ log.action_time }}</td>
<td>{{ log.user }}</td>
<td>{{ log.action_flag }}</td>
<td>{{ log.change_message }}</td>
</tr>
{% endfor %}
</tbody>
</table>
{% else %}
<p>No history for this object.</p>
{% endif %}
{% endblock content %}

View file

@ -10,7 +10,7 @@
{% block page_title_link %}
{% if object.pk %}
<a href="{% url view|admin2_urlname:"history" pk=object.pk %}" class="btn btn-info">History</a>
<a href="{% url view|admin2_urlname:"history" pk=object.pk %}" class="btn btn-info pull-right">History</a>
{% endif %}
{% endblock page_title_link %}