From be238d44c4faec643db6fb6d0e6e4e683cd70599 Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Wed, 27 May 2015 15:10:50 +0800
Subject: [PATCH] [share] bugfix for 'download link'

---
 media/css/seahub.css               | 3 +++
 seahub/templates/js/templates.html | 9 ++++++---
 static/scripts/app/views/share.js  | 1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/media/css/seahub.css b/media/css/seahub.css
index 9fa469bd52..a8a4f6457d 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -3576,6 +3576,9 @@ button.add-pub-repo {
 }
 
 /* share popup */
+#download-link-operations dl {
+    margin-top:0;
+}
 #download-link-operations dt {
     margin: 0;
 }
diff --git a/seahub/templates/js/templates.html b/seahub/templates/js/templates.html
index a0a302773f..7c2ded7dee 100644
--- a/seahub/templates/js/templates.html
+++ b/seahub/templates/js/templates.html
@@ -361,11 +361,14 @@
                     <input type="submit" value="{% trans 'Generate'%}" />
                 </form>
                 <div id="download-link-operations" class="hide">
-                        <dt class="vam">{% trans "Link: " %}</dt><dd id="download-link"></dd>
+                    <dl>
+                        <dt>{% trans "Link: " %}</dt>
+                        <dd id="download-link"></dd>
                         <% if (!is_dir) { %>
-                        <dt class="vam">{% trans "Direct Download Link: " %}</dt><dd id="direct-dl-link"></dd>
+                        <dt>{% trans "Direct Download Link: " %}</dt>
+                        <dd id="direct-dl-link"></dd>
                         <% } %>
-
+                    </dl>
                     <button id="send-download-link">{% trans 'Send' %}</button>
                     <button id="delete-download-link">{% trans 'Delete' %}</button>
                     <form id="send-download-link-form" action="" class="hide">
diff --git a/static/scripts/app/views/share.js b/static/scripts/app/views/share.js
index be2a926cb2..870ed0c51f 100644
--- a/static/scripts/app/views/share.js
+++ b/static/scripts/app/views/share.js
@@ -222,6 +222,7 @@ define([
 
                 if (link_type == 'download') {
                     _this.$('#download-link').html(data["download_link"]); // TODO: add 'click & select' func
+                    _this.$('#direct-dl-link').html(data['download_link'] + '?raw=1');
                     _this.download_link = data["download_link"]; // for 'link send'
                     _this.download_link_token = data["token"]; // for 'link delete'
                     _this.$('#download-link-operations').removeClass('hide');