From 0249a13012464260fc51a3fb741d581763b7c617 Mon Sep 17 00:00:00 2001
From: Paulo Reis <paulojreis@gmail.com>
Date: Wed, 3 May 2017 11:41:17 +0100
Subject: [PATCH] Add bulk actions as in-editor widgets.

---
 .../app/views/project/editor/review-panel.pug | 19 ++++++++++++++++++-
 .../stylesheets/app/editor/review-panel.less  | 12 ++++++++----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/services/web/app/views/project/editor/review-panel.pug b/services/web/app/views/project/editor/review-panel.pug
index 235207a50a..a9e12eaaed 100644
--- a/services/web/app/views/project/editor/review-panel.pug
+++ b/services/web/app/views/project/editor/review-panel.pug
@@ -6,6 +6,22 @@
 			ng-click="toggleReviewPanel();"
 			ng-class="{ 'rp-track-changes-indicator-on-dark' : darkTheme }"
 		) !{translate("track_changes_is_on")}
+		a.rp-bulk-actions-btn(
+			href
+			ng-if="reviewPanel.nSelectedEntries > 0"
+			ng-click="bulkAccept();"
+		) 
+			i.fa.fa-check
+			| &nbsp;#{translate("accept_all")}
+			| ({{ reviewPanel.nSelectedEntries }})
+		a.rp-bulk-actions-btn(
+			href
+			ng-if="reviewPanel.nSelectedEntries > 0"
+			ng-click="bulkReject();"
+		) 
+			i.fa.fa-times
+			| &nbsp;#{translate("reject_all")}
+			| ({{ reviewPanel.nSelectedEntries }})
 		a.rp-add-comment-btn(
 			href
 			ng-if="reviewPanel.entries[editor.open_doc_id]['add-comment'] != null"
@@ -13,6 +29,7 @@
 		) 
 			i.fa.fa-comment
 			| &nbsp;#{translate("add_comment")}
+
 	.review-panel-toolbar
 		resolved-comments-dropdown(
 			class="rp-flex-block"
@@ -85,7 +102,7 @@
 				div(ng-if="entry.type === 'bulk-actions'")
 					bulk-actions-entry(
 						on-bulk-accept="bulkAccept();"
-						on-bulk-reject="bulkAccept();"
+						on-bulk-reject="bulkReject();"
 						n-entries="reviewPanel.nSelectedEntries"
 					)
 
diff --git a/services/web/public/stylesheets/app/editor/review-panel.less b/services/web/public/stylesheets/app/editor/review-panel.less
index 8faee01eae..6d503fea3f 100644
--- a/services/web/public/stylesheets/app/editor/review-panel.less
+++ b/services/web/public/stylesheets/app/editor/review-panel.less
@@ -463,19 +463,22 @@
 	.rp-add-comment-btn,
 	.rp-bulk-actions-btn {
 		.rp-button();
-		display: block;
+		display: inline-block;
 		padding: 5px 10px;
 		border-radius: 3px;
 
 		.rp-in-editor-widgets & {
+			display: block;
 			white-space: nowrap;
 			border-radius: 0;
-			border-bottom-left-radius: 3px;
+
+			&:last-child {
+				border-bottom-left-radius: 3px;
+			}
 		}
 	}
 
 	.rp-bulk-actions-btn {
-		display: inline-block;
 		border-radius: 0;
 		&:first-child {
 			border-top-left-radius: 3px;
@@ -484,9 +487,10 @@
 		&:last-child {
 			border-top-right-radius: 3px;
 			border-bottom-right-radius: 3px;
+			margin-left: 1px;
 		}
 	}
-	
+
 	.rp-new-comment {
 		padding: 5px;
 	}