',
+ '<% if (new_reviews) { %>',
+ '<% _.each(new_reviews, function(review) { %>',
+ '
',
+ ''
].join('')),
events: {
'click .update-page': '_onUpdatePageClicked',
'click .ignore': '_onIgnoreClicked',
+ 'hover .update-bubble-content': '_onMouseOverUpdate',
+ },
+
+ initialize(options) {
+ this._updatesListByUsername = this._getCount(this.options.updateInfo);
+ },
+
+ /**
+ * Traverse the last-update server response
+ * to count the updates by username and update type
+ *
+ * Args:
+ * info (JSON object):
+ * The last-update JSON object returned by server.
+ *
+ * Return:
+ * updateCountByUserName (object):
+ * The result update object counted by username and update type.
+ */
+ _getCount(info) {
+ let updatesListByUsername = {};
+
+ for (const key in info) {
+ let result = [];
+
+ if (key !== "timestamp" && info[key].length) {
+ let count = _.countBy(info[key], 'username');
+
+ for (const i in count) {
+ let item = {};
+ item.username = i;
+ item.count = count[i];
+ item.user = this._getUserInfo(i, info[key]);
+ item.list = this._getUpdates(i, info[key]);
+ result.push(item);
+ }
+ }
+
+ updatesListByUsername[key] = result;
+ }
+
+ return updatesListByUsername;
+ },
+
+ /**
+ * Retrieve a user's url based on username.
+ *
+ * Args:
+ * username (string):
+ * The user's username.
+ *
+ * updates (object):
+ * The updates list.
+ *
+ * Return:
+ * The user info.
+ */
+ _getUserInfo(username, updates) {
+ for (const update in updates) {
+ if (username === updates[update].username) {
+ return updates[update].user;
+ }
+ }
},
/**
+ * Retrieve a user's updates.
+ *
+ * Args:
+ * username (string):
+ * The user's username.
+ *
+ * updates (object):
+ * The updates list.
+ *
+ * Return:
+ * The user's updates list.
+ */
+ _getUpdates(username, updates) {
+ let list = [];
+
+ for (const update in updates) {
+ if (username === updates[update].username) {
+ list.push(updates[update]);
+ }
+ }
+
+ return list;
+ },
+ /**
* Render the bubble with the information provided during construction.
*
* The bubble starts hidden. The caller must call open() to display it.
@@ -38,7 +168,7 @@ const UpdatesBubbleView = Backbone.View.extend({
.html(this.template(_.defaults({
updatePageText: gettext('Update Page'),
ignoreText: gettext('Ignore'),
- }, this.options.updateInfo)))
+ }, this._updatesListByUsername)))
.hide();
return this;
@@ -64,6 +194,22 @@ const UpdatesBubbleView = Backbone.View.extend({
},
/**
+ * Handle mouse move over on the update content.
+ *
+ * Loads the update text bubbles.
+ *
+ * Args:
+ * e (Event):
+ * The event which triggered the action.
+ */
+ _onMouseOverUpdate(e) {
+ e.preventDefault();
+ e.stopPropagation();
+
+ this.trigger('updatedText', this._updatesListByUsername);
+ },
+
+ /**
* Handle clicks on the "Update Page" link.
*
* Loads the review request page.
@@ -79,7 +225,7 @@ const UpdatesBubbleView = Backbone.View.extend({
this.trigger('updatePage');
},
- /*
+ /**
* Handle clicks on the "Ignore" link.
*
* Ignores the update and closes the page.
@@ -96,6 +242,265 @@ const UpdatesBubbleView = Backbone.View.extend({
},
});
+/**
+ * Update text bubbles showing updates' texts to the review request.
+ */
+const TextBubbleView = Backbone.View.extend({
+ id: 'updates-text-bubble',
+
+ template: _.template([
+ '',
+ '<%- review.count %>',
+ '<% if (review.count == 1) { %>',
+ ' new review by ',
+ '<% } else { %>',
+ ' new reviews by ',
+ '<% } %>',
+ '',
+ '<%- review.username %>',
+ '',
+ '
',
+ '<% }); %>',
+ '<% } %>',
+ '<% if (new_replies) { %>',
+ '<% _.each(new_replies, function(reply) { %>',
+ '',
+ '<% }); %>',
+ '<% } %>',
+ '<% if (new_updates) { %>',
+ '<% _.each(new_updates, function(update) { %>',
+ '',
+ '<%- update.count %>',
+ '<% if (update.count == 1) { %>',
+ ' new update by ',
+ '<% } else { %>',
+ ' new updates by ',
+ '<% } %>',
+ '',
+ '<%- update.username %>',
+ '',
+ '
',
+ '<% }); %>',
+ '<% } %>',
+ '',
+ '
',
+ ''
+ ].join('')),
+
+ events: {
+ 'click .update-page': '_onUpdatePageClicked',
+ 'click .ignore': '_onIgnoreClicked',
+ 'click .text-bubble-anchor': '_onUpdateEntryClicked',
+ },
+
+
+ /**
+ * Render the bubble with the information provided during construction.
+ *
+ * The bubble starts hidden. The caller must call open() to display it.
+ *
+ * Returns:
+ * UpdatesBubbleView:
+ * This object, for chaining.
+ */
+ render() {
+ this.$el
+ .html(this.template(_.defaults({
+ updatePageText: gettext('Update Page'),
+ ignoreText: gettext('Ignore'),
+ }, this.options.updateInfo)))
+ .hide();
+
+ return this;
+ },
+
+ /**
+ * Open the text bubbles on the screen.
+ */
+ open() {
+ this.$el
+ .css('position', 'fixed')
+ .fadeIn();
+ },
+
+ /**
+ * Close the update text bubbles.
+ *
+ * After closing, the text bubbles will be removed from the DOM.
+ */
+ close() {
+ this.trigger('closed');
+ this.$el.fadeOut(_.bind(this.remove, this));
+ },
+
+ /**
+ * Handle the hover event on the text bubbles
+ *
+ * Refreshs the page and navigates to the specific update.
+ *
+ * After refreshing, the text bubbles will be removed from the DOM.
+ */
+ _onUpdateEntryClicked(e){
+ e.preventDefault();
+ e.stopPropagation();
+
+ window.location.href = window.location.href;
+ const anchor = $(e.currentTarget).data('anchor');
+
+ this.trigger('updateEntry', anchor);
+ },
+
+ /**
+ * Handle clicks on the "Update Page" link.
+ *
+ * Loads the review request page.
+ *
+ * Args:
+ * e (Event):
+ * The event which triggered the action.
+ */
+ _onUpdatePageClicked(e) {
+ e.preventDefault();
+ e.stopPropagation();
+
+ this.trigger('updatePage');
+ },
+
+ /**
+ * Handle clicks on the "Ignore" link.
+ *
+ * Ignores the update and closes the page.
+ *
+ * Args:
+ * e (Event):
+ * The event which triggered the action.
+ */
+ _onIgnoreClicked(e) {
+ e.preventDefault();
+ e.stopPropagation();
+
+ this.close();
+ },
+});
/**
* A page managing reviewable content for a review request.
@@ -177,6 +582,7 @@ RB.ReviewablePageView = Backbone.View.extend({
});
this._updatesBubble = null;
+ this._textBubbles = null;
this._favIconURL = null;
this._favIconNotifyURL = null;
this._logoNotificationsURL = null;
@@ -247,7 +653,6 @@ RB.ReviewablePageView = Backbone.View.extend({
this.listenTo(this.reviewRequest, 'updated', this._onReviewRequestUpdated);
this.reviewRequest.beginCheckForUpdates(
- this.options.checkUpdatesType,
this.options.lastActivityTimestamp);
},
@@ -283,11 +688,16 @@ RB.ReviewablePageView = Backbone.View.extend({
this._updatesBubble.remove();
}
+ if (this._textBubbles) {
+ this._textBubbles.remove();
+ }
+
this._updatesBubble = new UpdatesBubbleView({
updateInfo: info,
reviewRequest: this.reviewRequest,
});
+ this.listenTo(this._updatesBubble, 'updatedText', this._showTextBubbles);
this.listenTo(this._updatesBubble, 'closed',
() => this._updateFavIcon(this._favIconURL));
@@ -300,6 +710,55 @@ RB.ReviewablePageView = Backbone.View.extend({
},
/**
+ * Create the updates text bubbles showing information about updates.
+ *
+ * Args:
+ * info (object):
+ * The updates information for the request.
+ */
+ _showTextBubbles(info) {
+ this._updateFavIcon(this._favIconNotifyURL);
+
+ if (this._updatesBubble) {
+ this._updatesBubble.remove();
+ }
+
+ this._textBubbles = new TextBubbleView({
+ updateInfo: info,
+ reviewRequest: this.reviewRequest,
+ });
+
+ this.listenTo(this._textBubbles, 'updateEntry', this._getUpdateEntry);
+
+ this.listenTo(this._textBubbles, 'closed',
+ () => this._updateFavIcon(this._favIconURL));
+
+ this.listenTo(this._textBubbles, 'updatePage', () => {
+ window.location = this.reviewRequest.get('reviewURL');
+ });
+
+ this._textBubbles.render().$el.appendTo(this.$el);
+ this._textBubbles.open();
+ },
+
+ /**
+ * Refreshs the page, and navigate to the specific update.
+ *
+ * Args:
+ * anchor (String):
+ * The anchor link for the update.
+ */
+ _getUpdateEntry(anchor) {
+ if (anchor.includes("#")) {
+ window.location.hash = anchor;
+ } else {
+ window.location.hash = "";
+ window.location.pathname += anchor;
+ }
+ window.location.reload(true);
+ },
+
+ /**
* Show the user a desktop notification for the last update.
*
* This function will create a notification if the user has not
diff --git a/reviewboard/static/rb/js/pages/views/tests/reviewablePageViewTests.js b/reviewboard/static/rb/js/pages/views/tests/reviewablePageViewTests.js
index c6eb9e4680d15024d2268a400921b4e0fbab19e9..ef8716b8c07efe74d36109e8bf420086606ba86d 100644
--- a/reviewboard/static/rb/js/pages/views/tests/reviewablePageViewTests.js
+++ b/reviewboard/static/rb/js/pages/views/tests/reviewablePageViewTests.js
@@ -127,39 +127,76 @@ suite('rb/pages/views/ReviewablePageView', function() {
});
describe('Update bubble', function() {
- var summary = 'My summary',
- user = {
- url: '/users/foo/',
- fullname: 'Mr. User',
- username: 'user'
+ const info = {
+ user: {
+ username: 'submitter',
+ fullname: 'Bob Smith'
},
- $bubble,
- bubbleView;
-
- beforeEach(function() {
- pageView.reviewRequest.trigger('updated', {
- summary: summary,
- user: user
- });
-
+ timestamp: '',
+ new_reviews: [{
+ id: 1,
+ username: 'adam',
+ text: 'Review 1',
+ anchor: '#review1',
+ user: {
+ url: '/users/adam',
+ }
+ },
+ {
+ id: 2,
+ username: 'adam',
+ ship_it: 'Ship it!',
+ text: 'Please ship it',
+ anchor: '#review2',
+ user: {
+ url: '/users/adam',
+ }
+ }],
+ new_replies: [{
+ id: 3,
+ username: 'cherry',
+ text: 'Reply 1',
+ anchor: '#gcomment3',
+ user: {
+ url: '/users/cherry',
+ }
+ }],
+ new_updates: [{
+ id: 4,
+ username: 'michael',
+ field: 'summary',
+ summary: 'summary field updated',
+ text: 'New summary',
+ anchor: '#changedesc4',
+ user: {
+ url: '/users/michael',
+ }
+ }]
+ };
+
+ var $bubble;
+ var bubbleView;
+ var updatesListByUsername;
+
+ beforeEach(function () {
+ pageView.reviewRequest.trigger('updated', info);
$bubble = $('#updates-bubble');
bubbleView = pageView._updatesBubble;
+ updatesListByUsername = bubbleView._getCount(info);
});
- it('Displays', function() {
- expect($bubble.length).toBe(1);
- expect(bubbleView.$el[0]).toBe($bubble[0]);
+ it('Displays', function () {
expect($bubble.is(':visible')).toBe(true);
- expect($bubble.find('#updates-bubble-summary').text())
- .toBe(summary);
- expect($bubble.find('#updates-bubble-user').text())
- .toBe(user.fullname);
- expect($bubble.find('#updates-bubble-user').attr('href'))
- .toBe(user.url);
+ expect($bubble.find('#review-adam').text())
+ .toBe("2 new reviews by adam");
+ expect($bubble.find('#reply-cherry').text())
+ .toBe("1 new reply by cherry");
+ expect($bubble.find('#update-michael').text())
+ .toBe("1 new update by michael");
});
- describe('Actions', function() {
- it('Ignore', function() {
+ describe('Actions', function () {
+ it('Ignore', function () {
spyOn(bubbleView, 'close').and.callThrough();
spyOn(bubbleView, 'trigger').and.callThrough();
spyOn(bubbleView, 'remove').and.callThrough();
@@ -171,25 +208,28 @@ suite('rb/pages/views/ReviewablePageView', function() {
expect(bubbleView.trigger).toHaveBeenCalledWith('closed');
});
- it('Update Page displays Updates Bubble', function() {
+ it('Update Page', function () {
spyOn(bubbleView, 'trigger');
-
$bubble.find('.update-page').click();
expect(bubbleView.trigger).toHaveBeenCalledWith('updatePage');
});
- it('Update Page calls notify if shouldNotify', function() {
- var info = {
- user: {
- fullname: 'Hello'
- }
- };
+ it('Displays Text Bubbles', function () {
+ spyOn(bubbleView, 'trigger');
+
+ $bubble.find('.update-bubble-content').trigger('mouseover');
+
+ expect(bubbleView.trigger).toHaveBeenCalledWith('updatedText', updatesListByUsername);
+ pageView._updatesBubble.trigger('updatedText', updatesListByUsername);
+ });
+
+ it('Update Page calls notify if shouldNotify', function () {
RB.NotificationManager.instance._canNotify = true;
spyOn(RB.NotificationManager.instance, 'notify');
spyOn(RB.NotificationManager.instance,
- '_haveNotificationPermissions').and.returnValue(true);
+ '_haveNotificationPermissions').and.returnValue(true);
spyOn(pageView, '_showUpdatesBubble');
pageView._onReviewRequestUpdated(info);
@@ -199,5 +239,64 @@ suite('rb/pages/views/ReviewablePageView', function() {
expect(pageView._showUpdatesBubble).toHaveBeenCalled();
});
});
+
+ describe('Text Bubbles', function () {
+ var $textbubble;
+ var textbubbleview;
+
+ beforeEach(function () {
+ pageView._updatesBubble.trigger('updatedText', updatesListByUsername);
+ $textbubble = $('#updates-text-bubble');
+ textbubbleview = pageView._textBubbles;
+ });
+
+ it('Displays', function () {
+ expect($textbubble.is(':visible')).toBe(true);
+ expect($textbubble.find('.text-bubble-text#1').text())
+ .toBe("Review 1");
+ expect($textbubble.find('.text-bubble-text#2 p').text())
+ .toBe("Please ship it");
+ expect($textbubble.find('.ship-it-label').text())
+ .toBe("Ship it!");
+ expect($textbubble.find('.text-bubble-text#3').text())
+ .toBe("Reply 1");
+ expect($textbubble.find('.text-bubble-text#4 .text-bubble-summary').text())
+ .toBe("summary field updated");
+ expect($textbubble.find('.text-bubble-text#4 p').text())
+ .toBe("New summary");
+ });
+
+ describe('Actions', function () {
+ it('Ignore', function () {
+ spyOn(textbubbleview, 'close').and.callThrough();
+ spyOn(textbubbleview, 'trigger').and.callThrough();
+ spyOn(textbubbleview, 'remove').and.callThrough();
+
+ $textbubble.find('.ignore').click();
+
+ expect(textbubbleview.close).toHaveBeenCalled();
+ expect(textbubbleview.remove).toHaveBeenCalled();
+ expect(textbubbleview.trigger).toHaveBeenCalledWith('closed');
+ });
+
+ it('Update Page', function () {
+ spyOn(textbubbleview, 'trigger');
+
+ $textbubble.find('.update-page').click();
+
+ expect(textbubbleview.trigger).toHaveBeenCalledWith('updatePage');
+ });
+
+ it('Update Page displays Text Bubbles', function () {
+ spyOn(textbubbleview, 'trigger');
+
+ $textbubble.find('.text-bubble-anchor#1').click();
+
+ expect(textbubbleview.trigger).toHaveBeenCalledWith('updateEntry', '#review1');
+ });
+ });
+ });
});
+
});
+
diff --git a/reviewboard/static/rb/js/resources/models/reviewRequestModel.es6.js b/reviewboard/static/rb/js/resources/models/reviewRequestModel.es6.js
index 94b4a092b4a4456eda054bb6e8c90aafb47eb606..32a44c0b5c6b5ee621aa2907c864efde9fdc5e20 100644
--- a/reviewboard/static/rb/js/resources/models/reviewRequestModel.es6.js
+++ b/reviewboard/static/rb/js/resources/models/reviewRequestModel.es6.js
@@ -130,6 +130,7 @@ RB.ReviewRequest = RB.BaseResource.extend({
return this.isNew() ? url : `${url}${this.id}/`;
},
+
/**
* Create the review request from an existing commit.
*
@@ -399,14 +400,11 @@ RB.ReviewRequest = RB.BaseResource.extend({
* The 'updated' event will be triggered when there's a new update.
*
* Args:
- * type (string):
- * The type of updates to check for.
*
* lastUpdateTimestamp (string):
* The timestamp of the last known update.
*/
- beginCheckForUpdates(type, lastUpdateTimestamp) {
- this._checkUpdatesType = type;
+ beginCheckForUpdates(lastUpdateTimestamp) {
this._lastUpdateTimestamp = lastUpdateTimestamp;
this.ready({
@@ -428,12 +426,13 @@ RB.ReviewRequest = RB.BaseResource.extend({
prefix: this.get('sitePrefix'),
noActivityIndicator: true,
url: this.get('links').last_update.href,
+ data: {
+ timestamp: this._lastUpdateTimestamp,
+ },
success: rsp => {
const lastUpdate = rsp.last_update;
- if ((this._checkUpdatesType === undefined ||
- this._checkUpdatesType === lastUpdate.type) &&
- this._lastUpdateTimestamp !== lastUpdate.timestamp) {
+ if (this._lastUpdateTimestamp !== lastUpdate.timestamp) {
this.trigger('updated', lastUpdate);
}
diff --git a/reviewboard/testing/testcase.py b/reviewboard/testing/testcase.py
index 5d137fa138d1e72460b70643334b7012f5927cde..436e76538c9246658f1f365997f541f66c86bfd8 100644
--- a/reviewboard/testing/testcase.py
+++ b/reviewboard/testing/testcase.py
@@ -426,7 +426,8 @@ class TestCase(FixturesCompilerMixin, DjbletsTestCase):
bugs_closed='', status='P', public=False,
publish=False, commit_id=None, changenum=None,
repository=None, id=None,
- create_repository=False):
+ create_repository=False,
+ timestamp=None):
"""Create a ReviewRequest for testing.
The ReviewRequest may optionally be attached to a LocalSite. It's also
@@ -481,6 +482,9 @@ class TestCase(FixturesCompilerMixin, DjbletsTestCase):
if publish:
review_request.publish(review_request.submitter)
+ if timestamp:
+ review_request.time_added = timestamp
+
return review_request
def create_visit(self, review_request, visibility, user='doc',
@@ -502,7 +506,7 @@ class TestCase(FixturesCompilerMixin, DjbletsTestCase):
def create_review(self, review_request, user='dopey', username=None,
body_top='Test Body Top', body_bottom='Test Body Bottom',
- ship_it=False, publish=False):
+ ship_it=False, publish=False, timestamp=None):
"""Creates a Review for testing.
The Review is tied to the given ReviewRequest. It's populated with
@@ -522,6 +526,9 @@ class TestCase(FixturesCompilerMixin, DjbletsTestCase):
body_bottom=body_bottom,
ship_it=ship_it)
+ if timestamp:
+ review.timestamp = timestamp
+
if publish:
review.publish()
diff --git a/reviewboard/webapi/resources/review_request_last_update.py b/reviewboard/webapi/resources/review_request_last_update.py
index 27b4c3903c933728bcbc81841f74bc34977405c6..b03e8d266d13a123dbff6de120d5569141d0f8fc 100644
--- a/reviewboard/webapi/resources/review_request_last_update.py
+++ b/reviewboard/webapi/resources/review_request_last_update.py
@@ -1,13 +1,21 @@
from __future__ import unicode_literals
+from datetime import datetime, timedelta
+
from django.core.exceptions import ObjectDoesNotExist
from django.http import HttpResponseNotModified
from django.utils import six
-from django.utils.translation import ugettext as _
+from django.utils.timezone import utc
from djblets.util.http import encode_etag, etag_if_none_match
+from djblets.webapi.decorators import webapi_request_fields
from djblets.webapi.errors import DOES_NOT_EXIST
from reviewboard.diffviewer.models import DiffSet
-from reviewboard.reviews.models import Review, ReviewRequest
+from reviewboard.reviews.models import (Comment,
+ FileAttachmentComment,
+ GeneralComment,
+ Review,
+ ReviewRequest,
+ ScreenshotComment)
from reviewboard.webapi.base import WebAPIResource
from reviewboard.webapi.decorators import (webapi_check_local_site,
webapi_check_login_required)
@@ -15,7 +23,7 @@ from reviewboard.webapi.resources import resources
class ReviewRequestLastUpdateResource(WebAPIResource):
- """Provides information on the last update made to a review request.
+ """Provides information on the new updates made to a review request.
Clients can periodically poll this to see if any new updates have been
made.
@@ -26,35 +34,48 @@ class ReviewRequestLastUpdateResource(WebAPIResource):
allowed_methods = ('GET',)
fields = {
- 'summary': {
- 'type': six.text_type,
- 'description': 'A short summary of the update. This should be one '
- 'of "Review request updated", "Diff updated", '
- '"New reply" or "New review".',
- },
'timestamp': {
'type': six.text_type,
'description': 'The timestamp of this most recent update '
'(YYYY-MM-DD HH:MM:SS format).',
},
- 'type': {
- 'type': ('review-request', 'diff', 'reply', 'review'),
- 'description': "The type of the last update. ``review-request`` "
- "means the last update was an update of the "
- "review request's information. ``diff`` means a "
- "new diff was uploaded. ``reply`` means a reply "
- "was made to an existing review. ``review`` means "
- "a new review was posted.",
+ 'new_reviews': {
+ 'type': list,
+ 'description': 'The collection of review objects newer than the '
+ 'timestamp provided that do not have a base '
+ 'review.',
+ 'added_in': '3.0',
},
- 'user': {
- 'type': six.text_type,
- 'description': 'The user who made the last update.',
+ 'new_replies': {
+ 'type': list,
+ 'description': 'The collection of review objects newer than the '
+ 'timestamp provided that have a base review.',
+ 'added_in': '3.0',
},
+ 'new_updates': {
+ 'type': list,
+ 'description': 'The collection of diffset, file attachment '
+ 'and field changes objects '
+ 'newer than the timestamp provided.',
+ 'added_in': '3.0',
+ }
}
+ @webapi_request_fields(
+ optional={
+ 'timestamp': {
+ 'type': six.text_type,
+ 'description': 'The timestamp of the most recent update '
+ 'received by the client. Used to identify '
+ 'out-of-date objects. Timestamp should follow'
+ 'the format: ',
+ '<% if (new_reviews) { %>',
+ '<% _.each(new_reviews, function(review) { %>',
+ '
',
+ //end of reviews
+ '',
+ '
',
+ //end of entry
+ '<% }); %>',
+ '<% } %>',
+ '',
+ '
',
+ //end of header
+ '',
+ '<%- review.count %>',
+ '<% if (review.count == 1) { %>',
+ ' new review by ',
+ '<% } else { %>',
+ ' new reviews by ',
+ '<% } %>',
+ '',
+ '<%- review.username %>',
+ '',
+ '
',
+ //end of header-details
+ '',
+ '
',
+ '
',
+ '',
+ '<% _.each(review.list, function(item) { %>',
+ '',
+ '
',
+ //end of body
+ '',
+ '<% if (item.ship_it) { %>',
+ '',
+ '<% } %>',
+ '
',
+ '',
+ '<% }); %>',
+ '', + '<% if (item.text != item.ship_it) { %>', + '<% if (item.text.length > 300) { %>', + '<%- item.text.substring(0, 300) %>[...]', + '<% } else { %>', + '<%- item.text %>', + '<% }}%>', + '
', + '',
+ '<% if (new_replies) { %>',
+ '<% _.each(new_replies, function(reply) { %>',
+ '
',
+ //end of replies
+ '',
+ '
',
+ //end of entry
+ '<% }); %>',
+ '<% } %>',
+ '',
+ '
',
+ //end of header
+ '',
+ '<%- reply.count %>',
+ '<% if (reply.count == 1) { %>',
+ ' new reply by ',
+ '<% } else { %>',
+ ' new replies by ',
+ '<% } %>',
+ '',
+ '<%- reply.username %>',
+ '',
+ '
',
+ //end of header-details
+ '',
+ '
',
+ '
',
+ '',
+ '<% _.each(reply.list, function(item) { %>',
+ '',
+ '
',
+ //end of body
+ '',
+ '<% if (item.text.length > 300) { %>',
+ '<%- item.text.substring(0, 300) %> [...]',
+ '<% } else { %>',
+ '<%- item.text %>',
+ '<% }%>',
+ '
',
+ '',
+ '<% }); %>',
+ '',
+ '<% if (new_updates) { %>',
+ '<% _.each(new_updates, function(update) { %>',
+ '
',
+ //end of updates
+ '',
+ '
',
+ //end of entry
+ '<% }); %>',
+ '<% } %>',
+ '',
+ '
',
+ //end of header
+ '',
+ '<%- update.count %>',
+ '<% if (update.count == 1) { %>',
+ ' new update by ',
+ '<% } else { %>',
+ ' new updates by ',
+ '<% } %>',
+ '',
+ '<%- update.username %>',
+ '',
+ '
',
+ //end of header-details
+ '',
+ '
',
+ '
',
+ '',
+ '<% _.each(update.list, function(item) { %>',
+ '',
+ '
',
+ //end of body
+ '',
+ '
',
+ '',
+ '<% }); %>',
+ '',
+ '<% if (item.field == "files") { %> ',
+ '<%- item.summary %>',
+ '<% } else if (item.field == "diff") { %>',
+ 'Diff revision <%- item.revision %>',
+ '<% } else { %>',
+ '<%- item.field %>',
+ ' field updated',
+ '<% } %>',
+ '
',
+ //end of summary
+ '', + '<% if (item.text.length > 300) { %>', + '<%- item.text.substring(0, 300) %> [...]', + '<% } else { %>', + '<%- item.text %>', + '<% }%>', + '
', + '