Explorar el Código

Allow history view to be closed

James Allen hace 12 años
padre
commit
548d7d98a4

+ 4 - 0
services/web/app/views/templates.jade

@@ -426,6 +426,10 @@
 	script(type='text/template')#trackChangesPanelTemplate
 	script(type='text/template')#trackChangesPanelTemplate
 		#trackChangesPanel
 		#trackChangesPanel
 			.track-changes-side-bar
 			.track-changes-side-bar
+				.track-changes-header
+					h3 Recent changes
+					a(href="#").track-changes-close
+						i.icon-remove
 				.change-list-area
 				.change-list-area
 			.track-changes-diff
 			.track-changes-diff
 
 

+ 7 - 0
services/web/public/coffee/track-changes/TrackChangesManager.coffee

@@ -12,6 +12,13 @@ define [
 			$("#editorWrapper").append(@$el)
 			$("#editorWrapper").append(@$el)
 			@hideEl()
 			@hideEl()
 
 
+			@ide.editor.on "change:doc", () =>
+				@hideEl()
+
+			@$el.find(".track-changes-close").on "click", (e) =>
+				e.preventDefault
+				@hideEl()
+
 		show: () ->
 		show: () ->
 			@project_id = window.userSettings.project_id
 			@project_id = window.userSettings.project_id
 			@doc_id = @ide.editor.current_doc_id
 			@doc_id = @ide.editor.current_doc_id

+ 24 - 8
services/web/public/stylesheets/less/trackchanges.less

@@ -26,15 +26,31 @@
 		position: absolute;
 		position: absolute;
 		right: 0;
 		right: 0;
 		background-color: white;
 		background-color: white;
-	}
 
 
-	.change-list-area {
-		overflow: scroll;
-		position: absolute;
-		left: 0px;
-		right: 0px;
-		top: 0px;
-		bottom: 0px;
+		.track-changes-header {
+			background-color: black;
+			h3 {
+				color: white;
+				padding-left: 8px;
+				font-size: 1.2em;
+			}
+			a {
+				color: white;
+				position: absolute;
+				top: 6px;
+				right: 8px;
+			}
+			height: 30px;
+		}
+
+		.change-list-area {
+			overflow: scroll;
+			position: absolute;
+			left: 0px;
+			right: 0px;
+			top: 30px;
+			bottom: 0px;
+		}
 	}
 	}
 
 
 	.deleted-change-background, .deleted-change-foreground, .inserted-change, .change-name-marker {
 	.deleted-change-background, .deleted-change-foreground, .inserted-change, .change-name-marker {