Merge pull request #665 from haiwen/guest-user

[guest-user] update url of "libraries" and "my home" tab

seahub/templates/base_for_backbone.html

@@ -50,7 +50,7 @@
                 {% block nav %}
                 <ul class="nav">
                     <li class="nav-item">
-                    <a href="{{ SITE_ROOT }}#my-libs/" class="a">{% trans "My Home" %}</a>
+                    <a href="{{ SITE_ROOT }}#" class="a">{% trans "My Home" %}</a>
                     </li>
 
                     {% if grps %}

seahub/templates/js/templates.html

@@ -505,7 +505,7 @@
         <% } %>
     </div>
     <ul class="side-tabnav-tabs">
-        <li class="tab tab-cur"><a href="{{ SITE_ROOT }}#my-libs/" class="lib">{% trans "Libraries" %}</a></li>
+        <li class="tab tab-cur"><a href="{{ SITE_ROOT }}#" class="lib">{% trans "Libraries" %}</a></li>
         <li class="tab"><a href="{{ SITE_ROOT }}#starred/" class="star">{% trans "Starred" %}</a></li>
 
         <% if (events_enabled) { %>

seahub/templates/sysadmin/sys_useradmin_admins.html

@@ -39,9 +39,14 @@
 
 <table>
     <tr>
+        {% if is_pro %}
         <th width="24%">{% trans "Email" %}</th>
         <th width="12%">{% trans "Status" %}</th>
         <th width="12%">{% trans "Role" %}</th>
+        {% else %}
+        <th width="36%">{% trans "Email" %}</th>
+        <th width="12%">{% trans "Status" %}</th>
+        {% endif %}
         <th width="16%">{% trans "Space Used" %}</th>
         <th width="22%">{% trans "Create At / Last Login" %}</th>
         <th width="14%">{% trans "Operations" %}</th>
@@ -67,7 +72,8 @@
             </select>
           {% endif %}
         </td>
-        
+
+        {% if is_pro %}
         <td>
           {% if user.source != 'LDAP' %}
             <div class="user-role">
@@ -88,6 +94,7 @@
             {% endif %}
           {% endif %}
         </td>
+        {% endif %}
 
         <td style="font-size:11px;">
             <p> {{ user.space_usage|filesizeformat }} {% if user.space_quota > 0 %} / {{ user.space_quota|filesizeformat }} {% endif %} </p>

static/scripts/app/router.js

@@ -28,7 +28,7 @@ define([
             'common/lib/:repo_id(/*path)': 'showCommonDir',
             'starred/': 'showStarredFile',
             // Default
-            '*actions': 'defaultAction'
+            '*actions': 'showRepos'
         },
 
         initialize: function() {
@@ -158,14 +158,8 @@ define([
             }
             this.switchCurrentView(this.orgView);
             this.orgView.showDir(repo_id, path);
-        },
-
-        defaultAction: function(actions) {
-            // We have no matching route, lets just log what the URL was
-
-            this.switchCurrentView(this.myHomeView);
-            this.myHomeView.showMyRepos();
         }
+
     });
 
     return Router;