Paulo Reis 9 лет назад
Родитель
Сommit
beac43741c

+ 9 - 1
services/web/app/views/project/editor/review-panel.pug

@@ -1,10 +1,18 @@
-#review-panel
+.rp-in-editor-widgets
 	a.rp-track-changes-indicator(
 	a.rp-track-changes-indicator(
 		href
 		href
 		ng-if="editor.wantTrackChanges"
 		ng-if="editor.wantTrackChanges"
 		ng-click="toggleReviewPanel();"
 		ng-click="toggleReviewPanel();"
 		ng-class="{ 'rp-track-changes-indicator-on-dark' : darkTheme }"
 		ng-class="{ 'rp-track-changes-indicator-on-dark' : darkTheme }"
 	) !{translate("track_changes_is_on")}
 	) !{translate("track_changes_is_on")}
+	a.rp-add-comment-btn(
+		href
+		ng-if="reviewPanel.entries[editor.open_doc_id]['add-comment'] != null"
+		ng-click="startNewComment();"
+	) 
+		i.fa.fa-comment
+		|  #{translate("add_comment")}
+#review-panel
 	.review-panel-toolbar
 	.review-panel-toolbar
 		resolved-comments-dropdown(
 		resolved-comments-dropdown(
 			class="rp-flex-block"
 			class="rp-flex-block"

+ 1 - 0
services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee

@@ -15,6 +15,7 @@ define [
 			entries: {}
 			entries: {}
 			resolvedComments: {}
 			resolvedComments: {}
 			hasEntries: false
 			hasEntries: false
+			showAddComment: false
 			subView: $scope.SubViews.CUR_FILE
 			subView: $scope.SubViews.CUR_FILE
 			openSubView: $scope.SubViews.CUR_FILE
 			openSubView: $scope.SubViews.CUR_FILE
 			overview:
 			overview:

+ 39 - 28
services/web/public/stylesheets/app/editor/review-panel.less

@@ -448,6 +448,11 @@
 		display: block;
 		display: block;
 		padding: 5px 10px;
 		padding: 5px 10px;
 		border-radius: 3px;
 		border-radius: 3px;
+
+		.rp-in-editor-widgets & {
+			border-radius: 0;
+			border-bottom-left-radius: 3px;
+		}
 	}
 	}
 
 
 	.rp-new-comment {
 	.rp-new-comment {
@@ -871,43 +876,49 @@
 	}
 	}
 }
 }
 
 
-.rp-track-changes-indicator {
-	display: none;
+.rp-in-editor-widgets {
 	position: absolute;
 	position: absolute;
 	top: 0;
 	top: 0;
-	right: @review-off-width;
-	padding: 5px 10px;
-	background-color: rgba(240, 240, 240, 0.9);
-	color: @rp-type-blue;
-	text-align: center;
-	border-bottom-left-radius: 3px;
+	right: 0;
 	font-size: 10px;
 	font-size: 10px;
-	z-index: 2;
-	white-space: nowrap;
+	
+	.rp-size-mini & {
+		right: @review-off-width;
+	}
+}
+	.rp-track-changes-indicator {
+		display: block;
+		padding: 5px 10px;
+		background-color: rgba(240, 240, 240, 0.9);
+		color: @rp-type-blue;
+		text-align: center;
+		border-bottom-left-radius: 3px;
+		z-index: 2;
+		white-space: nowrap;
 
 
-	&.rp-track-changes-indicator-on-dark {
-		background-color: rgba(88, 88, 88, .8);
-		color: #FFF;
-		
-		&:hover,
-		&:focus {
-			background-color: rgba(88, 88, 88, 1);
+		&.rp-track-changes-indicator-on-dark {
+			background-color: rgba(88, 88, 88, .8);
 			color: #FFF;
 			color: #FFF;
+			
+			&:hover,
+			&:focus {
+				background-color: rgba(88, 88, 88, 1);
+				color: #FFF;
+			}
 		}
 		}
-	}
 
 
-	&:hover,
-	&:focus {
-		outline: 0;
-		text-decoration: none;
-		background-color: rgba(240, 240, 240, 1);
-		color: @rp-type-blue;
-	}
+		&:hover,
+		&:focus {
+			outline: 0;
+			text-decoration: none;
+			background-color: rgba(240, 240, 240, 1);
+			color: @rp-type-blue;
+		}
 
 
-	.rp-size-mini & {
-		display: block;
+		.rp-size-expanded & {
+			display: none;
+		}
 	}
 	}
-}
 
 
 // Helper class for elements which aren't treated as flex-items by IE10, e.g:
 // Helper class for elements which aren't treated as flex-items by IE10, e.g:
 // * inline items;
 // * inline items;