From 131b9e4f55748761836f67dbb87b99fc0fc0b9df Mon Sep 17 00:00:00 2001
From: Daniel Pan <freeplant@gmail.com>
Date: Tue, 5 Apr 2016 17:51:44 +0800
Subject: [PATCH] fixes

---
 seahub/templates/libraries.html            | 32 +++-------------------
 static/scripts/app/views/group-settings.js |  4 +--
 2 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/seahub/templates/libraries.html b/seahub/templates/libraries.html
index 68ff1f90bf..48de0fdfbc 100644
--- a/seahub/templates/libraries.html
+++ b/seahub/templates/libraries.html
@@ -42,11 +42,11 @@
     <div class="hd">
         <h3 class="fleft">{% trans "Organization" %}</h3>
         {% if can_add_pub_repo %}
-        <div class="fright dropdown dropdown js-add-pub-lib-dropdown">
+        <div class="fright dropdown js-add-pub-lib-dropdown">
             <button class="dropdown-toggle"><span class="icon-plus-square add vam"></span><span class="vam">{% trans "Add Library"%}</span></button>
-            <ul class="add-pub-lib-dropdown-menu dropdown-menu dropdown-content hide">
-                <li><a class="op js-repo-rename share-existing" href="#">{% trans "Share existing libraries" %}</a></li>
-                <li><a class="op js-repo-rename create-new" href="#">{% trans "Create a new library" %}</a></li>
+            <ul class="dropdown-menu hide">
+                <li><a class="op share-existing" href="#">{% trans "Share existing libraries" %}</a></li>
+                <li><a class="op create-new" href="#">{% trans "Create a new library" %}</a></li>
             </ul>
         </div>
         {% endif %}
@@ -111,30 +111,6 @@
         <span class="loading-icon loading-tip"></span>
         <p class="error error-tip hide"></p>
     </div>
-
-    <div id="group-discussions" class="popover hide">
-        <div class="outer-caret up-outer-caret"><div class="inner-caret"></div></div>
-        <div class="popover-hd ovhd">
-            <span class="popover-close close sf2-icon-x1 op-icon fright" title="{% trans "Close" %}"></span>
-            <h3 class="popover-title">{% trans "Discussions" %}</h3>
-        </div>
-        <div class="popover-con">
-            <span class="loading-icon loading-tip"></span>
-            <p class="load-more-discussion hide js-load-more">{% trans "More..." %}</p>
-            <ul id="group-discussion-list" class="hide"></ul>
-            <p class="no-discussion-tip hide">{% trans "No discussion in this group yet." %}</p>
-            <p class="error hide"></p>
-        </div>
-        <div class="popover-footer">
-            <form action="" method="post" class="msg-form">
-                <img src="{% avatar_url request.user 64 %}" alt="" width="32" class="avatar-circle fleft" />
-                <div class="msg-body">
-                    <textarea name="message" placeholder="{% trans "Add a discussion..." %}" class="msg-input"></textarea>
-                    <button type="submit" class="submit">{% trans "Submit" %}</button>
-                </div>
-            </form>
-        </div>
-    </div>
 </script>
 
 <script type="text/template" id="group-settings-tmpl">
diff --git a/static/scripts/app/views/group-settings.js b/static/scripts/app/views/group-settings.js
index 7488f79ac1..75b570b3aa 100644
--- a/static/scripts/app/views/group-settings.js
+++ b/static/scripts/app/views/group-settings.js
@@ -294,8 +294,8 @@ define([
 
         manageMembers: function() {
             new ManageMembersView({
-                'group_id': this.group.id,
-                'group_name': this.group.name,
+                'group_id': this.groupView.group.id,
+                'group_name': this.groupView.group.name,
                 'is_owner': this.is_owner
             });
         },