dashboard improvements

3 files changed, 35 insertions, 15 deletions

diff --git a/templates/apps/userprofile/home.html b/templates/apps/userprofile/home.html
index 00feb0b..56154a7 100644
--- a/templates/apps/userprofile/home.html
+++ b/templates/apps/userprofile/home.html
@@ -1,5 +1,7 @@
 {% extends "tree.html" %}
 {% load datehumanize %}
+{% load userdisplay %}
+{% load tagging_tags %}
 {% block widgets %}
 	$("#gravatar").append($.gravatar($('#email').text()));
 	$("#names").accordion({
@@ -14,26 +16,44 @@
    	});
 {% endblock %}
 {% block content %}
-<h3>Memberships</h3>
-<div id="memberships">
-	{% for m in memberships.all %}
-	<div id="m{{m.id}}" class="{{m.status}}">
-	   <h3 class="listheader">{{m.name.shortname}}</h3>
-	   <div>
-	   	  You became a member of <a href="/name/id/{{m.name.id}}">{{m.name.shortname}}</a> {{m.timecreated|datehumanize}}
-	   </div>
+    {% if memberships %}
+	<h3>Memberships</h3>
+	<div id="memberships">
+		{% for m in memberships.all %}
+		<div id="m{{m.id}}" class="{{m.status}}">
+		   <h3 class="listheader">{{m.name.shortname}}</h3>
+		   <div>
+			   <div>
+				    You became a member of {{m.name.shortname}} {{m.timecreated|datehumanize}}
+				    {% if m.tags %}<h4>Role{{m.tags|pluralize}}</h4>
+				    <ul class="clist">{% for tag in m.tags %}<li>{{ tag|escape }}</li>{%endfor%}</ul>{%endif%}	
+			   </div>
+			   <div class="rlist button">
+		         <ul>
+		            {% if render.edit and m.user %} <!-- only allow roles for users right now -->
+		            <li><a href="/tag/membership/{{m.id}}/modify">Modify Roles</a></li>
+		            {% endif %}
+		            {% if render.kick and m.user %} <!-- only allow removing members for users right now -->
+		            <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>
+		      <!-- div class="clear"></div-->
+		   </div>
+		</div>
+		{% empty %}
+		<p>No members yet...</p>
+		{% endfor %}
 	</div>
-	{% empty %}
-	<p>You are not a member of any groups yet...</p>
-	{% endfor %}
-</div>
+	{% endif %}
+
 <h3>Groups</h3>
 <div id="names">
 	{% for n,p in names %}
 	<div id="n{{n.id}}">
 	   <h3 class="listheader">{{n.shortname}}</h3>
 	   <div>
-		  <a href="/name/id/{{n.id}}">{{n.shortname}}</a>
+		  <a href="/name/id/{{n.id}}">{{n.shortname}}</a> was created by {{n.creator|userdisplay}} {{n.timecreated|datehumanize}}.
 	   </div>
 	</div>
 	{% empty %}
diff --git a/templates/base.html b/templates/base.html
index de8d0fd..4061643 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -25,7 +25,7 @@
         <script type="text/javascript" src="/site-media/js/jquery.form.wizard-3.0.4.js"></script>
         <script type="text/javascript" src="/site-media/js/tag-it.js"></script>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-        <title>COIP{% if name %} - {{name.shortname}}{% else %} - top{% endif %}</title>
+        <title>COIP{% if name %} - {{name.shortname}}{% endif %}</title>
 		<script type="text/javascript">
 		$(function() {
 		   $("input:submit, input:reset, input:button, a",".button").button();
diff --git a/templates/tree.html b/templates/tree.html
index 144a668..bc8b5fd 100644
--- a/templates/tree.html
+++ b/templates/tree.html
@@ -66,7 +66,7 @@ $(function() {
 </li>
 <li style="margin-left: 10px; width: 59%;">
 	<div id="headline">
-		<a style="text-decoration: none" href="{% if name %}{{name.url}}{% else %}/{% endif %}">{% if name %}{{name.shortname}}{% else %}Top of the namespace{% endif %}</a>
+		<a style="text-decoration: none" href="{% if name %}{{name.url}}{% else %}/user/home{% endif %}">{% if name %}{{name.shortname}}{% else %}Dashboard{% endif %}</a>
 	</div>
 	<div>
     	{% block content %}{% endblock %}