Skip to content
Snippets Groups Projects
Commit c4d66579 authored by KKlaue's avatar KKlaue
Browse files

refactor: Add 'back' buttons, merge three files to one, update feedback pages

parent 52cce980
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 65 additions and 43 deletions
gemeinsamforschen/src/main/webapp/assets/js/givefeedback.js deleted 100644 → 0
+ 0
− 7
View file @ 52cce980
$(document).ready(function(){
$('#givefeedback').on('click', function(){
location.href="givefeedback.jsp?token="+getUserTokenFromUrl();
});
});
gemeinsamforschen/src/main/webapp/assets/js/project-student.js
+ 15
− 1
View file @ c4d66579
$(document).ready(function(){ $(document).ready(function(){
$('#projectId').on('click', function(){
$('.projectId').click(function () {
location.href="project-student.jsp?token="+getUserTokenFromUrl(); location.href="project-student.jsp?token="+getUserTokenFromUrl();
}); });
$('.givefeedback').click(function () { $('.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(); location.href="annotation-document.jsp?token="+getUserTokenFromUrl();
}) })
$('. overviewstudent').click(function () {
location.href="project-student.jsp?token="+getUserTokenFromUrl();
})
}); });
\ No newline at end of file
gemeinsamforschen/src/main/webapp/assets/js/viewfeedback.js deleted 100644 → 0
+ 0
− 5
View file @ 52cce980
$(document.getElementById("viewfeedback")).ready(function(){
$('#viewfeedback').on('click', function(data){
location.href="viewfeedback.jsp?token="+getUserTokenFromUrl();
});
});
\ No newline at end of file
gemeinsamforschen/src/main/webapp/pages/givefeedback.jsp
+ 15
− 8
View file @ c4d66579
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<script src="https://cdn.rawgit.com/showdownjs/showdown/1.8.5/dist/showdown.min.js"></script> <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"> <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/utility.js"></script>
<script src="../assets/js/viewfeedback.js"></script> <script src="../assets/js/project-student.js"></script>
</head> </head>
<body> <body>
...@@ -38,9 +38,9 @@ ...@@ -38,9 +38,9 @@
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a id="viewfeedback" role="button">Feedback A</a></li> <li><a class="viewfeedback" role="button">Feedback A</a></li>
<li><a id="viewfeedback" role="button">Feedback B</a></li> <li><a class="viewfeedback" role="button">Feedback B</a></li>
<li><a id="viewfeedback" role="button">Feedback C</a></li> <li><a class="viewfeedback" role="button">Feedback C</a></li>
</ul> </ul>
<a href="#"> <a href="#">
...@@ -103,9 +103,12 @@ ...@@ -103,9 +103,12 @@
element: document.getElementById("demo1"), element: document.getElementById("demo1"),
spellChecker: false, spellChecker: false,
//toolbar: ["bold", "italic", "heading", "|", "quote", "table", "code", "|" , "side-by-side", "fullscreen"], //toolbar: ["bold", "italic", "heading", "|", "quote", "table", "code", "|" , "side-by-side", "fullscreen"],
minHeight: "80px",
}); });
editor.style = "min-height: 100px";
function save() { function save() {
console.log("save"); console.log("save");
console.log(editor.value()); console.log(editor.value());
...@@ -118,10 +121,14 @@ ...@@ -118,10 +121,14 @@
} }
</script> </script>
<div>
<button class="btn btn-light">Next</button> <button class="btn btn-secondary" onclick="goBack()">Zurück</button>
<button class="btn btn-light" id="">Back</button>
</div> <script>
function goBack() {
window.history.back();
}
</script>
</td> </td>
<td id="chat"> <td id="chat">
......
gemeinsamforschen/src/main/webapp/pages/project-student.jsp
+ 21
− 16
View file @ c4d66579
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
<link rel="stylesheet" href="../assets/css/Sidebar-Menu.css"> <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"> <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/utility.js"></script>
<script src="../assets/js/viewfeedback.js"></script>
<script src="../assets/js/project-student.js"></script> <script src="../assets/js/project-student.js"></script>
</head> </head>
...@@ -37,9 +36,9 @@ ...@@ -37,9 +36,9 @@
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a id="viewfeedback" role="button">Feedback A</a></li> <li><a class="viewfeedback" role="button">Feedback A</a></li>
<li><a id="viewfeedback" role="button">Feedback B</a></li> <li><a class="viewfeedback" role="button">Feedback B</a></li>
<li><a id="viewfeedback" role="button">Feedback C</a></li> <li><a class="viewfeedback" role="button">Feedback C</a></li>
</ul> </ul>
<a href="#"> <a href="#">
...@@ -63,12 +62,12 @@ ...@@ -63,12 +62,12 @@
<hr> <hr>
<ul> <ul>
<li><a class="givefeedback" role="button"> <li><a class="annotationview" role="button">
Projektuebersicht hochgeladen Projektuebersicht hochgeladen
<i class="far fa-comments"></i> <i class="far fa-comments"></i>
</a> </a>
</li> </li>
<li><a class="givefeedback" role="button"> <li><a class="annotationview" role="button">
Blumen ins Hausaufgabenheft geklebt Blumen ins Hausaufgabenheft geklebt
<i class="far fa-comments"></i> <i class="far fa-comments"></i>
</a> </a>
...@@ -84,15 +83,15 @@ ...@@ -84,15 +83,15 @@
<a href="#">student2@uni.de</a> <a href="#">student2@uni.de</a>
<hr> <hr>
<ul> <ul>
<li><a class="givefeedback" role="button"> <li><a class="annotationview" role="button">
feedback zu Herbarium im Hausaufgabenheft gegeben Blumen an Vegetarier verfuettert
<i class="far fa-comments"></i> <i class="far fa-comments"></i>
</a></li> </a></li>
<li><a class="givefeedback" role="button"> <li><a class="annotationview" role="button">
Blumen an Vegetarier verfuettert Literaturverzeichnis hochgeladen
<i class="far fa-comments"></i> <i class="far fa-comments"></i>
</a></li> </a></li>
<li><a class="givefeedback" role="button"> <li><a class="annotationview" role="button">
Die armen Vegetarier Die armen Vegetarier
<i class="far fa-comments"></i> <i class="far fa-comments"></i>
</a></li> </a></li>
...@@ -106,8 +105,8 @@ ...@@ -106,8 +105,8 @@
<a href="#">student3@uni.de</a> <a href="#">student3@uni.de</a>
<hr> <hr>
<ul> <ul>
<li><a class="givefeedback" role="button"> <li><a class="annotationview" role="button">
Viva la Floristika "Viva la Floristika" - Titel hochgeladen
<i class="far fa-comments"></i> <i class="far fa-comments"></i>
</a> </a>
</li> </li>
...@@ -116,9 +115,15 @@ ...@@ -116,9 +115,15 @@
</tr> </tr>
</table> </table>
<div>
<button class="btn btn-light" id="project1Link">Back</button> <button onclick="goBack()" class="btn btn-secondary">Zurueck</button>
</div>
<script>
function goBack() {
window.history.back();
}
</script>
</td> </td>
<td id="chat"> <td id="chat">
<div class="card"> <div class="card">
......
gemeinsamforschen/src/main/webapp/pages/viewfeedback.jsp
+ 14
− 6
View file @ c4d66579
...@@ -17,8 +17,7 @@ ...@@ -17,8 +17,7 @@
<link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.css"> <link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.css">
<link rel="stylesheet" href="../assets/css/Sidebar-Menu.css"> <link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
<script src="../assets/js/utility.js"></script> <script src="../assets/js/utility.js"></script>
<script src="../assets/js/viewfeedback.js"></script> <script src="../assets/js/project-student.js"></script>
<script src="../assets/js/givefeedback.js"></script>
</head> </head>
<body> <body>
...@@ -36,9 +35,9 @@ ...@@ -36,9 +35,9 @@
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a id="viewfeedback" role="button">Feedback A</a></li> <li><a class="viewfeedback" role="button">Feedback A</a></li>
<li><a id="viewfeedback" role="button">Feedback B</a></li> <li><a class="viewfeedback" role="button">Feedback B</a></li>
<li><a id="viewfeedback" role="button">Feedback C</a></li> <li><a class="viewfeedback" role="button">Feedback C</a></li>
</ul> </ul>
<a href="#"> <a href="#">
...@@ -53,7 +52,16 @@ ...@@ -53,7 +52,16 @@
<h2>Feedback Nachrichten von Student X</h2> <h2>Feedback Nachrichten von Student X</h2>
<iframe width="90%" height="200%" src="http://rocketchat.westeurope.cloudapp.azure.com/channel/general?layout=embedded"></iframe> <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>
<td id="chat"> <td id="chat">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment