From 2b9923c70053abe7a3effd8e075f4647c4d5213d Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Fri, 4 Dec 2015 17:26:04 +0800
Subject: [PATCH] [groups] removed 'sideTips', use 'side nav'

---
 media/css/seahub.css               | 24 ------------------------
 seahub/templates/js/templates.html |  2 +-
 seahub/templates/libraries.html    | 10 ----------
 static/scripts/app/router.js       |  9 ++++++++-
 static/scripts/app/views/groups.js |  3 ---
 5 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/media/css/seahub.css b/media/css/seahub.css
index 8c0d744ca1..06da39bf2c 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -584,30 +584,6 @@ textarea:-moz-placeholder {/* for FF */
     top:-11px;
     left:-10px;
 }
-/**** info-item *****/
-.info-item {
-    border: 1px solid #eee;
-    border-radius: 2px;
-    margin-bottom: 12px;
-}
-.info-item h3,
-.info-item p {
-    margin:0;
-}
-.info-item h3 {
-    font-size:1.15em;
-}
-.info-item-top {
-    padding: 4px 10px;
-    background: #f8f8f8;
-    border-bottom: 1px solid #eee;
-}
-.info-item-bottom {
-    padding: 8px 10px;
-}
-.info-item p.not-last {
-    margin-bottom:0.4em;
-}
 /**** tabnav *****/
 .tabnav-tabs,
 .tabnav-tab {
diff --git a/seahub/templates/js/templates.html b/seahub/templates/js/templates.html
index 0224721f09..f6939ccd94 100644
--- a/seahub/templates/js/templates.html
+++ b/seahub/templates/js/templates.html
@@ -551,7 +551,7 @@
         <li class="tab" id="group-nav">
             <a href="#"><span class="sf2-icon-group"></span>{% trans "Groups" %}<span class="toggle-icon icon-caret-down fright"></span></a>
             <ul class="grp-list">
-                <li><a href="{% url 'group_list' %}"><span class="sharp">#</span>{% trans "All Groups" %}</a></li>
+                <li<% if (cur_group_tab == 'groups') { %> class="tab-cur"<% }%>><a href="{% url 'group_list' %}"><span class="sharp">#</span>{% trans "All Groups" %}</a></li>
                 {% for grp in grps %}
                 <li<% if (cur_group_id == '{{ grp.id }}') { %> class="tab-cur"<% }%>>
                     <a class="ellipsis" href="{{SITE_ROOT}}#group/{{ grp.id }}/" title="{{ grp.group_name }}"><span class="sharp">#</span>{{ grp.group_name }}</a>
diff --git a/seahub/templates/libraries.html b/seahub/templates/libraries.html
index 13afa50403..65c94b03c9 100644
--- a/seahub/templates/libraries.html
+++ b/seahub/templates/libraries.html
@@ -11,16 +11,6 @@
 {% endblock %}
 
 {% block left_panel %}
-<div class="info-item hide" id="groups-side-tips">
-    <h3 class="info-item-top">{% trans "Tips" %}</h3>
-    <div class="info-item-bottom">
-        {% if user.permissions.can_add_group %}
-        <p class="not-last">{% trans "After creating a group, you can add members and share libraries into it." %}</p>
-        {% else %}
-        <p class="not-last">{% trans "Since you are a guest user now, you can not create groups." %}</p>
-        {% endif %}
-    </div>
-</div>
 <div class="side-tabnav hide" id="side-nav"></div>
 {% endblock %}
 
diff --git a/static/scripts/app/router.js b/static/scripts/app/router.js
index fcdc23bc0e..406df78e27 100644
--- a/static/scripts/app/router.js
+++ b/static/scripts/app/router.js
@@ -149,12 +149,19 @@ define([
         showGroups: function () {
             this.switchCurrentView(this.groupsView);
             this.groupsView.show();
+            this.sideNavView.setCurTab('group', {
+                'cur_group_tab': 'groups',
+                'cur_group_id': ''
+            });
         },
 
         showGroupRepos: function(group_id) {
             this.switchCurrentView(this.groupView);
             this.groupView.showRepoList(group_id);
-            this.sideNavView.setCurTab('group', {'cur_group_id': group_id});
+            this.sideNavView.setCurTab('group', {
+                'cur_group_tab': '',
+                'cur_group_id': group_id
+            });
         },
 
         showGroupRepoDir: function(group_id, repo_id, path) {
diff --git a/static/scripts/app/views/groups.js b/static/scripts/app/views/groups.js
index eed9d3314c..655699a0df 100644
--- a/static/scripts/app/views/groups.js
+++ b/static/scripts/app/views/groups.js
@@ -16,7 +16,6 @@ define([
             this.listenTo(this.groups, 'add', this.addOne);
             this.listenTo(this.groups, 'reset', this.reset);
 
-            this.$sideTips = $('#groups-side-tips');
             this.$loadingTip = this.$('.loading-tip');
             this.$groupList = $('#group-list');   
             this.$emptyTip = this.$('.empty-tips');
@@ -82,13 +81,11 @@ define([
         },
 
         show: function() {
-            this.$sideTips.show();
             this.$el.show();
             this.render();
         },
 
         hide: function() {
-            this.$sideTips.hide();
             this.$el.hide();
         },