From d889f3bafe00ab748a469b4975ec7bee8a6a116d Mon Sep 17 00:00:00 2001
From: lian <imwhatiam123@gmail.com>
Date: Tue, 28 Jul 2015 19:54:57 +0800
Subject: [PATCH] update activity page

---
 media/css/seahub.css                          |  5 +++
 seahub/api2/views.py                          |  1 +
 seahub/templates/home_base.html               |  2 +-
 seahub/templates/js/templates.html            | 10 +++---
 seahub/templates/libraries.html               |  6 ++--
 static/scripts/app/router.js                  |  6 ++--
 .../app/views/{activity.js => activities.js}  | 31 ++++++++++---------
 static/scripts/app/views/details-item.js      | 27 ----------------
 static/scripts/app/views/details.js           | 25 ++++++++-------
 static/scripts/app/views/myhome.js            | 12 +++----
 10 files changed, 55 insertions(+), 70 deletions(-)
 rename static/scripts/app/views/{activity.js => activities.js} (69%)
 delete mode 100644 static/scripts/app/views/details-item.js

diff --git a/media/css/seahub.css b/media/css/seahub.css
index 145ba7865f..685a30ca48 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -1639,6 +1639,7 @@ textarea:-moz-placeholder {/* for FF */
 #repo-create-form .checkbox-label { /* for "Encrypt" */
     margin:10px 0 0;
 }
+.activity-group-hd,
 .event-group-hd {
     padding: 8px;
     color: #444;
@@ -1646,6 +1647,7 @@ textarea:-moz-placeholder {/* for FF */
     border-bottom: 1px solid #e5e5e5;
     margin:0;
 }
+.activity-group-bd,
 .event-group-bd {
     list-style-type: none;
     font-size:15px;
@@ -1676,11 +1678,13 @@ textarea:-moz-placeholder {/* for FF */
 }
 #events-loading,
 #notices-loading,
+#activities-more,
 #events-more,
 #notices-more-btn {
     text-align:center;
     width:100%;
 }
+#activities-more,
 #events-more,
 #notices-more-btn {
     color:#777;
@@ -1688,6 +1692,7 @@ textarea:-moz-placeholder {/* for FF */
     border:0;
     background: #efefef;
 }
+#activities-more:hover,
 #events-more:hover,
 #notices-more-btn:hover {
     color:#000;
diff --git a/seahub/api2/views.py b/seahub/api2/views.py
index 07ac406aa1..cabe58a190 100644
--- a/seahub/api2/views.py
+++ b/seahub/api2/views.py
@@ -3197,6 +3197,7 @@ class EventsView(APIView):
                 d['time'] = time_diff.seconds + (time_diff.days * 24 * 3600)
 
             d['nick'] = email2nickname(d['author'])
+            d['name'] = email2nickname(d['author'])
             d['avatar'] = avatar(d['author'], 36)
             d['time_relative'] = translate_seahub_time(utc_to_local(e.timestamp))
             d['date'] = utc_to_local(e.timestamp).strftime("%Y-%m-%d")
diff --git a/seahub/templates/home_base.html b/seahub/templates/home_base.html
index be887d0a3f..850094151e 100644
--- a/seahub/templates/home_base.html
+++ b/seahub/templates/home_base.html
@@ -14,7 +14,7 @@
         <li class="tab {% block cur_my_lib %}{% endblock %}"><a href="{{ SITE_ROOT }}" class="lib">{% trans "Libraries" %}</a></li>
         <li class="tab {% block cur_stars %}{% endblock %}"><a href="{{ SITE_ROOT }}#starred/" class="star">{% trans "Starred" %}</a></li>
         {% if events_enabled %}
-        <li class="tab {% block cur_activities %}{% endblock %}"><a href="{% url 'activities' %}" class="activity">{% trans "Activities" %}</a></li>
+        <li class="tab {% block cur_activities %}{% endblock %}"><a href="{{ SITE_ROOT }}#activities/" class="activity">{% trans "Activities" %}</a></li>
         {% endif %}
         {% for mod in request.user.mods_enabled %}
         {% if mod == 'personal wiki' %}
diff --git a/seahub/templates/js/templates.html b/seahub/templates/js/templates.html
index b22ef5ae3a..136a365bdc 100644
--- a/seahub/templates/js/templates.html
+++ b/seahub/templates/js/templates.html
@@ -813,10 +813,10 @@
         </select>
     </td>
 </script>
-<script type="text/template" id="activities-date-tmpl">
+<script type="text/template" id="activity-group-tmpl">
     <div>
-        <h4 class="event-group-hd"><%= date %></h4>
-        <ol class="event-group-bd"></ol>
+        <h4 class="activity-group-hd"><%= date %></h4>
+        <ol class="activity-group-bd"></ol>
     </div>
 </script>
 <script type="text/template" id="activity-item-tmpl">
@@ -844,7 +844,7 @@
         <p>{% trans "Deleted library" %} <%- activity.repo_name %></p>
         <% } %>
 
-        <p><a class="normal" href="{{ SITE_ROOT }}profile/<%- activity.author %>/"><%- activity.nick %></a> <span class="time"><%= activity.time_relative %></span></p>
+        <p><a class="normal" href="{{ SITE_ROOT }}profile/<% print(encodeURIComponent(activity.author)); %>/"><%- activity.name %></a> <span class="time"><%= activity.time_relative %></span></p>
     </div>
 </script>
 <script type="text/template" id="details-popup-tmpl">
@@ -852,7 +852,7 @@
     <p class="commit-time"></p>
     <img class="loading-tip" width="32" src="{{MEDIA_URL}}img/loading-new.gif" alt="{% trans 'Loading...' %}" />
 </script>
-<script type="text/template" id="details-item-tmpl">
+<script type="text/template" id="detail-item-tmpl">
     <h4><%= details_title %></h4>
     <ul>
     <% for (var i = 0, len = details.length; i < len; i++) { %>
diff --git a/seahub/templates/libraries.html b/seahub/templates/libraries.html
index cda2efad8b..69b5185595 100644
--- a/seahub/templates/libraries.html
+++ b/seahub/templates/libraries.html
@@ -113,10 +113,10 @@
     </div>
 </div>
 
-<div id="events" class="hide">
-    <div id="events-body" class="hide"></div>
+<div id="activities" class="hide">
+    <div id="activities-body" class="hide"></div>
     <img class="loading-tip" width="32" src="{{MEDIA_URL}}img/loading-new.gif" alt="{% trans 'Loading...' %}" />
-    <button id="events-more" class="hide">{% trans 'More' %}</button>
+    <button id="activities-more" class="hide">{% trans 'More' %}</button>
 </div>
 
 <div id="guide-for-new" class="hide">
diff --git a/static/scripts/app/router.js b/static/scripts/app/router.js
index fad521ae2f..096bcd1ea3 100644
--- a/static/scripts/app/router.js
+++ b/static/scripts/app/router.js
@@ -27,7 +27,7 @@ define([
             'org/lib/:repo_id(/*path)': 'showOrgRepoDir',
             'common/lib/:repo_id(/*path)': 'showCommonDir',
             'starred/': 'showStarredFile',
-            'activities/': 'showEvent',
+            'activities/': 'showActivities',
             // Default
             '*actions': 'showRepos'
         },
@@ -91,9 +91,9 @@ define([
             this.myHomeView.showStarredFile();
         },
 
-        showEvent: function() {
+        showActivities: function() {
             this.switchCurrentView(this.myHomeView);
-            this.myHomeView.showActivity();
+            this.myHomeView.showActivities();
         },
 
         showMyRepoDir: function(repo_id, path) {
diff --git a/static/scripts/app/views/activity.js b/static/scripts/app/views/activities.js
similarity index 69%
rename from static/scripts/app/views/activity.js
rename to static/scripts/app/views/activities.js
index 5ef88771fb..4af5180235 100644
--- a/static/scripts/app/views/activity.js
+++ b/static/scripts/app/views/activities.js
@@ -8,29 +8,30 @@ define([
 ], function($, _, Backbone, Common, ActivityCollection, ActivityItemView) {
     'use strict';
 
-    var EventView = Backbone.View.extend({
+    var ActivitiesView = Backbone.View.extend({
 
-        el: $('#events'),
+        el: $('#activities'),
 
-        template: _.template($('#activities-date-tmpl').html()),
+        activityGroupTemplate: _.template($('#activity-group-tmpl').html()),
 
         events: {
-            'click #events-more': 'getMoreActivites'
+            'click #activities-more': 'getMoreActivities'
         },
 
         initialize: function () {
             this.activities = new ActivityCollection();
 
-            this.$eventsBody = this.$('#events-body');
-            this.$eventsMore = this.$('#events-more');
+            this.$activitiesBody = this.$('#activities-body');
+            this.$activitiesMore = this.$('#activities-more');
             this.$loadingTip = this.$('.loading-tip');
 
             this.moreOffset = 0;
         },
 
-        getMoreActivites: function () {
+        getMoreActivities: function () {
             var _this = this;
             this.$loadingTip.show();
+            this.$activitiesMore.hide();
             this.activities.fetch({
                 remove: false,
                 data: {'start': _this.moreOffset},
@@ -47,9 +48,9 @@ define([
                 allActivities = [];
 
             this.$loadingTip.hide();
-            this.$eventsMore.hide();
+            this.$activitiesMore.hide();
             this.moreOffset = activitiesJson[len-1]['more_offset'];
-            this.$eventsBody.empty().show();
+            this.$activitiesBody.empty().show();
 
             for (var i = 0; i < len; i++) {
                 allActivities = allActivities.concat(activitiesJson[i]['events']);
@@ -58,19 +59,19 @@ define([
             var groupedActivities = _.groupBy(allActivities, 'date');
 
             for (var date in groupedActivities) {
-                var $activitiesDate = $(this.template({'date': date})),
+                var $activityGroup = $(this.activityGroupTemplate({'date': date})),
                     activityList = groupedActivities[date];
 
-                this.$eventsBody.append($activitiesDate);
+                this.$activitiesBody.append($activityGroup);
 
                 _.each(activityList, function (activity) {
                     var view = new ActivityItemView(activity);
-                    $activitiesDate.children('ol').append(view.render().el);
+                    $activityGroup.children('ol').append(view.render().el);
                 });
             }
 
             if (more) {
-                this.$eventsMore.show();
+                this.$activitiesMore.show();
             }
 
         },
@@ -81,6 +82,8 @@ define([
 
         show: function () {
             this.$el.show();
+            this.$activitiesBody.hide();
+            this.$activitiesMore.hide();
             this.$loadingTip.show();
 
             var _this = this;
@@ -95,5 +98,5 @@ define([
 
     });
 
-    return EventView;
+    return ActivitiesView;
 });
diff --git a/static/scripts/app/views/details-item.js b/static/scripts/app/views/details-item.js
deleted file mode 100644
index 48229b924c..0000000000
--- a/static/scripts/app/views/details-item.js
+++ /dev/null
@@ -1,27 +0,0 @@
-define([
-    'jquery',
-    'underscore',
-    'backbone',
-    'common'
-], function($, _, Backbone, Common) {
-    'use strict';
-
-    var DetailsItemView = Backbone.View.extend({
-
-        template: _.template($('#details-item-tmpl').html()),
-
-        initialize: function(options) {
-            this.details_title = options.details_title;
-            this.details = options.details;
-        },
-
-        render: function () {
-            var data = {'details_title': this.details_title, 'details': this.details}
-            this.$el.html(this.template(data));
-            return this;
-        }
-
-    });
-
-    return DetailsItemView;
-});
diff --git a/static/scripts/app/views/details.js b/static/scripts/app/views/details.js
index bef10680b3..ac83a61826 100644
--- a/static/scripts/app/views/details.js
+++ b/static/scripts/app/views/details.js
@@ -2,9 +2,8 @@ define([
     'jquery',
     'underscore',
     'backbone',
-    'common',
-    'app/views/details-item'
-], function($, _, Backbone, Common, DetailsItemView) {
+    'common'
+], function($, _, Backbone, Common) {
     'use strict';
 
     var DetailsView = Backbone.View.extend({
@@ -12,6 +11,7 @@ define([
         id: 'ls-ch',
 
         template: _.template($('#details-popup-tmpl').html()),
+        detailItemTemplate: _.template($('#detail-item-tmpl').html()),
 
         initialize: function (options) {
             this.repo_id = options['repo_id'];
@@ -24,9 +24,8 @@ define([
         },
 
         getDetails: function () {
-            var repo_id = this.repo_id,
-                cmmt_id = this.cmmt_id,
-                details_title,
+            var repo_id = this.repo_id, cmmt_id = this.cmmt_id,
+                details_title, item_data, item_html,
                 _this = this;
 
             Common.ajaxGet({
@@ -37,7 +36,9 @@ define([
                     _this.$('.commit-time').html(data['date_time']);
 
                     for (var item in data) {
-                        if (data[item].length > 0 && item != 'date_time') {
+                        if (item == "cmt_desc") {
+                            _this.$el.append(data[item]);
+                        } else if (data[item].length > 0 && item != 'date_time') {
                             if (item == "new") { details_title = gettext("New files") }
                             if (item == "removed") { details_title = gettext("Deleted files") }
                             if (item == "renamed") { details_title = gettext("Renamed or Moved files") }
@@ -45,14 +46,16 @@ define([
                             if (item == "newdir") { details_title = gettext("New directories") }
                             if (item == "deldir") { details_title = gettext("Deleted directories") }
 
-                            var view = new DetailsItemView({details_title: details_title, details: data[item]});
-                            _this.$el.append(view.render().el);
+                            item_data = {"details_title": details_title, "details": data[item]};
+                            item_html = _this.detailItemTemplate(item_data);
+                            _this.$el.append(item_html);
                         }
                     }
                     $(window).resize();
                 },
-                after_op_error: function(xhr) {
-                    Common.ajaxErrorHandler(xhr);
+                after_op_error: function() {
+                    $('#ls-ch').html(gettext("Unknown error"));
+                    setTimeout(function() { $.modal.close(); }, 2500);
                 }
             });
         }
diff --git a/static/scripts/app/views/myhome.js b/static/scripts/app/views/myhome.js
index 8f62244ded..1262bb0597 100644
--- a/static/scripts/app/views/myhome.js
+++ b/static/scripts/app/views/myhome.js
@@ -7,10 +7,10 @@ define([
     'app/views/myhome-sub-repos',
     'app/views/myhome-shared-repos',
     'app/views/starred-file',
-    'app/views/activity',
+    'app/views/activities',
     'app/views/myhome-side-nav'
 ], function($, _, Backbone, Common, ReposView, SubReposView,
-    SharedReposView, StarredFileView, ActivityView, MyhomeSideNavView) {
+    SharedReposView, StarredFileView, ActivitiesView, MyhomeSideNavView) {
     'use strict';
 
     var MyHomeView = Backbone.View.extend({
@@ -22,7 +22,7 @@ define([
             this.subReposView = new SubReposView();
             this.sharedReposView = new SharedReposView();
             this.starredFileView = new StarredFileView();
-            this.activityView = new ActivityView();
+            this.activitiesView = new ActivitiesView();
 
             this.dirView = options.dirView;
 
@@ -59,11 +59,11 @@ define([
             this.currentView = this.starredFileView;
         },
 
-        showActivity: function() {
+        showActivities: function() {
             this.sideNavView.show({'cur_tab': 'activities'});
             this.currentView.hide();
-            this.activityView.show();
-            this.currentView = this.activityView;
+            this.activitiesView.show();
+            this.currentView = this.activitiesView;
         },
 
         showDir: function(category, repo_id, path) {