From 669686039cf684be7990a1a47ee8d7b337a672f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sven=20K=C3=A4stle?= <sven.kaestle@gmx.de>
Date: Sat, 8 Sep 2018 16:37:37 +0200
Subject: [PATCH] feat: add back button to annotation page
---
.../src/main/webapp/assets/css/annotationStyle.css | 4 ++++
.../src/main/webapp/assets/js/annotationScript.js | 7 +++++++
.../src/main/webapp/pages/annotation-document.jsp | 5 ++++-
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/annotationStyle.css b/gemeinsamforschen/src/main/webapp/assets/css/annotationStyle.css
index 5ffeb66e..a9ed0b54 100644
--- a/gemeinsamforschen/src/main/webapp/assets/css/annotationStyle.css
+++ b/gemeinsamforschen/src/main/webapp/assets/css/annotationStyle.css
@@ -148,6 +148,10 @@ ol {
float: right;
margin: 20px;
}
+.leftcontent-buttons-back {
+ float: left;
+ margin: 20px;
+}
.leftcontent-text {
overflow: scroll;
white-space: pre-line;
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/annotationScript.js b/gemeinsamforschen/src/main/webapp/assets/js/annotationScript.js
index 52fcbdda..b6f25d8c 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/annotationScript.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/annotationScript.js
@@ -71,6 +71,13 @@ $(document).ready(function() {
location.href="givefeedback.jsp?token=" + getUserTokenFromUrl();
});
+ /**
+ * back button
+ */
+ $('#btnBack').click(function () {
+ location.href="project-student.jsp?token=" + getUserTokenFromUrl() + "&projectId=" + getQueryVariable("projectId");
+ });
+
/**
* validation of annotation create form inside the modal
*/
diff --git a/gemeinsamforschen/src/main/webapp/pages/annotation-document.jsp b/gemeinsamforschen/src/main/webapp/pages/annotation-document.jsp
index 0eedb0cb..d8e499fe 100644
--- a/gemeinsamforschen/src/main/webapp/pages/annotation-document.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/annotation-document.jsp
@@ -52,8 +52,11 @@
<div class="leftcontent">
<div class="leftcontent-text context-menu-one" id="documentText"></div>
<div class="leftcontent-buttons">
+ <div class="leftcontent-buttons-back">
+ <button id="btnBack" type="button" class="btn btn-secondary">Zurück</button>
+ </div>
<div class="leftcontent-buttons-next">
- <button id="btnContinue" type="button" class="btn btn-secondary">Weiter</button>
+ <button id="btnContinue" type="button" class="btn btn-primary">Weiter</button>
</div>
</div>
</div>
--
GitLab