From c4d665795eee6ce2965e42d7d7e53f3b2b9d0047 Mon Sep 17 00:00:00 2001
From: KKlaue <kathariina.klaue@gmail.com>
Date: Mon, 2 Jul 2018 17:30:14 +0200
Subject: [PATCH] refactor: Add 'back' buttons, merge three files to one,
update feedback pages
---
.../src/main/webapp/assets/js/givefeedback.js | 7 ----
.../main/webapp/assets/js/project-student.js | 16 +++++++-
.../src/main/webapp/assets/js/viewfeedback.js | 5 ---
.../src/main/webapp/pages/givefeedback.jsp | 23 ++++++++----
.../src/main/webapp/pages/project-student.jsp | 37 +++++++++++--------
.../src/main/webapp/pages/viewfeedback.jsp | 20 +++++++---
6 files changed, 65 insertions(+), 43 deletions(-)
delete mode 100644 gemeinsamforschen/src/main/webapp/assets/js/givefeedback.js
delete mode 100644 gemeinsamforschen/src/main/webapp/assets/js/viewfeedback.js
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/givefeedback.js b/gemeinsamforschen/src/main/webapp/assets/js/givefeedback.js
deleted file mode 100644
index b1001027..00000000
--- a/gemeinsamforschen/src/main/webapp/assets/js/givefeedback.js
+++ /dev/null
@@ -1,7 +0,0 @@
-
-$(document).ready(function(){
- $('#givefeedback').on('click', function(){
- location.href="givefeedback.jsp?token="+getUserTokenFromUrl();
- });
-});
-
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/project-student.js b/gemeinsamforschen/src/main/webapp/assets/js/project-student.js
index c227b61f..2a714319 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/project-student.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/project-student.js
@@ -1,9 +1,23 @@
$(document).ready(function(){
- $('#projectId').on('click', function(){
+
+ $('.projectId').click(function () {
location.href="project-student.jsp?token="+getUserTokenFromUrl();
});
$('.givefeedback').click(function () {
+ location.href="givefeedback.jsp?token="+getUserTokenFromUrl();
+ })
+
+ $('.viewfeedback').click(function () {
+ location.href="viewfeedback.jsp?token="+getUserTokenFromUrl();
+ })
+
+ $('.annotationview').click(function () {
location.href="annotation-document.jsp?token="+getUserTokenFromUrl();
})
+
+ $('. overviewstudent').click(function () {
+ location.href="project-student.jsp?token="+getUserTokenFromUrl();
+ })
+
});
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/viewfeedback.js b/gemeinsamforschen/src/main/webapp/assets/js/viewfeedback.js
deleted file mode 100644
index 17a86710..00000000
--- a/gemeinsamforschen/src/main/webapp/assets/js/viewfeedback.js
+++ /dev/null
@@ -1,5 +0,0 @@
-$(document.getElementById("viewfeedback")).ready(function(){
- $('#viewfeedback').on('click', function(data){
- location.href="viewfeedback.jsp?token="+getUserTokenFromUrl();
- });
-});
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/givefeedback.jsp b/gemeinsamforschen/src/main/webapp/pages/givefeedback.jsp
index a9daf09a..33d96121 100644
--- a/gemeinsamforschen/src/main/webapp/pages/givefeedback.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/givefeedback.jsp
@@ -20,7 +20,7 @@
<script src="https://cdn.rawgit.com/showdownjs/showdown/1.8.5/dist/showdown.min.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
<script src="../assets/js/utility.js"></script>
- <script src="../assets/js/viewfeedback.js"></script>
+ <script src="../assets/js/project-student.js"></script>
</head>
<body>
@@ -38,9 +38,9 @@
</button>
<ul class="dropdown-menu">
- <li><a id="viewfeedback" role="button">Feedback A</a></li>
- <li><a id="viewfeedback" role="button">Feedback B</a></li>
- <li><a id="viewfeedback" role="button">Feedback C</a></li>
+ <li><a class="viewfeedback" role="button">Feedback A</a></li>
+ <li><a class="viewfeedback" role="button">Feedback B</a></li>
+ <li><a class="viewfeedback" role="button">Feedback C</a></li>
</ul>
<a href="#">
@@ -103,9 +103,12 @@
element: document.getElementById("demo1"),
spellChecker: false,
//toolbar: ["bold", "italic", "heading", "|", "quote", "table", "code", "|" , "side-by-side", "fullscreen"],
+ minHeight: "80px",
});
+ editor.style = "min-height: 100px";
+
function save() {
console.log("save");
console.log(editor.value());
@@ -118,10 +121,14 @@
}
</script>
- <div>
- <button class="btn btn-light">Next</button>
- <button class="btn btn-light" id="">Back</button>
- </div>
+
+ <button class="btn btn-secondary" onclick="goBack()">Zurück</button>
+
+ <script>
+ function goBack() {
+ window.history.back();
+ }
+ </script>
</td>
<td id="chat">
diff --git a/gemeinsamforschen/src/main/webapp/pages/project-student.jsp b/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
index c2bd7ecb..3d3ebf69 100644
--- a/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
@@ -18,7 +18,6 @@
<link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.1.0/css/all.css" integrity="sha384-lKuwvrZot6UHsBSfcMvOkWwlCMgc0TaWr+30HWe3a4ltaBwTZhyTEggF5tJv8tbt" crossorigin="anonymous">
<script src="../assets/js/utility.js"></script>
- <script src="../assets/js/viewfeedback.js"></script>
<script src="../assets/js/project-student.js"></script>
</head>
@@ -37,9 +36,9 @@
</button>
<ul class="dropdown-menu">
- <li><a id="viewfeedback" role="button">Feedback A</a></li>
- <li><a id="viewfeedback" role="button">Feedback B</a></li>
- <li><a id="viewfeedback" role="button">Feedback C</a></li>
+ <li><a class="viewfeedback" role="button">Feedback A</a></li>
+ <li><a class="viewfeedback" role="button">Feedback B</a></li>
+ <li><a class="viewfeedback" role="button">Feedback C</a></li>
</ul>
<a href="#">
@@ -63,12 +62,12 @@
<hr>
<ul>
- <li><a class="givefeedback" role="button">
+ <li><a class="annotationview" role="button">
Projektuebersicht hochgeladen
<i class="far fa-comments"></i>
</a>
</li>
- <li><a class="givefeedback" role="button">
+ <li><a class="annotationview" role="button">
Blumen ins Hausaufgabenheft geklebt
<i class="far fa-comments"></i>
</a>
@@ -84,15 +83,15 @@
<a href="#">student2@uni.de</a>
<hr>
<ul>
- <li><a class="givefeedback" role="button">
- feedback zu Herbarium im Hausaufgabenheft gegeben
+ <li><a class="annotationview" role="button">
+ Blumen an Vegetarier verfuettert
<i class="far fa-comments"></i>
</a></li>
- <li><a class="givefeedback" role="button">
- Blumen an Vegetarier verfuettert
+ <li><a class="annotationview" role="button">
+ Literaturverzeichnis hochgeladen
<i class="far fa-comments"></i>
</a></li>
- <li><a class="givefeedback" role="button">
+ <li><a class="annotationview" role="button">
Die armen Vegetarier
<i class="far fa-comments"></i>
</a></li>
@@ -106,8 +105,8 @@
<a href="#">student3@uni.de</a>
<hr>
<ul>
- <li><a class="givefeedback" role="button">
- Viva la Floristika
+ <li><a class="annotationview" role="button">
+ "Viva la Floristika" - Titel hochgeladen
<i class="far fa-comments"></i>
</a>
</li>
@@ -116,9 +115,15 @@
</tr>
</table>
- <div>
- <button class="btn btn-light" id="project1Link">Back</button>
- </div>
+
+ <button onclick="goBack()" class="btn btn-secondary">Zurueck</button>
+
+ <script>
+ function goBack() {
+ window.history.back();
+ }
+ </script>
+
</td>
<td id="chat">
<div class="card">
diff --git a/gemeinsamforschen/src/main/webapp/pages/viewfeedback.jsp b/gemeinsamforschen/src/main/webapp/pages/viewfeedback.jsp
index 18480137..a6314029 100644
--- a/gemeinsamforschen/src/main/webapp/pages/viewfeedback.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/viewfeedback.jsp
@@ -17,8 +17,7 @@
<link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.css">
<link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
<script src="../assets/js/utility.js"></script>
- <script src="../assets/js/viewfeedback.js"></script>
- <script src="../assets/js/givefeedback.js"></script>
+ <script src="../assets/js/project-student.js"></script>
</head>
<body>
@@ -36,9 +35,9 @@
</button>
<ul class="dropdown-menu">
- <li><a id="viewfeedback" role="button">Feedback A</a></li>
- <li><a id="viewfeedback" role="button">Feedback B</a></li>
- <li><a id="viewfeedback" role="button">Feedback C</a></li>
+ <li><a class="viewfeedback" role="button">Feedback A</a></li>
+ <li><a class="viewfeedback" role="button">Feedback B</a></li>
+ <li><a class="viewfeedback" role="button">Feedback C</a></li>
</ul>
<a href="#">
@@ -53,7 +52,16 @@
<h2>Feedback Nachrichten von Student X</h2>
<iframe width="90%" height="200%" src="http://rocketchat.westeurope.cloudapp.azure.com/channel/general?layout=embedded"></iframe>
- <button class="btn btn-light" id="">Back</button>
+
+ <button class="btn btn-secondary" onclick="goBack()">Zurück</button>
+
+ <script>
+ function goBack() {
+ window.history.back();
+ }
+ </script>
+
+
</td>
<td id="chat">
--
GitLab