diff --git a/gemeinsamforschen/src/main/webapp/assets/js/showProjects.js b/gemeinsamforschen/src/main/webapp/assets/js/showProjects.js
index ec4771b77b5e0cad7aec62634f303cd254241f7e..ff687d3f310be2d92ae07cc89f27192ce1b194f5 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/showProjects.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/showProjects.js
@@ -35,7 +35,7 @@ function seeProject(projectName) {
$("#projectIsMissing").show();
} else {
if (response !== "wrong password") { //if response !== project missing and not wrong password, its the projectToken
- location.href="preferences.php?token="+getUserTokenFromUrl()+"&projectToken="+response;
+ location.href="enter-preferences.jsp?token="+getUserTokenFromUrl()+"&projectToken="+response;
} else {
$("#projectIsMissing").hide();
$('#projectWrongPassword').show();
diff --git a/gemeinsamforschen/src/main/webapp/core/management/create-project.jsp b/gemeinsamforschen/src/main/webapp/core/management/create-project.jsp
index cbfb9ce16ae8769661c470d7d6db718885ed4805..fd2d2015c526193a9cf892d587f4a326f30326ba 100644
--- a/gemeinsamforschen/src/main/webapp/core/management/create-project.jsp
+++ b/gemeinsamforschen/src/main/webapp/core/management/create-project.jsp
@@ -7,27 +7,17 @@
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<!DOCTYPE html>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
+
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
- <title>dozent-view-alternativ slider</title>
- <link rel="stylesheet" href="../../assets/bootstrap/css/bootstrap.min.css">
- <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Ubuntu:400,700">
- <link rel="stylesheet" href="../../assets/css/Login-Form-Clean.css">
- <link rel="stylesheet" href="../../assets/css/Navigation-with-Button1.css">
- <link rel="stylesheet" href="../../assets/css/Sidebar-Menu.css">
- <link rel="stylesheet" href="../../assets/css/Sidebar-Menu1.css">
- <link rel="stylesheet" href="../../assets/css/styles.css">
- <link rel="stylesheet" type="text/css" href="../../assets/jQuery-Tags-Input-master/src/jquery.tagsinput.css"/>
- <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
- <script type="text/javascript" src="../../assets/jQuery-Tags-Input-master/src/jquery.tagsinput.js"></script>
- <script src="../assets/js/config.js"></script>
- <script src="../assets/js/newProject.js"></script>
- <script src="../../assets/js/utility.js"></script>
- <script src="../../assets/bootstrap/js/bootstrap.min.js"></script>
- <script src="../../assets/js/Sidebar-Menu.js"></script>
+ <title>Projekterstellung</title>
+ <script src="js/config.js"></script>
+ <script src="js/newProject.js"></script>
</head>
<body>
@@ -41,9 +31,7 @@
</div>
<div id="wrapper" style="margin:0px;">
- <?php
- include_once 'menu.php'
- ?>
+ <menu:menu/>
<div class="page-content-wrapper">
<div class="container-fluid">
<div class="row">
diff --git a/gemeinsamforschen/src/main/webapp/core/management/delete-project.jsp b/gemeinsamforschen/src/main/webapp/core/management/delete-project.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..ea71a5a58f80dbe1f3196b1f03de8185a6faa35a
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/core/management/delete-project.jsp
@@ -0,0 +1,58 @@
+<%--
+ Created by IntelliJ IDEA.
+ User: dehne
+ Date: 12.09.2018
+ Time: 12:06
+ To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<!DOCTYPE html>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>Gruppenmatcher</title>
+ <script src="js/config.js"></script>
+ <script src="js/deleteProject.js"></script>
+
+</head>
+
+<body>
+<div class="loader-inactive" id="loader"></div>
+<div id="wrapper" class="wrapper" style="margin:0px;">
+ <menu:menu></menu:menu>
+ <div class="page-content-wrapper">
+ <div class="container-fluid"><a class="btn btn-link" role="button" href="#menu-toggle" id="menu-toggle"></a>
+ <div class="row">
+ <div class="col-md-12">
+ <h3>Projekt löschen! </h3>
+ <div class="page-header"></div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <fieldset>
+ <legend style="margin-left:13px;">Projektnamen</legend>
+ <input class="form-control" type="text" id="projectName" name="Project" required=""
+ placeholder="Projekt1" autofocus=""
+ style="margin:0px;max-width:417px;margin-left:14px;padding-top:10px;margin-top:2px;margin-bottom:13px;">
+ <div class="alert alert-warning" role="alert" id="projectIsMissing">
+ Dieser Projektname existiert nicht oder das Passwort ist falsch.
+ </div>
+
+ </fieldset>
+ <fieldset>
+ <legend style="margin-left:13px;">Passwort zum löschen</legend>
+ <input class="form-control" type="password" id="projectPassword" name="Password" required=""
+ placeholder="******"
+ style="margin:0px;max-width:417px;margin-left:14px;padding-top:10px;margin-top:2px;margin-bottom:13px;">
+ <div class="alert alert-warning" role="alert" id="projectWrongPassword">
+ Falsches Passwort.
+ </div>
+ </fieldset>
+ <button id="deleteProject" class="btn btn-danger">löschen</button>
+</div>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/core/management/enter-preferences.jsp b/gemeinsamforschen/src/main/webapp/core/management/enter-preferences.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..4683e6e5ba433f9bf25b95d796da274b0f524367
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/core/management/enter-preferences.jsp
@@ -0,0 +1,93 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<!DOCTYPE html>
+<html>
+
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>Gruppenmatcher</title>
+ <script src="js/config.js"></script>
+ <script src="js/createPreferences.js"></script>
+</head>
+<body>
+
+
+<p id="user" hidden><?php echo $userName; ?></p>
+<p id="projectName" hidden><?php echo $projectName; ?></p>
+<div class="loader-inactive" id="loader">
+ <div class="sk-cube1 sk-cube"></div>
+ <div class="sk-cube2 sk-cube"></div>
+ <div class="sk-cube4 sk-cube"></div>
+ <div class="sk-cube3 sk-cube"></div>
+</div>
+<div id="wrapper" class="wrapper" style="margin:0px;">
+ <?php
+ include_once 'menu.php'
+ ?>
+ <div class="page-content-wrapper">
+ <div class="container-fluid"><a class="btn btn-link" role="button" href="#menu-toggle" id="menu-toggle"></a>
+ <div class="row">
+ <div class="col-md-12">
+ <h3>Geben Sie hier ihre Präferenzen für das Projekt <?php echo $projectName; ?> ein!</h3>
+ <div class="page-header"></div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <fieldset>
+ <legend style="margin-left:13px;">Lernziele</legend>
+ <div id="competencies">
+ <input class="form-control" type="text" id="competencies0" name="competencies" required=""
+ placeholder="Ich möchte folgendes lernen:"
+ style="margin:0px;max-width:417px;margin-left:14px;padding-top:10px;margin-top:2px;margin-bottom:13px;">
+ </div>
+ <button
+ class="btn btn-default" type="button"
+ style="margin-left:443px;margin-top:-88px;height:36px;width:33px;"
+ id="addCompetenceButton">+
+ </button>
+ <button
+ class="btn btn-default" type="button"
+ style="margin-left:10px;margin-top:-88px;height:36px;width:33px;"
+ id="subtractCompetenceButton">-
+ </button>
+
+ </fieldset>
+ <fieldset style="margin-bottom:-3px;">
+ <legend style="margin-left:13px;">Forschungsfrage</legend>
+ <div id="researchQuestion">
+ <input class="form-control" id="researchQuestion0" type="text" name="researchQuestion" required=""
+ placeholder="Meine Forschungsfrage(n): "
+ style="margin:0px;max-width:417px;margin-left:14px;padding-top:10px;margin-top:2px;margin-bottom:13px;">
+ </div>
+ <button class="btn btn-default" type="button"
+ style="margin-left:443px;margin-top:-88px;height:36px;width:33px;"
+ id="addResearchQuestionButton">+
+ </button>
+ <button
+ class="btn btn-default" type="button"
+ style="margin-left:10px;margin-top:-88px;height:36px;width:33px;"
+ id="subtractCResearchQuestionButton">-
+ </button>
+ </fieldset>
+ <fieldset>
+ <legend style="margin-left:13px;">Tags</legend>
+ <p class="alert alert-warning" style="width:520px;">Wähle 2 der hier angegebenen Tags aus, die am ehesten zu deiner Forschungsfrage passen.</p>
+ <div id="tags">
+
+ </div>
+ </fieldset>
+ <button class="btn btn-primary" id="studentFormSubmit" style="width:90px;margin-left:169px;margin-top:13px;">
+ eintragen
+ </button>
+ <div class="alert alert-warning" style="width:520px" role="alert">
+ Das Verarbeiten der Lernziele und das Gruppenmatching kann einen Moment dauern!
+ </div>
+</div>
+
+</body>
+
+
+
+
diff --git a/gemeinsamforschen/src/main/webapp/core/management/groups.jsp b/gemeinsamforschen/src/main/webapp/core/management/groups.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..6321b9c39018d90850a9b37c79e6c2590b9f4a24
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/core/management/groups.jsp
@@ -0,0 +1,91 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<!DOCTYPE html>
+<html>
+
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>student-form-design</title>
+ <link rel="stylesheet" href="../assets/bootstrap/css/bootstrap.min.css">
+ <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Ubuntu:400,700">
+ <link rel="stylesheet" href="../assets/css/Login-Form-Clean.css">
+ <link rel="stylesheet" href="../assets/css/Navigation-with-Button1.css">
+ <link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
+ <link rel="stylesheet" href="../assets/css/Sidebar-Menu1.css">
+
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+ <script src="../assets/js/config.js"></script>
+ <script src="../assets/js/myGroupsInit.js"></script>
+ <script src="../assets/js/getProjects.js"></script>
+ <script src="../assets/bootstrap/js/bootstrap.min.js"></script>
+ <script src="../assets/js/Sidebar-Menu.js"></script>
+
+
+
+</head>
+
+<body>
+<p id="user" hidden><?php echo $userName; ?></p>
+
+<div id="wrapper" style="margin:0px;">
+ <?php
+ include_once 'menu.php'
+ ?>
+ <div class="page-content-wrapper">
+ <div class="container-fluid"><a class="btn btn-link" role="button" href="#menu-toggle" id="menu-toggle"></a>
+ <div class="row">
+ <div class="col-md-12">
+
+ <div class="page-header"></div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div>
+ <div class="container" style="margin-left:0px;">
+ <div class="row">
+ <div class="col-md-offset-3 col-sm-8 col-xs-1">
+ <h3>Projekt</h3>
+ <div class="dropdown">
+ <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown"
+ id="projectDropdown">Projekt auswählen
+ <span class="caret"></span></button>
+ <ul class="dropdown-menu" id="dropdownOptions">
+ </ul>
+ </div>
+ </div>
+ </div>
+ <div id="tablesHolder"></div>
+ <!-- <table class="table table-striped table-bordered table-list" style="width: 40%;margin-top: 10px;">
+ <thead id="tableHead">
+ <tr>
+ <th class="hidden-xs">Student</th>
+ <th>E-Mail</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr id="student2">
+
+ </tr>
+ <tr id="student3">
+
+ </tr>
+ <tr id="student4">
+
+ </tr>
+ <tr id="student5">
+
+ </tr>
+
+ </tbody>
+
+ </table>-->
+ <!--<p>Hier können sie ihre Gruppen zu allen Projekten einsehen. Klicken sie dafür auf das Dropdownmenü
+ um ihren Kurs auszuwählen.</p>-->
+ </div>
+ </div>
+</div>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/core/management/join-project.jsp b/gemeinsamforschen/src/main/webapp/core/management/join-project.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..0c108672309961676b0b63448d26f331800b493a
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/core/management/join-project.jsp
@@ -0,0 +1,66 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<!DOCTYPE html>
+<html>
+
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>Gruppenmatcher</title>
+ <link rel="stylesheet" href="../assets/bootstrap/css/bootstrap.min.css">
+ <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Ubuntu:400,700">
+ <link rel="stylesheet" href="../assets/css/Login-Form-Clean.css">
+ <link rel="stylesheet" href="../assets/css/Navigation-with-Button1.css">
+ <link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
+ <link rel="stylesheet" href="../assets/css/Sidebar-Menu1.css">
+ <link rel="stylesheet" href="../assets/css/styles.css">
+ <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
+ <script src="../assets/js/config.js"></script>
+ <script src="../assets/js/utility.js"></script>
+ <script src="../assets/js/showProjects.js"></script>
+ <script src="../assets/js/GETfile.js"></script>
+ <script src="../assets/bootstrap/js/bootstrap.min.js"></script>
+ <script src="../assets/js/Sidebar-Menu.js"></script>
+
+</head>
+
+<body>
+<p id="user" hidden><?php echo $userName; ?></p>
+<div class="loader-inactive" id="loader"></div>
+<div id="wrapper" class="wrapper" style="margin:0px;">
+ <?php
+ include_once 'menu.php'
+ ?>
+ <div class="page-content-wrapper">
+ <div class="container-fluid"><a class="btn btn-link" role="button" href="#menu-toggle" id="menu-toggle"></a>
+ <div class="row">
+ <div class="col-md-12">
+ <h3>Tragen sie sich in ein neues Projekt ein. </h3>
+ <div class="page-header"></div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <fieldset>
+ <legend style="margin-left:13px;">Projektnamen</legend>
+ <input class="form-control" type="text" id="projectName" name="Project" required=""
+ placeholder="Projekt1" autofocus=""
+ style="margin:0px;max-width:417px;margin-left:14px;padding-top:10px;margin-top:2px;margin-bottom:13px;">
+ <div class="alert alert-warning" role="alert" id="projectIsMissing">
+ Dieser Projektname existiert nicht.
+ </div>
+
+ </fieldset>
+ <fieldset>
+ <legend style="margin-left:13px;">Passwort</legend>
+ <input class="form-control" type="password" id="projectPassword" name="Password" required=""
+ placeholder="******"
+ style="margin:0px;max-width:417px;margin-left:14px;padding-top:10px;margin-top:2px;margin-bottom:13px;">
+ <div class="alert alert-warning" role="alert" id="projectWrongPassword">
+ Falsches Passwort.
+ </div>
+ </fieldset>
+ <button id="seeProject" class="btn btn-primary">Einsehen</button>
+</div>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/core/management/js/Sidebar-Menu.js b/gemeinsamforschen/src/main/webapp/core/management/js/Sidebar-Menu.js
deleted file mode 100644
index 75d87e9ab3437b44784b97cf2e600b636f8b4257..0000000000000000000000000000000000000000
--- a/gemeinsamforschen/src/main/webapp/core/management/js/Sidebar-Menu.js
+++ /dev/null
@@ -1,4 +0,0 @@
-$("#menu-toggle").click(function(e) {
- e.preventDefault();
- $("#wrapper").toggleClass("toggled");
-});
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/core/management/js/deleteProject.js b/gemeinsamforschen/src/main/webapp/core/management/js/deleteProject.js
index b429639c4f044f74c749a3d6c3c8d737bc218954..c3b488def69f02e9e13f1c3adfb79e43a5ea38d8 100644
--- a/gemeinsamforschen/src/main/webapp/core/management/js/deleteProject.js
+++ b/gemeinsamforschen/src/main/webapp/core/management/js/deleteProject.js
@@ -12,7 +12,7 @@ $(document).ready(function () {
function deleteProject(projectName) {
var token = getUserTokenFromUrl();
- var url = "../database/deleteProject.php?project=" + projectName + "&password=" + document.getElementById('projectPassword').value.trim() + "&token=" + token;
+ var url = "../database/delete-project.jsp?project=" + projectName + "&password=" + document.getElementById('projectPassword').value.trim() + "&token=" + token;
if (projectName === "") {
return false;
} else {
diff --git a/gemeinsamforschen/src/main/webapp/core/management/js/newProject.js b/gemeinsamforschen/src/main/webapp/core/management/js/newProject.js
index bf2eaf856cefd4156189b5814e2a7cf9826eb248..be07b3fead5a21b1ba8d1703d8f5688f01facc53 100644
--- a/gemeinsamforschen/src/main/webapp/core/management/js/newProject.js
+++ b/gemeinsamforschen/src/main/webapp/core/management/js/newProject.js
@@ -113,7 +113,7 @@ function createNewProject(allTheTags, activ) {
$.when(addProjectNeo4j, addProjectToLocalDB(allTheTags, projectName, password, activ, adminPassword)).done(function () {
document.getElementById('loader').className = "loader-inactive";
document.getElementById('wrapper').className = "wrapper";
- if ($('#Teilnehmer').prop("checked")) { //if author wants to join the course, he needs to be redirected to preferences.php
+ if ($('#Teilnehmer').prop("checked")) { //if author wants to join the course, he needs to be redirected to enter-preferences.jsp
var url = "../database/getProjects.php?project=" + projectName + "&password=" + document.getElementById('passwordProject').value;
$.ajax({
url: url,
@@ -121,7 +121,7 @@ function createNewProject(allTheTags, activ) {
Accept: "text/plain; charset=utf-8",
contentType: "text/plain",
success: function (response) {
- location.href = "preferences.php?token=" + getUserTokenFromUrl() + "&projectToken=" + response;
+ location.href = "enter-preferences.jsp?token=" + getUserTokenFromUrl() + "&projectToken=" + response;
},
error: function (a, b, c) {
console.log(a);
diff --git a/gemeinsamforschen/src/main/webapp/core/management/js/overview.js b/gemeinsamforschen/src/main/webapp/core/management/js/overview.js
index a66538baa5732073685e411e7eab5864e8d7cc51..a78bb0cda5635640c87505b6e1e0e218a965bf96 100644
--- a/gemeinsamforschen/src/main/webapp/core/management/js/overview.js
+++ b/gemeinsamforschen/src/main/webapp/core/management/js/overview.js
@@ -23,7 +23,7 @@ function printProjects(projects, offset) {
//'<a class="btn btn-default"><em class="fa fa-pencil" ></em></a>' +
//'<button id="deleteButton' +i+ '" class="btn btn-danger fa fa-trash deleteButton"></button>' +
content.innerHTML = '<td align="center">' +
- '<a href="deleteProject.php?token='+getUserTokenFromUrl()+'" class="btn btn-danger fa fa-trash"></a>' +
+ '<a href="delete-project.jsp?token='+getUserTokenFromUrl()+'" class="btn btn-danger fa fa-trash"></a>' +
'</td>' +
'<td class="hidden-xs" href="#Div_Promo_Carousel" data-slide="next">' + projects[i] + '</td>' +
'<td id="projectTags' + (i + offset) + '" href="#Div_Promo_Carousel" data-slide="next"></td>';
diff --git a/gemeinsamforschen/src/main/webapp/core/management/js/showProjects.js b/gemeinsamforschen/src/main/webapp/core/management/js/showProjects.js
index ec4771b77b5e0cad7aec62634f303cd254241f7e..ff687d3f310be2d92ae07cc89f27192ce1b194f5 100644
--- a/gemeinsamforschen/src/main/webapp/core/management/js/showProjects.js
+++ b/gemeinsamforschen/src/main/webapp/core/management/js/showProjects.js
@@ -35,7 +35,7 @@ function seeProject(projectName) {
$("#projectIsMissing").show();
} else {
if (response !== "wrong password") { //if response !== project missing and not wrong password, its the projectToken
- location.href="preferences.php?token="+getUserTokenFromUrl()+"&projectToken="+response;
+ location.href="enter-preferences.jsp?token="+getUserTokenFromUrl()+"&projectToken="+response;
} else {
$("#projectIsMissing").hide();
$('#projectWrongPassword').show();
diff --git a/gemeinsamforschen/src/main/webapp/core/management/js/utility.js b/gemeinsamforschen/src/main/webapp/core/management/js/utility.js
deleted file mode 100644
index dac28eb2de49b29e1df606bb4f4cbe2abd9f4627..0000000000000000000000000000000000000000
--- a/gemeinsamforschen/src/main/webapp/core/management/js/utility.js
+++ /dev/null
@@ -1,10 +0,0 @@
-function getUserTokenFromUrl() {
- var parts = window.location.search.substr(1).split("&");
- var $_GET = {};
- for (var i = 0; i < parts.length; i++) {
- var temp = parts[i].split("=");
- $_GET[decodeURIComponent(temp[0])] = decodeURIComponent(temp[1]);
- }
- return $_GET['token'];
-}
-
diff --git a/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp b/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp
index 047334f69717c358580fb58b3fc6eeff0d370094..9a1809c98f502df96dd866854609e8b0d335e860 100644
--- a/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp
@@ -1,5 +1,5 @@
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!DOCTYPE html>
<html>