From 23b8048245623aba5b8c60e005970ffb7d2a7823 Mon Sep 17 00:00:00 2001
From: KKlaue <kathariina.klaue@gmail.com>
Date: Sun, 1 Jul 2018 15:03:25 +0200
Subject: [PATCH] feat: add Buttons and Links
---
.../src/main/webapp/assets/js/givefeedback.js | 7 ++
.../main/webapp/assets/js/project-student.js | 5 ++
.../src/main/webapp/assets/js/utility.js | 1 +
.../src/main/webapp/assets/js/viewfeedback.js | 5 ++
.../src/main/webapp/pages/givefeedback.jsp | 14 ++--
.../src/main/webapp/pages/project-student.jsp | 67 +++++++++++--------
.../src/main/webapp/pages/viewfeedback.jsp | 12 ++--
7 files changed, 74 insertions(+), 37 deletions(-)
create mode 100644 gemeinsamforschen/src/main/webapp/assets/js/givefeedback.js
create mode 100644 gemeinsamforschen/src/main/webapp/assets/js/project-student.js
create 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
new file mode 100644
index 00000000..b1001027
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/givefeedback.js
@@ -0,0 +1,7 @@
+
+$(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
new file mode 100644
index 00000000..d24ac7a1
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/project-student.js
@@ -0,0 +1,5 @@
+$(document).ready(function(){
+ $('#projectId').on('click', function(){
+ location.href="project-student.jsp?token="+getUserTokenFromUrl();
+ });
+});
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/utility.js b/gemeinsamforschen/src/main/webapp/assets/js/utility.js
index dac28eb2..bbbf0394 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/utility.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/utility.js
@@ -6,5 +6,6 @@ function getUserTokenFromUrl() {
$_GET[decodeURIComponent(temp[0])] = decodeURIComponent(temp[1]);
}
return $_GET['token'];
+
}
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/viewfeedback.js b/gemeinsamforschen/src/main/webapp/assets/js/viewfeedback.js
new file mode 100644
index 00000000..17a86710
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/viewfeedback.js
@@ -0,0 +1,5 @@
+$(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 b3de7db2..a9daf09a 100644
--- a/gemeinsamforschen/src/main/webapp/pages/givefeedback.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/givefeedback.jsp
@@ -19,6 +19,8 @@
<script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.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">
+ <script src="../assets/js/utility.js"></script>
+ <script src="../assets/js/viewfeedback.js"></script>
</head>
<body>
@@ -36,9 +38,9 @@
</button>
<ul class="dropdown-menu">
- <li><a href="viewfeedback.jsp">Feedback A</a></li>
- <li><a href="viewfeedback.jsp">Feedback B</a></li>
- <li><a href="viewfeedback.jsp">Feedback C</a></li>
+ <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>
</ul>
<a href="#">
@@ -116,7 +118,11 @@
}
</script>
- </td>
+ <div>
+ <button class="btn btn-light">Next</button>
+ <button class="btn btn-light" id="">Back</button>
+ </div>
+ </td>
<td id="chat">
<div class="card">
diff --git a/gemeinsamforschen/src/main/webapp/pages/project-student.jsp b/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
index 2f934ded..f98ae5fd 100644
--- a/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
@@ -1,3 +1,4 @@
+<%--suppress XmlDuplicatedId --%>
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
<!DOCTYPE html>
@@ -16,6 +17,9 @@
<link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.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">
+ <script src="../assets/js/utility.js"></script>
+ <script src="../assets/js/viewfeedback.js"></script>
+ <script src="../assets/js/givefeedback.js"></script>
</head>
<body>
@@ -24,18 +28,18 @@
<div class="page-content-wrapper">
<div class="container-fluid">
- <h1 id="projectId">project1</h1>
+ <h1 id="projectId">Project 1</h1>
</div>
- <div align="right" class="dropdown" >
+ <div align="right" class="dropdown">
<button style= "position: absolute; right: 50px;" class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">
<i class="glyphicon glyphicon-envelope"></i>
</button>
<ul class="dropdown-menu">
- <li><a href="viewfeedback.jsp">Feedback A</a></li>
- <li><a href="viewfeedback.jsp">Feedback B</a></li>
- <li><a href="viewfeedback.jsp">Feedback C</a></li>
+ <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>
</ul>
<a href="#">
@@ -47,7 +51,7 @@
<table>
<tr>
<td id="yourContent">
- <h1>your content guys and girls!</h1>
+ <h1>Feedbackable Students</h1>
<!-- here will be all the content -->
<table>
<tr>
@@ -58,15 +62,18 @@
<a href="#">student1@uni.de</a>
<hr>
<ul>
- <li>Projektübersicht hochgeladen
- <a href="givefeedback.jsp">
- <i class="far fa-comments"></i>
- </a></li>
- <li>Blumen ins Hausaufgabenheft geklebt
- <a href="givefeedback.jsp">
- <span class="glyphicon glyphicon-pencil"
- style="font-size:18px;margin-left:5px;margin-top:-25px"></span>
- </a></li>
+
+ <li><a role="button" onclick="getUserTokenFromUrl()" >
+ Projektuebersicht hochgeladen
+ <i class="far fa-comments"></i>
+ </a>
+ </li>
+ <li><a role="button" onclick="getUserTokenFromUrl()">
+ Blumen ins Hausaufgabenheft geklebt
+ <i class="far fa-comments"></i>
+ </a>
+ </li>
+ </a>
</ul>
</td>
<td></td>
@@ -77,20 +84,17 @@
<a href="#">student2@uni.de</a>
<hr>
<ul>
- <li>feedback zu Herbarium im Hausaufgabenheft gegeben
- <a href="givefeedback.jsp">
- <span class="glyphicon glyphicon-comment"
- style="font-size:18px;margin-left:5px;margin-top:-25px"></span>
+ <li><a id="givefeedback" role="button">
+ feedback zu Herbarium im Hausaufgabenheft gegeben
+ <i class="far fa-comments"></i>
</a></li>
- <li>Blumen an Vegetarier verfüttert
- <a href="givefeedback.jsp">
- <span class="glyphicon glyphicon-comment"
- style="font-size:18px;margin-left:5px;margin-top:-25px"></span>
+ <li><a id="givefeedback" role="button">
+ Blumen an Vegetarier verfuettert
+ <i class="far fa-comments"></i>
</a></li>
- <li>Die armen Vegetarier
- <a href="givefeedback.jsp">
- <span class="glyphicon glyphicon-comment"
- style="font-size:18px;margin-left:5px;margin-top:-25px"></span>
+ <li><a id="givefeedback" role="button">
+ Die armen Vegetarier
+ <i class="far fa-comments"></i>
</a></li>
</ul>
</td>
@@ -102,14 +106,19 @@
<a href="#">student3@uni.de</a>
<hr>
<ul>
- <li>Viva la Floristika <a href="givefeedback.jsp"> <span class="glyphicon glyphicon-pencil"
- style="font-size:18px;margin-left:5px;margin-top:-25px"></span></a>
+ <li><a id="givefeedback" role="button">
+ Viva la Floristika
+ <i class="far fa-comments"></i>
+ </a>
</li>
</ul>
</td>
</tr>
</table>
+ <div>
+ <button class="btn btn-light" id="project1Link">Back</button>
+ </div>
</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 fdaead1d..18480137 100644
--- a/gemeinsamforschen/src/main/webapp/pages/viewfeedback.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/viewfeedback.jsp
@@ -16,6 +16,9 @@
<link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
<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>
</head>
<body>
@@ -26,16 +29,16 @@
<div class="container-fluid">
<h1 id="projectId"> PeerFeedback</h1>
</div>
- <div align="right" class="dropdown" >
+ <div align="right" class="dropdown">
<button style= "position: absolute; right: 50px;" class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">
<i class="glyphicon glyphicon-envelope"></i>
</button>
<ul class="dropdown-menu">
- <li><a href="viewfeedback.jsp">Feedback A</a></li>
- <li><a href="viewfeedback.jsp">Feedback B</a></li>
- <li><a href="viewfeedback.jsp">Feedback C</a></li>
+ <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>
</ul>
<a href="#">
@@ -50,6 +53,7 @@
<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>
</td>
<td id="chat">
--
GitLab