summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorsubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-06-10 00:05:02 +0100
committersubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-06-10 00:05:02 +0100
commitf9175cc6fad11770278d798863c9ade3b325d305 (patch)
treefd071966cd3781138dfe740f9a65f91d29d750e9 /templates
parent91b8ba1be31bc96829676567341d5f342301dd29 (diff)
downloadtroggle-f9175cc6fad11770278d798863c9ade3b325d305.tar.gz
troggle-f9175cc6fad11770278d798863c9ade3b325d305.tar.bz2
troggle-f9175cc6fad11770278d798863c9ade3b325d305.zip
[svn] * Added admin inlines for QMs in LogbookEntry model
* Added QM list edit view * Fixed "recent changes" box on front page
Diffstat (limited to 'templates')
-rw-r--r--templates/frontpage.html32
-rw-r--r--templates/registration/activation_email.html2
2 files changed, 30 insertions, 4 deletions
diff --git a/templates/frontpage.html b/templates/frontpage.html
index a193771..20028a3 100644
--- a/templates/frontpage.html
+++ b/templates/frontpage.html
@@ -3,11 +3,37 @@
{% block title %}Cambridge Expeditions to Austria{% endblock %}
+
+
{% block content %}
-<div id="col2">
-Recent edits
-</div>
+ <div id="related">
+ <h2>Recent Actions</h2>
+ {% load log %}
+ {% get_admin_log 10 as admin_log %}
+ {% if not admin_log %}
+ <p>No recent actions</p>
+ {% else %}
+ <ul class="actionlist">
+ {% for entry in admin_log %}
+ <li class="{% if entry.is_addition %}addlink{% endif %}{% if entry.is_change %}changelink{% endif %}{% if entry.is_deletion %}deletelink{% endif %}">
+ {% if entry.is_deletion %}
+ {{ entry.object_repr }}
+ {% else %}
+ <a href="{{ entry.get_admin_url }}">{{ entry.object_repr }}</a>
+ {% endif %}
+ <br/>
+ {% if entry.content_type %}
+ <span class="mini quiet">{% filter capfirst %}{{entry.content_type.name}}{% endfilter %}</span>
+ {% else %}
+ <span class="mini quiet">Unknown content</span>
+ {% endif %}
+ </li>
+ {% endfor %}
+ </ul>
+ {% endif %}
+ </div>
+
<div id="col1">
<h3>Welcome</h3>
diff --git a/templates/registration/activation_email.html b/templates/registration/activation_email.html
index e8f846b..3d56009 100644
--- a/templates/registration/activation_email.html
+++ b/templates/registration/activation_email.html
@@ -7,4 +7,4 @@
<P>to activate your account. Do this within {{ expiration_days }} days, or else you'll have to sign up again.</P>
<P>Yours,<BR>
-The magical troggle</P>
+The magical troggle</P>