Clean group_manage page

group/templates/group/group_discus.html

@@ -14,7 +14,7 @@
         <li class="tabnav-tab tabnav-tab-cur">{% trans "Discussions" %}</li>
         <li class="tabnav-tab"><a href="{% url 'group_wiki' group.id %}">{% trans "Wiki" %}</a></li>
         {% if is_staff %}
-        <li class="tabnav-tab"><a href="{% url 'pubuser' %}">{% trans "Admin" %}</a></li>
+        <li class="tabnav-tab"><a href="{% url 'group_manage' group.id %}">{% trans "Admin" %}</a></li>
         {% endif %}
 
     </ul>

group/templates/group/group_info.html

@@ -14,7 +14,7 @@
         <li class="tabnav-tab"><a href="{% url 'group_discus' group.id %}">{% trans "Discussions" %}</a></li>
         <li class="tabnav-tab"><a href="{% url 'group_wiki' group.id %}">{% trans "Wiki" %}</a></li>
         {% if is_staff %}
-        <li class="tabnav-tab"><a href="{% url 'pubuser' %}">{% trans "Admin" %}</a></li>
+        <li class="tabnav-tab"><a href="{% url 'group_manage' group.id %}">{% trans "Admin" %}</a></li>
         {% endif %}
 
     </ul>

group/templates/group/group_manage.html

@@ -5,7 +5,17 @@
 {% block nav_group_class %}class="cur"{% endblock %}
 
 {% block title_panel %}
-<h2>{{ group.group_name }} {% trans "administration"%}</h2>
+<div class="tabnav">
+    <ul class="tabnav-tabs">
+        <li class="tabnav-tab"><a href="{% url 'group_info' group.id %}">{% trans "Libraries" %}</a></li>
+        <li class="tabnav-tab"><a href="{% url 'group_discus' group.id %}">{% trans "Discussions" %}</a></li>
+        <li class="tabnav-tab"><a href="{% url 'group_wiki' group.id %}">{% trans "Wiki" %}</a></li>
+        <li class="tabnav-tab tabnav-tab-cur">{% trans "Admin" %}</li>
+    </ul>
+    <div class="fright">
+    {% grp_avatar group.props.id 24 %} <span style="font-size: 16px; font-weight:bold; margin: 0 6px;">{{ group.group_name }}</span>
+    </div>
+</div>
 {% endblock %}
 
 {% block left_panel %}

group/templates/group/group_wiki.html

@@ -12,9 +12,9 @@
     <ul class="tabnav-tabs">
         <li class="tabnav-tab"><a href="{% url 'group_info' group.id %}">{% trans "Libraries" %}</a></li>
         <li class="tabnav-tab"><a href="{% url 'group_discus' group.id %}">{% trans "Discussions" %}</a></li>
-        <li class="tabnav-tab tabnav-tab-cur"><a href="{% url 'group_wiki' group.id %}">{% trans "Wiki" %}</a></li>
+        <li class="tabnav-tab tabnav-tab-cur">{% trans "Wiki" %}</li>
         {% if is_staff %}
-        <li class="tabnav-tab"><a href="{% url 'pubuser' %}">{% trans "Admin" %}</a></li>
+        <li class="tabnav-tab"><a href="{% url 'group_manage' group.id %}">{% trans "Admin" %}</a></li>
         {% endif %}
 
     </ul>

group/urls.py

@@ -16,7 +16,7 @@ urlpatterns = patterns('',
     url(r'^(?P<group_id>\d+)/wiki_page_edit/(?P<page_name>[^/]+)$', group_wiki_page_edit, name='group_wiki_page_edit'),
     url(r'^reply/(?P<msg_id>[\d]+)/$', msg_reply, name='msg_reply'),
     url(r'^reply/new/$', msg_reply_new, name='msg_reply_new'),
-    url(r'^(?P<group_id>\d+)/manage/$', group_manage, name='group_members'),
+    url(r'^(?P<group_id>\d+)/manage/$', group_manage, name='group_manage'),
     url(r'^(?P<group_id>[\d]+)/create-repo/$', create_group_repo, name='create_group_repo'),
     (r'^(?P<group_id>[\d]+)/member/(?P<user_name>[^/]+)/$', group_member_operations),
     url(r'^(?P<group_id>\d+)/msgdel/(?P<msg_id>\d+)/$', group_message_remove, name='group_message_remove'),

group/views.py

@@ -483,12 +483,8 @@ def group_info(request, group_id):
 @login_required
 @ctx_switch_required
 @group_staff_required
-def group_manage(request, group_id):
+@group_check
-    group_id = int(group_id)    # Checked by URL Conf
+def group_manage(request, group):
-
-    group = get_group(group_id)
-    if not group:
-        return HttpResponseRedirect(reverse('group_list', args=[]))
 
     user = request.user.username
     
@@ -519,7 +515,7 @@ def group_manage(request, group_id):
                                             content_type=content_type)
                     else:
                         try:
-                            ccnet_threaded_rpc.group_add_member(group_id,
+                            ccnet_threaded_rpc.group_add_member(group.id,
                                                                 user, email)
                         except SearpcError, e:
                             result['error'] = _(e.msg)
@@ -555,7 +551,7 @@ def group_manage(request, group_id):
                     # Add user to group, unregistered user will see the group
                     # when he logs in.
                     try:
-                        ccnet_threaded_rpc.group_add_member(group_id,
+                        ccnet_threaded_rpc.group_add_member(group.id,
                                                             user, email)
                     except SearpcError, e:
                         result['error'] = _(e.msg)
@@ -571,7 +567,7 @@ def group_manage(request, group_id):
                                         content_type=content_type)
                 # Add user to group.
                 try:
-                    ccnet_threaded_rpc.group_add_member(group_id,
+                    ccnet_threaded_rpc.group_add_member(group.id,
                                                user, email)
                 except SearpcError, e:
                     result['error'] = _(e.msg)
@@ -592,7 +588,7 @@ def group_manage(request, group_id):
                             content_type=content_type)
 
     ### GET ###
-    members_all = ccnet_threaded_rpc.get_group_members(group_id)
+    members_all = ccnet_threaded_rpc.get_group_members(group.id)
     admins = [ m for m in members_all if m.is_staff ]    
 
     contacts = Contact.objects.filter(user_email=user)