From 0a0bb18f4f82e8d8c6ec6c1c0d77d77b3bf226ff Mon Sep 17 00:00:00 2001
From: James Allen <james@sharelatex.com>
Date: Fri, 7 Mar 2014 13:05:59 +0000
Subject: [PATCH] Allow history view to be closed
---
app/views/templates.jade | 4 +++
.../track-changes/TrackChangesManager.coffee | 7 ++++
public/stylesheets/less/trackchanges.less | 32 ++++++++++++++-----
3 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/app/views/templates.jade b/app/views/templates.jade
index 9f56e6110..5f4e7574e 100644
--- a/app/views/templates.jade
+++ b/app/views/templates.jade
@@ -426,6 +426,10 @@
script(type='text/template')#trackChangesPanelTemplate
#trackChangesPanel
.track-changes-side-bar
+ .track-changes-header
+ h3 Recent changes
+ a(href="#").track-changes-close
+ i.icon-remove
.change-list-area
.track-changes-diff
diff --git a/public/coffee/track-changes/TrackChangesManager.coffee b/public/coffee/track-changes/TrackChangesManager.coffee
index a385f56fe..58d470b51 100644
--- a/public/coffee/track-changes/TrackChangesManager.coffee
+++ b/public/coffee/track-changes/TrackChangesManager.coffee
@@ -12,6 +12,13 @@ define [
$("#editorWrapper").append(@$el)
@hideEl()
+ @ide.editor.on "change:doc", () =>
+ @hideEl()
+
+ @$el.find(".track-changes-close").on "click", (e) =>
+ e.preventDefault
+ @hideEl()
+
show: () ->
@project_id = window.userSettings.project_id
@doc_id = @ide.editor.current_doc_id
diff --git a/public/stylesheets/less/trackchanges.less b/public/stylesheets/less/trackchanges.less
index c96e69a64..c43bb55ab 100644
--- a/public/stylesheets/less/trackchanges.less
+++ b/public/stylesheets/less/trackchanges.less
@@ -26,15 +26,31 @@
position: absolute;
right: 0;
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 {
--
GitLab