From 978eb3973ed35c47b38117b687c645160d7e7550 Mon Sep 17 00:00:00 2001
From: Daniel Pan <freeplant@gmail.com>
Date: Sun, 31 Jan 2016 22:06:40 +0800
Subject: [PATCH 01/17] Add grid view for dirView

---
 media/css/seahub.css                    | 127 +++---
 seahub/templates/js/dir-view.html       |   2 +
 seahub/templates/js/templates.html      |  35 ++
 seahub/templates/view_shared_dir.html   |  16 +-
 static/scripts/app/views/dir.js         | 250 +++++++-----
 static/scripts/app/views/dirent-grid.js | 521 ++++++++++++++++++++++++
 6 files changed, 797 insertions(+), 154 deletions(-)
 create mode 100644 static/scripts/app/views/dirent-grid.js

diff --git a/media/css/seahub.css b/media/css/seahub.css
index f6c6731df8..54915473cc 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -3727,54 +3727,6 @@ img.thumbnail {
 .shared-dir-zip {
     margin-left:5px;
 }
-.grid {
-    display:inline-block;
-    width:100px;
-    padding:10px 24px;
-    position:relative;
-}
-.grid .img-link,
-.grid .text-link {
-    display:block;
-    text-align:center;
-}
-.grid .img-link {
-    height:100px;
-    font-size:0;
-    line-height:0;
-    border-radius:3px;
-    margin-bottom:6px;
-}
-.grid .img-link:before {
-    content:' ';
-    display:inline-block;
-    vertical-align:middle;
-    height:100%;
-}
-.grid .thumbnail {
-    max-width:96px;
-    max-height:96px;
-    padding:1px;
-    border:1px solid #ddd;
-    border-radius:3px;
-}
-.grid .text-link {
-    color:#333;
-    font-size:14px;
-    line-height:17px;
-    height:34px;
-    white-space:normal;
-}
-.grid .op-icon {
-    position:absolute;
-    top:10px;
-    right:24px;
-    padding:2px 6px;
-    background:#fff;
-    border:1px solid #eee;
-    border-radius:3px;
-    margin:0;
-}
 /**** #groups ****/ /* groups page */
 #groups .group-name {
     font-size:16px;
@@ -3833,3 +3785,82 @@ img.thumbnail {
 #add-group-members-form .submit {
     margin:0 0 0 5px;
 }
+/****** grid view *****/
+/* view mode */
+.switch-mode {
+    display:inline-block;
+    margin-left:12px;
+}
+.switch-mode .active {
+    background:#ccc;
+}
+.list-view-btn,
+.grid-view-btn {
+    outline:none;
+    padding:3px 6px 4px;
+    height:20px;
+    border:1px solid #ccc;
+    background:#fff;
+    display:inline-block;
+}
+.grid-view-btn {
+    border-left:none;
+}
+/* grid view */
+.grid-item {
+    display:inline-block;
+    width:100px;
+    padding:10px 24px;
+    position:relative;
+}
+.grid-item .img-link {
+    display:block;
+    text-align:center;
+    height:100px;
+    font-size:0;
+    line-height:0;
+    border-radius:3px;
+    margin-bottom:6px;
+}
+.grid-item .img-link:before {
+    content:' ';
+    display:inline-block;
+    vertical-align:middle;
+    height:100%;
+}
+.grid-item .img-link.hl {
+    background:#f8f8f8;
+}
+.grid-item .thumbnail {
+    max-width:96px;
+    max-height:96px;
+    padding:1px;
+    border:1px solid #ddd;
+    border-radius:3px;
+}
+.grid-item .text-link {
+    display:block;
+    text-align:center;
+    color:#333;
+    font-size:14px;
+    line-height:17px;
+    height:34px;
+    white-space:normal;
+}
+.grid-item .text-link.hl {
+    color:#f93;
+    background:#fff;
+}
+.grid-item .op-icon {
+    position:absolute;
+    top:10px;
+    right:24px;
+    padding:2px 6px;
+    background:#fff;
+    border:1px solid #eee;
+    border-radius:3px;
+    margin:0;
+}
+#dir-view .grid-item {
+    padding:10px 20px; /* use less padding */
+}
diff --git a/seahub/templates/js/dir-view.html b/seahub/templates/js/dir-view.html
index dcfa17a000..7540ad681b 100644
--- a/seahub/templates/js/dir-view.html
+++ b/seahub/templates/js/dir-view.html
@@ -8,6 +8,8 @@
         <thead></thead>
         <tbody></tbody>
     </table>
+    <ul class="grid-view hide">
+    </ul>
     <span class="loading-icon loading-tip"></span>
     <p class="error hide"></p>
 </div>
diff --git a/seahub/templates/js/templates.html b/seahub/templates/js/templates.html
index c8360cc404..a0fefa1d56 100644
--- a/seahub/templates/js/templates.html
+++ b/seahub/templates/js/templates.html
@@ -147,6 +147,12 @@
     <% if (!encrypted && can_generate_shared_link) { %>
     <button class="op-btn" id="share-cur-dir">{% trans "Share" %}</button>
     <% } %>
+
+    <div class="switch-mode vam">
+        <img src="{{ MEDIA_URL }}img/grid.png" title="{% trans "Grid View" %}" id="js-switch-grid-view" alt='' class="grid-view-btn cspt fright <% if (mode == 'grid') { %>active<% } %>" />
+        <img src="{{ MEDIA_URL }}img/list.png" title="{% trans "List View" %}" id="js-switch-list-view" alt='' class="list-view-btn cspt fright <% if (mode == 'list') { %>active<% } %>" />
+    </div>
+
     <% if (path == '/') { %>
         <div class="fright">
             <% if (user_perm == 'rw') { %>
@@ -349,6 +355,35 @@
     </td>
     <% } %>
 </script>
+
+<script type="text/template" id="grid-view-file-item-tmpl">
+    <a href="<%= url %>" class="img-link" target="_blank">
+        <img src="{{ MEDIA_URL }}img/file/txt-192.png" alt="" width="96" class="vam" />
+    </a>
+
+    <a href="<%= url %>" class="ellipsis text-link normal" target="_blank">
+        <%- dirent.obj_name %>
+    </a>
+</script>
+
+<script type="text/template" id="grid-view-img-item-tmpl">
+
+</script>
+
+<script type="text/template" id="grid-view-dir-item-tmpl">
+    <a href="<%= url %>" class="img-link">
+        <% if (dirent.perm == 'r') { %>
+        <img src="{{ MEDIA_URL }}img/folder-read-only-192.png" alt="" width="96" class="vam" />
+        <% } else { %>
+        <img src="{{ MEDIA_URL }}img/folder-beige-192.png" alt="" width="96" class="vam" />
+        <% } %>
+    </a>
+
+    <a href="<%= url %>" class="ellipsis normal text-link">
+        <%- dirent.obj_name %>
+    </a>
+</script>
+
 <script type="text/template" id="group-change-item-tmpl">
     <td>
     <span class="icon-plus"></span>
diff --git a/seahub/templates/view_shared_dir.html b/seahub/templates/view_shared_dir.html
index d7b6e78a1f..d73b3c3929 100644
--- a/seahub/templates/view_shared_dir.html
+++ b/seahub/templates/view_shared_dir.html
@@ -99,9 +99,9 @@
         </tbody>
     </table>
     {% else %}
-        <ul>
+        <ul class="grid">
             {% for dirent in dir_list %}
-            <li class="grid" title="{{ dirent.obj_name }}">
+            <li class="grid-item" title="{{ dirent.obj_name }}">
                 <a href="?p={{ path|urlencode }}{{ dirent.obj_name|urlencode }}&mode={{mode}}" class="img-link">
                     <img src="{{ MEDIA_URL }}img/folder-beige-192.png" alt="" width="96" class="vam" />
                 </a>
@@ -115,7 +115,7 @@
             {% endfor %}
 
             {% for dirent in file_list %}
-            <li class="file-item grid" data-name="{{dirent.obj_name}}" title="{{dirent.obj_name}}">
+            <li class="file-item grid-item" data-name="{{dirent.obj_name}}" title="{{dirent.obj_name}}">
                 {% if dirent.is_img %}
                 <a class="img-link img-img-link" href="{% url "view_file_via_shared_dir" token %}?p={{ path|urlencode }}{{ dirent.obj_name|urlencode }}" data-mfp-src="{% url "view_raw_shared_file" token dirent.obj_id dirent.obj_name %}?p={{ path|urlencode }}{{ dirent.obj_name|urlencode }}">
                     {% if dirent.encoded_thumbnail_src %}
@@ -215,15 +215,15 @@ $(function() {
 });
 {% endif %}
 
-$('.grid').hover(
+$('.grid-item').hover(
     function () {
-        $('.img-link', $(this)).css({'background': '#f8f8f8'});
-        $('.text-link', $(this)).css({'color': '#f93'});
+        $('.img-link', $(this)).addClass('hl');
+        $('.text-link', $(this)).addClass('hl');
         $('.op-icon', $(this)).removeClass('vh');
     },
     function () {
-        $('.img-link', $(this)).css({'background': '#fff'});
-        $('.text-link', $(this)).css({'color': '#333'});
+        $('.img-link', $(this)).removeClass('hl');
+        $('.text-link', $(this)).removeClass('hl');
         $('.op-icon', $(this)).addClass('vh');
     }
 );
diff --git a/static/scripts/app/views/dir.js b/static/scripts/app/views/dir.js
index 4018bc2fc1..e8b023f905 100644
--- a/static/scripts/app/views/dir.js
+++ b/static/scripts/app/views/dir.js
@@ -9,10 +9,11 @@ define([
     'file-tree',
     'app/collections/dirents',
     'app/views/dirent',
+    'app/views/dirent-grid',
     'app/views/fileupload',
     'app/views/share'
     ], function($, progressbar, magnificPopup, simplemodal, _, Backbone, Common,
-        FileTree, DirentCollection, DirentView, FileUploadView, ShareView) {
+        FileTree, DirentCollection, DirentView, DirentGridView, FileUploadView, ShareView) {
         'use strict';
 
         var DirView = Backbone.View.extend({
@@ -29,11 +30,16 @@ define([
             mvProgressTemplate: _.template($("#mv-progress-popup-template").html()),
 
             initialize: function(options) {
-                this.$dirent_list = this.$('.repo-file-list tbody');
+                this.$dirent_list_body = this.$('.repo-file-list tbody');
+                this.$dirent_list = this.$('.repo-file-list');
+                this.$dirent_grid = this.$('.grid-view');
                 this.$path_bar = this.$('.path');
                 // For compatible with css, we use .repo-op instead of .dir-op
                 this.$dir_op_bar = this.$('.repo-op');
 
+                this.view_mode = 'list';
+                this.contextOptions = {};
+
                 this.dir = new DirentCollection();
                 this.listenTo(this.dir, 'add', this.addOne);
                 this.listenTo(this.dir, 'reset', this.reset);
@@ -108,99 +114,26 @@ define([
                         }
                     }
                 });
+
             },
 
+            // public function
+            // show a folder
             // 'category' is sth. like url prefix
-            // options is for 'group dir view', at present (Wed Jan 13 12:44:17 CST 2016)
+            // options: for rendering from group view, currently is { group_name: group_name }
             showDir: function(category, repo_id, path, options) {
                 $('#top-search-form').html(this.top_search_form_template({
                     search_repo_id: repo_id
                 }));
 
-                this.$el.show();
-                this.$dirent_list.empty();
-                var loading_tip = this.$('.loading-tip').show();
-
                 this.contextOptions = options;
-
-                var dir = this.dir;
-                dir.setPath(category, repo_id, path);
-                var _this = this;
-                dir.fetch({
-                    cache: false,
-                    reset: true,
-                    data: {'p': path},
-                    success: function (collection, response, opts) {
-                        dir.last_start = 0; // for 'more'
-                        if (response.dirent_list.length == 0 ||  // the dir is empty
-                            !response.dirent_more ) { // no 'more'
-                            loading_tip.hide();
-                        }
-                    },
-                    error: function (collection, response, opts) {
-                        loading_tip.hide();
-                        var $el_con = _this.$('.repo-file-list-topbar, .repo-file-list').hide();
-                        var $error = _this.$('.error');
-                        var err_msg;
-                        var lib_need_decrypt = false;
-                        if (response.responseText) {
-                            if (response.responseJSON.lib_need_decrypt) {
-                                lib_need_decrypt = true;
-                            } else {
-                                err_msg = response.responseJSON.error;
-                            }
-                        } else {
-                            err_msg = gettext('Please check the network.');
-                        }
-                        if (err_msg) {
-                            $error.html(err_msg).show();
-                        }
-
-                        if (lib_need_decrypt) {
-                            var form = $($('#repo-decrypt-form-template').html());
-                            var decrypt_success = false;
-                            form.modal({
-                                containerCss: {'padding': '1px'},
-                                onClose: function () {
-                                    $.modal.close();
-                                    $el_con.show();
-                                    if (!decrypt_success) {
-                                        app.router.navigate(
-                                            category + '/', // need to append '/' at end
-                                            {trigger: true}
-                                        );
-                                    }
-                                }
-                            });
-                            $('#simplemodal-container').css({'height':'auto'});
-                            form.submit(function() {
-                                var passwd = $.trim($('[name="password"]', form).val());
-                                if (!passwd) {
-                                    $('.error', form).html(gettext("Password is required.")).removeClass('hide');
-                                    return false;
-                                }
-                                Common.ajaxPost({
-                                    form: form,
-                                    form_id: form.attr('id'),
-                                    post_url: Common.getUrl({'name':'repo_set_password'}),
-                                    post_data: {
-                                        repo_id: repo_id,
-                                        password: passwd,
-                                        username: app.pageOptions.username
-                                    },
-                                    after_op_success: function() {
-                                        decrypt_success = true;
-                                        $.modal.close();
-                                        _this.showDir(category, repo_id, path);
-                                    }
-                                });
-                                return false;
-                            });
-                        }
-                    }
-                });
+                this.$el.show();
+                this.dir.setPath(category, repo_id, path);
+                this.renderDir();
             },
 
+            // public function
+            // hide the folder view
             hide: function() {
                 $('#top-search-form').html(this.top_search_form_template({
                     search_repo_id: ''
@@ -209,16 +142,25 @@ define([
                 this.$el.hide();
             },
 
+            /***** private functions *****/
+
             addOne: function(dirent) {
-                var view = new DirentView({model: dirent, dirView: this});
-                this.$dirent_list.append(view.render().el);
+                var view;
+                if (this.view_mode == 'list') {
+                    view = new DirentView({model: dirent, dirView: this});
+                    this.$dirent_list_body.append(view.render().el);
+                } else {
+                    view = new DirentGridView({model: dirent, dirView: this});
+                    this.$dirent_grid.append(view.render().el);
+                }
             },
 
             reset: function() {
-                this.dir.each(this.addOne, this);
                 this.renderPath();
                 this.renderDirOpBar();
-                this.renderDirentsHd();
+                if (this.view_mode == 'list')
+                    this.renderDirentsHd();
+                this.dir.each(this.addOne, this);
                 this.fileUploadView.setFileInput();
                 this.getImageThumbnail();
             },
@@ -266,6 +208,96 @@ define([
                 get_thumbnail(0);
             },
 
+            _showEncryptDialog: function() {
+                var _this = this;
+                var form = $($('#repo-decrypt-form-template').html());
+                var decrypt_success = false;
+                form.modal({
+                    containerCss: {'padding': '1px'},
+                    onClose: function () {
+                        $.modal.close();
+                        _this.$el_con.show();
+                        if (!decrypt_success) {
+                            app.router.navigate(
+                                category + '/', // need to append '/' at end
+                                {trigger: true}
+                            );
+                        }
+                    }
+                });
+                $('#simplemodal-container').css({'height':'auto'});
+                form.submit(function() {
+                    var passwd = $.trim($('[name="password"]', form).val());
+                    if (!passwd) {
+                        $('.error', form).html(gettext("Password is required.")).removeClass('hide');
+                        return false;
+                    }
+                    Common.ajaxPost({
+                        form: form,
+                        form_id: form.attr('id'),
+                        post_url: Common.getUrl({'name':'repo_set_password'}),
+                        post_data: {
+                            repo_id: _this.dir.repo_id,
+                            password: passwd,
+                            username: app.pageOptions.username
+                        },
+                        after_op_success: function() {
+                            decrypt_success = true;
+                            $.modal.close();
+                            _this.showDir(_this.dir.category, _this.dir.repo_id, _this.dir.path);
+                        }
+                    });
+                    return false;
+                });
+            },
+
+            renderDir: function() {
+                this.$dirent_grid.empty();
+                this.$dirent_list_body.empty();
+
+                if (this.view_mode == 'list') {
+                    this.$dirent_list.show();
+                    this.$dirent_grid.hide();
+                } else {
+                    this.$dirent_list.hide();
+                    this.$dirent_grid.show();
+                }
+
+                var loading_tip = this.$('.loading-tip').show();
+
+                var _this = this;
+                var dir = this.dir;
+                dir.fetch({
+                    cache: false,
+                    reset: true,
+                    data: { 'p': dir.path },
+                    success: function(collection, response, opts) {
+                        dir.last_start = 0; // for 'more'
+                        if (response.dirent_list.length == 0 ||  // the dir is empty
+                            !response.dirent_more ) { // no 'more'
+                            loading_tip.hide();
+                        }
+                    },
+                    error: function(collection, response, opts) {
+                        loading_tip.hide();
+                        var $el_con = _this.$('.repo-file-list-topbar, .repo-file-list').hide();
+                        var $error = _this.$('.error');
+                        var err_msg;
+                        if (response.responseText) {
+                            if (response.responseJSON.lib_need_decrypt) {
+                                _this._showEncryptDialog();
+                                return;
+                            } else {
+                                err_msg = response.responseJSON.error;
+                            }
+                        } else {
+                            err_msg = gettext('Please check the network.');
+                        }
+                        $error.html(err_msg).show();
+                    }
+                });
+            },
+
             renderPath: function() {
                 var dir = this.dir;
                 var path = dir.path;
@@ -285,9 +317,8 @@ define([
                         category: dir.category,
                         context: context
                     };
-                if (this.contextOptions) {
-                    $.extend(obj, this.contextOptions);
-                }
+                // add possible group_name
+                $.extend(obj, this.contextOptions);
 
                 var path_list = path.substr(1).split('/');
                 var path_list_encoded = Common.encodePath(path.substr(1)).split('/');
@@ -308,6 +339,7 @@ define([
                 this.$dir_op_bar.html($.trim(this.dir_op_bar_template({
                     user_perm: dir.user_perm,
                     encrypted: dir.encrypted,
+                    mode: this.view_mode,
                     path: dir.path,
                     repo_id: dir.repo_id,
                     site_root: app.pageOptions.site_root,
@@ -326,6 +358,8 @@ define([
                 'click #add-new-dir': 'newDir',
                 'click #add-new-file': 'newFile',
                 'click #share-cur-dir': 'share',
+                'click #js-switch-grid-view': 'switchToGridView',
+                'click #js-switch-list-view': 'switchToListView',
                 'click th.select': 'select',
                 'click #mv-dirents': 'mv',
                 'click #cp-dirents': 'cp',
@@ -452,15 +486,15 @@ define([
                 var view = new DirentView({model: new_dirent, dirView: dirView});
                 var new_file = view.render().el;
                 // put the new file as the first file
-                if ($('tr', dirView.$dirent_list).length == 0) {
-                    dirView.$dirent_list.append(new_file);
+                if ($('tr', dirView.$dirent_list_body).length == 0) {
+                    dirView.$dirent_list_body.append(new_file);
                 } else {
                     var dirs = dir.where({'is_dir':true});
                     if (dirs.length == 0) {
-                        dirView.$dirent_list.prepend(new_file);
+                        dirView.$dirent_list_body.prepend(new_file);
                     } else {
                         // put the new file after the last dir
-                        $($('tr', dirView.$dirent_list)[dirs.length - 1]).after(new_file);
+                        $($('tr', dirView.$dirent_list_body)[dirs.length - 1]).after(new_file);
                     }
                 }
             },
@@ -468,7 +502,7 @@ define([
             addNewDir: function(new_dirent) {
                 var dirView = this;
                 var view = new DirentView({model: new_dirent, dirView: dirView});
-                dirView.$dirent_list.prepend(view.render().el); // put the new dir as the first one
+                dirView.$dirent_list_body.prepend(view.render().el); // put the new dir as the first one
             },
 
             share: function () {
@@ -486,6 +520,26 @@ define([
                 new ShareView(options);
             },
 
+            switchToGridView: function() {
+                if (this.view_mode == 'grid') {
+                    return false;
+                } else {
+                    this.view_mode = 'grid';
+                    this.renderDir();
+                    return false;
+                }
+            },
+
+            switchToListView: function() {
+                if (this.view_mode == 'list') {
+                    return false;
+                } else {
+                    this.view_mode = 'list';
+                    this.renderDir();
+                    return false;
+                }
+            },
+
             sortByName: function() {
                 this.$('.by-time .sort-icon').hide();
 
@@ -508,7 +562,7 @@ define([
                     }
                 };
                 dirents.sort();
-                this.$dirent_list.empty();
+                this.$dirent_list_body.empty();
                 dirents.each(this.addOne, this);
                 el.toggleClass('icon-caret-up icon-caret-down').show();
                 dirents.comparator = null;
@@ -534,7 +588,7 @@ define([
                 };
                 dirents.sort();
 
-                this.$dirent_list.empty();
+                this.$dirent_list_body.empty();
                 dirents.each(this.addOne, this);
                 el.toggleClass('icon-caret-up icon-caret-down').show();
                 dirents.comparator = null;
diff --git a/static/scripts/app/views/dirent-grid.js b/static/scripts/app/views/dirent-grid.js
new file mode 100644
index 0000000000..5512505c7d
--- /dev/null
+++ b/static/scripts/app/views/dirent-grid.js
@@ -0,0 +1,521 @@
+define([
+    'jquery',
+    'underscore',
+    'backbone',
+    'common',
+    'file-tree',
+    'app/views/share',
+    'app/views/folder-perm'
+], function($, _, Backbone, Common, FileTree, ShareView, FolderPermView) {
+    'use strict';
+
+    app = app || {};
+    app.globalState = app.globalState || {};
+
+    var DirentGridView = Backbone.View.extend({
+        tagName: 'li',
+        className: 'grid-item',
+
+        dirTemplate: _.template($('#grid-view-dir-item-tmpl').html()),
+        fileTemplate:  _.template($('#grid-view-file-item-tmpl').html()),
+
+        // renameTemplate: _.template($("#grid-rename-form-template").html()),
+        // mvcpTemplate: _.template($("#mvcp-form-template").html()),
+        // mvProgressTemplate: _.template($("#mv-progress-popup-template").html()),
+
+        initialize: function(options) {
+            this.dirView = options.dirView;
+            this.dir = this.dirView.dir;
+
+            this.listenTo(this.model, "change", this.render);
+            this.listenTo(this.model, 'remove', this.remove); // for multi dirents: delete, mv
+        },
+
+        render: function() {
+            var dir = this.dir;
+            var dirent_path = Common.pathJoin([dir.path, this.model.get('obj_name')]);
+            var is_pro = app.pageOptions.is_pro;
+            var url;
+            var template;
+
+            if (this.model.get('is_dir')) {
+                template = this.dirTemplate;
+                if (dir.category) {
+                    url = "#" + dir.category + "/lib/" + dir.repo_id + Common.encodePath(dirent_path);
+                } else {
+                    url = "#lib/" + dir.repo_id + Common.encodePath(dirent_path);
+                }
+            } else {
+                template = this.fileTemplate;
+                url = "/lib/" + dir.repo_id + "/file" + Common.encodePath(dirent_path);
+            }
+
+            this.$el.html(template({
+                dirent: this.model.attributes,
+                dirent_path: dirent_path,
+                url: url,
+                category: dir.category,
+                repo_id: dir.repo_id,
+                is_repo_owner: dir.is_repo_owner,
+                can_generate_shared_link: app.pageOptions.can_generate_shared_link,
+                is_pro: is_pro,
+                repo_encrypted: dir.encrypted
+            }));
+
+
+            this.$('.file-locked-icon').attr('title', gettext("locked by {placeholder}").replace('{placeholder}', this.model.get('lock_owner_name')));
+
+            return this;
+        },
+
+        events: {
+            'mouseenter': 'highlight',
+            'mouseleave': 'rmHighlight',
+            'mousedown .grid-img-inner-container img': 'showPopupMenu',
+            'click .grid-img-container': 'multiChoose',
+            'click .dir-link': 'visitDir',
+            'click .share': 'share',
+            'click .delete': 'del', // 'delete' is a preserve word
+            'click .rename': 'rename',
+            'click .mv': 'mvcp',
+            'click .cp': 'mvcp',
+            'click .set-folder-permission': 'setFolderPerm',
+            'click .lock-file': 'lockFile',
+            'click .unlock-file': 'unlockFile'
+        },
+
+        highlight: function() {
+            this.$('.img-link').addClass('hl');
+            this.$('.text-link').addClass('hl');
+            /*
+            if (!$('.grid-hidden-op:visible').length && !$('#grid-rename-form').length) {
+                this.$('.grid-img-inner-container').addClass('hl');
+            }
+            */
+        },
+
+        rmHighlight: function() {
+            this.$('.img-link').removeClass('hl');
+            this.$('.text-link').removeClass('hl');
+            /*
+            if (!$('.grid-hidden-op:visible').length && !$('#grid-rename-form').length) {
+                this.$('.grid-img-inner-container').removeClass('hl');
+            }
+            */
+        },
+
+        showPopupMenu: function(e) {
+            e = e || window.event;
+            if (e.which == 3 && this.dirView.$('.grid-item .grid-img-container.hl').length == 0) {
+                $('.grid-hidden-op').addClass('hide');
+                this.$('.grid-img-container').addClass('hl').children('.grid-img-inner-container').removeClass('hl');
+                this.$('.grid-hidden-op').css({
+                    'left': (e.pageX || e.clientX + document.body.scroolLeft),
+                    'top': e.pageY || e.clientY + document.body.scrollTop,
+                }).removeClass('hide');
+                return false;
+            };
+        },
+
+        multiChoose: function(e) {
+            var dirView = this.dirView;
+            if (e.which == 1 && dirView.$multi_choose == true) {
+                this.$('.grid-img-container').toggleClass('hl');
+                this.$('.grid-img-inner-container').removeClass('hl');
+                var $dirents_op = dirView.$('#multi-dirents-op');
+                var hl_num = dirView.$('.grid-img-container.hl').length;
+                if (hl_num > 0) {
+                    $dirents_op.css({'display':'inline'});
+                } else {
+                    $dirents_op.hide();
+                }
+            } else if (e.which == 1 && dirView.$multi_choose == false) {
+                return false;
+            }
+        },
+
+        visitDir: function() {
+            this.dirView.dir.reset();
+            // update url & dirents
+            var dir_url = this.$('.dir-link').attr("href");
+            app.router.navigate(dir_url, {trigger: true}); // offer an url fragment
+            return false;
+        },
+
+        share: function() {
+            var dir = this.dir,
+                obj_name = this.model.get('obj_name'),
+                dirent_path = Common.pathJoin([dir.path, obj_name]);
+
+            var options = {
+                'is_repo_owner': dir.is_repo_owner,
+                'is_virtual': dir.is_virtual,
+                'user_perm': this.model.get('perm'),
+                'repo_id': dir.repo_id,
+                'repo_encrypted': false,
+                'is_dir': this.model.get('is_dir') ? true : false,
+                'dirent_path': dirent_path,
+                'obj_name': obj_name
+            };
+            new ShareView(options);
+            return false;
+        },
+
+        del: function() {
+            var dirent_name = this.model.get('obj_name');
+            var dir = this.dir;
+            var options = {
+                repo_id: dir.repo_id,
+                name: this.model.get('is_dir') ? 'del_dir' : 'del_file'
+            };
+            var model = this.model;
+            $.ajax({
+                url: Common.getUrl(options) + '?parent_dir=' + encodeURIComponent(dir.path)
+                + '&name=' + encodeURIComponent(dirent_name),
+                type: 'POST',
+                dataType: 'json',
+                beforeSend: Common.prepareCSRFToken,
+                success: function(data) {
+                    dir.remove(model);
+                    var msg = gettext("Successfully deleted %(name)s")
+                        .replace('%(name)s', Common.HTMLescape(dirent_name));
+                    Common.feedback(msg, 'success');
+                },
+                error: function(xhr) {
+                    Common.ajaxErrorHandler(xhr);
+                }
+            });
+            return false;
+        },
+
+        rename: function() {
+            var is_dir = this.model.get('is_dir');
+            var dirent_name = this.model.get('obj_name');
+            var form = $(this.renameTemplate({
+                grid_dirent_name: dirent_name
+            }));
+
+            var $grid_hidden_op = this.$('.grid-hidden-op'),
+                $name = this.$('.grid-link'),
+                $img_container = this.$('.grid-img-container'),
+                $name_container = this.$('.grid-link-container');
+
+            $name_container.css('width', $('.grid-item').width()).css('margin', 0);
+            $grid_hidden_op.addClass('hide');
+            $img_container.addClass('hl');
+            $name_container.prepend(form);
+            $name.hide();
+
+            var cancelRename = function() {
+                $name.css('width', '104').show();
+                form.remove();
+                $img_container.removeClass('hl');
+                $op.css({
+                    'width': 104,
+                    'margin': '0 auto'
+                });
+                return false; // stop bubbling (to 'doc click to hide .hidden-op')
+            };
+
+            $('.cancel', form).click(cancelRename);
+
+            var form_id = form.attr('id');
+            var _this = this;
+            var dir = this.dirView.dir;
+            form.submit(function() {
+                var new_name = $.trim($('[name="grid_newname"]', form).val());
+                if (!new_name) {
+                    return false;
+                }
+                if (new_name == dirent_name) {
+                    cancelRename();
+                    return false;
+                }
+                var post_data = {
+                    'oldname': dirent_name,
+                    'newname': new_name
+                };
+                var post_url = Common.getUrl({
+                    name: is_dir ? 'rename_dir' : 'rename_file',
+                    repo_id: dir.repo_id
+                }) + '?parent_dir=' + encodeURIComponent(dir.path);
+                var after_op_success = function (data) {
+                    var renamed_dirent_data = {
+                        'obj_name': data['newname'],
+                        'last_modified': new Date().getTime()/1000,
+                        'last_update': gettext("Just now")
+                    };
+                    if (!is_dir) {
+                        $.extend(renamed_dirent_data, {
+                            'starred': false
+                        });
+                    }
+                    $.modal.close();
+                    _this.model.set(renamed_dirent_data); // it will trigger 'change' event
+                };
+                var after_op_error = function(xhr) {
+                    var err_msg;
+                    if (xhr.responseText) {
+                        err_msg = $.parseJSON(xhr.responseText).error;
+                    } else {
+                        err_msg = gettext("Failed. Please check the network.");
+                    }
+                    Common.feedback(err_msg, 'error');
+                    Common.enableButton(submit_btn);
+                };
+
+                var submit_btn = $('[type="submit"]', form);
+                Common.disableButton(submit_btn);
+                $.ajax({
+                    url: post_url,
+                    type: 'POST',
+                    dataType: 'json',
+                    beforeSend: Common.prepareCSRFToken,
+                    data: post_data,
+                    success: after_op_success,
+                    error: after_op_error
+                });
+                return false;
+            });
+            return false;
+        },
+
+         mvcp: function(event) {
+            var dir = this.dir;
+            var el = event.target || event.srcElement,
+                op_type = $(el).hasClass('mv') ? 'mv' : 'cp',
+                obj_name = this.model.get('obj_name'),
+                obj_type = this.model.get('is_dir') ? 'dir' : 'file';
+
+            var title = op_type == 'mv' ? gettext("Move {placeholder} to:") : gettext("Copy {placeholder} to:");
+            title = title.replace('{placeholder}', '<span class="op-target ellipsis ellipsis-op-target" title="' + Common.HTMLescape(obj_name) + '">' + Common.HTMLescape(obj_name) + '</span>');
+
+            var form = $(this.mvcpTemplate({
+                form_title: title,
+                op_type: op_type,
+                obj_type: obj_type,
+                obj_name: obj_name,
+                show_other_repos: !dir.encrypted,
+            }));
+            form.modal({appendTo:'#main', autoResize:true, focus:false});
+            $('#simplemodal-container').css({'width':'auto', 'height':'auto'});
+
+            FileTree.renderTreeForPath({
+                repo_name: dir.repo_name,
+                repo_id: dir.repo_id,
+                path: dir.path
+            });
+            if (!dir.encrypted) {
+                FileTree.prepareOtherReposTree({cur_repo_id: dir.repo_id});
+            }
+
+            var dirent = this.$el;
+            var dirent_list = this.dirView.$('.repo-file-list tr').eq(this.$el.index()+1);
+            var _this = this;
+            form.submit(function() {
+                var form = $(this),
+                    form_id = form.attr('id'),
+                    path = dir.path,
+                    repo_id = dir.repo_id;
+                var dst_repo = $('[name="dst_repo"]', form).val(),
+                    dst_path = $('[name="dst_path"]', form).val(),
+                    op = $('[name="op"]', form).val(),
+                    obj_name = $('[name="obj_name"]', form).val(),
+                    obj_type = $('[name="obj_type"]', form).val();
+
+                if (!$.trim(dst_repo) || !$.trim(dst_path)) {
+                    $('.error', form).removeClass('hide');
+                    return false;
+                }
+                if (dst_repo == repo_id && (dst_path == path || (obj_type == 'dir' && dst_path == path + obj_name + '/'))) {
+                    $('.error', form).html(gettext("Invalid destination path")).removeClass('hide');
+                    return false;
+                }
+                var options = { repo_id: repo_id };
+                if (obj_type == 'dir') {
+                    options.name = op == 'mv' ? 'mv_dir' : 'cp_dir';
+                } else {
+                    options.name = op == 'mv' ? 'mv_file' : 'cp_file';
+                }
+                var post_url = Common.getUrl(options) + '?path=' + encodeURIComponent(path) + '&obj_name=' + encodeURIComponent(obj_name);
+                var post_data = {
+                    'dst_repo': dst_repo,
+                    'dst_path': dst_path
+                };
+                var after_op_success = function(data) {
+                    $.modal.close();
+                    var msg = data['msg'];
+                    if (!data['task_id']) { // no progress
+                        if (op == 'mv') {
+                            // dirent.remove();
+                            dirent_list.remove();
+                        }
+                        Common.feedback(msg, 'success');
+                    } else {
+                        var mv_progress_popup = $(_this.mvProgressTemplate());
+                        var details = $('#mv-details', mv_progress_popup),
+                            cancel_btn = $('#cancel-mv', mv_progress_popup),
+                            other_info = $('#mv-other-info', mv_progress_popup);
+                        cancel_btn.removeClass('hide');
+                        setTimeout(function () {
+                            mv_progress_popup.modal({containerCss: {
+                                width: 300,
+                                height: 150,
+                                paddingTop: 50
+                            }, focus:false});
+                            var det_text = op == 'mv' ? gettext("Moving %(name)s") : gettext("Copying %(name)s");
+                            details.html(det_text.replace('%(name)s', Common.HTMLescape(obj_name))).removeClass('vh');
+                            $('#mv-progress').progressbar();
+                            req_progress();
+                        }, 100);
+                        var req_progress = function () {
+                            $.ajax({
+                                url: Common.getUrl({name: 'get_cp_progress'}) + '?task_id=' + encodeURIComponent(data['task_id']),
+                                dataType: 'json',
+                                success: function(data) {
+                                    var bar = $('.ui-progressbar-value', $('#mv-progress'));
+                                    if (!data['failed'] && !data['canceled'] && !data['successful']) {
+                                        if (data['done'] == data['total']) {
+                                            bar.css('width', '100%'); // 'done' and 'total' can be both 0
+                                            details.addClass('vh');
+                                            cancel_btn.addClass('hide');
+                                            other_info.html(gettext("Saving...")).removeClass('hide');
+                                        } else {
+                                            bar.css('width', parseInt(data['done']/data['total']*100, 10) + '%');
+                                        }
+                                        bar.show();
+                                        setTimeout(req_progress, 1000);
+                                    } else if (data['successful']) {
+                                        $.modal.close();
+                                        if (op == 'mv') {
+                                            dirent.remove();
+                                            dirent_list.remove();
+                                        }
+                                        Common.feedback(msg, 'success');
+                                    } else { // failed or canceled
+                                        details.addClass('vh');
+                                        var other_msg = data['failed'] ? gettext("Failed.") : gettext("Canceled.");
+                                        other_info.html(other_msg).removeClass('hide');
+                                        cancel_btn.addClass('hide');
+                                        setTimeout(function () { $.modal.close(); }, 1000);
+                                    }
+                                },
+                                error: function(xhr, textStatus, errorThrown) {
+                                    var error;
+                                    if (xhr.responseText) {
+                                        error = $.parseJSON(xhr.responseText).error;
+                                    } else {
+                                        error = gettext("Failed. Please check the network.");
+                                    }
+                                    details.addClass('vh')
+                                    other_info.html(error).removeClass('hide');
+                                    cancel_btn.addClass('hide');
+                                    setTimeout(function () { $.modal.close(); }, 1000);
+                                }
+                            });
+                        };
+
+                        cancel_btn.click(function() {
+                            Common.disableButton(cancel_btn);
+                            $.ajax({
+                                url: Common.getUrl({name: 'cancel_cp'}) + '?task_id=' + encodeURIComponent(data['task_id']),
+                                dataType: 'json',
+                                success: function(data) {
+                                    details.addClass('vh')
+                                    other_info.html(gettext("Canceled.")).removeClass('hide');
+                                    cancel_btn.addClass('hide');
+                                    setTimeout(function () {$.modal.close();}, 1000);
+                                },
+                                error: function(xhr, textStatus, errorThrown) {
+                                    var error;
+                                    if (xhr.responseText) {
+                                        error = $.parseJSON(xhr.responseText).error;
+                                    } else {
+                                        error = gettext("Failed. Please check the network.");
+                                    }
+                                    other_info.html(error).removeClass('hide');
+                                    Common.enableButton(cancel_btn);
+                                }
+                            });
+                        });
+                    }
+                }
+                Common.ajaxPost({
+                    'form': form,
+                    'post_url': post_url,
+                    'post_data': post_data,
+                    'after_op_success': after_op_success,
+                    'form_id': form_id
+                });
+                return false;
+            });
+            return false;
+        },
+
+        setFolderPerm: function() {
+            var options = {
+                'obj_name': this.model.get('obj_name'),
+                'dir_path': this.dir.path,
+                'repo_id': this.dir.repo_id
+            };
+            new FolderPermView(options);
+            return false;
+        },
+
+        lockOrUnlockFile: function(params) {
+            var dir = this.dir,
+                filepath = Common.pathJoin([dir.path, this.model.get('obj_name')]),
+                callback = params.after_success;
+
+            $.ajax({
+                url: Common.getUrl({name: 'lock_or_unlock_file', repo_id: dir.repo_id}),
+                type: 'PUT',
+                dataType: 'json',
+                data: {
+                    'operation': params.op,
+                    'p': filepath
+                },
+                cache: false,
+                beforeSend: Common.prepareCSRFToken,
+                success: function() {
+                    callback();
+                },
+                error: function (xhr) {
+                    Common.ajaxErrorHandler(xhr);
+                }
+            });
+        },
+
+        lockFile: function() {
+            var _this = this;
+            this.lockOrUnlockFile({
+                'op': 'lock',
+                'after_success': function() {
+                    _this.model.set({
+                        'is_locked': true,
+                        'locked_by_me': true,
+                        'lock_owner_name': app.pageOptions.name
+                    });
+                    _this.$el.removeClass('hl');
+                }
+            });
+            return false;
+        },
+
+        unlockFile: function() {
+            var _this = this;
+            this.lockOrUnlockFile({
+                'op': 'unlock',
+                'after_success': function() {
+                    _this.model.set({
+                        'is_locked': false
+                    });
+                    _this.$el.removeClass('hl');
+                }
+            });
+            return false;
+        }
+    });
+
+    return DirentGridView;
+});

From 5873f1af95faf31d63e0037e2e84a6b42d20f1be Mon Sep 17 00:00:00 2001
From: Daniel Pan <freeplant@gmail.com>
Date: Mon, 22 Feb 2016 17:16:40 +0800
Subject: [PATCH 02/17] Remember view mode in cookie

---
 static/scripts/app/views/dir.js |  11 ++-
 static/scripts/common.js        |   2 +
 static/scripts/lib/js.cookie.js | 145 ++++++++++++++++++++++++++++++++
 3 files changed, 156 insertions(+), 2 deletions(-)
 create mode 100644 static/scripts/lib/js.cookie.js

diff --git a/static/scripts/app/views/dir.js b/static/scripts/app/views/dir.js
index e8b023f905..05ecf588cd 100644
--- a/static/scripts/app/views/dir.js
+++ b/static/scripts/app/views/dir.js
@@ -7,13 +7,14 @@ define([
     'backbone',
     'common',
     'file-tree',
+    'js.cookie',
     'app/collections/dirents',
     'app/views/dirent',
     'app/views/dirent-grid',
     'app/views/fileupload',
     'app/views/share'
     ], function($, progressbar, magnificPopup, simplemodal, _, Backbone, Common,
-        FileTree, DirentCollection, DirentView, DirentGridView, FileUploadView, ShareView) {
+        FileTree, Cookies, DirentCollection, DirentView, DirentGridView, FileUploadView, ShareView) {
         'use strict';
 
         var DirView = Backbone.View.extend({
@@ -37,7 +38,11 @@ define([
                 // For compatible with css, we use .repo-op instead of .dir-op
                 this.$dir_op_bar = this.$('.repo-op');
 
-                this.view_mode = 'list';
+                var view_mode = Cookies.get('view_mode');
+                if (view_mode == 'grid') {
+                    this.view_mode = 'grid';
+                } else
+                    this.view_mode = 'list';
                 this.contextOptions = {};
 
                 this.dir = new DirentCollection();
@@ -525,6 +530,7 @@ define([
                     return false;
                 } else {
                     this.view_mode = 'grid';
+                    Cookies.set('view_mode', 'grid');
                     this.renderDir();
                     return false;
                 }
@@ -535,6 +541,7 @@ define([
                     return false;
                 } else {
                     this.view_mode = 'list';
+                    Cookies.set('view_mode', 'list');
                     this.renderDir();
                     return false;
                 }
diff --git a/static/scripts/common.js b/static/scripts/common.js
index e06b64ba62..68a314db9e 100644
--- a/static/scripts/common.js
+++ b/static/scripts/common.js
@@ -36,6 +36,8 @@ require.config({
 
         'jquery.magnific-popup': 'lib/jquery.magnific-popup',
 
+        'js.cookie': 'lib/js.cookie',
+
         simplemodal: 'lib/jquery.simplemodal',
         jstree: 'lib/jstree.1.0',
         select2: 'lib/select2-3.5.2',
diff --git a/static/scripts/lib/js.cookie.js b/static/scripts/lib/js.cookie.js
new file mode 100644
index 0000000000..9c7626735d
--- /dev/null
+++ b/static/scripts/lib/js.cookie.js
@@ -0,0 +1,145 @@
+/*!
+ * JavaScript Cookie v2.1.0
+ * https://github.com/js-cookie/js-cookie
+ *
+ * Copyright 2006, 2015 Klaus Hartl & Fagner Brack
+ * Released under the MIT license
+ */
+(function (factory) {
+	if (typeof define === 'function' && define.amd) {
+		define(factory);
+	} else if (typeof exports === 'object') {
+		module.exports = factory();
+	} else {
+		var _OldCookies = window.Cookies;
+		var api = window.Cookies = factory();
+		api.noConflict = function () {
+			window.Cookies = _OldCookies;
+			return api;
+		};
+	}
+}(function () {
+	function extend () {
+		var i = 0;
+		var result = {};
+		for (; i < arguments.length; i++) {
+			var attributes = arguments[ i ];
+			for (var key in attributes) {
+				result[key] = attributes[key];
+			}
+		}
+		return result;
+	}
+
+	function init (converter) {
+		function api (key, value, attributes) {
+			var result;
+
+			// Write
+
+			if (arguments.length > 1) {
+				attributes = extend({
+					path: '/'
+				}, api.defaults, attributes);
+
+				if (typeof attributes.expires === 'number') {
+					var expires = new Date();
+					expires.setMilliseconds(expires.getMilliseconds() + attributes.expires * 864e+5);
+					attributes.expires = expires;
+				}
+
+				try {
+					result = JSON.stringify(value);
+					if (/^[\{\[]/.test(result)) {
+						value = result;
+					}
+				} catch (e) {}
+
+				if (!converter.write) {
+					value = encodeURIComponent(String(value))
+						.replace(/%(23|24|26|2B|3A|3C|3E|3D|2F|3F|40|5B|5D|5E|60|7B|7D|7C)/g, decodeURIComponent);
+				} else {
+					value = converter.write(value, key);
+				}
+
+				key = encodeURIComponent(String(key));
+				key = key.replace(/%(23|24|26|2B|5E|60|7C)/g, decodeURIComponent);
+				key = key.replace(/[\(\)]/g, escape);
+
+				return (document.cookie = [
+					key, '=', value,
+					attributes.expires && '; expires=' + attributes.expires.toUTCString(), // use expires attribute, max-age is not supported by IE
+					attributes.path    && '; path=' + attributes.path,
+					attributes.domain  && '; domain=' + attributes.domain,
+					attributes.secure ? '; secure' : ''
+				].join(''));
+			}
+
+			// Read
+
+			if (!key) {
+				result = {};
+			}
+
+			// To prevent the for loop in the first place assign an empty array
+			// in case there are no cookies at all. Also prevents odd result when
+			// calling "get()"
+			var cookies = document.cookie ? document.cookie.split('; ') : [];
+			var rdecode = /(%[0-9A-Z]{2})+/g;
+			var i = 0;
+
+			for (; i < cookies.length; i++) {
+				var parts = cookies[i].split('=');
+				var name = parts[0].replace(rdecode, decodeURIComponent);
+				var cookie = parts.slice(1).join('=');
+
+				if (cookie.charAt(0) === '"') {
+					cookie = cookie.slice(1, -1);
+				}
+
+				try {
+					cookie = converter.read ?
+						converter.read(cookie, name) : converter(cookie, name) ||
+						cookie.replace(rdecode, decodeURIComponent);
+
+					if (this.json) {
+						try {
+							cookie = JSON.parse(cookie);
+						} catch (e) {}
+					}
+
+					if (key === name) {
+						result = cookie;
+						break;
+					}
+
+					if (!key) {
+						result[name] = cookie;
+					}
+				} catch (e) {}
+			}
+
+			return result;
+		}
+
+		api.get = api.set = api;
+		api.getJSON = function () {
+			return api.apply({
+				json: true
+			}, [].slice.call(arguments));
+		};
+		api.defaults = {};
+
+		api.remove = function (key, attributes) {
+			api(key, '', extend(attributes, {
+				expires: -1
+			}));
+		};
+
+		api.withConverter = init;
+
+		return api;
+	}
+
+	return init(function () {});
+}));

From 3caeee4c54559961cc24d17b44dff631304c0b5b Mon Sep 17 00:00:00 2001
From: Daniel Pan <freeplant@gmail.com>
Date: Mon, 22 Feb 2016 17:32:32 +0800
Subject: [PATCH 03/17] Add create file/folder in grid view

---
 static/scripts/app/views/dir.js | 49 ++++++++++++++++++++++++---------
 1 file changed, 36 insertions(+), 13 deletions(-)

diff --git a/static/scripts/app/views/dir.js b/static/scripts/app/views/dir.js
index 05ecf588cd..15ba4fb799 100644
--- a/static/scripts/app/views/dir.js
+++ b/static/scripts/app/views/dir.js
@@ -488,26 +488,49 @@ define([
             addNewFile: function(new_dirent) {
                 var dirView = this,
                     dir = this.dir;
-                var view = new DirentView({model: new_dirent, dirView: dirView});
-                var new_file = view.render().el;
-                // put the new file as the first file
-                if ($('tr', dirView.$dirent_list_body).length == 0) {
-                    dirView.$dirent_list_body.append(new_file);
-                } else {
-                    var dirs = dir.where({'is_dir':true});
-                    if (dirs.length == 0) {
-                        dirView.$dirent_list_body.prepend(new_file);
+
+                if (this.view_mode == 'list') {
+                    var view = new DirentView({model: new_dirent, dirView: dirView});
+                    var new_file = view.render().el;
+                    // put the new file as the first file
+                    if ($('tr', dirView.$dirent_list_body).length == 0) {
+                        dirView.$dirent_list_body.append(new_file);
                     } else {
-                        // put the new file after the last dir
-                        $($('tr', dirView.$dirent_list_body)[dirs.length - 1]).after(new_file);
+                        var dirs = dir.where({'is_dir':true});
+                        if (dirs.length == 0) {
+                            dirView.$dirent_list_body.prepend(new_file);
+                        } else {
+                            // put the new file after the last dir
+                            $($('tr', dirView.$dirent_list_body)[dirs.length - 1]).after(new_file);
+                        }
+                    }
+                } else {
+                    var gview = new DirentGridView({model: new_dirent, dirView: dirView});
+                    var grid_new_file = gview.render().el;
+                    if ($('.grid-item', dirView.$dirent_grid).length == 0) {
+                        dirView.$dirent_grid.append(grid_new_file);
+                    } else {
+                        var dirs = dir.where({'is_dir':true});
+                        if (dirs.length == 0) {
+                            dirView.$dirent_grid.prepend(grid_new_file);
+                        } else {
+                            // put the new file after the last dir
+                            $($('.grid-item', dirView.$dirent_grid)[dirs.length - 1]).after(grid_new_file);
+                        }
                     }
                 }
             },
 
             addNewDir: function(new_dirent) {
                 var dirView = this;
-                var view = new DirentView({model: new_dirent, dirView: dirView});
-                dirView.$dirent_list_body.prepend(view.render().el); // put the new dir as the first one
+                if (this.view_mode == 'list') {
+                    var view = new DirentView({model: new_dirent, dirView: dirView});
+                    // put the new dir as the first one
+                    dirView.$dirent_list_body.prepend(view.render().el);
+                } else {
+                    var gview = new DirentGridView({model: new_dirent, dirView: dirView});
+                    dirView.$dirent_grid.prepend(gview.render().el);
+                }
             },
 
             share: function () {

From 23e3d2d088714120bf2087b6a963d037110fea57 Mon Sep 17 00:00:00 2001
From: Daniel Pan <freeplant@gmail.com>
Date: Mon, 22 Feb 2016 22:32:52 +0800
Subject: [PATCH 04/17] Add right click context menu

---
 media/css/seahub.css                    |   3 +
 seahub/templates/js/templates.html      |  44 +++
 static/scripts/app/views/dir.js         |  20 ++
 static/scripts/app/views/dirent-grid.js | 447 +++---------------------
 4 files changed, 109 insertions(+), 405 deletions(-)

diff --git a/media/css/seahub.css b/media/css/seahub.css
index 54915473cc..e88e9c0d45 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -3861,6 +3861,9 @@ img.thumbnail {
     border-radius:3px;
     margin:0;
 }
+.grid-item-op {
+    position:relative;
+}
 #dir-view .grid-item {
     padding:10px 20px; /* use less padding */
 }
diff --git a/seahub/templates/js/templates.html b/seahub/templates/js/templates.html
index a0fefa1d56..713ca37015 100644
--- a/seahub/templates/js/templates.html
+++ b/seahub/templates/js/templates.html
@@ -384,6 +384,50 @@
     </a>
 </script>
 
+<script type="text/template" id="grid-view-file-op-tmpl">
+    <ul class="grid-item-op">
+        <li><a class="op download" href="<%= url %>">{% trans "Download" %}</a></li>
+        <% if (!repo_encrypted && can_generate_shared_link) { %>
+        <li><a class="op share" href="#">{% trans "Share" %}</a></li>
+        <% } %>
+        <% if (dirent.perm == 'rw') { %>
+        <li><a class="op delete" href="#">{% trans "Delete" %}</a></li>
+        <li><a class="op rename" href="#">{% trans "Rename" %}</a></li>
+        <li><a class="op mv" href="#">{% trans "Move" %}</a></li>
+        <li><a class="op cp" href="#">{% trans "Copy" %}</a></li>
+        <li><a class="op file-history" href="{{ SITE_ROOT }}repo/file_revisions/<%= repo_id %>/?p=<% print(encodeURIComponent(dirent_path)); %>">{% trans "History" %}</a></li>
+            <% if (is_pro) { %>
+                <% if (dirent.is_locked) { %>
+                    <% if (dirent.locked_by_me) { %>
+        <li><a class="op unlock-file" href="#">{% trans "Unlock" %}</a></li>
+                    <% } else { %>
+        <li><a class="op lock-file" href="#">{% trans "Lock" %}</a></li>
+                    <% } %>
+                <% } %>
+        <li><a class="op open-via-client" href="seafile://openfile?repo_id=<%= repo_id %>&path=<% print(encodeURIComponent(dirent_path)); %>">{% trans "Open via Client" %}</a></li>
+            <% } %>
+        <% } %>
+    </ul>
+</script>
+
+<script type="text/template" id="grid-view-dir-op-tmpl">
+    <ul class="grid-item-op">
+        <li><a class="op download" href="<%= url %>">{% trans "Download" %}</a></li>
+        <% if (!repo_encrypted && can_generate_shared_link) { %>
+        <li><a class="op share" href="#">{% trans "Share" %}</a></li>
+        <% } %>
+        <% if (dirent.perm == 'rw') { %>
+        <li><a class="op delete" href="#">{% trans "Delete" %}</a></li>
+        <li><a class="op rename" href="#">{% trans "Rename" %}</a></li>
+        <li><a class="op mv" href="#">{% trans "Move" %}</a></li>
+        <li><a class="op cp" href="#">{% trans "Copy" %}</a></li>
+            <% if (is_pro) { %>
+        <li><a class="op open-via-client" href="seafile://openfile?repo_id=<%= repo_id %>&path=<% print(encodeURIComponent(dirent_path)); %>">{% trans "Open via Client" %}</a></li>
+            <% } %>
+        <% } %>
+    </ul>
+</script>
+
 <script type="text/template" id="group-change-item-tmpl">
     <td>
     <span class="icon-plus"></span>
diff --git a/static/scripts/app/views/dir.js b/static/scripts/app/views/dir.js
index 15ba4fb799..13f8bac764 100644
--- a/static/scripts/app/views/dir.js
+++ b/static/scripts/app/views/dir.js
@@ -120,6 +120,26 @@ define([
                     }
                 });
 
+                // stop default event when clicking the right mouse button in grid view
+                $('.grid-view').bind("contextmenu", function(e) {
+                    if (e && e.preventDefault) {
+                        e.preventDefault();
+                    } else {
+                        window.event.returnValue = false;
+                    }
+                });
+
+                // remove 'grid-item-op' popup
+                $(document).click(function(e) {
+                    var target =  e.target || event.srcElement;
+                    var $popup = $('.grid-item-op');
+                    if ($popup.length > 0 &&
+                        !$popup.is(target) &&
+                        !$popup.find('*').is(target)) {
+                        $popup.remove();
+                    }
+                });
+
             },
 
             // public function
diff --git a/static/scripts/app/views/dirent-grid.js b/static/scripts/app/views/dirent-grid.js
index 5512505c7d..b8d42f466b 100644
--- a/static/scripts/app/views/dirent-grid.js
+++ b/static/scripts/app/views/dirent-grid.js
@@ -17,7 +17,9 @@ define([
         className: 'grid-item',
 
         dirTemplate: _.template($('#grid-view-dir-item-tmpl').html()),
+        dirOpTemplate: _.template($('#grid-view-dir-op-tmpl').html()),
         fileTemplate:  _.template($('#grid-view-file-item-tmpl').html()),
+        fileOpTemplate: _.template($('#grid-view-file-op-tmpl').html()),
 
         // renameTemplate: _.template($("#grid-rename-form-template").html()),
         // mvcpTemplate: _.template($("#mvcp-form-template").html()),
@@ -34,7 +36,6 @@ define([
         render: function() {
             var dir = this.dir;
             var dirent_path = Common.pathJoin([dir.path, this.model.get('obj_name')]);
-            var is_pro = app.pageOptions.is_pro;
             var url;
             var template;
 
@@ -58,11 +59,10 @@ define([
                 repo_id: dir.repo_id,
                 is_repo_owner: dir.is_repo_owner,
                 can_generate_shared_link: app.pageOptions.can_generate_shared_link,
-                is_pro: is_pro,
+                is_pro: app.pageOptions.is_pro,
                 repo_encrypted: dir.encrypted
             }));
 
-
             this.$('.file-locked-icon').attr('title', gettext("locked by {placeholder}").replace('{placeholder}', this.model.get('lock_owner_name')));
 
             return this;
@@ -71,8 +71,10 @@ define([
         events: {
             'mouseenter': 'highlight',
             'mouseleave': 'rmHighlight',
-            'mousedown .grid-img-inner-container img': 'showPopupMenu',
-            'click .grid-img-container': 'multiChoose',
+            'mousedown .img-link': 'showPopupMenu',
+            'mousedown .text-link': 'showPopupMenu'
+
+            /*
             'click .dir-link': 'visitDir',
             'click .share': 'share',
             'click .delete': 'del', // 'delete' is a preserve word
@@ -82,6 +84,7 @@ define([
             'click .set-folder-permission': 'setFolderPerm',
             'click .lock-file': 'lockFile',
             'click .unlock-file': 'unlockFile'
+            */
         },
 
         highlight: function() {
@@ -106,415 +109,49 @@ define([
 
         showPopupMenu: function(e) {
             e = e || window.event;
-            if (e.which == 3 && this.dirView.$('.grid-item .grid-img-container.hl').length == 0) {
-                $('.grid-hidden-op').addClass('hide');
-                this.$('.grid-img-container').addClass('hl').children('.grid-img-inner-container').removeClass('hl');
-                this.$('.grid-hidden-op').css({
-                    'left': (e.pageX || e.clientX + document.body.scroolLeft),
-                    'top': e.pageY || e.clientY + document.body.scrollTop,
-                }).removeClass('hide');
-                return false;
-            };
-        },
+            var dir = this.dir;
+            var dirent_path = Common.pathJoin([dir.path, this.model.get('obj_name')]);
+            var url;
+            var template;
 
-        multiChoose: function(e) {
-            var dirView = this.dirView;
-            if (e.which == 1 && dirView.$multi_choose == true) {
-                this.$('.grid-img-container').toggleClass('hl');
-                this.$('.grid-img-inner-container').removeClass('hl');
-                var $dirents_op = dirView.$('#multi-dirents-op');
-                var hl_num = dirView.$('.grid-img-container.hl').length;
-                if (hl_num > 0) {
-                    $dirents_op.css({'display':'inline'});
+            if (this.model.get('is_dir')) {
+                template = this.dirOpTemplate;
+                if (dir.category) {
+                    url = "#" + dir.category + "/lib/" + dir.repo_id + Common.encodePath(dirent_path);
                 } else {
-                    $dirents_op.hide();
+                    url = "#lib/" + dir.repo_id + Common.encodePath(dirent_path);
                 }
-            } else if (e.which == 1 && dirView.$multi_choose == false) {
-                return false;
-            }
-        },
-
-        visitDir: function() {
-            this.dirView.dir.reset();
-            // update url & dirents
-            var dir_url = this.$('.dir-link').attr("href");
-            app.router.navigate(dir_url, {trigger: true}); // offer an url fragment
-            return false;
-        },
-
-        share: function() {
-            var dir = this.dir,
-                obj_name = this.model.get('obj_name'),
-                dirent_path = Common.pathJoin([dir.path, obj_name]);
-
-            var options = {
-                'is_repo_owner': dir.is_repo_owner,
-                'is_virtual': dir.is_virtual,
-                'user_perm': this.model.get('perm'),
-                'repo_id': dir.repo_id,
-                'repo_encrypted': false,
-                'is_dir': this.model.get('is_dir') ? true : false,
-                'dirent_path': dirent_path,
-                'obj_name': obj_name
-            };
-            new ShareView(options);
-            return false;
-        },
-
-        del: function() {
-            var dirent_name = this.model.get('obj_name');
-            var dir = this.dir;
-            var options = {
-                repo_id: dir.repo_id,
-                name: this.model.get('is_dir') ? 'del_dir' : 'del_file'
-            };
-            var model = this.model;
-            $.ajax({
-                url: Common.getUrl(options) + '?parent_dir=' + encodeURIComponent(dir.path)
-                + '&name=' + encodeURIComponent(dirent_name),
-                type: 'POST',
-                dataType: 'json',
-                beforeSend: Common.prepareCSRFToken,
-                success: function(data) {
-                    dir.remove(model);
-                    var msg = gettext("Successfully deleted %(name)s")
-                        .replace('%(name)s', Common.HTMLescape(dirent_name));
-                    Common.feedback(msg, 'success');
-                },
-                error: function(xhr) {
-                    Common.ajaxErrorHandler(xhr);
-                }
-            });
-            return false;
-        },
-
-        rename: function() {
-            var is_dir = this.model.get('is_dir');
-            var dirent_name = this.model.get('obj_name');
-            var form = $(this.renameTemplate({
-                grid_dirent_name: dirent_name
-            }));
-
-            var $grid_hidden_op = this.$('.grid-hidden-op'),
-                $name = this.$('.grid-link'),
-                $img_container = this.$('.grid-img-container'),
-                $name_container = this.$('.grid-link-container');
-
-            $name_container.css('width', $('.grid-item').width()).css('margin', 0);
-            $grid_hidden_op.addClass('hide');
-            $img_container.addClass('hl');
-            $name_container.prepend(form);
-            $name.hide();
-
-            var cancelRename = function() {
-                $name.css('width', '104').show();
-                form.remove();
-                $img_container.removeClass('hl');
-                $op.css({
-                    'width': 104,
-                    'margin': '0 auto'
-                });
-                return false; // stop bubbling (to 'doc click to hide .hidden-op')
-            };
-
-            $('.cancel', form).click(cancelRename);
-
-            var form_id = form.attr('id');
-            var _this = this;
-            var dir = this.dirView.dir;
-            form.submit(function() {
-                var new_name = $.trim($('[name="grid_newname"]', form).val());
-                if (!new_name) {
-                    return false;
-                }
-                if (new_name == dirent_name) {
-                    cancelRename();
-                    return false;
-                }
-                var post_data = {
-                    'oldname': dirent_name,
-                    'newname': new_name
-                };
-                var post_url = Common.getUrl({
-                    name: is_dir ? 'rename_dir' : 'rename_file',
-                    repo_id: dir.repo_id
-                }) + '?parent_dir=' + encodeURIComponent(dir.path);
-                var after_op_success = function (data) {
-                    var renamed_dirent_data = {
-                        'obj_name': data['newname'],
-                        'last_modified': new Date().getTime()/1000,
-                        'last_update': gettext("Just now")
-                    };
-                    if (!is_dir) {
-                        $.extend(renamed_dirent_data, {
-                            'starred': false
-                        });
-                    }
-                    $.modal.close();
-                    _this.model.set(renamed_dirent_data); // it will trigger 'change' event
-                };
-                var after_op_error = function(xhr) {
-                    var err_msg;
-                    if (xhr.responseText) {
-                        err_msg = $.parseJSON(xhr.responseText).error;
-                    } else {
-                        err_msg = gettext("Failed. Please check the network.");
-                    }
-                    Common.feedback(err_msg, 'error');
-                    Common.enableButton(submit_btn);
-                };
-
-                var submit_btn = $('[type="submit"]', form);
-                Common.disableButton(submit_btn);
-                $.ajax({
-                    url: post_url,
-                    type: 'POST',
-                    dataType: 'json',
-                    beforeSend: Common.prepareCSRFToken,
-                    data: post_data,
-                    success: after_op_success,
-                    error: after_op_error
-                });
-                return false;
-            });
-            return false;
-        },
-
-         mvcp: function(event) {
-            var dir = this.dir;
-            var el = event.target || event.srcElement,
-                op_type = $(el).hasClass('mv') ? 'mv' : 'cp',
-                obj_name = this.model.get('obj_name'),
-                obj_type = this.model.get('is_dir') ? 'dir' : 'file';
-
-            var title = op_type == 'mv' ? gettext("Move {placeholder} to:") : gettext("Copy {placeholder} to:");
-            title = title.replace('{placeholder}', '<span class="op-target ellipsis ellipsis-op-target" title="' + Common.HTMLescape(obj_name) + '">' + Common.HTMLescape(obj_name) + '</span>');
-
-            var form = $(this.mvcpTemplate({
-                form_title: title,
-                op_type: op_type,
-                obj_type: obj_type,
-                obj_name: obj_name,
-                show_other_repos: !dir.encrypted,
-            }));
-            form.modal({appendTo:'#main', autoResize:true, focus:false});
-            $('#simplemodal-container').css({'width':'auto', 'height':'auto'});
-
-            FileTree.renderTreeForPath({
-                repo_name: dir.repo_name,
-                repo_id: dir.repo_id,
-                path: dir.path
-            });
-            if (!dir.encrypted) {
-                FileTree.prepareOtherReposTree({cur_repo_id: dir.repo_id});
+            } else {
+                template = this.fileOpTemplate;
+                url = "/lib/" + dir.repo_id + "/file" + Common.encodePath(dirent_path) + "?dl=1";
             }
 
-            var dirent = this.$el;
-            var dirent_list = this.dirView.$('.repo-file-list tr').eq(this.$el.index()+1);
-            var _this = this;
-            form.submit(function() {
-                var form = $(this),
-                    form_id = form.attr('id'),
-                    path = dir.path,
-                    repo_id = dir.repo_id;
-                var dst_repo = $('[name="dst_repo"]', form).val(),
-                    dst_path = $('[name="dst_path"]', form).val(),
-                    op = $('[name="op"]', form).val(),
-                    obj_name = $('[name="obj_name"]', form).val(),
-                    obj_type = $('[name="obj_type"]', form).val();
+            this.$('.img-link').addClass('hl');
+            this.$('.text-link').addClass('hl');
 
-                if (!$.trim(dst_repo) || !$.trim(dst_path)) {
-                    $('.error', form).removeClass('hide');
-                    return false;
-                }
-                if (dst_repo == repo_id && (dst_path == path || (obj_type == 'dir' && dst_path == path + obj_name + '/'))) {
-                    $('.error', form).html(gettext("Invalid destination path")).removeClass('hide');
-                    return false;
-                }
-                var options = { repo_id: repo_id };
-                if (obj_type == 'dir') {
-                    options.name = op == 'mv' ? 'mv_dir' : 'cp_dir';
-                } else {
-                    options.name = op == 'mv' ? 'mv_file' : 'cp_file';
-                }
-                var post_url = Common.getUrl(options) + '?path=' + encodeURIComponent(path) + '&obj_name=' + encodeURIComponent(obj_name);
-                var post_data = {
-                    'dst_repo': dst_repo,
-                    'dst_path': dst_path
-                };
-                var after_op_success = function(data) {
-                    $.modal.close();
-                    var msg = data['msg'];
-                    if (!data['task_id']) { // no progress
-                        if (op == 'mv') {
-                            // dirent.remove();
-                            dirent_list.remove();
-                        }
-                        Common.feedback(msg, 'success');
-                    } else {
-                        var mv_progress_popup = $(_this.mvProgressTemplate());
-                        var details = $('#mv-details', mv_progress_popup),
-                            cancel_btn = $('#cancel-mv', mv_progress_popup),
-                            other_info = $('#mv-other-info', mv_progress_popup);
-                        cancel_btn.removeClass('hide');
-                        setTimeout(function () {
-                            mv_progress_popup.modal({containerCss: {
-                                width: 300,
-                                height: 150,
-                                paddingTop: 50
-                            }, focus:false});
-                            var det_text = op == 'mv' ? gettext("Moving %(name)s") : gettext("Copying %(name)s");
-                            details.html(det_text.replace('%(name)s', Common.HTMLescape(obj_name))).removeClass('vh');
-                            $('#mv-progress').progressbar();
-                            req_progress();
-                        }, 100);
-                        var req_progress = function () {
-                            $.ajax({
-                                url: Common.getUrl({name: 'get_cp_progress'}) + '?task_id=' + encodeURIComponent(data['task_id']),
-                                dataType: 'json',
-                                success: function(data) {
-                                    var bar = $('.ui-progressbar-value', $('#mv-progress'));
-                                    if (!data['failed'] && !data['canceled'] && !data['successful']) {
-                                        if (data['done'] == data['total']) {
-                                            bar.css('width', '100%'); // 'done' and 'total' can be both 0
-                                            details.addClass('vh');
-                                            cancel_btn.addClass('hide');
-                                            other_info.html(gettext("Saving...")).removeClass('hide');
-                                        } else {
-                                            bar.css('width', parseInt(data['done']/data['total']*100, 10) + '%');
-                                        }
-                                        bar.show();
-                                        setTimeout(req_progress, 1000);
-                                    } else if (data['successful']) {
-                                        $.modal.close();
-                                        if (op == 'mv') {
-                                            dirent.remove();
-                                            dirent_list.remove();
-                                        }
-                                        Common.feedback(msg, 'success');
-                                    } else { // failed or canceled
-                                        details.addClass('vh');
-                                        var other_msg = data['failed'] ? gettext("Failed.") : gettext("Canceled.");
-                                        other_info.html(other_msg).removeClass('hide');
-                                        cancel_btn.addClass('hide');
-                                        setTimeout(function () { $.modal.close(); }, 1000);
-                                    }
-                                },
-                                error: function(xhr, textStatus, errorThrown) {
-                                    var error;
-                                    if (xhr.responseText) {
-                                        error = $.parseJSON(xhr.responseText).error;
-                                    } else {
-                                        error = gettext("Failed. Please check the network.");
-                                    }
-                                    details.addClass('vh')
-                                    other_info.html(error).removeClass('hide');
-                                    cancel_btn.addClass('hide');
-                                    setTimeout(function () { $.modal.close(); }, 1000);
-                                }
-                            });
-                        };
-
-                        cancel_btn.click(function() {
-                            Common.disableButton(cancel_btn);
-                            $.ajax({
-                                url: Common.getUrl({name: 'cancel_cp'}) + '?task_id=' + encodeURIComponent(data['task_id']),
-                                dataType: 'json',
-                                success: function(data) {
-                                    details.addClass('vh')
-                                    other_info.html(gettext("Canceled.")).removeClass('hide');
-                                    cancel_btn.addClass('hide');
-                                    setTimeout(function () {$.modal.close();}, 1000);
-                                },
-                                error: function(xhr, textStatus, errorThrown) {
-                                    var error;
-                                    if (xhr.responseText) {
-                                        error = $.parseJSON(xhr.responseText).error;
-                                    } else {
-                                        error = gettext("Failed. Please check the network.");
-                                    }
-                                    other_info.html(error).removeClass('hide');
-                                    Common.enableButton(cancel_btn);
-                                }
-                            });
-                        });
-                    }
-                }
-                Common.ajaxPost({
-                    'form': form,
-                    'post_url': post_url,
-                    'post_data': post_data,
-                    'after_op_success': after_op_success,
-                    'form_id': form_id
+            if (e.which == 3) {
+                var op = template({
+                    dirent: this.model.attributes,
+                    dirent_path: dirent_path,
+                    url: url,
+                    category: dir.category,
+                    repo_id: dir.repo_id,
+                    is_repo_owner: dir.is_repo_owner,
+                    can_generate_shared_link: app.pageOptions.can_generate_shared_link,
+                    is_pro: app.pageOptions.is_pro,
+                    repo_encrypted: dir.encrypted
                 });
+                this.$el.append(op);
+                this.$('.grid-item-op').css({
+                    'left': '100px',
+                    'top': '100px',
+                });
+
+                // TODO: bind operations here
                 return false;
-            });
-            return false;
-        },
-
-        setFolderPerm: function() {
-            var options = {
-                'obj_name': this.model.get('obj_name'),
-                'dir_path': this.dir.path,
-                'repo_id': this.dir.repo_id
-            };
-            new FolderPermView(options);
-            return false;
-        },
-
-        lockOrUnlockFile: function(params) {
-            var dir = this.dir,
-                filepath = Common.pathJoin([dir.path, this.model.get('obj_name')]),
-                callback = params.after_success;
-
-            $.ajax({
-                url: Common.getUrl({name: 'lock_or_unlock_file', repo_id: dir.repo_id}),
-                type: 'PUT',
-                dataType: 'json',
-                data: {
-                    'operation': params.op,
-                    'p': filepath
-                },
-                cache: false,
-                beforeSend: Common.prepareCSRFToken,
-                success: function() {
-                    callback();
-                },
-                error: function (xhr) {
-                    Common.ajaxErrorHandler(xhr);
-                }
-            });
-        },
-
-        lockFile: function() {
-            var _this = this;
-            this.lockOrUnlockFile({
-                'op': 'lock',
-                'after_success': function() {
-                    _this.model.set({
-                        'is_locked': true,
-                        'locked_by_me': true,
-                        'lock_owner_name': app.pageOptions.name
-                    });
-                    _this.$el.removeClass('hl');
-                }
-            });
-            return false;
-        },
-
-        unlockFile: function() {
-            var _this = this;
-            this.lockOrUnlockFile({
-                'op': 'unlock',
-                'after_success': function() {
-                    _this.model.set({
-                        'is_locked': false
-                    });
-                    _this.$el.removeClass('hl');
-                }
-            });
-            return false;
+            }
         }
+
     });
 
     return DirentGridView;

From 0a1600a26de6353ff1a06ad5f2ae5ff0d47bc231 Mon Sep 17 00:00:00 2001
From: Daniel Pan <freeplant@gmail.com>
Date: Tue, 23 Feb 2016 14:34:58 +0800
Subject: [PATCH 05/17] Add grid/list view icon font

---
 media/css/seahub.css                  |  16 ++++++++++++++++
 media/css/sf_font2/seafile-font2.eot  | Bin 7760 -> 7920 bytes
 media/css/sf_font2/seafile-font2.svg  |   2 ++
 media/css/sf_font2/seafile-font2.ttf  | Bin 7576 -> 7736 bytes
 media/css/sf_font2/seafile-font2.woff | Bin 5196 -> 5272 bytes
 seahub/templates/js/templates.html    |   4 +++-
 6 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/media/css/seahub.css b/media/css/seahub.css
index e88e9c0d45..bdcc2263aa 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -134,6 +134,8 @@
 /*.sf2-icon-group-settings:before { content:"\e022"; }*/
 .sf2-icon-comment:before { content:"\e023"; }
 .sf2-icon-wiki2:before { content:"\e024"; }
+.sf2-icon-grid-view:before { content:"\e025"; }
+.sf2-icon-list-view:before { content:"\e026"; }
 
 /******* tags **********/
 html { background:#fff; }
@@ -3806,6 +3808,20 @@ img.thumbnail {
 .grid-view-btn {
     border-left:none;
 }
+.grid-view-icon-btn,
+.list-view-icon-btn {
+    display:inline-block;
+    padding:0 6px;
+    font-size:18px;
+    height:27px;
+    color:#aaa;
+    border:1px solid #ccc;
+    background:#fff;
+}
+.grid-view-icon-btn.active,
+.list-view-icon-btn.active {
+    color:#fff;
+}
 /* grid view */
 .grid-item {
     display:inline-block;
diff --git a/media/css/sf_font2/seafile-font2.eot b/media/css/sf_font2/seafile-font2.eot
index 1ba88e520856f11851293d8a1736d75fca93c46c..87ae8cd92b06d0c9ac8c81dccaee3403149ad71f 100644
GIT binary patch
delta 557
zcmca$^TC$wgB$~ch1^6oGnQ1n-n$bWI#P-h-taIm$jLA;Fvz&OxVkZfGq5o*$o>KH
z75szsjr99{>KGUpBY^y{<lMx9qe4u#7#Ns<dKhP<Cl(j{|Ife-RR0Ai&yk)}nRX-a
z^hE{+W}tr2mW<TI6n5sW@X0!ivh``qB0xPGfa+p$@{<#D98wE_>Xv}a%}uN*U?^eu
z2$Z(~@)hzDb5nQ9ToYwrkZb^oohZmJE_uJ49jI2?18Db321cMNAimqHmm1G+^Ob>{
z2`Iq8aOvZcd2pHuB+4WV<a00pr6-?Y)MeC~{Eab|QEhSvQ?8*51IW)nw}Y_^*h~h7
zNkAURbQuN~hB6?{2BaB5`X8uGe#ex^tihnU*^fDbk%em!*P+eJShz*&S%8Wy8J{p7
z2Wn+!;AY@wU@$ipRaOOJMkp<F;shhZi4*^U7(_o=y?QlcACLeVj;U8sRM8X(%P^k!
zXMv21ELU5u0%D-+fPiQ77D;|ab|VI323-cD$)}`rSd5HyjVAw+nh*5uEa?CiMs-Gw
p&99{8nM63#i!xJm%Q92TIdd|LOTetjoN@|`nv=EUq`8qo4*-m-i1h#f

delta 400
zcmexhd%=b+K#qZ7hU`Q(GnTCre7Gk%bfgq+e|v+0LAHj0fkDRI#np`=lz|P%j{))(
z{Dbw4^!t5)a*Po`epqsDV!@H;Osg0em^gr9Q_>TQ3;zFSU<RrW0m^fv=TxR`(&szI
zz`*>0fkBibBQ-IFZB~!+WF1D?dM~CQKs_6P>LPOTlM@r`qRs);%>nX*auX{G7>XD^
z0_81$e1*Kk+|-@YS49~ZBtUvj6yz6|aGjFf%)lUZ0BH9_21cMNAm;X&ur;3F<|_j?
z6HtJG;nH5!7C6lW5@iww@;MlQ(vwdx>N09f{>B)~s4_W(DOVS0IZzISWx(b!F!TX=
zAd_VnSb(l!0EPn#kPp=RKxOhLro_$R%;AiiH?eSwZnl&XVq`aDFk#STFq|ADt;1z#
tqHCyYWMF8<F!`L6_T<gdc|g0AWCAvq$;dNJUMZ)*s6P3WoHRF*0|6i7Ty+2d

diff --git a/media/css/sf_font2/seafile-font2.svg b/media/css/sf_font2/seafile-font2.svg
index 3aab1b4caa..e329868b23 100644
--- a/media/css/sf_font2/seafile-font2.svg
+++ b/media/css/sf_font2/seafile-font2.svg
@@ -44,4 +44,6 @@
 <glyph glyph-name="01" unicode="&#57378;" d="M223 130c0 21 7 38 19 54-2 5-2 7-2 11 0 17 7 28 16 40-14 2-30 2-47 2-107 0-193-46-193-102 0-56 96-72 96-72 42-14 107-16 158-9-28 18-47 46-47 76z m-4 70c0 0 0-2 0-5-12-16-19-37-19-58 0-23 7-42 19-60-37-3-75 2-100 11l-3 0c-16 3-76 19-76 49 0 38 69 79 169 79 5 0 7 0 12 3-2-7-2-12-2-19z m4 291l-28 0c-46 0-83-37-83-84l0-58c0-49 39-86 88-86l19 0c49 0 88 40 88 86l0 58c0 47-37 84-84 84z m63-142c0-35-30-63-65-63l-19 0c-37 0-65 28-65 63l0 58c0 33 26 61 58 61l31 0c32 0 60-28 60-61z m84-328c-19 0-35 16-35 35l0 2c-2 3-2 3-5 3l-2-3c-14-14-35-14-49 0-14 14-14 35 0 49l3 2c0 3 0 3-3 5-18 0-35 16-35 35 0 19 17 35 35 35l3 0c0 0 2 2 2 5l-2 2c-14 14-14 35 0 49 14 14 35 14 48 0l3-3c2 0 2 0 4 3l0 2c0 19 17 35 35 35 19 0 35-16 35-35l0-2c3-3 3-3 5-3l2 3c14 14 35 14 49 0 14-14 14-35 0-49l-7-5c0-2 0-2 2-4l3 0c18 0 35-17 35-35 0-19-17-35-35-35l-3 0c-2-3-2-3-2-5l2-2c14-14 14-35 0-49-13-14-34-14-48 0l-3 2c-2 0-2 0-4-2l0-2c2-17-14-33-33-33z m-44 67l7-4c4-3 9-5 16-7l9-3 0-18c0-7 5-12 12-12 7 0 12 5 12 12l0 18 9 3c5 2 12 4 16 7l7 4 14-14c5-4 12-4 17 0 4 5 4 12 0 17l-14 14 4 7c3 4 5 9 7 16l3 9 18 0c7 0 12 5 12 12 0 7-5 12-12 12l-21 0-2 9c-2 5-5 12-7 16l-5 7 14 14c5 5 5 12 0 16-4 5-11 5-16 0l-16-16-5 2c-5 3-9 5-16 7l-10 3 0 18c0 7-4 12-11 12-7 0-12-5-12-12l0-18-7-3c-5-2-12-4-16-7l-7-2-14 14c-5 5-12 5-16 0-5-5-5-12 0-16l14-14-5-7c-2-5-5-9-7-16l-2-10-17 0c-7 0-11-4-11-11 0-7 4-12 11-12l19 0 2-9c3-5 5-12 7-17l5-7-14-14c-5-4-5-11 0-16 5-5 12-5 16 0z m44 17c-23 0-42 18-42 42 0 23 19 42 42 42 23 0 42-19 42-42 0-24-19-42-42-42z m0 60c-9 0-19-9-19-18 0-10 10-19 19-19 9 0 19 9 19 19 0 9-10 18-19 18z"/>
 <glyph glyph-name="04-1" unicode="&#57379;" d="M254 440c97 0 184-72 184-156 0-84-84-156-184-156-17 0-33 2-49 5-3 0-3 0-5 0-11 0-18-5-25-14-14-26-42-42-68-45 5 14 14 35 14 56 0 26-9 47-14 59 0 2-2 2-2 4-19 26-31 58-31 89 0 32 14 72 42 97 35 38 84 61 138 61m0 28c-117 0-212-84-210-186 0-42 14-80 40-107 4-12 11-26 11-47 0-23-18-56-18-56-7-5-7-11-5-16 5-2 7-9 14-9 2 0 9-3 19-3 39 0 74 23 95 58 16-2 33-4 56-4 116 0 212 84 212 186 0 102-96 184-214 184z"/>
 <glyph glyph-name="021" unicode="&#57380;" d="M254 44l-180 56c-11 5-18 19-18 30l0 317c0 14 14 25 28 21l170-49 179 49c2 0 5 0 7 0 11 0 21-10 21-21l0-317c0-11-7-25-19-30z m-177 401l0-315c0-2 2-7 4-7l173-53 179 56c0 0 2 4 2 7l0 312-181-49z m165-38l23 0 0-349-23 0z"/>
+<glyph glyph-name="grid-view" unicode="&#57381;" d="M28 228l200 0 0-171-200 0z m256 0l200 0 0-171-200 0z m-256 227l200 0 0-171-200 0z m256 0l200 0 0-171-200 0z"/>
+<glyph glyph-name="list-view" unicode="&#57382;" d="M28 114l456 0 0-57-456 0z m0 114l456 0 0-57-456 0z m0 113l456 0 0-57-456 0z m0 114l456 0 0-57-456 0z"/>
 </font></defs></svg>
diff --git a/media/css/sf_font2/seafile-font2.ttf b/media/css/sf_font2/seafile-font2.ttf
index 1deadd0e1cc94693b8832ab2586c3d55ff68f978..75ca19b65b950d4b34d8e2142dcee02c7c79c20d 100644
GIT binary patch
delta 596
zcmZWlO=uHg6r8uaHYTYAN&`0CXo}h&HP&u0HrR@YMh}WDO51}XOS?@1*)}Ah){E)E
zlVF7|NDq=j35ez*<f2zWTu=}_h=_tnkD?UxR*bW$V8Mmi`QCfq4Bx!f6HiAf5CFTd
z1QlcH^p%Un*td3IkIt@s?#$UVCea2&H(AFnT^=+B?_IbB$Q0{|Y1=Hk=ukca3N^Bt
zF-wJJlTL{K<a}o)e{=T3_^Y>oN`3ft)-q>&>YYi>J`u@m)~cA=X=Mk+oowvS+T}(6
ztje=IVSP0}KW*kuSp^!@SWnpIVgY4ra6ZgBHfP$_GyQ!S=vrdWEzFn7KOXvcxBEOF
z^{5q&0YBe8VqFi7{6bKn40yLut8TGUtFFkX9CS{~HR*L8h&`mk3(pWO=q(Rmg_XA|
z9U2zMZDaxMzVtdt#Z>z-(73Nmi56H3Ja2qggW-zC%PCoxmz4StL<l&Z2=6;U$Y0i7
zSKzu$!sGRNy)MiA(fogHPq^pUHt6F19^Q^(s-AjG@OAv!8=JdB;xmvy9EQ^oIUFz&
zaU*UV9ZJGk?mFa@B6AG>H8Q42pY%73?!8K<KU2)j#20eb4SzmYDz{F~cr?~Gz_c1|
Tw-)Ga0<TBc-gx|Po3-j6*n^8b

delta 419
zcmdmCGsC)`fsuiMftR6yftew|%`L>YaQoXE3=Fb0Kv5ZY7gsliPzE+2KL*HG@DJ8E
z((m^H$}vU&`C-Yqi3LZVGp%A^VB!FZO-WBIF8Kc+XcB{L2vD9QJ*P5llRn=u1_tI2
z3=E<i8L5dWY_oclfpT|%*eoL>wLX!>iHQ}cSp+Dcl95|d!Rf{H1IXV1<VWP>CnqM>
zMV$j0FbBvF%1x{&U?^hv2$Z(~@)hzDb5nOpUlnCwkO1j9QIKC;!gWe^GXsOv0idHM
zf;|WHAh*wit?~ReUm3WWfZ7-sF6~uqfzV8<Et42+88s%`F~%~gOrFD-s|&OYC<nqa
zVEqgXeLx;4m}D4OfVMLL1B3<02O9N2WwI4h;^z5G;f$MqF>{M<Zj=;aWH)3mVbEnT
zoIFcPhsDrD*KqPFsrf(~vZMnx?~|5in*32#L0uha01MD4h<iYWGn}zqbRI+_9H-g>
E07bT3xc~qF

diff --git a/media/css/sf_font2/seafile-font2.woff b/media/css/sf_font2/seafile-font2.woff
index 76bef0a41ff92d57f3719b48ad6cb1d1c0c100aa..543f7f0c4369a0a2a33c9669fd6cc172c2e20bb4 100644
GIT binary patch
delta 5150
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
IX#leS2PZ(g(f|Me

delta 5086
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

diff --git a/seahub/templates/js/templates.html b/seahub/templates/js/templates.html
index 713ca37015..c51bccb4b3 100644
--- a/seahub/templates/js/templates.html
+++ b/seahub/templates/js/templates.html
@@ -149,8 +149,10 @@
     <% } %>
 
     <div class="switch-mode vam">
-        <img src="{{ MEDIA_URL }}img/grid.png" title="{% trans "Grid View" %}" id="js-switch-grid-view" alt='' class="grid-view-btn cspt fright <% if (mode == 'grid') { %>active<% } %>" />
+        <span class="list-view-icon-btn sf2-icon-list-view <% if (mode == 'list') { %>active<% } %>" id="js-switch-list-view"></span><span class="grid-view-icon-btn sf2-icon-grid-view <% if (mode == 'grid') { %>active<% } %>" id="js-switch-grid-view"></span>
+        <!-- <img src="{{ MEDIA_URL }}img/grid.png" title="{% trans "Grid View" %}" id="js-switch-grid-view" alt='' class="grid-view-btn cspt fright <% if (mode == 'grid') { %>active<% } %>" />
         <img src="{{ MEDIA_URL }}img/list.png" title="{% trans "List View" %}" id="js-switch-list-view" alt='' class="list-view-btn cspt fright <% if (mode == 'list') { %>active<% } %>" />
+    -->
     </div>
 
     <% if (path == '/') { %>

From f49547bbfe6bef9ffdbb25859427a2744216d676 Mon Sep 17 00:00:00 2001
From: Daniel Pan <freeplant@gmail.com>
Date: Wed, 24 Feb 2016 12:11:28 +0800
Subject: [PATCH 06/17] Clean dirent-grid.js

---
 media/css/seahub.css                    |  5 +-
 seahub/templates/js/templates.html      |  8 +--
 static/scripts/app/models/dirent.js     | 45 ++++++++++++++--
 static/scripts/app/views/dirent-grid.js | 68 ++++++++++---------------
 4 files changed, 76 insertions(+), 50 deletions(-)

diff --git a/media/css/seahub.css b/media/css/seahub.css
index bdcc2263aa..2b62ce0fda 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -1204,9 +1204,12 @@ textarea:-moz-placeholder {/* for FF */
     padding:4px 12px;
     min-width:110px;
     white-space:nowrap;
+    color:#444;
 }
 .dropdown-menu a:hover {
-    background:#eee;
+    background:#feaa7c;
+    text-decoration:none;
+    color:#fff;
 }
 /********** container ***********/
 #main, #footer {
diff --git a/seahub/templates/js/templates.html b/seahub/templates/js/templates.html
index c51bccb4b3..3cf14384b9 100644
--- a/seahub/templates/js/templates.html
+++ b/seahub/templates/js/templates.html
@@ -387,8 +387,8 @@
 </script>
 
 <script type="text/template" id="grid-view-file-op-tmpl">
-    <ul class="grid-item-op">
-        <li><a class="op download" href="<%= url %>">{% trans "Download" %}</a></li>
+    <ul class="grid-item-op dropdown-menu">
+        <li><a class="op download" href="<%= download_url %>">{% trans "Download" %}</a></li>
         <% if (!repo_encrypted && can_generate_shared_link) { %>
         <li><a class="op share" href="#">{% trans "Share" %}</a></li>
         <% } %>
@@ -413,8 +413,8 @@
 </script>
 
 <script type="text/template" id="grid-view-dir-op-tmpl">
-    <ul class="grid-item-op">
-        <li><a class="op download" href="<%= url %>">{% trans "Download" %}</a></li>
+    <ul class="grid-item-op dropdown-menu">
+        <li><a class="op download" href="<%= download_url %>">{% trans "Download" %}</a></li>
         <% if (!repo_encrypted && can_generate_shared_link) { %>
         <li><a class="op share" href="#">{% trans "Share" %}</a></li>
         <% } %>
diff --git a/static/scripts/app/models/dirent.js b/static/scripts/app/models/dirent.js
index 9eb182c7cd..44d69cbce1 100644
--- a/static/scripts/app/models/dirent.js
+++ b/static/scripts/app/models/dirent.js
@@ -1,10 +1,49 @@
 define([
     'underscore',
-    'backbone'
-], function(_, Backbone) {
+    'backbone',
+    'common'
+], function(_, Backbone, Common) {
     'use strict';
 
-    var Dirent = Backbone.Model.extend({});
+    var Dirent = Backbone.Model.extend({
+
+        // get the absolute path within the library
+        getPath: function() {
+            return Common.pathJoin([this.collection.path, this.get('obj_name')]);
+        },
+
+        // return the URL to visit the folder or file
+        getWebUrl: function() {
+            var dir = this.collection;
+            var dirent_path = this.getPath();
+
+            if (this.get('is_dir')) {
+                if (dir.category) {
+                    return "#" + dir.category + "/lib/" + dir.repo_id + Common.encodePath(dirent_path);
+                } else {
+                    return "#lib/" + dir.repo_id + Common.encodePath(dirent_path);
+                }
+            } else {
+                return app.config.siteRoot + "lib/" + dir.repo_id
+                    + "/file" + Common.encodePath(dirent_path);
+            }
+        },
+
+        // return the URL to download the folder or file
+        getDownloadUrl: function() {
+            var dir = this.collection;
+            var dirent_path = this.getPath();
+
+            if (this.get('is_dir')) {
+                return app.config.siteRoot + "repo/download_dir/" + dir.repo_id
+                    + "/?p=" + Common.encodePath(dirent_path);
+            } else {
+                return app.config.siteRoot + "lib/" + dir.repo_id
+                    + "/file" + Common.encodePath(dirent_path) + "?dl=1";
+            }
+        }
+
+    });
 
     return Dirent;
 });
diff --git a/static/scripts/app/views/dirent-grid.js b/static/scripts/app/views/dirent-grid.js
index b8d42f466b..a0c8bfefcd 100644
--- a/static/scripts/app/views/dirent-grid.js
+++ b/static/scripts/app/views/dirent-grid.js
@@ -35,26 +35,18 @@ define([
 
         render: function() {
             var dir = this.dir;
-            var dirent_path = Common.pathJoin([dir.path, this.model.get('obj_name')]);
-            var url;
             var template;
 
             if (this.model.get('is_dir')) {
                 template = this.dirTemplate;
-                if (dir.category) {
-                    url = "#" + dir.category + "/lib/" + dir.repo_id + Common.encodePath(dirent_path);
-                } else {
-                    url = "#lib/" + dir.repo_id + Common.encodePath(dirent_path);
-                }
             } else {
                 template = this.fileTemplate;
-                url = "/lib/" + dir.repo_id + "/file" + Common.encodePath(dirent_path);
             }
 
             this.$el.html(template({
                 dirent: this.model.attributes,
-                dirent_path: dirent_path,
-                url: url,
+                dirent_path: this.model.getPath(),
+                url: this.model.getWebUrl(),
                 category: dir.category,
                 repo_id: dir.repo_id,
                 is_repo_owner: dir.is_repo_owner,
@@ -71,8 +63,10 @@ define([
         events: {
             'mouseenter': 'highlight',
             'mouseleave': 'rmHighlight',
-            'mousedown .img-link': 'showPopupMenu',
-            'mousedown .text-link': 'showPopupMenu'
+            //'mousedown .img-link': 'showPopupMenu',
+            //'mousedown .text-link': 'showPopupMenu'
+            'contextmenu .img-link': 'showPopupMenu',
+            'contextmenu .text-link': 'showPopupMenu'
 
             /*
             'click .dir-link': 'visitDir',
@@ -107,49 +101,39 @@ define([
             */
         },
 
-        showPopupMenu: function(e) {
-            e = e || window.event;
+        showPopupMenu: function(event) {
+            console.log("showPopupMenu");
             var dir = this.dir;
-            var dirent_path = Common.pathJoin([dir.path, this.model.get('obj_name')]);
-            var url;
             var template;
 
             if (this.model.get('is_dir')) {
                 template = this.dirOpTemplate;
-                if (dir.category) {
-                    url = "#" + dir.category + "/lib/" + dir.repo_id + Common.encodePath(dirent_path);
-                } else {
-                    url = "#lib/" + dir.repo_id + Common.encodePath(dirent_path);
-                }
             } else {
                 template = this.fileOpTemplate;
-                url = "/lib/" + dir.repo_id + "/file" + Common.encodePath(dirent_path) + "?dl=1";
             }
 
             this.$('.img-link').addClass('hl');
             this.$('.text-link').addClass('hl');
 
-            if (e.which == 3) {
-                var op = template({
-                    dirent: this.model.attributes,
-                    dirent_path: dirent_path,
-                    url: url,
-                    category: dir.category,
-                    repo_id: dir.repo_id,
-                    is_repo_owner: dir.is_repo_owner,
-                    can_generate_shared_link: app.pageOptions.can_generate_shared_link,
-                    is_pro: app.pageOptions.is_pro,
-                    repo_encrypted: dir.encrypted
-                });
-                this.$el.append(op);
-                this.$('.grid-item-op').css({
-                    'left': '100px',
-                    'top': '100px',
-                });
+            var op = template({
+                dirent: this.model.attributes,
+                dirent_path: this.model.getPath(),
+                download_url: this.model.getDownloadUrl(),
+                category: dir.category,
+                repo_id: dir.repo_id,
+                is_repo_owner: dir.is_repo_owner,
+                can_generate_shared_link: app.pageOptions.can_generate_shared_link,
+                is_pro: app.pageOptions.is_pro,
+                repo_encrypted: dir.encrypted
+            });
+            this.$el.append(op);
+            this.$('.grid-item-op').css({
+                'left': '100px',
+                'top': '100px',
+            });
 
-                // TODO: bind operations here
-                return false;
-            }
+            // TODO: bind operations here
+            return false;
         }
 
     });

From e5766ec06e627277fabd1703be38d231de803167 Mon Sep 17 00:00:00 2001
From: Daniel Pan <freeplant@gmail.com>
Date: Wed, 24 Feb 2016 17:11:15 +0800
Subject: [PATCH 07/17] Update dirent del function

---
 static/scripts/app/models/dirent.js     | 34 ++++++++++++++++++++++++-
 static/scripts/app/views/dirent-grid.js | 21 ++++++++++++++-
 static/scripts/app/views/dirent.js      | 14 +---------
 static/scripts/common.js                |  4 +--
 4 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/static/scripts/app/models/dirent.js b/static/scripts/app/models/dirent.js
index 44d69cbce1..5563a75b37 100644
--- a/static/scripts/app/models/dirent.js
+++ b/static/scripts/app/models/dirent.js
@@ -1,8 +1,9 @@
 define([
+    'jquery',
     'underscore',
     'backbone',
     'common'
-], function(_, Backbone, Common) {
+], function($, _, Backbone, Common) {
     'use strict';
 
     var Dirent = Backbone.Model.extend({
@@ -41,6 +42,37 @@ define([
                 return app.config.siteRoot + "lib/" + dir.repo_id
                     + "/file" + Common.encodePath(dirent_path) + "?dl=1";
             }
+        },
+
+        // We can't use Backbone.sync() here because the URL for a dirent
+        // is not a standard RESTful one
+        deleteFromServer: function(options) {
+            var dir = this.collection;
+            var path = this.getPath();
+            var model = this;
+
+            var opts = {
+                repo_id: dir.repo_id,
+                name: this.get('is_dir') ? 'del_dir' : 'del_file'
+            };
+            $.ajax({
+                url: Common.getUrl(opts) + '?p=' + encodeURIComponent(path),
+                type: 'DELETE',
+                dataType: 'json',
+                beforeSend: Common.prepareCSRFToken,
+                success: function(data) {
+                    // We don't understand how the event actually work in Backbone
+                    // It is safer to call dir.remove() directly.
+                    dir.remove(model);
+                    // this.trigger('destroy');
+                    if (options.success)
+                        options.success(data);
+                },
+                error: function(xhr) {
+                    if (options.error)
+                        options.error(xhr);
+                }
+            });
         }
 
     });
diff --git a/static/scripts/app/views/dirent-grid.js b/static/scripts/app/views/dirent-grid.js
index a0c8bfefcd..dde1756279 100644
--- a/static/scripts/app/views/dirent-grid.js
+++ b/static/scripts/app/views/dirent-grid.js
@@ -133,8 +133,27 @@ define([
             });
 
             // TODO: bind operations here
+
+            this.$('.grid-item-op .delete').on('click', { view: this }, this.del);
+
             return false;
-        }
+        },
+
+        del: function(event) {
+            var _this = event.data.view;
+            var dirent_name = _this.model.get('obj_name');
+            _this.model.deleteFromServer({
+                success: function(data) {
+                    var msg = gettext("Successfully deleted %(name)s")
+                        .replace('%(name)s', Common.HTMLescape(dirent_name));
+                    Common.feedback(msg, 'success');
+                },
+                error: function(xhr) {
+                    Common.ajaxErrorHandler(xhr);
+                }
+            });
+            return false;
+        },
 
     });
 
diff --git a/static/scripts/app/views/dirent.js b/static/scripts/app/views/dirent.js
index 3add62a80c..ef49ca4aef 100644
--- a/static/scripts/app/views/dirent.js
+++ b/static/scripts/app/views/dirent.js
@@ -183,20 +183,8 @@ define([
 
         del: function() {
             var dirent_name = this.model.get('obj_name');
-            var dir = this.dir;
-            var options = {
-                repo_id: dir.repo_id,
-                name: this.model.get('is_dir') ? 'del_dir' : 'del_file'
-            };
-            var model = this.model;
-            $.ajax({
-                url: Common.getUrl(options) + '?parent_dir=' + encodeURIComponent(dir.path)
-                + '&name=' + encodeURIComponent(dirent_name),
-                type: 'POST',
-                dataType: 'json',
-                beforeSend: Common.prepareCSRFToken,
+            this.model.deleteFromServer({
                 success: function(data) {
-                    dir.remove(model);
                     var msg = gettext("Successfully deleted %(name)s")
                         .replace('%(name)s', Common.HTMLescape(dirent_name));
                     Common.feedback(msg, 'success');
diff --git a/static/scripts/common.js b/static/scripts/common.js
index 68a314db9e..ea24b7a349 100644
--- a/static/scripts/common.js
+++ b/static/scripts/common.js
@@ -68,8 +68,8 @@ define([
                 case 'list_lib_dir': return siteRoot + 'ajax/lib/' + options.repo_id + '/dir/';
                 case 'star_file': return siteRoot + 'ajax/repo/' + options.repo_id + '/file/star/';
                 case 'unstar_file': return siteRoot + 'ajax/repo/' + options.repo_id + '/file/unstar/';
-                case 'del_dir': return siteRoot + 'ajax/repo/' + options.repo_id + '/dir/delete/';
-                case 'del_file': return siteRoot + 'ajax/repo/' + options.repo_id + '/file/delete/';
+                case 'del_dir': return siteRoot + 'api2/repos/' + options.repo_id + '/dir/';
+                case 'del_file': return siteRoot + 'api2/repos/' + options.repo_id + '/file/';
                 case 'rename_dir': return siteRoot + 'ajax/repo/' + options.repo_id + '/dir/rename/';
                 case 'rename_file': return siteRoot + 'ajax/repo/' + options.repo_id + '/file/rename/';
                 case 'mv_dir': return siteRoot + 'ajax/repo/' + options.repo_id + '/dir/mv/';

From 3a4ad38ea5232481d5de0ef72e59bc9e89d43647 Mon Sep 17 00:00:00 2001
From: Daniel Pan <freeplant@gmail.com>
Date: Thu, 25 Feb 2016 13:47:19 +0800
Subject: [PATCH 08/17] Add share dialog

---
 static/scripts/app/models/dirent.js     |  1 +
 static/scripts/app/views/dirent-grid.js | 37 ++++++++++++++++++++-----
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/static/scripts/app/models/dirent.js b/static/scripts/app/models/dirent.js
index 5563a75b37..eba5685094 100644
--- a/static/scripts/app/models/dirent.js
+++ b/static/scripts/app/models/dirent.js
@@ -50,6 +50,7 @@ define([
             var dir = this.collection;
             var path = this.getPath();
             var model = this;
+            options = options || {};
 
             var opts = {
                 repo_id: dir.repo_id,
diff --git a/static/scripts/app/views/dirent-grid.js b/static/scripts/app/views/dirent-grid.js
index dde1756279..ab8a716256 100644
--- a/static/scripts/app/views/dirent-grid.js
+++ b/static/scripts/app/views/dirent-grid.js
@@ -102,7 +102,6 @@ define([
         },
 
         showPopupMenu: function(event) {
-            console.log("showPopupMenu");
             var dir = this.dir;
             var template;
 
@@ -132,17 +131,21 @@ define([
                 'top': '100px',
             });
 
-            // TODO: bind operations here
-
-            this.$('.grid-item-op .delete').on('click', { view: this }, this.del);
+            // Using _.bind(function, object) to make that whenever the function is
+            // called, the value of this will be the object.
+            this.$el.on('click', '.delete', _.bind(this.del, this));
+            this.$el.on('click', '.share', _.bind(this.share, this));
 
             return false;
         },
 
+        _closeMenu: function() {
+            this.$('.grid-item-op').remove();
+        },
+
         del: function(event) {
-            var _this = event.data.view;
-            var dirent_name = _this.model.get('obj_name');
-            _this.model.deleteFromServer({
+            var dirent_name = this.model.get('obj_name');
+            this.model.deleteFromServer({
                 success: function(data) {
                     var msg = gettext("Successfully deleted %(name)s")
                         .replace('%(name)s', Common.HTMLescape(dirent_name));
@@ -155,6 +158,26 @@ define([
             return false;
         },
 
+        share: function() {
+            var dir = this.dir,
+                obj_name = this.model.get('obj_name'),
+                dirent_path = this.model.getPath();
+
+            var options = {
+                'is_repo_owner': dir.is_repo_owner,
+                'is_virtual': dir.is_virtual,
+                'user_perm': this.model.get('perm'),
+                'repo_id': dir.repo_id,
+                'repo_encrypted': false,
+                'is_dir': this.model.get('is_dir') ? true : false,
+                'dirent_path': dirent_path,
+                'obj_name': obj_name
+            };
+            new ShareView(options);
+            this._closeMenu();
+            return false;
+        }
+
     });
 
     return DirentGridView;

From 43a5861ea469634068c619866ba7f724aa8622d1 Mon Sep 17 00:00:00 2001
From: Daniel Pan <freeplant@gmail.com>
Date: Thu, 25 Feb 2016 16:39:52 +0800
Subject: [PATCH 09/17] Add mv/cp to grid view

---
 seahub/templates/js/lib-op-popups.html        |   4 +-
 .../scripts/app/views/dialogs/dirent-mvcp.js  | 227 ++++++++++++++++++
 static/scripts/app/views/dirent-grid.js       |  21 +-
 3 files changed, 248 insertions(+), 4 deletions(-)
 create mode 100644 static/scripts/app/views/dialogs/dirent-mvcp.js

diff --git a/seahub/templates/js/lib-op-popups.html b/seahub/templates/js/lib-op-popups.html
index 81aefb22f5..d353461520 100644
--- a/seahub/templates/js/lib-op-popups.html
+++ b/seahub/templates/js/lib-op-popups.html
@@ -40,7 +40,7 @@
     </script>
 
     <script type="text/template" id="mvcp-form-template">
-    <form id="mv-form" action="" method="post" class="file-choose-form hide">{% csrf_token %}
+    <form id="mv-form" action="" method="post" class="file-choose-form">{% csrf_token %}
         <h3><%= form_title %></h3>
         <div id="mv-dir-list" class="dir-tree-cont">
             <% if (show_cur_repo) { %>
@@ -68,7 +68,7 @@
     </script>
 
     <script type="text/template" id="mv-progress-popup-template">
-    <div id="mv-progress-popup" class="alc hide">
+    <div id="mv-progress-popup" class="alc">
         <p id="mv-details" class="ellipsis"></p>
         <div id="mv-progress"></div>
         <p id="mv-other-info" class="hide"></p>
diff --git a/static/scripts/app/views/dialogs/dirent-mvcp.js b/static/scripts/app/views/dialogs/dirent-mvcp.js
new file mode 100644
index 0000000000..cf1ab0ec13
--- /dev/null
+++ b/static/scripts/app/views/dialogs/dirent-mvcp.js
@@ -0,0 +1,227 @@
+define([
+    'jquery',
+    'underscore',
+    'backbone',
+    'common',
+    'file-tree'
+], function($, _, Backbone, Common, FileTree) {
+    'use strict';
+
+    var DirentMvcpDialog = Backbone.View.extend({
+
+        mvcpTemplate: _.template($("#mvcp-form-template").html()),
+        mvProgressTemplate: _.template($("#mv-progress-popup-template").html()),
+
+        initialize: function(options) {
+            this.dirent = options.dirent;
+            this.dir = options.dir;
+            this.op_type = options.op_type;
+
+            // only show current repo if current repo is read-write
+            this.show_cur_repo = this.dirent.get('perm') == 'rw' ? true : false;
+
+            this.render();
+            this.$el.modal({appendTo:'#main', autoResize:true, focus:false});
+            $('#simplemodal-container').css({'width':'auto', 'height':'auto'});
+
+            if (this.show_cur_repo) {
+                FileTree.renderTreeForPath({
+                    repo_name: this.dir.repo_name,
+                    repo_id: this.dir.repo_id,
+                    path: this.dir.path
+                });
+            }
+            if (!this.dir.encrypted) {
+                FileTree.prepareOtherReposTree({cur_repo_id: this.dir.repo_id});
+            }
+
+            this.$error = this.$('.error');
+            this.$form = this.$('form');
+        },
+
+        render: function() {
+            var dir = this.dir;
+            var obj_name = this.dirent.get('obj_name'),
+                obj_type = this.dirent.get('is_dir') ? 'dir' : 'file';
+
+            var title = this.op_type == 'mv' ?
+                gettext("Move {placeholder} to:") : gettext("Copy {placeholder} to:");
+            title = title.replace('{placeholder}',
+                '<span class="op-target ellipsis ellipsis-op-target" title="'
+                + Common.HTMLescape(obj_name) + '">' + Common.HTMLescape(obj_name) + '</span>');
+
+            this.$el.html(this.mvcpTemplate({
+                form_title: title,
+                op_type: this.op_type,
+                obj_type: obj_type,
+                obj_name: this.dirent.get('obj_name'),
+                show_cur_repo: this.show_cur_repo,
+                show_other_repos: !dir.encrypted
+            }));
+
+            return this;
+        },
+
+        events: {
+            'submit form': 'formSubmit'
+        },
+
+        _showProgress: function(msg, task_id) {
+            var _this = this;
+            var op = this.op_type,
+                obj_name = this.dirent.get("obj_name");
+            var mv_progress_popup = $(_this.mvProgressTemplate());
+            var details = $('#mv-details', mv_progress_popup),
+                cancel_btn = $('#cancel-mv', mv_progress_popup),
+                other_info = $('#mv-other-info', mv_progress_popup);
+
+            cancel_btn.removeClass('hide');
+
+            setTimeout(function() {
+                mv_progress_popup.modal({containerCss: {
+                    width: 300,
+                    height: 150,
+                    paddingTop: 50
+                }, focus:false});
+                var det_text = _this.op_type == 'mv' ?
+                    gettext("Moving %(name)s") : gettext("Copying %(name)s");
+                details.html(det_text.replace('%(name)s', Common.HTMLescape(obj_name))).removeClass('vh');
+                $('#mv-progress').progressbar();
+                req_progress();
+            }, 100);
+            var req_progress = function() {
+                $.ajax({
+                    url: Common.getUrl({name: 'get_cp_progress'}) + '?task_id=' + encodeURIComponent(task_id),
+                    dataType: 'json',
+                    success: function(data) {
+                        var bar = $('.ui-progressbar-value', $('#mv-progress'));
+                        if (!data['failed'] && !data['canceled'] && !data['successful']) {
+                            if (data['done'] == data['total']) {
+                                bar.css('width', '100%'); // 'done' and 'total' can be both 0
+                                details.addClass('vh');
+                                cancel_btn.addClass('hide');
+                                other_info.html(gettext("Saving...")).removeClass('hide');
+                            } else {
+                                bar.css('width', parseInt(data['done']/data['total']*100, 10) + '%');
+                            }
+                            bar.show();
+                            setTimeout(req_progress, 1000);
+                        } else if (data['successful']) {
+                            $.modal.close();
+                            if (op == 'mv') {
+                                dirent.remove();
+                            }
+                            Common.feedback(msg, 'success');
+                        } else { // failed or canceled
+                            details.addClass('vh');
+                            var other_msg = data['failed'] ? gettext("Failed.") : gettext("Canceled.");
+                            other_info.html(other_msg).removeClass('hide');
+                            cancel_btn.addClass('hide');
+                            setTimeout(function () { $.modal.close(); }, 1000);
+                        }
+                    },
+                    error: function(xhr, textStatus, errorThrown) {
+                        var error;
+                        if (xhr.responseText) {
+                            error = $.parseJSON(xhr.responseText).error;
+                        } else {
+                            error = gettext("Failed. Please check the network.");
+                        }
+                        details.addClass('vh')
+                        other_info.html(error).removeClass('hide');
+                        cancel_btn.addClass('hide');
+                        setTimeout(function () { $.modal.close(); }, 1000);
+                    }
+                });
+            };
+
+            cancel_btn.click(function() {
+                Common.disableButton(cancel_btn);
+                $.ajax({
+                    url: Common.getUrl({name: 'cancel_cp'}) + '?task_id=' + encodeURIComponent(task_id),
+                    dataType: 'json',
+                    success: function(data) {
+                        details.addClass('vh')
+                        other_info.html(gettext("Canceled.")).removeClass('hide');
+                        cancel_btn.addClass('hide');
+                        setTimeout(function () {$.modal.close();}, 1000);
+                    },
+                    error: function(xhr, textStatus, errorThrown) {
+                        var error;
+                        if (xhr.responseText) {
+                            error = $.parseJSON(xhr.responseText).error;
+                        } else {
+                            error = gettext("Failed. Please check the network.");
+                        }
+                        other_info.html(error).removeClass('hide');
+                        Common.enableButton(cancel_btn);
+                    }
+                });
+            });
+        },
+
+        formSubmit: function() {
+            var _this = this;
+            var form_id = this.$form.attr('id'),
+                path = this.dir.path,
+                repo_id = this.dir.repo_id,
+                obj_name = this.dirent.get('obj_name'),
+                obj_type = this.dirent.get('is_dir') ? 'dir' : 'file';
+            var dst_repo = $('[name="dst_repo"]', this.$form).val(),
+                dst_path = $('[name="dst_path"]', this.$form).val();
+
+            if (!$.trim(dst_repo) || !$.trim(dst_path)) {
+                $('.error', form).removeClass('hide');
+                return false;
+            }
+            if (dst_repo == repo_id && (dst_path == path || (obj_type == 'dir' && dst_path == path + obj_name + '/'))) {
+                this.$error.html(gettext("Invalid destination path")).removeClass('hide');
+                return false;
+            }
+            var options = { repo_id: repo_id };
+            if (obj_type == 'dir') {
+                options.name = this.op_type == 'mv' ? 'mv_dir' : 'cp_dir';
+            } else {
+                options.name = this.op_type == 'mv' ? 'mv_file' : 'cp_file';
+            }
+            var post_url = Common.getUrl(options) + '?path=' + encodeURIComponent(path)
+                + '&obj_name=' + encodeURIComponent(obj_name);
+            var post_data = {
+                'dst_repo': dst_repo,
+                'dst_path': dst_path
+            };
+            var after_op_success = function(data) {
+                $.modal.close();
+                var msg;
+
+                if (_this.op_type == 'mv') {
+                    msg = gettext("Successfully moved %(name)s")
+                        .replace('%(name)s', Common.HTMLescape(obj_name));
+                } else {
+                    msg = gettext("Successfully copied %(name)s")
+                        .replace('%(name)s', Common.HTMLescape(obj_name));
+                }
+
+                if (!data['task_id']) { // no progress
+                    if (_this.op_type == 'mv') {
+                        _this.dir.remove(_this.dirent);
+                    }
+                    Common.feedback(msg, 'success');
+                } else {
+                    _this._showProgress(msg, data['task_id']);
+                }
+            }
+            Common.ajaxPost({
+                'form': this.$form,
+                'post_url': post_url,
+                'post_data': post_data,
+                'after_op_success': after_op_success,
+                'form_id': form_id
+            });
+            return false;
+        }
+
+    });
+
+    return DirentMvcpDialog;
+});
diff --git a/static/scripts/app/views/dirent-grid.js b/static/scripts/app/views/dirent-grid.js
index ab8a716256..6f2d3fc7c0 100644
--- a/static/scripts/app/views/dirent-grid.js
+++ b/static/scripts/app/views/dirent-grid.js
@@ -5,8 +5,10 @@ define([
     'common',
     'file-tree',
     'app/views/share',
-    'app/views/folder-perm'
-], function($, _, Backbone, Common, FileTree, ShareView, FolderPermView) {
+    'app/views/folder-perm',
+    'app/views/dialogs/dirent-mvcp'
+], function($, _, Backbone, Common, FileTree, ShareView, FolderPermView,
+    DirentMvcpDialog) {
     'use strict';
 
     app = app || {};
@@ -135,6 +137,8 @@ define([
             // called, the value of this will be the object.
             this.$el.on('click', '.delete', _.bind(this.del, this));
             this.$el.on('click', '.share', _.bind(this.share, this));
+            this.$el.on('click', '.mv', _.bind(this.mvcp, this));
+            this.$el.on('click', '.cp', _.bind(this.mvcp, this));
 
             return false;
         },
@@ -176,6 +180,19 @@ define([
             new ShareView(options);
             this._closeMenu();
             return false;
+        },
+
+        mvcp: function(event) {
+            var op_type = $(event.target).hasClass('mv') ? 'mv' : 'cp';
+            var options = {
+                'dir': this.dir,
+                'dirent': this.model,
+                'op_type': op_type
+            };
+
+            new DirentMvcpDialog(options);
+            this._closeMenu();
+            return false;
         }
 
     });

From 3de67a1f15a4cd64052eee79e33bb522eddb584e Mon Sep 17 00:00:00 2001
From: Daniel Pan <freeplant@gmail.com>
Date: Fri, 26 Feb 2016 14:44:30 +0800
Subject: [PATCH 10/17] Add rename

---
 seahub/templates/js/lib-op-popups.html        | 10 +++
 seahub/templates/js/templates.html            |  3 -
 static/scripts/app/models/dirent.js           | 43 ++++++++++
 .../scripts/app/views/dialogs/dirent-mvcp.js  |  5 +-
 .../app/views/dialogs/dirent-rename.js        | 79 +++++++++++++++++++
 static/scripts/app/views/dirent-grid.js       | 27 ++++---
 static/scripts/app/views/dirent.js            | 39 ++-------
 static/scripts/common.js                      |  4 +-
 8 files changed, 157 insertions(+), 53 deletions(-)
 create mode 100644 static/scripts/app/views/dialogs/dirent-rename.js

diff --git a/seahub/templates/js/lib-op-popups.html b/seahub/templates/js/lib-op-popups.html
index d353461520..11d97090e3 100644
--- a/seahub/templates/js/lib-op-popups.html
+++ b/seahub/templates/js/lib-op-popups.html
@@ -39,6 +39,16 @@
     </form>
     </script>
 
+    <script type="text/template" id="dirent-rename-dialog-template">
+    <form id="rename-form" class="dirent-rename-dialog" action="" method="post">
+        <h3><%= form_title %></h3>
+        <input type="text" name="newname" value="<%- dirent_name %>" class="input vam" maxlength="{{max_file_name}}" />
+        <p class="error hide"></p>
+        <button type="submit" class="submit">{% trans "Submit" %}</button>
+        <button class="simplemodal-close">{% trans "Cancel" %}</button>
+    </form>
+    </script>
+
     <script type="text/template" id="mvcp-form-template">
     <form id="mv-form" action="" method="post" class="file-choose-form">{% csrf_token %}
         <h3><%= form_title %></h3>
diff --git a/seahub/templates/js/templates.html b/seahub/templates/js/templates.html
index 3cf14384b9..09bc312b0d 100644
--- a/seahub/templates/js/templates.html
+++ b/seahub/templates/js/templates.html
@@ -150,9 +150,6 @@
 
     <div class="switch-mode vam">
         <span class="list-view-icon-btn sf2-icon-list-view <% if (mode == 'list') { %>active<% } %>" id="js-switch-list-view"></span><span class="grid-view-icon-btn sf2-icon-grid-view <% if (mode == 'grid') { %>active<% } %>" id="js-switch-grid-view"></span>
-        <!-- <img src="{{ MEDIA_URL }}img/grid.png" title="{% trans "Grid View" %}" id="js-switch-grid-view" alt='' class="grid-view-btn cspt fright <% if (mode == 'grid') { %>active<% } %>" />
-        <img src="{{ MEDIA_URL }}img/list.png" title="{% trans "List View" %}" id="js-switch-list-view" alt='' class="list-view-btn cspt fright <% if (mode == 'list') { %>active<% } %>" />
-    -->
     </div>
 
     <% if (path == '/') { %>
diff --git a/static/scripts/app/models/dirent.js b/static/scripts/app/models/dirent.js
index eba5685094..258fae8de4 100644
--- a/static/scripts/app/models/dirent.js
+++ b/static/scripts/app/models/dirent.js
@@ -74,6 +74,49 @@ define([
                         options.error(xhr);
                 }
             });
+        },
+
+        rename: function(options) {
+            var dir = this.collection;
+            var _this = this;
+            options = options || {};
+
+            var opts = {
+                repo_id: dir.repo_id,
+                name: this.get('is_dir') ? 'rename_dir' : 'rename_file'
+            };
+
+            var post_data = {
+                'operation': 'rename',
+                'newname': options.newname
+            };
+
+            $.ajax({
+                url: Common.getUrl(opts) + '?p=' + encodeURIComponent(this.getPath()),
+                type: 'POST',
+                dataType: 'json',
+                beforeSend: Common.prepareCSRFToken,
+                data: post_data,
+                success: function(data) {
+                    var renamed_dirent_data = {
+                        'obj_name': options.newname,
+                        'last_modified': new Date().getTime()/1000,
+                        'last_update': gettext("Just now")
+                    };
+                    if (!_this.get('is_dir')) {
+                        $.extend(renamed_dirent_data, {
+                            'starred': false
+                        });
+                    }
+                    _this.set(renamed_dirent_data)
+                    if (options.success)
+                        options.success(data);
+                },
+                error: function(xhr) {
+                    if (options.error)
+                        options.error(xhr);
+                }
+            });
         }
 
     });
diff --git a/static/scripts/app/views/dialogs/dirent-mvcp.js b/static/scripts/app/views/dialogs/dirent-mvcp.js
index cf1ab0ec13..d366501805 100644
--- a/static/scripts/app/views/dialogs/dirent-mvcp.js
+++ b/static/scripts/app/views/dialogs/dirent-mvcp.js
@@ -162,8 +162,7 @@ define([
 
         formSubmit: function() {
             var _this = this;
-            var form_id = this.$form.attr('id'),
-                path = this.dir.path,
+            var path = this.dir.path,
                 repo_id = this.dir.repo_id,
                 obj_name = this.dirent.get('obj_name'),
                 obj_type = this.dirent.get('is_dir') ? 'dir' : 'file';
@@ -216,7 +215,7 @@ define([
                 'post_url': post_url,
                 'post_data': post_data,
                 'after_op_success': after_op_success,
-                'form_id': form_id
+                'form_id': this.$form.attr('id')
             });
             return false;
         }
diff --git a/static/scripts/app/views/dialogs/dirent-rename.js b/static/scripts/app/views/dialogs/dirent-rename.js
new file mode 100644
index 0000000000..ad6cd1fbfd
--- /dev/null
+++ b/static/scripts/app/views/dialogs/dirent-rename.js
@@ -0,0 +1,79 @@
+define([
+    'jquery',
+    'underscore',
+    'backbone',
+    'common',
+], function($, _, Backbone, Common) {
+    'use strict';
+
+    var DirentRenameDialog = Backbone.View.extend({
+
+        template: _.template($("#dirent-rename-dialog-template").html()),
+
+        initialize: function(options) {
+            this.dirent = options.dirent;
+            this.dir = options.dir;
+
+            this.render();
+            this.$el.modal({appendTo:'#main', autoResize:true, focus:false});
+            $('#simplemodal-container').css({'width':'auto', 'height':'auto'});
+
+            this.$error = this.$('.error');
+            this.$form = this.$('form');
+        },
+
+        render: function() {
+            var title = this.dirent.get('is_dir') ?
+                gettext("Rename Folder") : gettext("Rename File");
+
+            this.$el.html(this.template({
+                form_title: title,
+                dirent_name: this.dirent.get('obj_name')
+            }));
+
+            return this;
+        },
+
+        events: {
+            'submit form': 'formSubmit'
+        },
+
+        formSubmit: function() {
+            var _this = this;
+            var new_name = $.trim(this.$('[name="newname"]').val());
+
+            if (!new_name) {
+                return false;
+            }
+            if (new_name == this.dirent.get('obj_name')) {
+                $.modal.close();
+                return false;
+            }
+
+            var $submit_btn = this.$('[type="submit"]');
+            Common.disableButton($submit_btn);
+
+            this.dirent.rename({
+                newname: new_name,
+                success: function() {
+                    $.modal.close();
+                },
+                error: function(xhr, textStatus, errorThrown) {
+                    var err;
+                    if (xhr.responseText) {
+                        err = $.parseJSON(xhr.responseText).error;
+                    } else {
+                        err = gettext("Failed. Please check the network.");
+                    }
+                    _this.$error.html(err).removeClass('hide');
+                    $("#simplemodal-container").css({'height':'auto'});
+                    Common.enableButton($submit_btn);
+                }
+            });
+            return false;
+        }
+
+    });
+
+    return DirentRenameDialog;
+});
diff --git a/static/scripts/app/views/dirent-grid.js b/static/scripts/app/views/dirent-grid.js
index 6f2d3fc7c0..22947f9716 100644
--- a/static/scripts/app/views/dirent-grid.js
+++ b/static/scripts/app/views/dirent-grid.js
@@ -6,9 +6,10 @@ define([
     'file-tree',
     'app/views/share',
     'app/views/folder-perm',
-    'app/views/dialogs/dirent-mvcp'
+    'app/views/dialogs/dirent-mvcp',
+    'app/views/dialogs/dirent-rename'
 ], function($, _, Backbone, Common, FileTree, ShareView, FolderPermView,
-    DirentMvcpDialog) {
+    DirentMvcpDialog, DirentRenameDialog) {
     'use strict';
 
     app = app || {};
@@ -22,6 +23,7 @@ define([
         dirOpTemplate: _.template($('#grid-view-dir-op-tmpl').html()),
         fileTemplate:  _.template($('#grid-view-file-item-tmpl').html()),
         fileOpTemplate: _.template($('#grid-view-file-op-tmpl').html()),
+        renameTemplate: _.template($("#dirent-rename-dialog-template").html()),
 
         // renameTemplate: _.template($("#grid-rename-form-template").html()),
         // mvcpTemplate: _.template($("#mvcp-form-template").html()),
@@ -86,21 +88,11 @@ define([
         highlight: function() {
             this.$('.img-link').addClass('hl');
             this.$('.text-link').addClass('hl');
-            /*
-            if (!$('.grid-hidden-op:visible').length && !$('#grid-rename-form').length) {
-                this.$('.grid-img-inner-container').addClass('hl');
-            }
-            */
         },
 
         rmHighlight: function() {
             this.$('.img-link').removeClass('hl');
             this.$('.text-link').removeClass('hl');
-            /*
-            if (!$('.grid-hidden-op:visible').length && !$('#grid-rename-form').length) {
-                this.$('.grid-img-inner-container').removeClass('hl');
-            }
-            */
         },
 
         showPopupMenu: function(event) {
@@ -139,6 +131,7 @@ define([
             this.$el.on('click', '.share', _.bind(this.share, this));
             this.$el.on('click', '.mv', _.bind(this.mvcp, this));
             this.$el.on('click', '.cp', _.bind(this.mvcp, this));
+            this.$el.on('click', '.rename', _.bind(this.rename, this));
 
             return false;
         },
@@ -193,6 +186,16 @@ define([
             new DirentMvcpDialog(options);
             this._closeMenu();
             return false;
+        },
+
+        rename: function() {
+            this._closeMenu();
+            var options = {
+                'dir': this.dir,
+                'dirent': this.model
+            };
+            new DirentRenameDialog(options);
+            return false;
         }
 
     });
diff --git a/static/scripts/app/views/dirent.js b/static/scripts/app/views/dirent.js
index ef49ca4aef..1202f1a22d 100644
--- a/static/scripts/app/views/dirent.js
+++ b/static/scripts/app/views/dirent.js
@@ -227,9 +227,7 @@ define([
             };
             $('.cancel', form).click(cancelRename);
 
-            var form_id = form.attr('id');
             var _this = this;
-            var dir = this.dirView.dir;
             form.submit(function() {
                 var new_name = $.trim($('[name="newname"]', form).val());
                 if (!new_name) {
@@ -239,27 +237,10 @@ define([
                     cancelRename();
                     return false;
                 }
-                var post_data = {
-                    'oldname': dirent_name,
-                    'newname': new_name
-                };
-                var post_url = Common.getUrl({
-                    name: is_dir ? 'rename_dir' : 'rename_file',
-                    repo_id: dir.repo_id
-                }) + '?parent_dir=' + encodeURIComponent(dir.path);
-                var after_op_success = function(data) {
-                    var renamed_dirent_data = {
-                        'obj_name': data['newname'],
-                        'last_modified': new Date().getTime()/1000,
-                        'last_update': gettext("Just now")
-                    };
-                    if (!is_dir) {
-                        $.extend(renamed_dirent_data, {
-                            'starred': false
-                        });
-                    }
-                    _this.model.set(renamed_dirent_data); // it will trigger 'change' event
-                };
+
+                var submit_btn = $('[type="submit"]', form);
+                Common.disableButton(submit_btn);
+
                 var after_op_error = function(xhr) {
                     var err_msg;
                     if (xhr.responseText) {
@@ -270,16 +251,8 @@ define([
                     Common.feedback(err_msg, 'error');
                     Common.enableButton(submit_btn);
                 };
-
-                var submit_btn = $('[type="submit"]', form);
-                Common.disableButton(submit_btn);
-                $.ajax({
-                    url: post_url,
-                    type: 'POST',
-                    dataType: 'json',
-                    beforeSend: Common.prepareCSRFToken,
-                    data: post_data,
-                    success: after_op_success,
+                _this.model.rename({
+                    newname: new_name,
                     error: after_op_error
                 });
                 return false;
diff --git a/static/scripts/common.js b/static/scripts/common.js
index ea24b7a349..97bdd6e21c 100644
--- a/static/scripts/common.js
+++ b/static/scripts/common.js
@@ -70,8 +70,8 @@ define([
                 case 'unstar_file': return siteRoot + 'ajax/repo/' + options.repo_id + '/file/unstar/';
                 case 'del_dir': return siteRoot + 'api2/repos/' + options.repo_id + '/dir/';
                 case 'del_file': return siteRoot + 'api2/repos/' + options.repo_id + '/file/';
-                case 'rename_dir': return siteRoot + 'ajax/repo/' + options.repo_id + '/dir/rename/';
-                case 'rename_file': return siteRoot + 'ajax/repo/' + options.repo_id + '/file/rename/';
+                case 'rename_dir': return siteRoot + 'api2/repos/' + options.repo_id + '/dir/';
+                case 'rename_file': return siteRoot + 'api2/repos/' + options.repo_id + '/file/';
                 case 'mv_dir': return siteRoot + 'ajax/repo/' + options.repo_id + '/dir/mv/';
                 case 'cp_dir': return siteRoot + 'ajax/repo/' + options.repo_id + '/dir/cp/';
                 case 'mv_file': return siteRoot + 'ajax/repo/' + options.repo_id + '/file/mv/';

From 003838b8f135877a11d9b048530c232c76b27ec4 Mon Sep 17 00:00:00 2001
From: Daniel Pan <freeplant@gmail.com>
Date: Sun, 28 Feb 2016 22:17:08 +0800
Subject: [PATCH 11/17] Fix CSS problems

---
 media/css/seahub.css                    | 2 +-
 seahub/templates/js/lib-op-popups.html  | 2 +-
 static/scripts/app/views/dirent-grid.js | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media/css/seahub.css b/media/css/seahub.css
index 2b62ce0fda..b518cca322 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -3881,7 +3881,7 @@ img.thumbnail {
     margin:0;
 }
 .grid-item-op {
-    position:relative;
+    position:fixed;
 }
 #dir-view .grid-item {
     padding:10px 20px; /* use less padding */
diff --git a/seahub/templates/js/lib-op-popups.html b/seahub/templates/js/lib-op-popups.html
index 11d97090e3..98abaa9eb2 100644
--- a/seahub/templates/js/lib-op-popups.html
+++ b/seahub/templates/js/lib-op-popups.html
@@ -42,7 +42,7 @@
     <script type="text/template" id="dirent-rename-dialog-template">
     <form id="rename-form" class="dirent-rename-dialog" action="" method="post">
         <h3><%= form_title %></h3>
-        <input type="text" name="newname" value="<%- dirent_name %>" class="input vam" maxlength="{{max_file_name}}" />
+        <input type="text" name="newname" value="<%- dirent_name %>" class="input vam" maxlength="{{max_file_name}}" /><br />
         <p class="error hide"></p>
         <button type="submit" class="submit">{% trans "Submit" %}</button>
         <button class="simplemodal-close">{% trans "Cancel" %}</button>
diff --git a/static/scripts/app/views/dirent-grid.js b/static/scripts/app/views/dirent-grid.js
index 22947f9716..d4f043e100 100644
--- a/static/scripts/app/views/dirent-grid.js
+++ b/static/scripts/app/views/dirent-grid.js
@@ -121,8 +121,8 @@ define([
             });
             this.$el.append(op);
             this.$('.grid-item-op').css({
-                'left': '100px',
-                'top': '100px',
+                'left': event.pageX,
+                'top': event.pageY,
             });
 
             // Using _.bind(function, object) to make that whenever the function is

From 463b48c78819c70429cbba43649fc2893caba521 Mon Sep 17 00:00:00 2001
From: Daniel Pan <freeplant@gmail.com>
Date: Mon, 29 Feb 2016 15:29:29 +0800
Subject: [PATCH 12/17] Make open-via-client in community edition and clean
 code for file/dir icons

---
 media/img/file/192/excel.png            | Bin 0 -> 713 bytes
 media/img/file/192/file.png             | Bin 0 -> 548 bytes
 media/img/file/192/music.png            | Bin 0 -> 4999 bytes
 media/img/file/192/pdf.png              | Bin 0 -> 9182 bytes
 media/img/file/192/pic.png              | Bin 0 -> 20933 bytes
 media/img/file/192/ppt.png              | Bin 0 -> 1601 bytes
 media/img/file/192/txt.png              | Bin 0 -> 619 bytes
 media/img/file/192/word.png             | Bin 0 -> 707 bytes
 media/img/file/24/excel.png             | Bin 0 -> 203 bytes
 media/img/file/24/file.png              | Bin 0 -> 142 bytes
 media/img/file/24/music.png             | Bin 0 -> 299 bytes
 media/img/file/24/pdf.png               | Bin 0 -> 879 bytes
 media/img/file/24/pic.png               | Bin 0 -> 865 bytes
 media/img/file/24/ppt.png               | Bin 0 -> 248 bytes
 media/img/file/24/txt.png               | Bin 0 -> 154 bytes
 media/img/file/24/word.png              | Bin 0 -> 195 bytes
 seahub/templates/js/templates.html      |  44 +++++----------
 seahub/templates/libraries.html         |   1 -
 static/scripts/app/models/dirent.js     |   9 +++
 static/scripts/app/views/dirent-grid.js |   7 +++
 static/scripts/app/views/dirent.js      |  18 +++++-
 static/scripts/app/views/fileupload.js  |   2 +-
 static/scripts/common.js                |  71 ++++++++++++++++++++++++
 23 files changed, 119 insertions(+), 33 deletions(-)
 create mode 100644 media/img/file/192/excel.png
 create mode 100644 media/img/file/192/file.png
 create mode 100644 media/img/file/192/music.png
 create mode 100644 media/img/file/192/pdf.png
 create mode 100644 media/img/file/192/pic.png
 create mode 100644 media/img/file/192/ppt.png
 create mode 100644 media/img/file/192/txt.png
 create mode 100644 media/img/file/192/word.png
 create mode 100644 media/img/file/24/excel.png
 create mode 100644 media/img/file/24/file.png
 create mode 100644 media/img/file/24/music.png
 create mode 100644 media/img/file/24/pdf.png
 create mode 100644 media/img/file/24/pic.png
 create mode 100644 media/img/file/24/ppt.png
 create mode 100644 media/img/file/24/txt.png
 create mode 100644 media/img/file/24/word.png

diff --git a/media/img/file/192/excel.png b/media/img/file/192/excel.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf3266e4c291a7406f2b44ea79d131f8ae8dfee7
GIT binary patch
literal 713
zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE8Azrw%`pX1ivoN?T!D1`qz*AZBXNHtQ9mOw
ze<O)tQy?ksXDH@pAm(o<;;t#~Zw!<Y4>AFY0L4SgQ-O-b{0zl?4S@=PCW!eOiF@ga
z`-4OpCU;F;Fni7Vb&Zp|4jw$XWy_YL?mDRmi{5!trDJW@tXZ>q_3Eu#x1K+LUMk9J
z+qP{74jkxPI<tAnlxx?ny?*^#CeC*H^y$(u){<f7KwBh&OtiQE$pYFTUlQaO%&@<q
zu>a4$Uv1HUCI6`WssAzm-@W$7jOn@^k-M+|4L{c?u#ka)al5CBV@O5Zn==b}85DS2
z52|(eH#u(by!|)a+2FAGle-M!`<Z|yGBCKOF8ujVH0{-vjJ@^!A6D&obKbM-5Q7Lq
zU?;Ph#e&}8_gC(5n6Z3*UvFj}WPMi2Bk03x2G;feynOfkGn~e}jblkeTAKsc4`&6|
zD;#SWSi%^Xv>6&j8xC+eEMQf*z$B2t$gzciC5nMbm!VOt!GRmUFbBi#tY6zY4u4=g
ze));>{${q46Z{?yOnMtjnB}_XS6+<TDKFEIw_59#b~S5>{<SiPi48z$p$o~JAgW;B
z|L-?SFH3$%xz86Q!PdyorKWz-cT32L2Y>aiGw*nNBj8^Axp$3vY+Lp{YQOrK6C3~#
zqQPkUR91=Xy|wi>E-`GJVkA?~h9t|tu;baXD4_?or*BO)c+)3<EY+~|UeJ3!WD$mn
zI{Cusxjzqn<bVqwSpL^?B_jhHBSTw%tj+WIhb|u!BBR*XvY*SHqP!}tEXsNx3sA95
XJM-0v|3a2If;4)%`njxgN@xNAvLpZ0

literal 0
HcmV?d00001

diff --git a/media/img/file/192/file.png b/media/img/file/192/file.png
new file mode 100644
index 0000000000000000000000000000000000000000..df1352f761f3a52ede0ff7bd0a5a5f1ba9bee0be
GIT binary patch
literal 548
zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE8Azrw%`pX1`2jv5u0VS8=FOYHVB5BB$B!T1
zvSrK0jT?c2K(KxLb|4oB)~;O(<N_H$g<H37g)la3*Z?x~zyY8LSUE@m5S%-A?*9Gz
zSFc`u{rdIOr%zwKdUgK%d7${gg9il^pFacYktqrC3ub62?Emxcmr7gozrQ~u+dCp3
z-%HnJ{PVZIvgNMQr}I(_42&M0E{-7;jBn3}7ezUWupV${OMUJm^=-dv^r!tLQ<qr;
z+_iquSj-AE(fsqZqcxU)%I{hm*uU9rai;zMx?^*hbN9bYy5IIcN_u|9gGF*F>~-f~
zIhG{sU(J5A(btxP|4Q>02U`ycs1*)|C-_C0|3Ih@2ii}+Tpaa#iu{in>&ip1B?}h+
zX=pgGOV`hO!`!-<KCjjK8ynBgUw=O;_p0fI_}_J}8Yeb@!GUTa0V;tR^55LA)a|kS
kP<*fN#q}f$Z%`E3_Xy7BeSakG0FcAr>FVdQ&MBb@0PuzLPXGV_

literal 0
HcmV?d00001

diff --git a/media/img/file/192/music.png b/media/img/file/192/music.png
new file mode 100644
index 0000000000000000000000000000000000000000..6057c995c7d7ccfa090169739715dd1ab7e6e683
GIT binary patch
literal 4999
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
Wy(Oc+Aus>^J+nM*V^(469{oT1ZyIj^

literal 0
HcmV?d00001

diff --git a/media/img/file/192/pdf.png b/media/img/file/192/pdf.png
new file mode 100644
index 0000000000000000000000000000000000000000..576808cf390b9bc4c6fd41a6ec64f88f6b121583
GIT binary patch
literal 9182
zcmY*<cT^MIxAr6iNN5SYS7`!LrAi5*<4YAq0V&dvsvsRg??nVbq@yng2-raB9i$iO
zNbkLd5)!`r?swN+_x>?+*38;-&Y3-XKlAJoXQ;15Nyb73005<qwz@H4Z28XtB_W)R
z=Uhnv;MPYSbyX8T(C%0m;U1KzI$T$N5COheuNH;!17I}31wj9MI0S=`00Mvj|7Vzz
ze>G@3;KdWW;#M({*2*C{_nTQi=jY4y!9LGbZ7O)neb4m{DcA3mJ@c-g_+*6)`Z(!|
zFAWSb+H1!&JkxZA%0n{D@_bcPdQb9`WK;YP2CT)!PqjytO1htF?;iaa@)gFw`~NoQ
zV2gq=<?^acS2*~r@=tPDON_(K@tOeVg1_D2uq_-O6HWfq_h9SGkd4f&6I6v`!eI9D
zkT4IUYn9v0SLc45gHLVn)kT~_V)M)P@%$eKq4l1?_3=oc!@_a+K+t<ozg#T|^qg_u
z;05VJe*U*HZc|q2gLIYKLl^kRPsv+L0>imL;#7b-R(K)&0ANecWLhPUz;JR_rG$!V
zBkC}W_T%71ePRFL3HM1qk4g)1D2WOi091Vk5-ZjK&zNOtNnfVTf|ivF)}YW2Dl({u
zy|Z003%B?(1$wkm9&_#Sy8hp+^7<$)(BW|%#Eb~IrdQWK+Ialz>}4xVV*&5K*1sS^
zB%b>oxclVoy8c+!^Z&?-Q!xVG{$HN*498$HZ!v@_24fR?b1lLC&9_x`UQw!oxmewK
z3@fTx@-m>uxYzZ<`6*2}5L$i{qyW_61kN+N5r5VqC_tdY2@v23BPzJdxTNQPp2Gn*
zgJ6h&o)DFqoBTGt%r#LiZJ^<9e?1h!^RKs!5dLH{w(mNHC_1IeLq#ua-RCbHDIC0T
z^Ic>z>FDfh0Km-!%-;h5QFbEn-p@hy_v^{Ko|YYBt}qWy#mev$$i!r+`wKU58?sN0
z<-bc#)@H(tNtmV+MS<ijCwI6m7ykC>&;_sq&62f9+nQA=;b+nd`+A5wpOS*TTZ|6j
z*JfVS=mnO*Tq#NLqwEJ67d~N5!RFPWA#ZP|QZg5u2dT-gy1XoYk&WO5EPJFv?Osv=
zPM4`2*f&8`DgM@hhp|=8p(Z3u8_$6P+&6~sSsz>eI)ZFhO$jNILzwz9$LhxK3bR6i
z1g1oZY_TP4qjR53T?i6wpAp_5LrBKZw9h2y*%0aGn`tp%QILW=71tn;wJq}YBZWBG
z1L$6C0-Fn#nHLjux>r)Ky5S=Rc<<`L5!^QFX0?dBG*B8~Xtu(U3<8;Nyq!P$GD@81
z<iw`!>}0RjM&&P5*4K&MniBaP_wCX7-lOvhWmyOez46t?7xeu=pNLAxiZpd+viY7E
z3qboXaw4w}|NDjWzKpP!d^%A5$P8WWyL_v%M)_CIo|pwWa-1B{ImhMChHS(3CkFhb
zRKeCy!B1FKO6)jqk!o<Ke_Fw=qzX5wm@VL=$}e@r8CA#t?cMyh57CR&risiz)w|%n
zZ_^(UVTW|#joen5V0@oO(|**y3Rf60mr1Z;ejOD8oH|9A-bvxqk&Up^eX#iSPL&HW
zU;QFMi$l3P0ccARtqRiAspdh*z&mbjKvAmy9#F(1(#)$E9v(YHzl`%D2E${!s%NY7
zd-FAd$$*dt;7`*kpL1j&FyK-F@I{2c#&1M=@g7uBK<d68iQ$iY$=1e)w(cV35mDBM
z1Lj!L#ml)@O2}O{CH#JG=}_xq`kjQE#_+c|SF-P(1Mj*DW-z{M!yo8SsXz;#bYR?l
zXr+ErGS^L5QWLHk_U{8f1-nJJDV6fMqj;~IMl~3^WG__|@Gi)TO@1IVQFZ-Bx58i{
zWDY_LJh{MU>}@0+!3YMC_Z-AT44~0b!iH(zd@&E6EuD<igf8XW9;OqtL%YowAcj2>
z9dG{Q*}GR_?e<LQ3m*aTQ&5CYO><B#XlJaJ6O8QM&tCjIyI>za-R$vR8=weeY{T0e
z2o<dS{DG;hcL;2KHB8s-mBr@C;@~;8CS&i=HF@n{C@Ccs^+~7Q0xBi-he`Y!BmVW(
zt3kUAGb6{`X{EdacFueU`@K2YtIEozK)xfXAKNrlmZGL_XGyxdxaE{Nx>5~WmXJO+
z+(P=f=;CVRNId6pX>C3ySRS1VLTVj13hiy+mA>@Bz>HtZ%Bq0sClA043pK>wHUBXz
zP$VwbJBv?29IR9S!$3|W&`fdPMHV5~+v^#!6!bXoOvBJsWKb+CCK0|6RbIqqZ6u6&
zW4xK|61JW@SVIy2Np{X&JbGEOXxL@}Y@Pov#IIgY^1CLgItRw^r}1({wR2<HpLomn
z<Xk1{*GtBqUfUmk%QgE^gNuuXx3SL9#6%RnY)wwyOYw0_Ip*X9P@wpB??=?S=P&!8
zKyqdG$Q^l(j3*x?^2^FC6LeX_I$&>>q8qD$daV)=)jg;yj+A@r<0R7aI?B<g+MRMX
z|9r26+ptw75~%<({w@FvsFNJgN{C$4H90-gEvQSsZ0OX=zs2*Bc202q3uO#v-2pgd
z4zn>0)%i!g^<c+qcUmCI=am=M2Yf*c>RA-{hP-3x)au>CtcvP$ec%T%epC@f<1d`K
z($T>v>STFS_WbqXpO>YBL*4tY)kOQEIP4CsuAS7`qo1(PIvD`NFDy`ihX;3q>qmMU
zx7oro#syTI)XB!;>5iCM9J(}M^QY(Svy0g)@0dQLfn-myS%bbe<z<KM(?m-^Z-H90
zjW@;J?mK7Z_aRUo2tt`b9Z5{XxJ~Rmy17(5;@!q8`1)k*yys$5DSGd7(=`LN+pI0N
zK-u$c=E+0$49x5j%E6zn>}e&X24>sW0!bePbc#+&0D;ncEv%p4t3JOAODj_)%0l$i
z*U2pumm72MSOv3ZYZoTbOsfPXB&IAl>as6$__HOsHxQc#mVl`Quq{8VLo>#7QZzrM
zhO|Fto%j<PQdU-`#I2gkk3?A`SiwgN$h`w0MkZ>?%6gDqUJ!$>UGTZIqzW$eolVhb
z^sS|%k}pzjh?6tCiwXr|UNWGl0lXnx-VMIckOBwINiv(=5_()lVh=579mx}#k!=WJ
zWB+6A2sm`brcRK<3>1@az6*n=8&#MD&Rks>Qt06rNMtw>$iG7J^fMs1Vvx^N<pd-?
zz8YmX%%ZHUBZ(Vo0{C7y4z+xewX(Hv(nj&H{PiZ+Z<5T|8VcPtwMs<644o&l0A+Ea
z#}OZ&$x(qWq^kXv6Bbm?3q&rPd15HkPCiwk;$9{&E={e%{>f`)Vhb--Rr@f+D2c;n
z;&L!KisanLLVdsxtey?d(x^Vn>GkilNV%QIm^y1-wHfy4AQa4ZJW<*8dLzGXa|J;o
zCoG(`e?1=ZuhO}fH@K&I^qZ<)B*1gNPByst<2@tPW1eO&GzY{N?|aaJ4?OtEHAa5C
zxr&%6b4k`Z6T|-Yz>{#kqPBSakrtRhzUk|F3JFwEUu!@Xf;8jj>O`JW@(I2C`o(tF
zbN#a2?7RB(k{TO)ixg8{p{1f@Qs5F(1GyMxG$}w9Taa-FxI}D{BMk3!kN^~$m|1?N
zi15YeG0UU@r3cLLIcpPzL6PjCY51ZeCSeGf4)~AjqkvqX22ddK#B;9tiAWq?(c-aG
zQtLbw&NS&$3PD_DL-{dt^K@wb6s5Q~9?ewMhql<xn>;?WK9H<crdK-IXx@0nQFMig
zp~3Fg(`wwSX{CG_L#GbcYyT~4Mf~`pkf2iq&_yf-7o;G;dN6(Hw&Npqx|iw<$z*94
z9a6EsjvNHNuFo=GOFfUCQ{Jz{T9c8te}d1iDW=>^i<#-&ho*W=!T@u0m|o<UGH58-
zBj1;bV`kofbR8yu*Pplj>qdV^oT*hB*5jtLwrAl`K(Yy+b8?M$RA~-<MIu;TKMKkP
zUO;(MGf!)Tip<Vyd=BDjI77(z;$OLU=LNc#==J1<xeHIObeLChoA=U0L|M&>)fDOp
zpef$}UQGL7h@d(2_Sjc_R3v7yn&hPnFEi!*bl+4J7N{d3L$yg9(HFJZsy4DcUhC;}
z{Y|dc^>#NA_C0P{iY!C5{4Re>;BVz>C>8j%Dhvdnk-j!*zR0!Qw(tDYDNH?Az@0wj
zwIVHe?*()~ppjRnz_$8e37gt{WRR>B;@Iq|?VHBmR&Yd-x=a4fI#r#C8|h|nl+*4!
z&e%~KaKiqFRh&te?F~cQlW+ePV~>3Z5ZsY$?vC6F3tns)+GV^^E(1SQ%?I%i!9Y&X
z)w95maa^OH2}fx6U+tg^FF`N&HA%aHoMfu}P@-_Xc9MeaxhI~BnHX}#6m_)j3+v1Y
zi1sN642h)$et3sP>pp%^U)Ww^r50EAa>LVo{6&X_3f17Y%k@Yjt=yq0_Hr23f?~OT
z0qtloN{(6DUS_i~{}XXML;JC0<0`5D<TdSbEZzz~>Flb<+3K%+^TW!nx$SqnE}f@K
zm^V1K70Zh3NJ&=9e0M@UFT%{I*7{a&iqAfVG6#<v2}yS845|+Y6hIaHEMTvl@h5Oz
zW2&K`{(}XaEcn;WhwgmM>(9Q6&wA2MZ;HhXKqdD=e^@P&spJA25b@&)AUuvKNoG84
zK;mf~&syJsmjv5elI9$UE%w9_8wGozD*y;q?3)z;Ytc-V`=8_D+u-69p3Ib+Ki1(8
zvx>tG%xrg|)1<zBXozcb%LxsbZYEa&#Cu@ykn1@TSctfQnKhp(up~2eiWr6-yd%@n
zm~LJGZ`E2et3gvYhO+<<Y&eAr&kusvS)_De=ju7CNm9Bmu~+Sy1$*TlD40+f)h=bA
z7d0Lh;z3vd0badlu{8`sqPTAHq0Rm*JAXsH8wC=gqE$8F@2Q$4>EB6(tgEEt&%%jr
z`~^Xq6a_<o9d-X85cKC?_W>i-i!z;|kLA>(r4s3a%GGdl_n*;K#}|#b>u00QFzd-|
z;Aogd=GFjF^>aWuvdYD@Fdj+?q*3o*cl!QhlCiqSz!w8Q!k(*P<s)q#atWL=x41y$
z8KOABmqzkISlI=&2<~=I2|I1>VeT|?>*j@&Jw_GR%rc~Yj55*V-xSt75b;k<ki-+z
z_>GbZzp7_@^yV)+Y1*6mrP9(CPG_PXKIYw%i&`8HW)tGs{*0@;Xc!S&jPf+zTNWZa
zY5QYU?1CI4<<K0(!HfCXZgy|6-E0P9{Be^ZOL!P4-ol%@f)>r&+C$M2Mp72F2tc9g
z2W!s}7FEhFC?6Y82<uF~Wom01=N`ce>Yx+ZfX4*@;<535-D(h`E|pZos@!lbACYxh
zKJsc?*l>BbPP%l#12AVe!tBVM4P+X&E$lJA1L>QZaC0hv(jh;0<2aTuY^RT_nW%Ms
zd$x1?Uz|k*6pzK^w@&;LPA?S|?IJMuu^(twyt_(h7r_%+NFvz4aSdD~EPitK*ee|A
zXjrBC`rP!C$`SG72MWcr@Uf-1W?qfWmOpW>p&?Gqn<u%I6)2EP4`c_j_!IGkk+-a#
zd}r>{f`OLZhN$7Q6-v`WzXi(~Qf^Z2I2zFyqEJg|GW+h7u$It0MuBvFfEXmgk7q$z
zOg{R>Pv_)ue=AZrBnQS9k2z@X+8JHaR6k+ZlyKyx(7cu2v(QBU-h)+3Ga+<Z3?D24
z+BKu)8X-LfKp*JBX^=_!cPb;K7K5xPIWqjtNr*^P<AQ0sZ@nDsCs%w{Z#s|c-}Lrd
zPW{fMe0j!*w`<=1N8-PJnk~=3urN8uqQR$SqR1Ptm_7Q5Sq*CFS3-gM!w`-M%6)Q2
zjZR`*R7Y3gP?5bj32~rF{3Dz8Gt<J=VO5ncR>2%-L_trOH&Otd19OlyjMe+<x-%oj
zuI-N{y2~QNrpt!AAY%KNY4^=3;5^vrvP0@n{mb18**Q<XUrJpDyQW6wLbNS~(x7KS
zXu$hEFE?<&1aBfM>?MkK)Ng<DzW6+xkFk^^xmUM>eTsGb(x34>b<|+U`K7hn0w}M?
zvH@D3=il$K%b2B_g@=NUfAF`ID<jd`D1hLE1zJl9EYBqKFV21Z_SicTS%~=b^{~{~
z68(y!oV-JafsyAJFh3m+msI!bl=*XVEb&`93Su8{&)Tr2KeY%+*!{T+j)y;Q4*B&)
z&L`;^OBM9%*>^@s3V4Lc6+5f~iDvXdV2tg9C7hWK5m7TUV)M;E$yU9$A=NCRO4RF}
z9TWz>8&m~URSj`JPs<C`*Ta8J;W*`+HfF|_)+VWa*Q5_4i_2(cIsF00$*Qv_*iNh?
z%y9F?M>PSoNQ6s$gh4^DABy(Wyn%+~4eW(^3GI#+rN&m=N@hdZT@upb?xAlsZet92
zo{t{dU}@ni{n;7Hj?JpUcOvxxK9ERg706_J7<_Fc4=8+{=X}yE+L2tsLEmJTFef~`
zf_0A7b|C@!HLuu><<jee;wCWV^B#+F%|YDoLzf0Pq6Lx}^_!^rf#g&uVvzOF$EC@I
zW}cTCr@dQsi2pEjRvc5fIyDmNQ%(2lK|wcs%y}V?YbQSV!A-)LREe`&a|;Q36D}P<
z6VL_piw^btZ+1Q*Wun__Fqh>m`1*&pM2!kQwahpwH9Bc{rQ{tnA%T><NE8>@D5e+Q
z=RVmRg1=z&<In|22}t&gR|@UNfy8~dqg)&*tA`4Ga%tpu^Tk<EIVe`D<MI~&U4AO1
z&>U`Da%X31ts8lbcEZYb!%6nkki6y7j*vKDyk{)n{%XPzWuY`rk}(IG55TsWYz@xe
zKHs~>U}M?kNp$V*Ts}0bQ0D!&eNr5avb7!A8>_N$p9eFl`RmKPQatA!^qBLM-`mjm
z(1xJ}ukJty{D}3Lw&vsEVy}y3dv;!)U-DOC7K45_KE}INL93~zKJ*Wq1dT02h$L=l
z;))xzY27`Vz*^4l&i6KIO{eqU1NylDFSP^qJ#ej_Jlt608c49XEX>n+98{uR3l-Pj
znGkE@|LG%{NT@u9Z^2*8Oa<2v*g8-kvLd$2c2jYe_4-m}Ig<NlNH9c0^Ol@Y{JahW
z8*>y;P9L^J4ZUlQKv1jBGDn14lTq<E+n?*<wO)OBoxh#-%p^}KAztd2pprkhGX`F~
zdNIP{9U_5+fylhUKc!kVQE0P@F5~m_56j;c#O`nPnQY^qYf^Fd8hoC&GOE%t@b=$O
zb4F_2thgdc1eq_ws2%?B3!NN$V$OZ!q+cowddx$qHzB2A0D~+@?iOl*gkt2mcE%=V
z+SF;)3v1ieb~%OrWBVfT$QU$Xw$_}wGXB|Zwtb>f3Aevl`RR}^=hBV6Mg_+tbaH~v
zz=b~Cf~3;g9J3%zJ|fPmQQXi=dOpeq<*{{fb7oUY&e%~}fmP*)4-=S^s=vD=1$_F8
z7?;nW3P^K%1aqKmDsD)OmVLF=z2@DM;!Z|ZWMhPUEC>Gl$UnDTZK;*$ap(XOAtcb)
z6M%5Nv(5z=%*fRpfv}^`GC%ycs2}BTy+r)wqu0&JyGMR6FH~0!@<67x#y#RnDUe&?
z$36Coj+JsEa|7??m;=viY?YB0hT=D;MK(_J7OJR-nuS)4_T~EOdbN&}k)5sp<cZs1
z$Akc<=6ah|Bw<0pQ5c{Ll>bITJ>S*Z9Xe)dMno529j&C^O=qZK3wNu=dYd;S6GfC+
zPxli@g0aOm%^;}Tl(s9<^ijdZCiS*YLJFJa!w}`{zh1Hxqy0v-v91BTvsIoix(uo_
z(~;5E9O&z*nHsef?skL<MkungD{S$!VR{O``$iG_?!OV!&MH-v9<sP<BNv2VU(89N
zB%!$Skr%mRrW*G~D)eo7=7yNgBs@*gd8Jj2`n?RzS>1W0gg9a`B4D?T2>Y>B6vrlq
z=GpT79cSw~&CWREaaTLy$mM&;F>|DJ@=_#HLr(fRiT*&IYT7F{th_&Q1of9R_1Wz&
zB~DiFIqFRBO7PPn1pqFwaE*h=6<kD1Vq1_^(AD_naaa96QR~O8!A5x*aiOS!@n|_`
z&yHlKq=3JbhpFOEOz0U3tcToJ59Xt;mFhPS;^)}7u}NXA+I4F(cbj)CBkwLYKR8y3
zgfbg%8b3ARniZ>y<fd^6j+^?mGl`;Ojs&Qj{y{Tw8ixHN>P%wI(Asb`usN6m68+xV
zPDhu>Ej%&eY#Fzr5}fjswp$9v3XT{qy+QI?`2RQ!L@+bm2tG+WT)W2Hk!yAnKCbal
z`~8WQEJHmP*Hu6e^0||}a02jrxX2~_8hkSMFJ+JAHyZhJ(;`KwZ<^!rpEqP$nXJRV
zm6`c9gSe4l?FF<g4&JZLxKO}gu9s!S{_^SMZcY8LSDPI_iIq&Xtk8=Ws~9`e$78Hr
zg})z8a?53pZ^fCVH~Y#Cx?j+4)VdZ$%v%~;s6Feyk6}%UWtRc#$S&wAoqjAj99GR)
zsAKl8f5jC#sZUp5Zr&Oa>a^13bknB38@eN%o+HQIP#8_qvNfCyj3|4lC0-s#16r~h
zoBfu$>BO3k#k~hOp~;DnG+Iq~wm{2ll$PC!sv2+FT-=pXz-z`{ilVuN$=?xqb|#&B
zM|n8vfo$%rF7prXmRK}9ms*XC^chA*4XA_$^FAJz-WH*=k@!+w<Elp-7IpjcRw!*o
z>GIr@oF}yy<J}S1V)VFEx*C^<$H+<u)uZzRE`R)bT3u0O<99k?O$t<h>RsOZL@J8P
zOW<H7Q(dyPN~>FZF%!ii_YzKr^t_Mujw*4{Ey%lX+rD2&Y^AsSn`&69F%fS+b+d2o
zG+YknCR2jn?qMJxEBP-1h|{I1XXyj-v?3--A{@(ySgHH-FT?}u$$P&_QX@D-1BZ|2
z*z7)AMDMQkc{+^cdw!7+Hy~auc(o@R9c?6emqT1T&5o4kgJomrLxwK_yPny7TvXwI
z*j_WE>5g&Ip`t?}xj?TXz<eDEDe_2n8<2mTuo4y+d~%Cr<lFU=R0NmpZyvkrEAm0N
z=?-B52U2kr{;__1&ntG`&a!(t7dk3Wsm&tN)F-5;pFgtc?qD>`%hh-ZR-fm)gnd2a
zPhS30v1Ngk3Q{G(RlyNl#yUWuNhR8yGDIol)^An}ew)-UykXZ?CFK4G<>TX<V4gSw
zAZgcemUOzvT3`QPB86C!H_=fehyN<dni^Nv6d50%zA$94MveY7cTT%A?5c^G8UG-c
zV%w|_Fv|!+Tf)lBRi6LEq;_<-zpV_LwzX9-Qhoc8GP2Kd;QUZT-JacTmr?t>-%tn&
zxc5@AP9LapZ&|DrkUrsk>&DHOs(@eM^;<r#cPHe-2)XK;J{-B_cdJ=U5H<rc46~MD
zfq^1x5%B?BM3+|90F7ozaTu@7et^9YPS9;2ANuuifqL?X-HPTj5}y?{PgH3zHp)bR
zL1@nrx=1iw%3vh1<jBh~IquYe7-upn)iE#G!tqA9F}>s8&$4ZnCb5-OjY%JNx>aE%
z?O|(ayHC6?3<rpiPh+{M=rJdXk}6%tl{n_{S9IGDKt%Ie3~o&~MRVJ5$n`FlQSYCc
z&~^VvX%~^-Z&?p#b7dcFRff3uQe?@e=s2+BugG_^B*Us~dnr5eGxIYIJ({m@2+JS&
z+{o9ogphDiG+K&mdp_uHI?Y}7ZUfZnO)^J6ZbjDlZ~@iFl4!S7??*4fQ6h%;XnRy(
zsXlHfzm^b#SjLp21Hf?++-SAu;3)z<=J%&GjHtZhJ?C4xx>etFs_={y{;=cp`O)mt
z+L2a+;q})7!%JHmOL3I&g_H;68%J7@8~;dqeQ8WW_{x{(fARe;^_cFW#B&f>T?pDT
z`RP(EI`UqwK(lvikxXFY-HU@JN_~Y3%4%K#+5-av4a4wMyS;(Qh$ynBPh0HcXRG!|
zc%(5q5W^gDI-3HB;m5!?by(5S7LSk}c0-<x^RveSo!52?LeAPVl<&@kiykPb#chuo
zi!hHeeq?4YG7k{b3M8={RI_jhoP&50STb`gMejO@>5r$o0aBakD&&lv<!p<TZ_srn
z_D8J+TuXy^&I#Aju6;QKdF8Qlqm*)MA+-HyN{B`W%wh2-B;t`jnEpRr{L_MvWFUD$
zLa)#J3vfP+DO&JVDK7l5Bkbkg{i=f5SGw%J?%KJn^E{1nf~jO7+$j3d(|d1E@R4vW
zhHqL8jkWpbUuO)UhNZMXbvU90kh%}-)9LR|u^g^YI2<x^$S2a9CZQgxhRu=wO5|}H
zc`>CZ^V*c2-sY$pFWA>_Se)iJOGF+cK4XdCa#!I4yumHtVMX-2Cy<vivD$k9p~u8D
zid5xy26{W<PhWo*wc7GBwhE%W^T8~{;QDftNKV3|#%w(DrU6x!yiF-tlyCKlK*iz-
zi9QB&Br*~}ag?4!{&osJh)9&RdaKN)F-lROZZQKr#V+6TTke>9LIdL9#rbn?`<(V=
z#0<9)P{%#%spvZ(bK536ktIPnKcq8f^4rz=j?>rsTdD&CX%ayrFU-oy)mxX;9xJ#A
z?%ID0g7;7UmX9-DDrWAiMaHW%&pjf?ej-~PeoP!7I<rf34q@d34<n%0h>57!NcBXE
zrf7NSt2f^FR$g;9h0&-wkdO9EE9?B`NOOd}O=Jo$vehyvm7K3!U#(>rKe{Ahnwb)#
zZ7Gljxhi`JMUJaGqVJEsCdDhVN(5uo;%uc#Y}((XSY$DZvq&I~W1f*xMboUBZ2a(@
z4^O1;Yp4uN*v7atTiM@a&luPnmM9aYjunc%17No_b-rBJauoKfif|}rx!`nT#!hlm
zhIh?m%Io(!<EC!5w6<l@rNWepXH~}1%aSNtf@ay=!J82An>!INcE+_tpGIv`-Dd2-
zC1_Eg=9?M~d3<{NoPsBV4?9|`np@t&hE5(_E_1wvHw_Mbu_~?0e&aYi7ZOZj4Q-K6
zd(ZY)X@ApM@XPrMygFhoM=+n%{=*B$`;YcJymXE(aZ6ZrZ*LIu{A`@DCA0{`VYRn6
zH0lUw@K4#T(x7wx4cbc%X4KC6_Tb*IniUL;Y9Bs-BSx)qH;MiF<%iarDI)aP!{Ye1
zW?579htvlKr{VA;zE7%ZSZ1)FUAPbU&rgjM#9|#gcB$)ierQX+feJ}@^xwdujrRww
zZSytB5ep$v11tG_Vyb_Z$UX@@GyI`pgd>sM+cTvh1ng|!@q*{?Q7G~K7TDE$>y7tS
z%l$QXoI=|5wAo(rId`uT*XZNKsDkjfEf&R4jg`eGq=*ETUDKlmW#`bhPx;aMXefc+
zE5~bRH!fhA3eUES`RO>6!c};mobFBx<S_Cs-XbPtQdwOr6$&b4Dwvrya6l`5h8=zv
z<87lb6bZkCz9tFHJfeLq7a-Dj^&qad4aIh`OuLI;d>U{nTW+54S5d4W+zF1k44Mg%
zBwDQ}a3qpRjY&W;RoygoKy&C=;Jw9e27PI7UrgT`<U%a=fO?#gD?|2Md3w}!O9%=L
zPW`7^AMhtRocXF(Y+Ga^s<x9(h)JnRx**k2mo2}L#vCmG3g}v^7Rrs$TKaK*tTfXw
z^l(D+&u#1$&tn0=T3S~KK@0vO6zNo!FJ&(kI^@5!j7xxDDA=p;p~o_)a)Ga8t7qs|
zEDl!6wTzqOBUG<`+7t>QazT+ko(Jrwt3L37@SAg=Uc74@pdnpOsEw(c5Fdd$Q4gg{
zt~wt6t+o;X)Bt(NsPc5xr+urE-62erVhgP@5@6-J6Mmae5BZ)-))pG3NUx^7@#sKx
zClwb7=+hArtFE3y07>f|-Q~sZ@7e3b+i5sE5<|k51um(Xl%FBQVjPXI=e2)8*fVBy
zSf|E)?hA<F0rjP7g=vcB%I2<Xk73C!AqJ5YywB|o_I&106~hMRNGcCF%uiXcV*m1A
z`;uY>#|1D^Cc7P8@z4DKmoAh5^{XnsP$l6*_fj$k#g;LEg`mye=#)A;0#lIf*EFWk
zf)yx8tZbA%z&PH^5p<C0+<}y`4j2B1=7;GMaE;$qr<#08l_VGNfpv;9{^E9!Lx0Ss
zUNpKd{#_G2=HsJ|KDwvPi_8t95~#M(vFWr1?6av067U@O=3oUbLZ^)?aC+k-B@_i`
ki~3(JHvhNb=6|kQ0PeCblt%_umGC5>qoJ=}iLws=e`wh;T>t<8

literal 0
HcmV?d00001

diff --git a/media/img/file/192/pic.png b/media/img/file/192/pic.png
new file mode 100644
index 0000000000000000000000000000000000000000..31e0c19f863ef3e4611ce8467ce60fc75d0d52fc
GIT binary patch
literal 20933
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
s000000000000000000000002E1rzu1+67moPyhe`07*qoM6N<$f<yMZv;Y7A

literal 0
HcmV?d00001

diff --git a/media/img/file/192/ppt.png b/media/img/file/192/ppt.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd2b8dd214e1f069b60596afc6b617130a6c65c5
GIT binary patch
literal 1601
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

literal 0
HcmV?d00001

diff --git a/media/img/file/192/txt.png b/media/img/file/192/txt.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d8d4b555054403022e4d3b3942c3d7d15c41ed2
GIT binary patch
literal 619
zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE8Azrw%`pX1)d4;su0VS8=FOYHVB5BB$B!T1
zvSrK0jT?c2K(KY|Rv;J1Si5#DkO2hSw{HiM5cL~2Y&dY>08kB30mK}zk}c=Xox6Yk
z{;OB7u3fwK`t|EIYt|e)cI@iatJ9}XfBN+4!Gi~Z%FdrZub?XJ1k@%|666=m&`{X_
z=ie`tw&=${+9m&X{JR&KuKVY2J!56dUG`r;dKnlPn>}3|Ln;{G-e%1^>>%QLkyAZ2
zt?lRL|Gd*~t7~kJKiB>4?!k#~Hnwx=X1PFs_G6Ds8(sgkY0SsAE)6;Ubmh}JBZXV8
zUb?4(1#62Bw6V-<m^_hXT0@yyqxu6Urr-vabqt&_j6yq@R0>!<9&k-KAga))?Z6b?
zz+&0(`4|7(dbSA)tO5D|7XIRNV7l(^!4!|GC4mD;3&bo5hH2N@<i$4H{%@H3^`Lt0
zSyP3be||a?{WRY6{+RNVOQk-07`GojoB9598vAFqfaSZZKbCF|aj4t)p6>-CFm!-`
zbN}U&OBqZSp6qw$I8e_D5d@M4>g^8ntO12Q3?wu+^YRtLcp!TEyU&fQy{F3b3m`<z
zEN(n_AjpIeXpojUbHa)fNuV%SR;<0AO{RD8;Xd_LMP(&0SX6y!InRV8OirIcN<Cfu
KT-G@yGywn$-~ST;

literal 0
HcmV?d00001

diff --git a/media/img/file/192/word.png b/media/img/file/192/word.png
new file mode 100644
index 0000000000000000000000000000000000000000..9018b64caf78a087793eddfab39b268a33d32c48
GIT binary patch
literal 707
zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE8Azrw%`pXW0(?STf%MclOJ!{`<!mx!Y%&-a
z9AvH2<*YM+BGczAO(^W%ym^bfeZH)9rmSU}tTj*pgPcvKv{{^(d5Va2lALuWNU?Q>
zv{gD#4ag86X_pJsE@PF!pdBh_lMWP=v&{yok+sR_nlv9M4rF&soTubgt>9F0?b@~D
z$B(zq+yVqjZdK>cpI36PQTC|4bLY;kUAv|&STApvtLRdG@ZiD4ix;0gdv^Nt>91eE
z2D(APu}I#bpyZ^41kg>IB|(0{4DSy#II#4u`SbSrzkfReY8iJ6i}QY*z2EZh>XbiU
zCa~o%`ulJB-1=Q}O*Czl85kHlJzX3_Dj471JQ~EDDB*H($D?(QP1P~=75|qzZMP`t
zzq0rD#Ne-Qt(;vTKr=Vb)FVspU20rZoB(qg|9e&2mfkbo%cEU&6|U!dOSK%j{o8rx
zjDm)+1?*q+w=mf*&=sg)WNH*wpeD6I<OL)9?5X_OZHs>}PxJGdZz5mcu<QpgVt4S~
zKFPMFtW5f+{_Xfq-37IF!JP5im$7@iUau}Yp<4(TP7o0AI@Ud6{kL?7GK<~~iDEEe
z28M>~dhOdx8dgu#_2WPiox#{994+OLp3^PN1Q$MV;NXFSoQ!Zj14!T@AA--o#>WQa
z{u6-;Ex5I}dqdvW^9_%G`L<j=Z}hUK0|MqT#ICA&_N!m|2}q@<tDnm{r-UW|UUKjo

literal 0
HcmV?d00001

diff --git a/media/img/file/24/excel.png b/media/img/file/24/excel.png
new file mode 100644
index 0000000000000000000000000000000000000000..99f9aaaa9a7a0b3acbdfa01875b5faa588425b83
GIT binary patch
literal 203
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9Y$ZW{!3_UF&^$uA7AVr->Eakt
z!I=ERU)4dnSwuPa2vhGzg#}V;S+4uv-zQ+eu_9#O0a@`T2^N*DLI=|V^CrZs(>|i(
z#mlrwF|GE`ubE2C4>%;^o=CMYdYEz~ib);HyRgi6_P)tX4X-{*Zt1jexS_z&Io~m~
x*=?`cD^scTiF2*X^ORT_u3ldAVYv(g1Gil2g(-`#i38oj;OXk;vd$@?2>?P4MC<?n

literal 0
HcmV?d00001

diff --git a/media/img/file/24/file.png b/media/img/file/24/file.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c5e246b30708fb7795046879fa2d731085d956c
GIT binary patch
literal 142
zcmeAS@N?(olHy`uVBq!ia0vp^5+KY0Bp8m$B&h%?rjj7PV21zE6P30CdG4Mrjv*C{
zZ%=OIYzW|C3HUDmT<WL1QSd1dwnZ`;UE=B=w&t%qR=#G(l{3)_ei{*G52slj%AH&|
nL+gbsqmX0mAHxqO5>fKjchAXLa>>sH*~8%J>gTe~DWM4fsNO6<

literal 0
HcmV?d00001

diff --git a/media/img/file/24/music.png b/media/img/file/24/music.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a91d035c8c64600a97a5f29d45b9592cc1cece8
GIT binary patch
literal 299
zcmV+`0o4A9P)<h;3K|Lk000e1NJLTq000;O000;W0{{R3*Qw3Q0001BP)t-s|Ns90
zhqM5Uy8v{X0C}R|?(_fu{|%107?ZpJq1SM+#~75o0HD<Xp3?x1zVi9|0G-nD`TG=q
zqX3r3mBrO*t;7I-s%oypzTD+Om$U$ev_O}%md4fqahCvLg1_A6^b0=m00001bW%=J
z06^y0W&i*Hc}YY;RCr#U$wv+YF$_adQ?66fd%OQFBM5L1Iof3Yir{n0%J}5U>I=}-
z;4rY5FtM1>O~b|nu2>*xSnp;WpAT>fu)Q7j=j3^6@Jad$UiZ_*1b>~q4Xid$_yzew
xOffVdAN8@P2ILzl(AYrzI1M!o8M^G2^ahUQ2;v89^eg}X002ovPDHLkV1k}<hcN&E

literal 0
HcmV?d00001

diff --git a/media/img/file/24/pdf.png b/media/img/file/24/pdf.png
new file mode 100644
index 0000000000000000000000000000000000000000..11f0d637fa304f8dd62608b2e7aa3fb9d9eaf69a
GIT binary patch
literal 879
zcmV-#1CacQP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0009vNkl<ZcmceV
zZA(*s9L9YOR+~=6d$)O)bLP}sZR*VFf4MZVo&`OtS5V+f$cP?`LV}fMOsA}-nYU?Y
zIn9B_R!$@>O+?Zp{=(Ju<D5bC;3PqP;luU)eebTLXdHmQ%D*>wbIFC*7pjkim|wWs
zf}?K-IJUuDtsT2f7qQzM!^Jm|-!kmaIqZndFSK5kO^#zQQ*FbJyWzLIsy+`fFZ5Gm
zJ?2}QaC9J>s2WV!DzW8qk~(}=RJ=p{(kZ(YAx9N98|ol(F)wuMzdCG?KyxEa_MvJp
zZmqzk(*ePTK*=Xq7ZL63K!{(hyyJw*oQ2R?w@ck%tipnIM-{QlN+SHV1+HI%2+@!7
zE%cB6ibhIH5VfDfDu47SS+!XaA>+<kh#2MJ4>q~(=d9mSf)R^ZAm^oKs2cc+ix94?
zK%}x9VG>dB6`LU9-TixzETsrr<vM47nJZE^@Se`ca@iRyTL^WftOP5}C%CxQ*Nf%$
zJD6n7zNk}wnxzgE=Bpccat&DGfhDs7^N`sDPo5F65Hs^8*5$r3Z=#AhgStV#J{!S;
zd;|*>m`~>B;^mcAe32x4^!X6(>co&Chjk-FKTwc|d8)|!bF$S99%p1gG8!Nm^n_~E
zV<0O7+dS^c%tSByB6fm7^yzc>PRC%m1-(2xO;hfx8}y{4V1|cgvIuo3Jq>=h8zP2l
zYTzj^!}QG?_@Do^vDjZ<$NPsp@TR4K`|1YWx<pK*reczKl9SP`)8Xjw5Zi$Oy!I*#
z*E=zw)E^M3tqnVii+Fpt9fPcMU)`Wfqrr<L9r_a!(52Br#MiYobTjuRB;pwlj3p&u
zjK@c*9@cuaT0EutxyK!KgO2!kJUV#_v$t;J``#Wzbi|*)6W07(eom-Lu2FKKM5__A
z_|aP#v>*&aG5Bap-&;F>x*}6|RJ<z={dX~sXDRH^n+`s*qzi#v+8sFOf|=B39=Eua
z5pNca*9y<u8T<W#NfcKdFsZ`cFPiZjjN;_4&&8E2%op?IDB2%5#Dqr@+>;X5>Knq0
zDrEI7`~86v|Mh+o8X;gusPwUBrsn<JGZJC_zhC-4<pYR|(^2U@dd2_%002ovPDHLk
FV1gB}tjYiY

literal 0
HcmV?d00001

diff --git a/media/img/file/24/pic.png b/media/img/file/24/pic.png
new file mode 100644
index 0000000000000000000000000000000000000000..d628f47363a58ff45b552ae4bdc068004699d186
GIT binary patch
literal 865
zcmV-n1D^beP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0009hNkl<ZcmdUx
zF>V}36GmTEch4-Bq}G%`z=;4sR;s%=^bMTI=h6|J`3?>YCpIkDhGjvbD2h9r?dh(n
zpV)vPeql2?&<9jBz<a0(>T8Jz{>v!vWeYOE)zwu@)5Oiq4YgLxj6=UJA`lV&KO#a(
ziE$iRuh$$OAG6tPBm-PtUh?G06Fz5Ny?Vv1fDG{V?c2TJ$De*<H#@ru^9&~^&Q}|u
z&9I#WR~S~H8n@fV?dDJyFb|{~ISHDaAHIKn$IJj17Z(6LJT|_5`VF-P%cA7uj4LH;
z5DvWuAFkozeW2MHHbFO~bz`@k_&DA0_g}vN&+nKS;QIO+fCndVz5(-0bO2>o30hz%
z0V?1@or3K)xV$jlUHX1L*a%uU+dSkxGXvCG0r>c?bG<fjM-aTjGJr}@ijWcjsDn&~
z?m7>$Qy#!(<(NUP%6(=AaCZQ_E!a|VSJvyyFbHlPvp@o@1-%Ko7K9mRYXM+hg1Q)U
z4gO7y`^?O}Y_}EK%zDUBE0mxlC#y4N@B%8rNd$Fv)D?HZoAYrtqC3fV+~re2<ImSK
zg9z#lz<LEqArrU<o^J(Xu+C21L2ZFL)GNna(0*9J@4x;`Oi+dqO#@4$yLFWSpqWqt
zMsbQb8UaA}U^3<Po9VCs0Ef0qL@8J*G!LqGrrwyEvqZ3XFfW~Ej)mg}%?yC|?`B>c
z5<GtVl(Vxl+>S_tBB}s%VClxrU?I`NnOkRZW4knJ@9dh=a9TZvLjv#4Se(470IXCv
zDiD$Za2LWAbD>$GwoJ8=?#^OC2mY9j4hy0i>kOyIFl1qsK?%%ud+5>wTnUFNAl(TM
z#DM0gJ4Z1e7MKT@7hAU117lHEgRmNvp(v$5&Iymenxn}X2L}yObu1v7<JLYEs4Bqz
zV{@a=Gp)iFNFs<Tnv`+Kx06UY1BwNJAxSCjfTF2zpP7OE4F?#H3U5CALqY*a68G*s
zh=VAAlFEpO(tz$x7yy)`f&0u1aC&+Qz;`dc<um1unE@U>dc@0@FZU&Jd&l?9cDU6z
r)Moo8J3l|)_rSAf&j9%HUlsoY2)yi1#%^0?00000NkvXXu0mjfY8`?E

literal 0
HcmV?d00001

diff --git a/media/img/file/24/ppt.png b/media/img/file/24/ppt.png
new file mode 100644
index 0000000000000000000000000000000000000000..6aa676fd03201138be274e90a7adebf6ea1de615
GIT binary patch
literal 248
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaAnFaWSxc>kDf4ZUcMHjUT3#T8n
zS6(0I`~Ca(S>{UXY*jXG+Vtzo=f%$Y=bhC~JE`v6xpSej-mlM}=2)qA#|oSQn!s2R
z<QL4~@a#q!kW=94;uum9H}_mL*I@%5m%#Hc60Ogd{hzJ7B`<RVlj8U93T{v1{QqeE
z{=)viT;$AU&Na?V1#{&!8EzO?h&Mjo9{4@kw#kzz>FPz529s81u>(^)%wIV%UERzb
wbar#E>+O@_YI2DpjPuvU=KQ@8_U;Q)(n_`*`DIl;K)V?{UHx3vIVCg!0JmUdw*UYD

literal 0
HcmV?d00001

diff --git a/media/img/file/24/txt.png b/media/img/file/24/txt.png
new file mode 100644
index 0000000000000000000000000000000000000000..281abef98eb1b50f97c3b97860548267629c7caf
GIT binary patch
literal 154
zcmeAS@N?(olHy`uVBq!ia0vp^5+KY0Bp8m$B&h%?rjj7PV21zE6P30CdBL78jv*C{
zch4AdH5l-;CcdwqQ$LZdYFVGGj*CjDcIJ_r^?xh!FD@vL*cp_`9B@9Mh<m||iWRE)
z<_WS4Cvp-kUj&!ChVTEu*Yo$i)<+%5Gu(;nH$wSWm$cqV1zGCp>gTe~DWM4fKB6<y

literal 0
HcmV?d00001

diff --git a/media/img/file/24/word.png b/media/img/file/24/word.png
new file mode 100644
index 0000000000000000000000000000000000000000..61f26a99a4819f1800537c6eb9acf371e7e415db
GIT binary patch
literal 195
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9Y$ZW{!3_UF&^$uA7AR8T>Eakt
z!I=ERU)4dn+2n5b)3?PR6c$J+|37s;e!s8*$BGc^8Yw*%Lk<rq){y2ii|#0_ozN+;
zS;Lg$MB9w7FHe_u@iZwXR7}hkU{koN&=Q%!vD<OBS?(`CE{0X|QEa(Nd_7gUSF*R5
oWjsGOceV$k!&ejSKbq_e3pD5b3N29x0lI;~)78&qol`;+0KcO`OaK4?

literal 0
HcmV?d00001

diff --git a/seahub/templates/js/templates.html b/seahub/templates/js/templates.html
index 09bc312b0d..7f51b7568a 100644
--- a/seahub/templates/js/templates.html
+++ b/seahub/templates/js/templates.html
@@ -210,22 +210,14 @@
         <% } %>
     </td>
     <td class="star"></td>
-    <% if (dirent.perm == 'r') { %>
-        <td class="dirent-icon"><img src="{{ MEDIA_URL }}img/folder-read-only-24.png" alt="{% trans "Directory icon" %}" /></td>
-    <% } else { %>
-        <td class="dirent-icon"><img src="{{ MEDIA_URL }}img/folder-24.png" alt="{% trans "Directory icon" %}" /></td>
-    <% } %>
+    <td class="dirent-icon"><img src="<%= icon_url %>" width="24" alt="{% trans "Directory icon" %}" /></td>
     <td>
-        <% if (category) { %>
-        <span class="dirent-name"><a href="#<%= category %>/lib/<%= repo_id %><%- encoded_path %>" class="dir-link normal"><%- dirent.obj_name %></a></span>
-        <% } else { %>
-        <span class="dirent-name"><a href="#lib/<%= repo_id %><%- encoded_path %>" class="dir-link normal"><%- dirent.obj_name %></a></span>
-        <% } %>
+        <span class="dirent-name"><a href="<%= url %>" class="dir-link normal"><%- dirent.obj_name %></a></span>
     </td>
     <td class="dirent-op">
         <div class="repo-file-op vh">
             <div class="displayed-op">
-                <a class="op-icon download sf2-icon-download sf2-x" href="{{ SITE_ROOT }}repo/download_dir/<%= repo_id %>/?p=<% print(encodeURIComponent(dirent_path)); %>" title="{% trans "Download" %}"></a>
+                <a class="op-icon download sf2-icon-download sf2-x" href="<%= download_url %>" title="{% trans "Download" %}"></a>
                 <% if (!repo_encrypted && can_generate_shared_link) { %>
                 <span class="op-icon share sf2-icon-share sf2-x" title="{% trans "Share" %}"></span>
                 <% } %>
@@ -242,9 +234,7 @@
                 <% if (app.pageOptions.folder_perm_enabled && is_repo_owner) { %>
                 <li><a class="op set-folder-permission" href="#">{% trans "Permission" %}</a></li>
                 <% } %>
-                <% if (is_pro) { %>
                 <li><a class="op open-via-client" href="seafile://openfile?repo_id=<%- repo_id %>&path=<% print(encodeURIComponent(dirent_path + '/')); %>">{% trans "Open via Client" %}</a></li>
-                <% } %>
             </ul>
             <% } else if (dirent.perm == 'r' && !repo_encrypted) { %>
             <span class="more-op-icon sf2-icon-caret-down op-icon" title="{% trans "More operations" %}"></span>
@@ -283,10 +273,10 @@
             <% if (dirent.encoded_thumbnail_src) { %>
             <img class="thumbnail" src="{{ SITE_ROOT }}<%- dirent.encoded_thumbnail_src %>" alt="" />
             <% } else { %>
-            <img src="{{ MEDIA_URL }}img/file/<%= dirent.file_icon %>" alt="" />
+            <img src="<%= icon_url %>" width="24" alt="" />
             <% } %>
         <% } else { %>
-        <img src="{{ MEDIA_URL }}img/file/<%= dirent.file_icon %>" alt="" />
+        <img src="<%= icon_url %>" width="24" alt="" />
         <% } %>
 
         <% if (is_pro && dirent.is_locked) { %>
@@ -297,16 +287,16 @@
     <td>
         <span class="dirent-name">
             <% if (dirent.is_img) { %>
-            <a class="normal img-name-link" href="{{ SITE_ROOT }}lib/<%= repo_id %>/file<%- encoded_path %>" target="_blank" data-mfp-src="{{ SITE_ROOT }}repo/<%= repo_id %>/raw<%- encoded_path %>"><%- dirent.obj_name %></a>
+            <a class="normal img-name-link" href="<%= url %>" target="_blank" data-mfp-src="{{ SITE_ROOT }}repo/<%= repo_id %>/raw<%- encoded_path %>"><%- dirent.obj_name %></a>
             <% } else { %>
-            <a class="normal" href="{{ SITE_ROOT }}lib/<%= repo_id %>/file<%- encoded_path %>" target="_blank"><%- dirent.obj_name %></a>
+            <a class="normal" href="<%= url %>" target="_blank"><%- dirent.obj_name %></a>
             <% } %>
         </span>
     </td>
     <td class="dirent-op">
         <div class="repo-file-op vh">
             <div class="displayed-op">
-                <a class="op-icon download sf2-icon-download sf2-x" href="{{ SITE_ROOT }}lib/<%= repo_id %>/file<%- encoded_path %>?dl=1" title="{% trans "Download" %}"></a>
+                <a class="op-icon download sf2-icon-download sf2-x" href="<%= download_url %>" title="{% trans "Download" %}"></a>
                 <% if (!repo_encrypted && can_generate_shared_link) { %>
                 <span class="op-icon share sf2-icon-share sf2-x" title="{% trans "Share" %}"></span>
                 <% } %>
@@ -333,8 +323,8 @@
                     <% } else { %>
                     <li><a class="op lock-file" href="#">{% trans "Lock" %}</a></li>
                     <% } %>
-                <li><a class="op open-via-client" href="seafile://openfile?repo_id=<%- repo_id %>&path=<% print(encodeURIComponent(dirent_path)); %>">{% trans "Open via Client" %}</a></li>
                 <% } %>
+                <li><a class="op open-via-client" href="seafile://openfile?repo_id=<%- repo_id %>&path=<% print(encodeURIComponent(dirent_path)); %>">{% trans "Open via Client" %}</a></li>
             </ul>
             <% } else if (dirent.perm == 'r' && !repo_encrypted) { %>
             <span class="more-op-icon sf2-icon-caret-down op-icon" title="{% trans "More operations" %}"></span>
@@ -357,7 +347,7 @@
 
 <script type="text/template" id="grid-view-file-item-tmpl">
     <a href="<%= url %>" class="img-link" target="_blank">
-        <img src="{{ MEDIA_URL }}img/file/txt-192.png" alt="" width="96" class="vam" />
+        <img src="<%= icon_url %>" alt="" width="96" class="vam" />
     </a>
 
     <a href="<%= url %>" class="ellipsis text-link normal" target="_blank">
@@ -371,11 +361,7 @@
 
 <script type="text/template" id="grid-view-dir-item-tmpl">
     <a href="<%= url %>" class="img-link">
-        <% if (dirent.perm == 'r') { %>
-        <img src="{{ MEDIA_URL }}img/folder-read-only-192.png" alt="" width="96" class="vam" />
-        <% } else { %>
-        <img src="{{ MEDIA_URL }}img/folder-beige-192.png" alt="" width="96" class="vam" />
-        <% } %>
+        <img src="<%= icon_url %>" alt="" width="96" class="vam" />
     </a>
 
     <a href="<%= url %>" class="ellipsis normal text-link">
@@ -399,12 +385,12 @@
                 <% if (dirent.is_locked) { %>
                     <% if (dirent.locked_by_me) { %>
         <li><a class="op unlock-file" href="#">{% trans "Unlock" %}</a></li>
-                    <% } else { %>
-        <li><a class="op lock-file" href="#">{% trans "Lock" %}</a></li>
                     <% } %>
+                <% } else { %>
+        <li><a class="op lock-file" href="#">{% trans "Lock" %}</a></li>
                 <% } %>
-        <li><a class="op open-via-client" href="seafile://openfile?repo_id=<%= repo_id %>&path=<% print(encodeURIComponent(dirent_path)); %>">{% trans "Open via Client" %}</a></li>
             <% } %>
+        <li><a class="op open-via-client" href="seafile://openfile?repo_id=<%= repo_id %>&path=<% print(encodeURIComponent(dirent_path)); %>">{% trans "Open via Client" %}</a></li>
         <% } %>
     </ul>
 </script>
@@ -420,9 +406,7 @@
         <li><a class="op rename" href="#">{% trans "Rename" %}</a></li>
         <li><a class="op mv" href="#">{% trans "Move" %}</a></li>
         <li><a class="op cp" href="#">{% trans "Copy" %}</a></li>
-            <% if (is_pro) { %>
         <li><a class="op open-via-client" href="seafile://openfile?repo_id=<%= repo_id %>&path=<% print(encodeURIComponent(dirent_path)); %>">{% trans "Open via Client" %}</a></li>
-            <% } %>
         <% } %>
     </ul>
 </script>
diff --git a/seahub/templates/libraries.html b/seahub/templates/libraries.html
index 4cf339f858..5478debb1f 100644
--- a/seahub/templates/libraries.html
+++ b/seahub/templates/libraries.html
@@ -238,7 +238,6 @@
 <script type="text/javascript">
 app["pageOptions"] = {
     site_root: "{{ SITE_ROOT }}",
-    base_url: "{{ SITE_ROOT }}" + "home/my/",
     csrfToken: "{{ csrf_token }}",
     reposUrl: "{% url 'api2-repos' %}",
     pubReposUrl: "{% url 'api2-pub-repos' %}",
diff --git a/static/scripts/app/models/dirent.js b/static/scripts/app/models/dirent.js
index 258fae8de4..f4747a714c 100644
--- a/static/scripts/app/models/dirent.js
+++ b/static/scripts/app/models/dirent.js
@@ -13,6 +13,15 @@ define([
             return Common.pathJoin([this.collection.path, this.get('obj_name')]);
         },
 
+        getIconUrl: function(size) {
+            if (this.get('is_dir')) {
+                var is_readonly = this.get('perm') == 'r';
+                return Common.getDirIconUrl(is_readonly, size);
+            } else {
+                return Common.getFileIconUrl(this.get('obj_name'), size);
+            }
+        },
+
         // return the URL to visit the folder or file
         getWebUrl: function() {
             var dir = this.collection;
diff --git a/static/scripts/app/views/dirent-grid.js b/static/scripts/app/views/dirent-grid.js
index d4f043e100..94fe4a3972 100644
--- a/static/scripts/app/views/dirent-grid.js
+++ b/static/scripts/app/views/dirent-grid.js
@@ -50,6 +50,7 @@ define([
             this.$el.html(template({
                 dirent: this.model.attributes,
                 dirent_path: this.model.getPath(),
+                icon_url: this.model.getIconUrl(192),
                 url: this.model.getWebUrl(),
                 category: dir.category,
                 repo_id: dir.repo_id,
@@ -132,6 +133,7 @@ define([
             this.$el.on('click', '.mv', _.bind(this.mvcp, this));
             this.$el.on('click', '.cp', _.bind(this.mvcp, this));
             this.$el.on('click', '.rename', _.bind(this.rename, this));
+            this.$el.on('click', '.open-via-client', _.bind(this.open_via_client, this));
 
             return false;
         },
@@ -196,6 +198,11 @@ define([
             };
             new DirentRenameDialog(options);
             return false;
+        },
+
+        open_via_client: function() {
+            this._closeMenu();
+            return true;
         }
 
     });
diff --git a/static/scripts/app/views/dirent.js b/static/scripts/app/views/dirent.js
index 1202f1a22d..4ecbd77555 100644
--- a/static/scripts/app/views/dirent.js
+++ b/static/scripts/app/views/dirent.js
@@ -38,6 +38,9 @@ define([
                 dirent: this.model.attributes,
                 dirent_path: dirent_path,
                 encoded_path: Common.encodePath(dirent_path),
+                icon_url: this.model.getIconUrl(48),
+                url: this.model.getWebUrl(),
+                download_url: this.model.getDownloadUrl(),
                 category: dir.category,
                 repo_id: dir.repo_id,
                 is_repo_owner: dir.is_repo_owner,
@@ -65,7 +68,14 @@ define([
             'click .cp': 'mvcp',
             'click .set-folder-permission': 'setFolderPerm',
             'click .lock-file': 'lockFile',
-            'click .unlock-file': 'unlockFile'
+            'click .unlock-file': 'unlockFile',
+            'click .open-via-client': 'open_via_client'
+        },
+
+        _hideMenu: function() {
+            //this.$('.hidden-op').addClass('hide');
+            this.$el.removeClass('hl').find('.repo-file-op').addClass('vh');
+            this.$('.hidden-op').addClass('hide');
         },
 
         highlight: function() {
@@ -498,7 +508,13 @@ define([
                 }
             });
             return false;
+        },
+
+        open_via_client: function() {
+            this._hideMenu();
+            return true;
         }
+
     });
 
     return DirentView;
diff --git a/static/scripts/app/views/fileupload.js b/static/scripts/app/views/fileupload.js
index c4b3ddedd3..b0caaede44 100644
--- a/static/scripts/app/views/fileupload.js
+++ b/static/scripts/app/views/fileupload.js
@@ -274,7 +274,7 @@ define([
             .bind('fileuploadprogressall', function (e, data) {
                 $total_progress.html(parseInt(data.loaded / data.total * 100, 10) + '% ' +
                     '<span style="font-size:14px;color:#555;">(' +
-                    $(this).data('blueimp-fileupload')._formatBitrate(data.bitrate) + 
+                    $(this).data('blueimp-fileupload')._formatBitrate(data.bitrate) +
                     ')</span>').removeClass('hide');
                 if (data.loaded > 0 && data.loaded == data.total) {
                     saving_tip.show();
diff --git a/static/scripts/common.js b/static/scripts/common.js
index 97bdd6e21c..b7268030ff 100644
--- a/static/scripts/common.js
+++ b/static/scripts/common.js
@@ -148,6 +148,77 @@ define([
             }
         },
 
+        FILEEXT_ICON_MAP: {
+            // text file
+            'md': 'txt.png',
+            'txt': 'txt.png',
+
+            // pdf file
+            'pdf' : 'pdf.png',
+            // document file
+            'doc' : 'word.png',
+            'docx' : 'word.png',
+            'ppt' : 'ppt.png',
+            'pptx' : 'ppt.png',
+            'xls' : 'excel.png',
+            'xlsx' : 'excel.png',
+            'txt' : 'txt.png',
+            'odt' : 'word.png',
+            'fodt' : 'word.png',
+            'ods' : 'excel.png',
+            'fods' : 'excel.png',
+            'odp' : 'ppt.png',
+            'fodp' : 'ppt.png',
+            // music file
+            'mp3' : 'music.png',
+            'oga' : 'music.png',
+            'ogg' : 'music.png',
+            'flac' : 'music.png',
+            'aac' : 'music.png',
+            'ac3' : 'music.png',
+            'wma' : 'music.png',
+            // image file
+            'jpg' : 'pic.png',
+            'jpeg' : 'pic.png',
+            'png' : 'pic.png',
+            'svg' : 'pic.png',
+            'gif' : 'pic.png',
+            'bmp' : 'pic.png',
+            'ico' : 'pic.png',
+            // default
+            'default' : 'file.png'
+        },
+
+        getFileIconUrl: function(filename, size) {
+            if (size > 24) {
+                size = 192;
+            } else {
+                size = 24;
+            }
+
+            var file_ext;
+            if (filename.lastIndexOf('.') == -1) {
+                return app.config.mediaUrl + "img/file/" + size + "/"
+                    + this.FILEEXT_ICON_MAP['default'];
+            } else {
+                file_ext = filename.substr(filename.lastIndexOf('.') + 1).toLowerCase();
+            }
+
+            if (_.has(this.FILEEXT_ICON_MAP, file_ext)) {
+                return app.config.mediaUrl + "img/file/" + size + "/" + this.FILEEXT_ICON_MAP[file_ext];
+            } else {
+                return app.config.mediaUrl + "img/file/" + size + "/" + this.FILEEXT_ICON_MAP['default'];
+            }
+        },
+
+        getDirIconUrl: function(is_readonly, size) {
+            if (is_readonly) {
+                return app.config.mediaUrl + "img/folder-read-only-192.png";
+            } else {
+                return app.config.mediaUrl + "img/folder-beige-192.png";
+            }
+        },
+
         showConfirm: function(title, content, yesCallback) {
             var $popup = $("#confirm-popup");
             var $cont = $('#confirm-con');

From 1fa7c8fd5ecf365230cfe0ebaf0422aa92cffac5 Mon Sep 17 00:00:00 2001
From: Daniel Pan <freeplant@gmail.com>
Date: Tue, 1 Mar 2016 17:20:04 +0800
Subject: [PATCH 13/17] Add lock/unlock function and fix a bug in
 DirentGridView menu event binding

---
 media/css/seahub.css                    |  6 +++
 seahub/templates/js/templates.html      |  3 ++
 static/scripts/app/models/dirent.js     | 69 ++++++++++++++++++++++++-
 static/scripts/app/views/dirent-grid.js | 49 ++++++++++++++----
 static/scripts/app/views/dirent.js      | 48 ++++-------------
 5 files changed, 125 insertions(+), 50 deletions(-)

diff --git a/media/css/seahub.css b/media/css/seahub.css
index b518cca322..e26f44b29a 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -3833,6 +3833,7 @@ img.thumbnail {
     position:relative;
 }
 .grid-item .img-link {
+    position:relative; /* for locked icon */
     display:block;
     text-align:center;
     height:100px;
@@ -3880,6 +3881,11 @@ img.thumbnail {
     border-radius:3px;
     margin:0;
 }
+.grid-file-locked-icon {
+    position:absolute;
+    bottom:0px;
+    right:10px;
+}
 .grid-item-op {
     position:fixed;
 }
diff --git a/seahub/templates/js/templates.html b/seahub/templates/js/templates.html
index 7f51b7568a..6ae08f378d 100644
--- a/seahub/templates/js/templates.html
+++ b/seahub/templates/js/templates.html
@@ -348,6 +348,9 @@
 <script type="text/template" id="grid-view-file-item-tmpl">
     <a href="<%= url %>" class="img-link" target="_blank">
         <img src="<%= icon_url %>" alt="" width="96" class="vam" />
+        <% if (is_pro && dirent.is_locked) { %>
+        <img class="grid-file-locked-icon" width="16" src="{{ MEDIA_URL }}img/file-locked-32.png" alt="{% trans "locked" %}" />
+        <% } %>
     </a>
 
     <a href="<%= url %>" class="ellipsis text-link normal" target="_blank">
diff --git a/static/scripts/app/models/dirent.js b/static/scripts/app/models/dirent.js
index f4747a714c..ecdeb65e3d 100644
--- a/static/scripts/app/models/dirent.js
+++ b/static/scripts/app/models/dirent.js
@@ -126,7 +126,74 @@ define([
                         options.error(xhr);
                 }
             });
-        }
+        },
+
+        lockOrUnlockFile: function(options) {
+            var dir = this.collection,
+                filepath = this.getPath();
+
+            $.ajax({
+                url: Common.getUrl({name: 'lock_or_unlock_file', repo_id: dir.repo_id}),
+                type: 'PUT',
+                dataType: 'json',
+                data: {
+                    'operation': options.op,
+                    'p': filepath
+                },
+                cache: false,
+                beforeSend: Common.prepareCSRFToken,
+                success: function() {
+                    options.success();
+                },
+                error: function(xhr) {
+                    options.error(xhr);
+                }
+            });
+        },
+
+        lockFile: function(options) {
+            var _this = this;
+            this.lockOrUnlockFile({
+                op: 'lock',
+                success: function() {
+                    _this.set({
+                        'is_locked': true,
+                        'locked_by_me': true,
+                        'lock_owner_name': app.pageOptions.name
+                    });
+                    if (options.success) {
+                        options.success();
+                    }
+                },
+                error: function(xhr) {
+                    if (options.error) {
+                        options.error(xhr)
+                    }
+                }
+            });
+            return false;
+        },
+
+        unlockFile: function(options) {
+            var _this = this;
+            this.lockOrUnlockFile({
+                op: 'unlock',
+                success: function() {
+                    _this.set({
+                        'is_locked': false
+                    });
+                    if (options.success) {
+                        options.success();
+                    }
+                },
+                error: function(xhr) {
+                    if (options.error) {
+                        options.error(xhr)
+                    }
+                }
+            });
+            return false;
+        },
 
     });
 
diff --git a/static/scripts/app/views/dirent-grid.js b/static/scripts/app/views/dirent-grid.js
index 94fe4a3972..5d81588b7d 100644
--- a/static/scripts/app/views/dirent-grid.js
+++ b/static/scripts/app/views/dirent-grid.js
@@ -128,21 +128,24 @@ define([
 
             // Using _.bind(function, object) to make that whenever the function is
             // called, the value of this will be the object.
-            this.$el.on('click', '.delete', _.bind(this.del, this));
-            this.$el.on('click', '.share', _.bind(this.share, this));
-            this.$el.on('click', '.mv', _.bind(this.mvcp, this));
-            this.$el.on('click', '.cp', _.bind(this.mvcp, this));
-            this.$el.on('click', '.rename', _.bind(this.rename, this));
-            this.$el.on('click', '.open-via-client', _.bind(this.open_via_client, this));
+            this.$('.delete').on('click', _.bind(this.del, this));
+            this.$('.share').on('click', _.bind(this.share, this));
+            this.$('.mv').on('click', _.bind(this.mvcp, this));
+            this.$('.cp').on('click', _.bind(this.mvcp, this));
+            this.$('.rename').on('click', _.bind(this.rename, this));
+            this.$('.open-via-client').on('click', _.bind(this.open_via_client, this));
+            this.$('.lock-file').on('click', _.bind(this.lockFile, this));
+            this.$('.unlock-file').on('click', _.bind(this.unlockFile, this));
 
             return false;
         },
 
-        _closeMenu: function() {
+        closeMenu: function() {
             this.$('.grid-item-op').remove();
         },
 
         del: function(event) {
+            this.closeMenu();
             var dirent_name = this.model.get('obj_name');
             this.model.deleteFromServer({
                 success: function(data) {
@@ -173,7 +176,7 @@ define([
                 'obj_name': obj_name
             };
             new ShareView(options);
-            this._closeMenu();
+            this.closeMenu();
             return false;
         },
 
@@ -186,12 +189,12 @@ define([
             };
 
             new DirentMvcpDialog(options);
-            this._closeMenu();
+            this.closeMenu();
             return false;
         },
 
         rename: function() {
-            this._closeMenu();
+            this.closeMenu();
             var options = {
                 'dir': this.dir,
                 'dirent': this.model
@@ -200,8 +203,32 @@ define([
             return false;
         },
 
+        lockFile: function() {
+            this.closeMenu();
+            this.model.lockFile({
+                success: function() {
+                },
+                error: function(xhr) {
+                    Common.ajaxErrorHandler(xhr);
+                }
+            });
+            return false;
+        },
+
+        unlockFile: function() {
+            this.closeMenu();
+            this.model.unlockFile({
+                success: function() {
+                },
+                error: function(xhr) {
+                    Common.ajaxErrorHandler(xhr);
+                }
+            });
+            return false;
+        },
+
         open_via_client: function() {
-            this._closeMenu();
+            this.closeMenu();
             return true;
         }
 
diff --git a/static/scripts/app/views/dirent.js b/static/scripts/app/views/dirent.js
index 4ecbd77555..90c601d3d6 100644
--- a/static/scripts/app/views/dirent.js
+++ b/static/scripts/app/views/dirent.js
@@ -456,41 +456,14 @@ define([
             return false;
         },
 
-        lockOrUnlockFile: function(params) {
-            var dir = this.dir,
-                filepath = Common.pathJoin([dir.path, this.model.get('obj_name')]),
-                callback = params.after_success;
-
-            $.ajax({
-                url: Common.getUrl({name: 'lock_or_unlock_file', repo_id: dir.repo_id}),
-                type: 'PUT',
-                dataType: 'json',
-                data: {
-                    'operation': params.op,
-                    'p': filepath
-                },
-                cache: false,
-                beforeSend: Common.prepareCSRFToken,
-                success: function() {
-                    callback();
-                },
-                error: function (xhr) {
-                    Common.ajaxErrorHandler(xhr);
-                }
-            });
-        },
-
         lockFile: function() {
             var _this = this;
-            this.lockOrUnlockFile({
-                'op': 'lock',
-                'after_success': function() {
-                    _this.model.set({
-                        'is_locked': true,
-                        'locked_by_me': true,
-                        'lock_owner_name': app.pageOptions.name
-                    });
+            this.model.lockFile({
+                success: function() {
                     _this.$el.removeClass('hl');
+                },
+                error: function(xhr) {
+                    Common.ajaxErrorHandler(xhr);
                 }
             });
             return false;
@@ -498,13 +471,12 @@ define([
 
         unlockFile: function() {
             var _this = this;
-            this.lockOrUnlockFile({
-                'op': 'unlock',
-                'after_success': function() {
-                    _this.model.set({
-                        'is_locked': false
-                    });
+            this.model.unlockFile({
+                success: function() {
                     _this.$el.removeClass('hl');
+                },
+                error: function(xhr) {
+                    Common.ajaxErrorHandler(xhr);
                 }
             });
             return false;

From 707346ce7dd035fbd251282bffb7457845bea4b6 Mon Sep 17 00:00:00 2001
From: Daniel Pan <freeplant@gmail.com>
Date: Tue, 1 Mar 2016 21:24:48 +0800
Subject: [PATCH 14/17] Add permission setting dialog

---
 seahub/templates/js/templates.html      |  3 +++
 static/scripts/app/views/dirent-grid.js | 13 ++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/seahub/templates/js/templates.html b/seahub/templates/js/templates.html
index 6ae08f378d..3414691920 100644
--- a/seahub/templates/js/templates.html
+++ b/seahub/templates/js/templates.html
@@ -409,6 +409,9 @@
         <li><a class="op rename" href="#">{% trans "Rename" %}</a></li>
         <li><a class="op mv" href="#">{% trans "Move" %}</a></li>
         <li><a class="op cp" href="#">{% trans "Copy" %}</a></li>
+            <% if (app.pageOptions.folder_perm_enabled && is_repo_owner) { %>
+        <li><a class="op set-folder-permission" href="#">{% trans "Permission" %}</a></li>
+            <% } %>
         <li><a class="op open-via-client" href="seafile://openfile?repo_id=<%= repo_id %>&path=<% print(encodeURIComponent(dirent_path)); %>">{% trans "Open via Client" %}</a></li>
         <% } %>
     </ul>
diff --git a/static/scripts/app/views/dirent-grid.js b/static/scripts/app/views/dirent-grid.js
index 5d81588b7d..cd12c1c712 100644
--- a/static/scripts/app/views/dirent-grid.js
+++ b/static/scripts/app/views/dirent-grid.js
@@ -7,7 +7,7 @@ define([
     'app/views/share',
     'app/views/folder-perm',
     'app/views/dialogs/dirent-mvcp',
-    'app/views/dialogs/dirent-rename'
+    'app/views/dialogs/dirent-rename',
 ], function($, _, Backbone, Common, FileTree, ShareView, FolderPermView,
     DirentMvcpDialog, DirentRenameDialog) {
     'use strict';
@@ -136,6 +136,7 @@ define([
             this.$('.open-via-client').on('click', _.bind(this.open_via_client, this));
             this.$('.lock-file').on('click', _.bind(this.lockFile, this));
             this.$('.unlock-file').on('click', _.bind(this.unlockFile, this));
+            this.$('.set-folder-permission').on('click', _.bind(this.setFolderPerm, this));
 
             return false;
         },
@@ -203,6 +204,16 @@ define([
             return false;
         },
 
+        setFolderPerm: function() {
+            var options = {
+                'obj_name': this.model.get('obj_name'),
+                'dir_path': this.dir.path,
+                'repo_id': this.dir.repo_id
+            };
+            new FolderPermView(options);
+            return false;
+        },
+
         lockFile: function() {
             this.closeMenu();
             this.model.lockFile({

From 80d51d446488f6dcd9447f41a0d1ad46751ae878 Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Thu, 3 Mar 2016 11:12:44 +0800
Subject: [PATCH 15/17] [dir view] bugfix for 'decrypt lib', position of grid
 item's op menu, and etc.

---
 media/css/seahub.css                    | 27 ++++++------------------
 seahub/templates/js/dir-view.html       | 14 +++++++------
 seahub/templates/js/templates.html      |  2 +-
 static/scripts/app/views/dir.js         | 28 +++++++++++++------------
 static/scripts/app/views/dirent-grid.js |  7 +++++--
 5 files changed, 35 insertions(+), 43 deletions(-)

diff --git a/media/css/seahub.css b/media/css/seahub.css
index e26f44b29a..5d4d0dc3c7 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -3796,34 +3796,22 @@ img.thumbnail {
     display:inline-block;
     margin-left:12px;
 }
-.switch-mode .active {
-    background:#ccc;
-}
-.list-view-btn,
-.grid-view-btn {
-    outline:none;
-    padding:3px 6px 4px;
-    height:20px;
-    border:1px solid #ccc;
-    background:#fff;
-    display:inline-block;
-}
-.grid-view-btn {
-    border-left:none;
-}
 .grid-view-icon-btn,
 .list-view-icon-btn {
     display:inline-block;
     padding:0 6px;
-    font-size:18px;
     height:27px;
-    color:#aaa;
-    border:1px solid #ccc;
     background:#fff;
+    border:1px solid #ccc;
+    font-size:18px;
+    color:#aaa;
+    cursor:pointer;
 }
 .grid-view-icon-btn.active,
 .list-view-icon-btn.active {
     color:#fff;
+    background:#ccc;
+    cursor:default;
 }
 /* grid view */
 .grid-item {
@@ -3886,9 +3874,6 @@ img.thumbnail {
     bottom:0px;
     right:10px;
 }
-.grid-item-op {
-    position:fixed;
-}
 #dir-view .grid-item {
     padding:10px 20px; /* use less padding */
 }
diff --git a/seahub/templates/js/dir-view.html b/seahub/templates/js/dir-view.html
index 7540ad681b..60e0490184 100644
--- a/seahub/templates/js/dir-view.html
+++ b/seahub/templates/js/dir-view.html
@@ -4,12 +4,14 @@
         <p class="path"></p>
         <div class="repo-op"></div>
     </div>
-    <table class="repo-file-list">
-        <thead></thead>
-        <tbody></tbody>
-    </table>
-    <ul class="grid-view hide">
-    </ul>
+    <div class="js-dir-content">
+        <table class="repo-file-list">
+            <thead></thead>
+            <tbody></tbody>
+        </table>
+        <ul class="grid-view hide">
+        </ul>
+    </div>
     <span class="loading-icon loading-tip"></span>
     <p class="error hide"></p>
 </div>
diff --git a/seahub/templates/js/templates.html b/seahub/templates/js/templates.html
index 3414691920..519742d419 100644
--- a/seahub/templates/js/templates.html
+++ b/seahub/templates/js/templates.html
@@ -149,7 +149,7 @@
     <% } %>
 
     <div class="switch-mode vam">
-        <span class="list-view-icon-btn sf2-icon-list-view <% if (mode == 'list') { %>active<% } %>" id="js-switch-list-view"></span><span class="grid-view-icon-btn sf2-icon-grid-view <% if (mode == 'grid') { %>active<% } %>" id="js-switch-grid-view"></span>
+        <span class="list-view-icon-btn sf2-icon-list-view <% if (mode == 'list') { %>active<% } %>" title="{% trans "List" %}" id="js-switch-list-view"></span><span class="grid-view-icon-btn sf2-icon-grid-view <% if (mode == 'grid') { %>active<% } %>" title="{% trans "Grid" %}" id="js-switch-grid-view"></span>
     </div>
 
     <% if (path == '/') { %>
diff --git a/static/scripts/app/views/dir.js b/static/scripts/app/views/dir.js
index 13f8bac764..9e3bdb503f 100644
--- a/static/scripts/app/views/dir.js
+++ b/static/scripts/app/views/dir.js
@@ -41,8 +41,10 @@ define([
                 var view_mode = Cookies.get('view_mode');
                 if (view_mode == 'grid') {
                     this.view_mode = 'grid';
-                } else
+                } else {
                     this.view_mode = 'list';
+                }
+
                 this.contextOptions = {};
 
                 this.dir = new DirentCollection();
@@ -183,8 +185,9 @@ define([
             reset: function() {
                 this.renderPath();
                 this.renderDirOpBar();
-                if (this.view_mode == 'list')
+                if (this.view_mode == 'list') {
                     this.renderDirentsHd();
+                }
                 this.dir.each(this.addOne, this);
                 this.fileUploadView.setFileInput();
                 this.getImageThumbnail();
@@ -233,7 +236,7 @@ define([
                 get_thumbnail(0);
             },
 
-            _showEncryptDialog: function() {
+            _showLibDecryptDialog: function() {
                 var _this = this;
                 var form = $($('#repo-decrypt-form-template').html());
                 var decrypt_success = false;
@@ -244,7 +247,7 @@ define([
                         _this.$el_con.show();
                         if (!decrypt_success) {
                             app.router.navigate(
-                                category + '/', // need to append '/' at end
+                                _this.dir.category + '/', // need to append '/' at end
                                 {trigger: true}
                             );
                         }
@@ -269,7 +272,7 @@ define([
                         after_op_success: function() {
                             decrypt_success = true;
                             $.modal.close();
-                            _this.showDir(_this.dir.category, _this.dir.repo_id, _this.dir.path);
+                            _this.renderDir();
                         }
                     });
                     return false;
@@ -305,12 +308,12 @@ define([
                     },
                     error: function(collection, response, opts) {
                         loading_tip.hide();
-                        var $el_con = _this.$('.repo-file-list-topbar, .repo-file-list').hide();
+                        _this.$el_con = _this.$('.repo-file-list-topbar, .js-dir-content').hide();
                         var $error = _this.$('.error');
                         var err_msg;
                         if (response.responseText) {
                             if (response.responseJSON.lib_need_decrypt) {
-                                _this._showEncryptDialog();
+                                _this._showLibDecryptDialog();
                                 return;
                             } else {
                                 err_msg = response.responseJSON.error;
@@ -337,12 +340,11 @@ define([
                     context = 'common';
                 }
                 var obj = {
-                        path: path,
-                        repo_name: dir.repo_name,
-                        category: dir.category,
-                        context: context
-                    };
-                // add possible group_name
+                    path: path,
+                    repo_name: dir.repo_name,
+                    category: dir.category,
+                    context: context
+                };
                 $.extend(obj, this.contextOptions);
 
                 var path_list = path.substr(1).split('/');
diff --git a/static/scripts/app/views/dirent-grid.js b/static/scripts/app/views/dirent-grid.js
index cd12c1c712..feff01ba2f 100644
--- a/static/scripts/app/views/dirent-grid.js
+++ b/static/scripts/app/views/dirent-grid.js
@@ -121,9 +121,12 @@ define([
                 repo_encrypted: dir.encrypted
             });
             this.$el.append(op);
+
+            var el_pos = this.$el.offset();
             this.$('.grid-item-op').css({
-                'left': event.pageX,
-                'top': event.pageY,
+                'position': 'absolute',
+                'left': event.pageX - el_pos.left,
+                'top': event.pageY - el_pos.top
             });
 
             // Using _.bind(function, object) to make that whenever the function is

From 9a89536ae536569d42cf7517194d02d806e4df61 Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Thu, 3 Mar 2016 16:37:18 +0800
Subject: [PATCH 16/17] [dir view] enable 'thumbnail' for grid view

---
 seahub/templates/js/templates.html | 15 ++++++++++-----
 seahub/templates/libraries.html    |  2 ++
 seahub/views/__init__.py           |  2 ++
 seahub/views/ajax.py               |  3 ++-
 static/scripts/app/views/dir.js    | 23 +++++++++++++++++++++--
 5 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/seahub/templates/js/templates.html b/seahub/templates/js/templates.html
index 519742d419..c1ffbd3f85 100644
--- a/seahub/templates/js/templates.html
+++ b/seahub/templates/js/templates.html
@@ -347,7 +347,16 @@
 
 <script type="text/template" id="grid-view-file-item-tmpl">
     <a href="<%= url %>" class="img-link" target="_blank">
-        <img src="<%= icon_url %>" alt="" width="96" class="vam" />
+        <% if (dirent.is_img) { %>
+            <% if (dirent.encoded_thumbnail_src) { %>
+            <img class="thumbnail vam" src="{{ SITE_ROOT }}<%- dirent.encoded_thumbnail_src %>" alt="" />
+            <% } else { %>
+            <img src="<%= icon_url %>" width="96" alt="" class="vam" />
+            <% } %>
+        <% } else { %>
+        <img src="<%= icon_url %>" width="96" alt="" class="vam" />
+        <% } %>
+
         <% if (is_pro && dirent.is_locked) { %>
         <img class="grid-file-locked-icon" width="16" src="{{ MEDIA_URL }}img/file-locked-32.png" alt="{% trans "locked" %}" />
         <% } %>
@@ -358,10 +367,6 @@
     </a>
 </script>
 
-<script type="text/template" id="grid-view-img-item-tmpl">
-
-</script>
-
 <script type="text/template" id="grid-view-dir-item-tmpl">
     <a href="<%= url %>" class="img-link">
         <img src="<%= icon_url %>" alt="" width="96" class="vam" />
diff --git a/seahub/templates/libraries.html b/seahub/templates/libraries.html
index 5478debb1f..7f0f9818bc 100644
--- a/seahub/templates/libraries.html
+++ b/seahub/templates/libraries.html
@@ -274,6 +274,8 @@ app["pageOptions"] = {
     enable_upload_folder: {% if enable_upload_folder %} true {% else %} false {% endif %},
     enable_resumable_fileupload: {% if enable_resumable_fileupload %} true {% else %} false {% endif %},
     enable_thumbnail: {% if enable_thumbnail %} true {% else %} false {% endif %},
+    thumbnail_default_size: {{ thumbnail_default_size }},
+    thumbnail_size_for_grid: {{ thumbnail_size_for_grid }},
     enable_encrypted_library: {% if enable_encrypted_library %} true {% else %} false {% endif %},
     enable_repo_history_setting: {% if enable_repo_history_setting %} true {% else %} false {% endif %},
     max_upload_file_size: {% if max_upload_file_size %} {{ max_upload_file_size }} {% else %} '' {% endif %},
diff --git a/seahub/views/__init__.py b/seahub/views/__init__.py
index 10835670e6..4666f75bf5 100644
--- a/seahub/views/__init__.py
+++ b/seahub/views/__init__.py
@@ -966,6 +966,8 @@ def libraries(request):
             'enable_upload_folder': settings.ENABLE_UPLOAD_FOLDER,
             'enable_resumable_fileupload': settings.ENABLE_RESUMABLE_FILEUPLOAD,
             'enable_thumbnail': settings.ENABLE_THUMBNAIL,
+            'thumbnail_default_size': settings.THUMBNAIL_DEFAULT_SIZE,
+            'thumbnail_size_for_grid': settings.THUMBNAIL_SIZE_FOR_GRID,
             'enable_encrypted_library': config.ENABLE_ENCRYPTED_LIBRARY,
             'enable_repo_history_setting': config.ENABLE_REPO_HISTORY_SETTING,
             'max_upload_file_size': max_upload_file_size,
diff --git a/seahub/views/ajax.py b/seahub/views/ajax.py
index 8f7468975e..9e2088e4b6 100644
--- a/seahub/views/ajax.py
+++ b/seahub/views/ajax.py
@@ -470,7 +470,8 @@ def list_lib_dir(request, repo_id):
         d_['perm'] = d.permission # perm for sub dir in current dir
         dirent_list.append(d_)
 
-    size = THUMBNAIL_DEFAULT_SIZE
+    size = int(request.GET.get('thumbnail_size', THUMBNAIL_DEFAULT_SIZE))
+
     for f in file_list:
         f_ = {}
         f_['is_file'] = True
diff --git a/static/scripts/app/views/dir.js b/static/scripts/app/views/dir.js
index 9e3bdb503f..0218fbfa53 100644
--- a/static/scripts/app/views/dir.js
+++ b/static/scripts/app/views/dir.js
@@ -210,12 +210,19 @@ define([
                     repo_id = this.dir.repo_id,
                     cur_path = this.dir.path,
                     _this = this;
+                var thumbnail_size = app.pageOptions.thumbnail_default_size;
+                if (this.view_mode == 'grid') {
+                    thumbnail_size = app.pageOptions.thumbnail_size_for_grid;
+                }
                 var get_thumbnail = function(i) {
                     var cur_img = images_with_no_thumbnail[i];
                     var cur_img_path = Common.pathJoin([cur_path, cur_img.get('obj_name')]);
                     $.ajax({
                         url: Common.getUrl({name: 'thumbnail_create', repo_id: repo_id}),
-                        data: {'path': cur_img_path},
+                        data: {
+                            'path': cur_img_path,
+                            'size': thumbnail_size
+                        },
                         cache: false,
                         dataType: 'json',
                         success: function(data) {
@@ -294,11 +301,18 @@ define([
                 var loading_tip = this.$('.loading-tip').show();
 
                 var _this = this;
+                var thumbnail_size = app.pageOptions.thumbnail_default_size;
+                if (this.view_mode == 'grid') {
+                    thumbnail_size = app.pageOptions.thumbnail_size_for_grid;
+                }
                 var dir = this.dir;
                 dir.fetch({
                     cache: false,
                     reset: true,
-                    data: { 'p': dir.path },
+                    data: {
+                        'p': dir.path,
+                        'thumbnail_size': thumbnail_size
+                    },
                     success: function(collection, response, opts) {
                         dir.last_start = 0; // for 'more'
                         if (response.dirent_list.length == 0 ||  // the dir is empty
@@ -1039,11 +1053,16 @@ define([
                     var loading_tip = this.$('.loading-tip'),
                         _this = this;
                     dir.last_start = start;
+                    var thumbnail_size = app.pageOptions.thumbnail_default_size;
+                    if (this.view_mode == 'grid') {
+                        thumbnail_size = app.pageOptions.thumbnail_size_for_grid;
+                    }
                     dir.fetch({
                         cache: false,
                         remove: false,
                         data: {
                             'p': dir.path,
+                            'thumbnail_size': thumbnail_size,
                             'start': dir.more_start
                         },
                         success: function (collection, response, opts) {

From abec40b07c844a2500b2084c746a6f62e4cba3d9 Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Thu, 3 Mar 2016 17:47:36 +0800
Subject: [PATCH 17/17] [dir view] clean up views/dirent.js,
 views/dirent-grid.js

---
 static/scripts/app/views/dirent-grid.js |  24 +--
 static/scripts/app/views/dirent.js      | 185 ++----------------------
 2 files changed, 14 insertions(+), 195 deletions(-)

diff --git a/static/scripts/app/views/dirent-grid.js b/static/scripts/app/views/dirent-grid.js
index feff01ba2f..1d23dbd235 100644
--- a/static/scripts/app/views/dirent-grid.js
+++ b/static/scripts/app/views/dirent-grid.js
@@ -7,7 +7,7 @@ define([
     'app/views/share',
     'app/views/folder-perm',
     'app/views/dialogs/dirent-mvcp',
-    'app/views/dialogs/dirent-rename',
+    'app/views/dialogs/dirent-rename'
 ], function($, _, Backbone, Common, FileTree, ShareView, FolderPermView,
     DirentMvcpDialog, DirentRenameDialog) {
     'use strict';
@@ -25,10 +25,6 @@ define([
         fileOpTemplate: _.template($('#grid-view-file-op-tmpl').html()),
         renameTemplate: _.template($("#dirent-rename-dialog-template").html()),
 
-        // renameTemplate: _.template($("#grid-rename-form-template").html()),
-        // mvcpTemplate: _.template($("#mvcp-form-template").html()),
-        // mvProgressTemplate: _.template($("#mv-progress-popup-template").html()),
-
         initialize: function(options) {
             this.dirView = options.dirView;
             this.dir = this.dirView.dir;
@@ -68,22 +64,8 @@ define([
         events: {
             'mouseenter': 'highlight',
             'mouseleave': 'rmHighlight',
-            //'mousedown .img-link': 'showPopupMenu',
-            //'mousedown .text-link': 'showPopupMenu'
             'contextmenu .img-link': 'showPopupMenu',
             'contextmenu .text-link': 'showPopupMenu'
-
-            /*
-            'click .dir-link': 'visitDir',
-            'click .share': 'share',
-            'click .delete': 'del', // 'delete' is a preserve word
-            'click .rename': 'rename',
-            'click .mv': 'mvcp',
-            'click .cp': 'mvcp',
-            'click .set-folder-permission': 'setFolderPerm',
-            'click .lock-file': 'lockFile',
-            'click .unlock-file': 'unlockFile'
-            */
         },
 
         highlight: function() {
@@ -184,8 +166,8 @@ define([
             return false;
         },
 
-        mvcp: function(event) {
-            var op_type = $(event.target).hasClass('mv') ? 'mv' : 'cp';
+        mvcp: function(e) {
+            var op_type = $(e.currentTarget).hasClass('mv') ? 'mv' : 'cp';
             var options = {
                 'dir': this.dir,
                 'dirent': this.model,
diff --git a/static/scripts/app/views/dirent.js b/static/scripts/app/views/dirent.js
index 90c601d3d6..73128f8b3b 100644
--- a/static/scripts/app/views/dirent.js
+++ b/static/scripts/app/views/dirent.js
@@ -5,8 +5,10 @@ define([
     'common',
     'file-tree',
     'app/views/share',
+    'app/views/dialogs/dirent-mvcp',
     'app/views/folder-perm'
-], function($, _, Backbone, Common, FileTree, ShareView, FolderPermView) {
+], function($, _, Backbone, Common, FileTree, ShareView, DirentMvcpDialog,
+    FolderPermView) {
     'use strict';
 
     app = app || {};
@@ -73,7 +75,6 @@ define([
         },
 
         _hideMenu: function() {
-            //this.$('.hidden-op').addClass('hide');
             this.$el.removeClass('hl').find('.repo-file-op').addClass('vh');
             this.$('.hidden-op').addClass('hide');
         },
@@ -270,179 +271,15 @@ define([
             return false;
         },
 
-        mvcp: function(event) {
-            var dir = this.dir;
-            var el = event.target || event.srcElement,
-                op_type = $(el).hasClass('mv') ? 'mv' : 'cp',
-                obj_name = this.model.get('obj_name'),
-                obj_type = this.model.get('is_dir') ? 'dir' : 'file';
+        mvcp: function(e) {
+            var op_type = $(e.currentTarget).hasClass('mv') ? 'mv' : 'cp';
+            var options = {
+                'dir': this.dir,
+                'dirent': this.model,
+                'op_type': op_type
+            };
 
-            var title = op_type == 'mv' ? gettext("Move {placeholder} to:") : gettext("Copy {placeholder} to:");
-            title = title.replace('{placeholder}', '<span class="op-target ellipsis ellipsis-op-target" title="' + Common.HTMLescape(obj_name) + '">' + Common.HTMLescape(obj_name) + '</span>');
-
-            var show_cur_repo = true;
-            if (this.model.get('perm') == 'r') {
-                show_cur_repo = false;
-            }
-            var form = $(this.mvcpTemplate({
-                form_title: title,
-                op_type: op_type,
-                obj_type: obj_type,
-                obj_name: obj_name,
-                show_cur_repo: show_cur_repo,
-                show_other_repos: !dir.encrypted
-            }));
-            form.modal({appendTo:'#main', autoResize:true, focus:false});
-            $('#simplemodal-container').css({'width':'auto', 'height':'auto'});
-
-            if (show_cur_repo) {
-                FileTree.renderTreeForPath({
-                    repo_name: dir.repo_name,
-                    repo_id: dir.repo_id,
-                    path: dir.path
-                });
-            }
-            if (!dir.encrypted) {
-                FileTree.prepareOtherReposTree({cur_repo_id: dir.repo_id});
-            }
-
-            var dirent = this.$el;
-            var _this = this;
-            form.submit(function() {
-                var form = $(this),
-                    form_id = form.attr('id'),
-                    path = dir.path,
-                    repo_id = dir.repo_id;
-                var dst_repo = $('[name="dst_repo"]', form).val(),
-                    dst_path = $('[name="dst_path"]', form).val(),
-                    op = $('[name="op"]', form).val(),
-                    obj_name = $('[name="obj_name"]', form).val(),
-                    obj_type = $('[name="obj_type"]', form).val();
-
-                if (!$.trim(dst_repo) || !$.trim(dst_path)) {
-                    $('.error', form).removeClass('hide');
-                    return false;
-                }
-                if (dst_repo == repo_id && (dst_path == path || (obj_type == 'dir' && dst_path == path + obj_name + '/'))) {
-                    $('.error', form).html(gettext("Invalid destination path")).removeClass('hide');
-                    return false;
-                }
-                var options = { repo_id: repo_id };
-                if (obj_type == 'dir') {
-                    options.name = op == 'mv' ? 'mv_dir' : 'cp_dir';
-                } else {
-                    options.name = op == 'mv' ? 'mv_file' : 'cp_file';
-                }
-                var post_url = Common.getUrl(options) + '?path=' + encodeURIComponent(path) + '&obj_name=' + encodeURIComponent(obj_name);
-                var post_data = {
-                    'dst_repo': dst_repo,
-                    'dst_path': dst_path
-                };
-                var after_op_success = function(data) {
-                    $.modal.close();
-                    var msg = data['msg'];
-                    if (!data['task_id']) { // no progress
-                        if (op == 'mv') {
-                            dirent.remove();
-                        }
-                        Common.feedback(msg, 'success');
-                    } else {
-                        var mv_progress_popup = $(_this.mvProgressTemplate());
-                        var details = $('#mv-details', mv_progress_popup),
-                            cancel_btn = $('#cancel-mv', mv_progress_popup),
-                            other_info = $('#mv-other-info', mv_progress_popup);
-                        cancel_btn.removeClass('hide');
-                        setTimeout(function () {
-                            mv_progress_popup.modal({containerCss: {
-                                width: 300,
-                                height: 150,
-                                paddingTop: 50
-                            }, focus:false});
-                            var det_text = op == 'mv' ? gettext("Moving %(name)s") : gettext("Copying %(name)s");
-                            details.html(det_text.replace('%(name)s', Common.HTMLescape(obj_name))).removeClass('vh');
-                            $('#mv-progress').progressbar();
-                            req_progress();
-                        }, 100);
-                        var req_progress = function () {
-                            $.ajax({
-                                url: Common.getUrl({name: 'get_cp_progress'}) + '?task_id=' + encodeURIComponent(data['task_id']),
-                                dataType: 'json',
-                                success: function(data) {
-                                    var bar = $('.ui-progressbar-value', $('#mv-progress'));
-                                    if (!data['failed'] && !data['canceled'] && !data['successful']) {
-                                        if (data['done'] == data['total']) {
-                                            bar.css('width', '100%'); // 'done' and 'total' can be both 0
-                                            details.addClass('vh');
-                                            cancel_btn.addClass('hide');
-                                            other_info.html(gettext("Saving...")).removeClass('hide');
-                                        } else {
-                                            bar.css('width', parseInt(data['done']/data['total']*100, 10) + '%');
-                                        }
-                                        bar.show();
-                                        setTimeout(req_progress, 1000);
-                                    } else if (data['successful']) {
-                                        $.modal.close();
-                                        if (op == 'mv') {
-                                            dirent.remove();
-                                        }
-                                        Common.feedback(msg, 'success');
-                                    } else { // failed or canceled
-                                        details.addClass('vh');
-                                        var other_msg = data['failed'] ? gettext("Failed.") : gettext("Canceled.");
-                                        other_info.html(other_msg).removeClass('hide');
-                                        cancel_btn.addClass('hide');
-                                        setTimeout(function () { $.modal.close(); }, 1000);
-                                    }
-                                },
-                                error: function(xhr, textStatus, errorThrown) {
-                                    var error;
-                                    if (xhr.responseText) {
-                                        error = $.parseJSON(xhr.responseText).error;
-                                    } else {
-                                        error = gettext("Failed. Please check the network.");
-                                    }
-                                    details.addClass('vh')
-                                    other_info.html(error).removeClass('hide');
-                                    cancel_btn.addClass('hide');
-                                    setTimeout(function () { $.modal.close(); }, 1000);
-                                }
-                            });
-                        };
-
-                        cancel_btn.click(function() {
-                            Common.disableButton(cancel_btn);
-                            $.ajax({
-                                url: Common.getUrl({name: 'cancel_cp'}) + '?task_id=' + encodeURIComponent(data['task_id']),
-                                dataType: 'json',
-                                success: function(data) {
-                                    details.addClass('vh')
-                                    other_info.html(gettext("Canceled.")).removeClass('hide');
-                                    cancel_btn.addClass('hide');
-                                    setTimeout(function () {$.modal.close();}, 1000);
-                                },
-                                error: function(xhr, textStatus, errorThrown) {
-                                    var error;
-                                    if (xhr.responseText) {
-                                        error = $.parseJSON(xhr.responseText).error;
-                                    } else {
-                                        error = gettext("Failed. Please check the network.");
-                                    }
-                                    other_info.html(error).removeClass('hide');
-                                    Common.enableButton(cancel_btn);
-                                }
-                            });
-                        });
-                    }
-                }
-                Common.ajaxPost({
-                    'form': form,
-                    'post_url': post_url,
-                    'post_data': post_data,
-                    'after_op_success': after_op_success,
-                    'form_id': form_id
-                });
-                return false;
-            });
+            new DirentMvcpDialog(options);
             return false;
         },