From 85485eda22e4db51e74fca925ad4d43bb404b847 Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Thu, 10 Jan 2013 16:13:40 +0800
Subject: [PATCH] improved share_admin

---
 media/css/seahub.css                  |  1 +
 organizations/views.py                |  6 +++---
 share/templates/repo/share_admin.html | 30 ++++++++++++++-------------
 share/views.py                        |  6 +++---
 4 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/media/css/seahub.css b/media/css/seahub.css
index 05a82c6232..507cd313ec 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -906,6 +906,7 @@ textarea:-moz-placeholder {/* for FF */
 .repo-op {
     text-align:right;
 }
+#repo-setting-btn,
 #recycle-btn,
 .file-op button,
 #file-op button,
diff --git a/organizations/views.py b/organizations/views.py
index e62f7b4e02..28b0141106 100644
--- a/organizations/views.py
+++ b/organizations/views.py
@@ -773,7 +773,7 @@ def org_share_permission_admin(request, url_prefix):
         try:
             seafserv_threaded_rpc.set_share_permission(repo_id, from_email, email_or_group, permission)
         except:
-            return HttpResponse(json.dumps({'success': False}), content_type=content_type)
+            return HttpResponse(json.dumps({'success': False}), status=400, content_type=content_type)
         return HttpResponse(json.dumps({'success': True}), content_type=content_type)
 
     if share_type == 'group':
@@ -781,14 +781,14 @@ def org_share_permission_admin(request, url_prefix):
         try:
             seafserv_threaded_rpc.set_org_group_repo_permission(org_id, group_id, repo_id, permission)
         except:
-            return HttpResponse(json.dumps({'success': False}), content_type=content_type)
+            return HttpResponse(json.dumps({'success': False}), status=400, content_type=content_type)
         return HttpResponse(json.dumps({'success': True}), content_type=content_type)
 
     if share_type == 'public':
         try:
             seafserv_threaded_rpc.set_org_inner_pub_repo(org_id, repo_id, permission)
         except:
-            return HttpResponse(json.dumps({'success': False}), content_type=content_type)
+            return HttpResponse(json.dumps({'success': False}), status=400, content_type=content_type)
         return HttpResponse(json.dumps({'success': True}), content_type=content_type)
 
 @login_required
diff --git a/share/templates/repo/share_admin.html b/share/templates/repo/share_admin.html
index 593deb2bbc..2a9dc0b62d 100644
--- a/share/templates/repo/share_admin.html
+++ b/share/templates/repo/share_admin.html
@@ -14,7 +14,7 @@
 <div class="info-item">
     <h3 class="info-item-top">{% trans "Tips" %}</h3>
     <div class="info-item-bottom">
-        <p>{% blocktrans %}If you don't want others to change contents of library, you may set share permission to "read-only" when sharing it.{% endblocktrans %}</p>
+        <p>{% blocktrans %}If you don't want others to change the contents of your shared libraries, you can set the share permission to "read-only" when sharing them.{% endblocktrans %}</p>
     </div>
 </div>
 {% endblock %}
@@ -71,8 +71,8 @@
 </table>
 {% else %}
 <div class="empty-tips">
-  <h2 class="center-contents">{% trans "You are not sharing any libraries" %}</h2>
-  <p>{% blocktrans %}Share library to your friends and colleagues by clicking the "Share" icon near the library.{% endblocktrans %}</p>
+  <h2 class="center-contents">{% trans "You have not shared any library" %}</h2>
+  <p>{% trans "You can share libraries to your friends and colleagues by clicking the share icon of your own libraries in your home page or creating a new library in groups you are in." %}</p>
 </div>
 {% endif %}
 
@@ -101,17 +101,18 @@
   </tr>
   {% endfor %}
 </table>
-<p id="link" class="hide"><input type="text" readonly="readonly" value="" id="shared-link" /></p>
+<input type="text" readonly="readonly" value="" id="shared-link" class="hide" />
 {% else %}
 <div class="empty-tips">
-  <h2 class="center-contents">{% trans "You don't have any file shared links"%}</h2>
-  <p>{% blocktrans %}Share files to your friends and colleagues by clicking "Share link" button on file viewing page. {% endblocktrans %}</p>
+  <h2 class="center-contents">{% trans "You don't have any shared link"%}</h2>
+  <p>{% trans "You can share a folder or a file when you view a library, or share a file when you view it." %}</p>
 </div>
 {% endif %}
 {% endblock %}
 
 {% block extra_script %}
 <script type="text/javascript">
+{% if shared_repos %}
 $('tr:gt(0)').hover(
     function() {
         $(this).find('.share-permission-edit-icon').removeClass('vh');
@@ -150,14 +151,12 @@ $('.share-permission-select').change(function() {
             if (data['success']) {
                 feedback('{% trans "Edit succeeded" %}', 'success');
                 select.prev().children('.share-permission-cur-value').html(select.children('option[value="' +select.val() + '"]').text());
-            } else {
-                feedback('{% trans "Edit failed" %}', 'error');
             }
             select.addClass('hide');
             select.prev().removeClass('hide');
         },
-        error: function(jqXHR, textStatus, errorThrown) {
-            feedback(textStatus + '，{% trans "edit failed" %}', 'error');
+        error: function() {
+            feedback('{% trans "Edit failed." %}', 'error');
             select.addClass('hide');
             select.prev().removeClass('hide');
         }   
@@ -175,17 +174,20 @@ $(document).click(function(e) {
 $('.cancel-share').click(function() {
     location.href = $(this).attr('data');
 });
+{% endif %}
 
+{% if fileshares %}
 $(".view-link").click(function() {
     var link = $(this).attr('data');
-    $('#link').before('<p class="hide">' + link + '</p>');
-    $('#shared-link').val(link).css('width', $('#link').prev().width() + 2);
-    $("#link").modal({appendTo:'#main'});
-    $('#link').prev().remove();
+    $('#shared-link').before('<p class="hide">' + link + '</p>')
+    .val(link).css('width', $('#shared-link').prev().width() + 2)
+    .modal({focus:false});
+    $('#shared-link').prev().remove();
     return false;
 });
 $('#shared-link').click(function() {
     $(this).select();
 });
+{% endif %}
 </script>
 {% endblock %}
diff --git a/share/views.py b/share/views.py
index bc90d15a3f..97e323c45e 100644
--- a/share/views.py
+++ b/share/views.py
@@ -279,21 +279,21 @@ def share_permission_admin(request):
         try:
             seafserv_threaded_rpc.set_share_permission(repo_id, from_email, email_or_group, permission)
         except:
-            return HttpResponse(json.dumps({'success': False}), content_type=content_type)
+            return HttpResponse(json.dumps({'success': False}), status=400, content_type=content_type)
         return HttpResponse(json.dumps({'success': True}), content_type=content_type)
 
     if share_type == 'group':
         try:
             seafserv_threaded_rpc.set_group_repo_permission(int(email_or_group), repo_id, permission)
         except:
-            return HttpResponse(json.dumps({'success': False}), content_type=content_type)
+            return HttpResponse(json.dumps({'success': False}), status=400, content_type=content_type)
         return HttpResponse(json.dumps({'success': True}), content_type=content_type)
 
     if share_type == 'public':
         try:
             seafserv_threaded_rpc.set_inner_pub_repo(repo_id, permission)
         except:
-            return HttpResponse(json.dumps({'success': False}), content_type=content_type)
+            return HttpResponse(json.dumps({'success': False}), status=400, content_type=content_type)
         return HttpResponse(json.dumps({'success': True}), content_type=content_type)
 
 # 2 views for anonymous share: