diff options
Diffstat (limited to 'templates/apps/name')
| -rw-r--r-- | templates/apps/name/acls.html | 3 | ||||
| -rw-r--r-- | templates/apps/name/name.html | 24 |
2 files changed, 17 insertions, 10 deletions
diff --git a/templates/apps/name/acls.html b/templates/apps/name/acls.html index 7fe8250..a514b91 100644 --- a/templates/apps/name/acls.html +++ b/templates/apps/name/acls.html @@ -27,6 +27,9 @@ <div class="ilist button"> <ul> <li><a href="/name/{{name.id}}/acl/0/add">Add Permission</a></li> + {% if name %} + <li style="float: right;"><input type="button" onClick="document.location='{{name.url}}'" value="Cancel"/></li> + {% endif %} </ul> </div> {% endblock %}
\ No newline at end of file diff --git a/templates/apps/name/name.html b/templates/apps/name/name.html index e00a887..01de064 100644 --- a/templates/apps/name/name.html +++ b/templates/apps/name/name.html @@ -59,18 +59,22 @@ <div id="m{{m.id}}" class="{{m.status}}"> <h3 class="listheader">{{m.user|lastidentifier}}</h3> <div> - <div>{{m.user|userdisplay}} ({{m.user|lastidentifier}}) became a member of {{name.shortname}} {{m.timecreated|datehumanize}}.</div> - <div class="rlist"> + <div> + {{m.user|userdisplay}} ({{m.user|lastidentifier}}) became a member of {{name.shortname}} {{m.timecreated|datehumanize}} + and has the following role{{m.tags|pluralize}}: + <ul> + {% for tag in m.tags %} + <li>{{ tag|escape }}</li> + {% endfor %} + </ul> + </div> + <div class="rlist button"> <ul> - {% if user == m.user %} - <b>Role{{ m.tags|pluralize }} in this group</b><br> - {% for tag in m.tags %}<ul>{{ tag|escape }}</ul>{% endfor %} - <li class="button"><a href="/name/{{name.id}}/leave/{{m.user.username}}">Leave Group</a></li> - <li class="button"><a href="/tag/membership/{{m.id}}/add">Add role</a></li> - {% else %} - {% if render.kick %} - <li class="button"><a href="/name/{{name.id}}/leave/{{m.user.username}}">Remove from Group</a></li> + {% if render.edit %} + <li><a href="/tag/membership/{{m.id}}/modify">Modify Roles</a></li> {% endif %} + {% if render.kick %} + <li><a href="/name/{{name.id}}/leave/{{m.user.username}}">{% if m.user == user %}Leave{% else %}Remove from{% endif %} Group</a></li> {% endif %} </ul> </div> |