From dfdfc57b631ea681b857b2b038d27d922af605c7 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Tue, 1 Mar 2011 01:25:44 +0100 Subject: leave and join groups --- templates/apps/name/name.html | 49 +++++++++++++++++++++++++++++++++++++------ templates/base.html | 2 +- 2 files changed, 44 insertions(+), 7 deletions(-) (limited to 'templates') diff --git a/templates/apps/name/name.html b/templates/apps/name/name.html index dce2028..d697c78 100644 --- a/templates/apps/name/name.html +++ b/templates/apps/name/name.html @@ -17,12 +17,35 @@ {% if not name %}

This is the top of the namespace

{% endif %} - {% if name.description %} -
- {% autoescape off %} -

{{name.description|safe}}

- {% endautoescape %} +
+ {% if name.description %} + {% autoescape off %} +

{{name.description|safe}}

+ {% endautoescape %} + {% endif %} + {% if name %} +
+
    + {% if render.acl %} +
  • Modify Access
    • + {% endif %} + {% if render.edit %} +
  • Modify
    • + {% endif %} + {% if render.delete %} +
  • Delete
    • + {% endif %} + {% if render.invite %} +
  • Invite
    • + {% endif %} + {% if render.join %} +
  • Join
    • + {% endif %} +
+
+
+ {% endif %} {% if memberships and render.invite %}

Members

@@ -30,7 +53,21 @@ {% for m in memberships.all %}

{{m.user|lastidentifier}}

-
{{m.user|userdisplay}} ({{m.user|lastidentifier}}) became a member of {{name.shortname}} {{m.timecreated|datehumanize}}.
+
+
{{m.user|userdisplay}} ({{m.user|lastidentifier}}) became a member of {{name.shortname}} {{m.timecreated|datehumanize}}.
+
+
    + {% if user == m.user %} +
  • Leave Group
    • + {% else %} + {% if render.kick %} +
  • Kick
    • + {% endif %} + {% endif %} +
+
+
+
{% empty %}

No members yet...

diff --git a/templates/base.html b/templates/base.html index d0f22ea..c702d71 100644 --- a/templates/base.html +++ b/templates/base.html @@ -81,7 +81,7 @@
{% endif %} - {% if name %} + {% if noname %}