Improve group nav and fix other urls

seahub/group/templates/group/group_base.html

@@ -18,7 +18,7 @@
         {% if group.is_pub %}<img src="{{MEDIA_URL}}img/grp_public.png" alt="" title="{% trans "This group is public." %}" class="fright" style="margin:8px 0 0 5px;" />{% endif %}
     </div>
     <ul class="side-tabnav-tabs">
-        <li class="tab {% block cur_library %}{% endblock%}"><a href="{% url 'group_info' group.id %}" class="lib">{% trans "Libraries" %}</a></li>
+        <li class="tab {% block cur_library %}{% endblock%}"><a href="{{ SITE_ROOT }}#group/{{ group.id }}/" class="lib">{% trans "Libraries" %}</a></li>
 
         <li class="tab {% block cur_discuss %}{% endblock%}"><a href="{% url 'group_discuss' group.id %}" class="msgs">{% trans "Discussion" %}</a></li>
 

seahub/templates/admin_base.html

@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
 
-{% block sys_admin %}<a href="{{ SITE_ROOT }}home/my/" title="{% trans "Exit System Admin" %}"><img src="{{ MEDIA_URL }}img/admin_out.png" alt="" /></a>{% endblock %}
+{% block sys_admin %}<a href="{{ SITE_ROOT }}" title="{% trans "Exit System Admin" %}"><img src="{{ MEDIA_URL }}img/admin_out.png" alt="" /></a>{% endblock %}
 
 {% block nav %}{% endblock %}

seahub/templates/home_base.html

@@ -11,7 +11,7 @@
         {% endif %}
     </div>
     <ul class="side-tabnav-tabs">
-        <li class="tab {% block cur_my_lib %}{% endblock %}"><a href="{% url 'myhome' %}" class="lib">{% trans "Libraries" %}</a></li>
+        <li class="tab {% block cur_my_lib %}{% endblock %}"><a href="{{ SITE_ROOT }}" class="lib">{% trans "Libraries" %}</a></li>
         <li class="tab {% block cur_stars %}{% endblock %}"><a href="{% url 'starred' %}" class="star">{% trans "Starred" %}</a></li>
         {% if events_enabled %}
         <li class="tab {% block cur_activities %}{% endblock %}"><a href="{% url 'activities' %}" class="activity">{% trans "Activities" %}</a></li>

seahub/templates/js/templates.html

@@ -453,7 +453,7 @@
     <td><a href="#my-libs/lib/<%= origin_repo_id %><%- origin_path %>"><%- abbrev_origin_path %></a></td>
     <td><%= mtime_relative %></td>
 </script>
-<script type="text/template" id="grp-side-nav-tmpl">
+<script type="text/template" id="group-side-nav-tmpl">
     <div class="hd w100 ovhd">
         <h3 class="fleft">
             <%= avatar %> <span title="<%- name %>" class="grp-name ellipsis vam"><%- name %></span>
@@ -475,20 +475,14 @@
             <% } %>
         <% } %>
 
-        <% if (app.pageOptions.enable_pubfile && is_pub) { %>
-        <li class="tab"><a href="{{ SITE_ROOT }}group/<%= id %>/files/" class="files">{% trans "Files" %}</a></li>
-        <% } %>
-
-        <% if (view_perm != 'pub') { %>
         <li class="tab"><a href="{{ SITE_ROOT }}group/<%= id %>/members/" class="members">{% trans "Members" %}</a></li>
-        <% } %>
 
         <% if (is_staff) { %>
         <li class="tab"><a href="{{ SITE_ROOT }}group/<%= id %>/manage/" class="admin">{% trans "Admin" %}</a></li>
         <% } %>
     </ul>
 </script>
-<script type="text/template" id="grp-mods-enable-form-tmpl">
+<script type="text/template" id="group-mods-enable-form-tmpl">
 <form id="mods-enable-form" method="post" action="{{ SITE_ROOT }}group/<%= id %>/modules/toggle/" class="hide">{% csrf_token%}
     <h3>{% trans "Enable Modules"%}</h3>
     <ul>

seahub/templates/myhome.html

@@ -193,8 +193,7 @@ app["pageOptions"] = {
     username: "{{request.user.username}}",
     repo_password_min_length: {{ repo_password_min_length }},
     enable_upload_folder: {% if enable_upload_folder %} true {% else %} false {% endif %},
-    max_upload_file_size: {% if max_upload_file_size %} {{ max_upload_file_size }} {% else %} '' {% endif %},
+    max_upload_file_size: {% if max_upload_file_size %} {{ max_upload_file_size }} {% else %} '' {% endif %}
-    enable_pubfile: {% if enable_pubfile %} true {% else %} false {% endif %}
 };
 
 </script>

seahub/templates/myhome_base.html

@@ -3,7 +3,7 @@
 {% block nav %}
 <ul class="nav">
     <li class="nav-item">
-        <a href="{{ SITE_ROOT }}home/my/" class="a {% block cur_myhome %}{% endblock %}">{% trans "My Home" %}</a>
+        <a href="{{ SITE_ROOT }}" class="a {% block cur_myhome %}{% endblock %}">{% trans "My Home" %}</a>
     </li>
     <li class="nav-item" {% if grps %}style="position:relative;"{% endif %}>
         <a href="{% url 'group_list' %}" class="a {% block cur_group %}{% endblock %}" {% if grps %}id="top-nav-grp"{% endif %}>{% trans "Groups" %}{% if grps %} <span class="icon-caret-down"></span>{% endif %}</a>

seahub/templates/pub_base.html

@@ -9,7 +9,7 @@
 <div class="side-tabnav">
     <h3 class="hd">{% trans "Organization" %}</h3>
     <ul class="side-tabnav-tabs">
-        <li class="tab {% block cur_lib %}{% endblock %}"><a href="{% url 'pubrepo' %}" class="lib">{% trans "Libraries" %}</a></li>
+        <li class="tab {% block cur_lib %}{% endblock %}"><a href="{{ SITE_ROOT }}#org/" class="lib">{% trans "Libraries" %}</a></li>
         <li class="tab {% block cur_grp %}{% endblock %}"><a href="{% url 'pubgrp' %}" class="group">{% trans "Groups" %}</a></li>
         <li class="tab {% block cur_user %}{% endblock %}"><a href="{% url 'pubuser' %}" class="members">{% trans "Members" %}</a></li>
     </ul>

seahub/urls.py

@@ -152,7 +152,7 @@ urlpatterns = patterns('',
     url(r'^ajax/repo/(?P<repo_id>[-0-9a-f]{36})/file_op_url/$', get_file_op_url, name='get_file_op_url'),
     url(r'^ajax/u/d/(?P<token>[-0-9a-f]{10})/upload/$', get_file_upload_url_ul, name='get_file_upload_url_ul'),
     url(r'^ajax/group/(?P<group_id>\d+)/repos/$', get_unenc_group_repos, name='get_group_repos'),
-    url(r'^ajax/group/(?P<group_id>\d+)/basic_info/$', get_group_basic_info, name='get_group_basic_info'),
+    url(r'^ajax/group/(?P<group_id>\d+)/basic-info/$', get_group_basic_info, name='get_group_basic_info'),
     url(r'^ajax/my-unenc-repos/$', get_my_unenc_repos, name='get_my_unenc_repos'),
     url(r'^ajax/unenc-rw-repos/$', unenc_rw_repos, name='unenc_rw_repos'),
     url(r'^ajax/contacts/$', get_contacts, name='get_contacts'),

seahub/views/ajax.py

@@ -2420,12 +2420,11 @@ def toggle_group_folder_permission(request, repo_id):
         return HttpResponse(json.dumps({"error": e.msg}), status=500,
                             content_type=content_type)
 
+@login_required_ajax
 def get_group_basic_info(request, group_id):
     '''
     Get group basic info for group side nav
     '''
-    if not request.is_ajax():
-        raise Http404
 
     content_type = 'application/json; charset=utf-8'
     result = {}
@@ -2437,28 +2436,12 @@ def get_group_basic_info(request, group_id):
         return HttpResponse(json.dumps(result),
                             status=400, content_type=content_type)
 
-    group.is_staff = False
+    group.is_staff = is_group_staff(group, request.user)
     if PublicGroup.objects.filter(group_id=group.id):
         group.is_pub = True
     else:
         group.is_pub = False
 
-    if not request.user.is_authenticated():
-        if group.is_pub:
-            group.view_perm = "pub"
-
-    joined = is_group_user(group_id_int, request.user.username)
-    if joined:
-        group.view_perm = "joined"
-        group.is_staff = is_group_staff(group, request.user)
-
-    if request.user.is_staff:
-        # viewed by system admin
-        group.view_perm = "sys_admin"
-
-    if group.is_pub:
-        group.view_perm = "pub"
-
     mods_available = get_available_mods_by_group(group.id)
     mods_enabled = get_enabled_mods_by_group(group.id)
 
@@ -2468,7 +2451,6 @@ def get_group_basic_info(request, group_id):
         "avatar": grp_avatar(group.id, 32),
         "is_staff": group.is_staff,
         "is_pub": group.is_pub,
-        "view_perm": group.view_perm,
         "mods_available": mods_available,
         "mods_enabled": mods_enabled,
         }), content_type=content_type)

static/scripts/app/views/group-side-nav.js

@@ -9,8 +9,8 @@ define([
     var GroupSideNavView = Backbone.View.extend({
         el: '#grp-side-nav',
 
-        template: _.template($("#grp-side-nav-tmpl").html()),
+        template: _.template($("#group-side-nav-tmpl").html()),
-        enableModTemplate: _.template($("#grp-mods-enable-form-tmpl").html()),
+        enableModTemplate: _.template($("#group-mods-enable-form-tmpl").html()),
 
         initialize: function() {
         },

static/scripts/common.js

@@ -110,7 +110,7 @@ define([
               case 'repo_set_password': return siteRoot + 'repo/set_password/';
 
               case 'group_repos': return siteRoot + 'api2/groups/' + options.group_id + '/repos/';
-              case 'group_basic_info': return siteRoot + 'ajax/group/' + options.group_id + '/basic_info/';
+              case 'group_basic_info': return siteRoot + 'ajax/group/' + options.group_id + '/basic-info/';
             }
         },