diff --git a/gemeinsamforschen/src/main/webapp/pages/annotation-document.jsp b/gemeinsamforschen/src/main/webapp/annotation/annotation-document.jsp
similarity index 96%
rename from gemeinsamforschen/src/main/webapp/pages/annotation-document.jsp
rename to gemeinsamforschen/src/main/webapp/annotation/annotation-document.jsp
index 3e7d05ba8463e64f6e937f870ef3e1c32dddbd31..f7700ab8d87be7d2a6f5ab56d09f2f9a8172185e 100644
--- a/gemeinsamforschen/src/main/webapp/pages/annotation-document.jsp
+++ b/gemeinsamforschen/src/main/webapp/annotation/annotation-document.jsp
@@ -1,7 +1,7 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!DOCTYPE html>
<html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/unstructured-annotation.jsp b/gemeinsamforschen/src/main/webapp/annotation/unstructured-annotation.jsp
similarity index 95%
rename from gemeinsamforschen/src/main/webapp/pages/unstructured-annotation.jsp
rename to gemeinsamforschen/src/main/webapp/annotation/unstructured-annotation.jsp
index 94b29c07de3adfa1681dd11423e4607e69700e7e..de6ef8857c2085b42cb76e54da6369e2bdfa3f61 100644
--- a/gemeinsamforschen/src/main/webapp/pages/unstructured-annotation.jsp
+++ b/gemeinsamforschen/src/main/webapp/annotation/unstructured-annotation.jsp
@@ -1,7 +1,7 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!DOCTYPE html>
<html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/unstructured-upload.jsp b/gemeinsamforschen/src/main/webapp/annotation/unstructured-upload.jsp
similarity index 89%
rename from gemeinsamforschen/src/main/webapp/pages/unstructured-upload.jsp
rename to gemeinsamforschen/src/main/webapp/annotation/unstructured-upload.jsp
index 083f71f4cd99bffc55a20c3f311eae53d1fd2bb9..92c6e31e5f4f8d8370f7d25a62d9be795b5b7191 100644
--- a/gemeinsamforschen/src/main/webapp/pages/unstructured-upload.jsp
+++ b/gemeinsamforschen/src/main/webapp/annotation/unstructured-upload.jsp
@@ -1,7 +1,8 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
+
<!DOCTYPE html>
<html>
@@ -25,7 +26,7 @@
<body>
<div id="wrapper" class="full-height">
- <menu:menu></menu:menu>
+ <menu:menu/>
<div class="page-content-wrapper full-height">
<div class="container-fluid full-height">
<div class="container-fluid-content">
diff --git a/gemeinsamforschen/src/main/webapp/pages/Quiz-docent.jsp b/gemeinsamforschen/src/main/webapp/assessment/Quiz-docent.jsp
similarity index 63%
rename from gemeinsamforschen/src/main/webapp/pages/Quiz-docent.jsp
rename to gemeinsamforschen/src/main/webapp/assessment/Quiz-docent.jsp
index 6d693e27525436354f12e04005d2f59850d4e3e0..f18d4b7436ddf84330f301e83f989bd238118205 100644
--- a/gemeinsamforschen/src/main/webapp/pages/Quiz-docent.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/Quiz-docent.jsp
@@ -1,8 +1,8 @@
<%@ page contentType="text/html;charset=UTF-8" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="footer" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="footer" %>
<html>
<head>
diff --git a/gemeinsamforschen/src/main/webapp/pages/Quiz.jsp b/gemeinsamforschen/src/main/webapp/assessment/Quiz.jsp
similarity index 63%
rename from gemeinsamforschen/src/main/webapp/pages/Quiz.jsp
rename to gemeinsamforschen/src/main/webapp/assessment/Quiz.jsp
index 5e7341363506343927281caf860275bcb48080c6..719048e061aed5dac831fccec8e14b79e622ae7b 100644
--- a/gemeinsamforschen/src/main/webapp/pages/Quiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/Quiz.jsp
@@ -1,8 +1,8 @@
<%@ page contentType="text/html;charset=UTF-8" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="footer" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="footer" %>
<html>
<head>
diff --git a/gemeinsamforschen/src/main/webapp/pages/assessmentCalculator.jsp b/gemeinsamforschen/src/main/webapp/assessment/assessmentCalculator.jsp
similarity index 69%
rename from gemeinsamforschen/src/main/webapp/pages/assessmentCalculator.jsp
rename to gemeinsamforschen/src/main/webapp/assessment/assessmentCalculator.jsp
index c7d44f13736c7ec10eb7c87c6218cc676026b14d..4cfa0c32a23f9074b83ac916483208e3b578c7d8 100644
--- a/gemeinsamforschen/src/main/webapp/pages/assessmentCalculator.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/assessmentCalculator.jsp
@@ -1,7 +1,7 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!-- TODO refactor @Sven: bitte nutze einen Unterordner für dein Modul z.B. webapp/annotation/ -->
diff --git a/gemeinsamforschen/src/main/webapp/pages/createQuiz.jsp b/gemeinsamforschen/src/main/webapp/assessment/createQuiz.jsp
similarity index 81%
rename from gemeinsamforschen/src/main/webapp/pages/createQuiz.jsp
rename to gemeinsamforschen/src/main/webapp/assessment/createQuiz.jsp
index 7601ff88f154ff2df7613bfc1c2f55a5de1a2c25..60ce0a732ef2177ed9dde1435bdcc1c65f59cc72 100644
--- a/gemeinsamforschen/src/main/webapp/pages/createQuiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/createQuiz.jsp
@@ -1,8 +1,8 @@
<%@ page contentType="text/html;charset=UTF-8" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="footer" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="footer" %>
<html>
<head>
diff --git a/gemeinsamforschen/src/main/webapp/pages/finalAssessments.jsp b/gemeinsamforschen/src/main/webapp/assessment/finalAssessments.jsp
similarity index 98%
rename from gemeinsamforschen/src/main/webapp/pages/finalAssessments.jsp
rename to gemeinsamforschen/src/main/webapp/assessment/finalAssessments.jsp
index 4a6908591abadfecd0fcd915e9743637d29d0442..78c9235d2324ddbe4cd42eb4d1940106a042eb5b 100644
--- a/gemeinsamforschen/src/main/webapp/pages/finalAssessments.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/finalAssessments.jsp
@@ -1,8 +1,8 @@
<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="footer" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="footer" %>
<!DOCTYPE html>
<html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/rateContribution.jsp b/gemeinsamforschen/src/main/webapp/assessment/rateContribution.jsp
similarity index 92%
rename from gemeinsamforschen/src/main/webapp/pages/rateContribution.jsp
rename to gemeinsamforschen/src/main/webapp/assessment/rateContribution.jsp
index cfda957fd875e6dcc394162b2031fe301bf6ff53..e706a9eae47b8b3187613fc3caa94e849d75340d 100644
--- a/gemeinsamforschen/src/main/webapp/pages/rateContribution.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/rateContribution.jsp
@@ -1,8 +1,8 @@
<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="footer" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="footer" %>
<!DOCTYPE html>
<html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/takeQuiz.jsp b/gemeinsamforschen/src/main/webapp/assessment/takeQuiz.jsp
similarity index 76%
rename from gemeinsamforschen/src/main/webapp/pages/takeQuiz.jsp
rename to gemeinsamforschen/src/main/webapp/assessment/takeQuiz.jsp
index a0c99526f7d16fcef2a3473c6f5d5f098ed016de..433023e0bd5714a1e5d395a3609aee02d22551c4 100644
--- a/gemeinsamforschen/src/main/webapp/pages/takeQuiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/takeQuiz.jsp
@@ -1,8 +1,8 @@
<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="footer" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="footer" %>
<!DOCTYPE html>
<html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/viewQuiz.jsp b/gemeinsamforschen/src/main/webapp/assessment/viewQuiz.jsp
similarity index 75%
rename from gemeinsamforschen/src/main/webapp/pages/viewQuiz.jsp
rename to gemeinsamforschen/src/main/webapp/assessment/viewQuiz.jsp
index 8cadd01e748a2be689f85d9fec370d4d97e2d4a6..4c742cd78d807d65d0011afee36c50cd84e09542 100644
--- a/gemeinsamforschen/src/main/webapp/pages/viewQuiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/viewQuiz.jsp
@@ -1,8 +1,8 @@
<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="footer" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="footer" %>
<!DOCTYPE html>
<html>
diff --git a/gemeinsamforschen/src/main/webapp/core/session/session_example_1.jsp b/gemeinsamforschen/src/main/webapp/core/session/session_example_1.jsp
index 4f2ddf97366c1617b8aad74c34fe72937b36fea1..e1b81b465b971d6f33be838634b9a1f0a484f192 100644
--- a/gemeinsamforschen/src/main/webapp/core/session/session_example_1.jsp
+++ b/gemeinsamforschen/src/main/webapp/core/session/session_example_1.jsp
@@ -6,7 +6,7 @@
To change this template use File | Settings | File Templates.
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="gf" uri="../core/pages/gemeinsamForschen.tld" %>
+<%@ taglib prefix="gf" uri="../core/gemeinsamForschen.tld" %>
<html>
<head>
<title>Title</title>
diff --git a/gemeinsamforschen/src/main/webapp/core/session/session_example_2.jsp b/gemeinsamforschen/src/main/webapp/core/session/session_example_2.jsp
index a6e570bc3814fac53418a447f95854fe729a2224..4e58d95d9b1c81aa9c3345c323c39e0f5f82d01e 100644
--- a/gemeinsamforschen/src/main/webapp/core/session/session_example_2.jsp
+++ b/gemeinsamforschen/src/main/webapp/core/session/session_example_2.jsp
@@ -6,7 +6,7 @@
To change this template use File | Settings | File Templates.
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="gf" uri="../core/pages/gemeinsamForschen.tld" %>
+<%@ taglib prefix="gf" uri="../core/gemeinsamForschen.tld" %>
<html>
<head>
<title>Big Deal</title>
diff --git a/gemeinsamforschen/src/main/webapp/pages/createProject.jsp b/gemeinsamforschen/src/main/webapp/course/createProject.jsp
similarity index 69%
rename from gemeinsamforschen/src/main/webapp/pages/createProject.jsp
rename to gemeinsamforschen/src/main/webapp/course/createProject.jsp
index 84f529a57f133988191875eac3c9f327d3217b23..1812ed96777867afef58061e968415f4b2d5821b 100644
--- a/gemeinsamforschen/src/main/webapp/pages/createProject.jsp
+++ b/gemeinsamforschen/src/main/webapp/course/createProject.jsp
@@ -1,8 +1,8 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!DOCTYPE html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/editDescription.jsp b/gemeinsamforschen/src/main/webapp/course/editDescription.jsp
similarity index 94%
rename from gemeinsamforschen/src/main/webapp/pages/editDescription.jsp
rename to gemeinsamforschen/src/main/webapp/course/editDescription.jsp
index 5a5bd034793617af707358b3a968d004002cfec1..dec41640e22c911f3499eca39c9d9f0519260cbb 100644
--- a/gemeinsamforschen/src/main/webapp/pages/editDescription.jsp
+++ b/gemeinsamforschen/src/main/webapp/course/editDescription.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>
diff --git a/gemeinsamforschen/src/main/webapp/pages/enrollProject.jsp b/gemeinsamforschen/src/main/webapp/course/enrollProject.jsp
similarity index 96%
rename from gemeinsamforschen/src/main/webapp/pages/enrollProject.jsp
rename to gemeinsamforschen/src/main/webapp/course/enrollProject.jsp
index 4de718d37303e1c498deb9b562be7b2826f68a4b..f44df07fd7fcba42d6ecc2bbf9001546b593ed5a 100644
--- a/gemeinsamforschen/src/main/webapp/pages/enrollProject.jsp
+++ b/gemeinsamforschen/src/main/webapp/course/enrollProject.jsp
@@ -1,5 +1,5 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
<!DOCTYPE html>
<html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/specificRequirement.jsp b/gemeinsamforschen/src/main/webapp/course/specificRequirement.jsp
similarity index 93%
rename from gemeinsamforschen/src/main/webapp/pages/specificRequirement.jsp
rename to gemeinsamforschen/src/main/webapp/course/specificRequirement.jsp
index 7c2a043255ef4e1e23096946f9daedf3cea2ae79..a5e9ba27fd1bf9b9fd8c40b665b5d0d290e46c37 100644
--- a/gemeinsamforschen/src/main/webapp/pages/specificRequirement.jsp
+++ b/gemeinsamforschen/src/main/webapp/course/specificRequirement.jsp
@@ -1,5 +1,5 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
+<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
<!DOCTYPE html>
<html>
@@ -22,7 +22,7 @@
<body>
<div id="wrapper">
- <menu:menu></menu:menu>
+ <menu:menu/>
<div class="page-content-wrapper">
<div class="container-fluid">
diff --git a/gemeinsamforschen/src/main/webapp/pages/specificSkills.jsp b/gemeinsamforschen/src/main/webapp/course/specificSkills.jsp
similarity index 96%
rename from gemeinsamforschen/src/main/webapp/pages/specificSkills.jsp
rename to gemeinsamforschen/src/main/webapp/course/specificSkills.jsp
index 1f5f24e2d64e948b3cf5873352c35be7a892a02e..f1d3b559ea1522e1ca1bcba61ea7000fbf08ad58 100644
--- a/gemeinsamforschen/src/main/webapp/pages/specificSkills.jsp
+++ b/gemeinsamforschen/src/main/webapp/course/specificSkills.jsp
@@ -1,5 +1,5 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
<!DOCTYPE html>
<html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/changePhase.jsp b/gemeinsamforschen/src/main/webapp/docent/changePhase.jsp
similarity index 80%
rename from gemeinsamforschen/src/main/webapp/pages/changePhase.jsp
rename to gemeinsamforschen/src/main/webapp/docent/changePhase.jsp
index c3d7c07a1f47ed3e1a855ef454dca240d92fb8c7..763926f0c09af8ee56ba9a769c3914b34dea5b59 100644
--- a/gemeinsamforschen/src/main/webapp/pages/changePhase.jsp
+++ b/gemeinsamforschen/src/main/webapp/docent/changePhase.jsp
@@ -1,8 +1,8 @@
<%@ page contentType="text/html;charset=UTF-8" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="footer" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="footer" %>
<html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/overview-docent.jsp b/gemeinsamforschen/src/main/webapp/docent/overview-docent.jsp
similarity index 94%
rename from gemeinsamforschen/src/main/webapp/pages/overview-docent.jsp
rename to gemeinsamforschen/src/main/webapp/docent/overview-docent.jsp
index 736db5bd3aa5a1ca53a86b1694994e78ef880631..708c6b2b3d3a7f8ce67b9edf7c4610ed303e7d41 100644
--- a/gemeinsamforschen/src/main/webapp/pages/overview-docent.jsp
+++ b/gemeinsamforschen/src/main/webapp/docent/overview-docent.jsp
@@ -1,7 +1,7 @@
<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!DOCTYPE html>
<html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/project-docent.jsp b/gemeinsamforschen/src/main/webapp/docent/project-docent.jsp
similarity index 92%
rename from gemeinsamforschen/src/main/webapp/pages/project-docent.jsp
rename to gemeinsamforschen/src/main/webapp/docent/project-docent.jsp
index 5aafa19554988dc0438d51b9bd5fe573390cc479..d22be2837be9dad091e7b50a71f7344bfbcc8f8c 100644
--- a/gemeinsamforschen/src/main/webapp/pages/project-docent.jsp
+++ b/gemeinsamforschen/src/main/webapp/docent/project-docent.jsp
@@ -1,9 +1,9 @@
<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
<%@ taglib prefix="communication" uri="/communication/chatWindow.tld" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="footer" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="footer" %>
diff --git a/gemeinsamforschen/src/main/webapp/pages/project-docent_CG.jsp b/gemeinsamforschen/src/main/webapp/docent/project-docent_CG.jsp
similarity index 97%
rename from gemeinsamforschen/src/main/webapp/pages/project-docent_CG.jsp
rename to gemeinsamforschen/src/main/webapp/docent/project-docent_CG.jsp
index ab4ab32c16da0455e463e051cde43c30f1dea16a..b276788dcf1c79f3a39737cfb02afcf93c50ef7c 100644
--- a/gemeinsamforschen/src/main/webapp/pages/project-docent_CG.jsp
+++ b/gemeinsamforschen/src/main/webapp/docent/project-docent_CG.jsp
@@ -1,7 +1,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!DOCTYPE html>
<html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/givefeedback.jsp b/gemeinsamforschen/src/main/webapp/feedback/givefeedback.jsp
similarity index 96%
rename from gemeinsamforschen/src/main/webapp/pages/givefeedback.jsp
rename to gemeinsamforschen/src/main/webapp/feedback/givefeedback.jsp
index 688a5df9105e5918f12ae6464bf5f483f868a37b..be99ae9d34cdfc8f87d8bc18744389173a6e1cea 100644
--- a/gemeinsamforschen/src/main/webapp/pages/givefeedback.jsp
+++ b/gemeinsamforschen/src/main/webapp/feedback/givefeedback.jsp
@@ -1,7 +1,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!DOCTYPE html>
<html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/viewfeedback.jsp b/gemeinsamforschen/src/main/webapp/feedback/viewfeedback.jsp
similarity index 97%
rename from gemeinsamforschen/src/main/webapp/pages/viewfeedback.jsp
rename to gemeinsamforschen/src/main/webapp/feedback/viewfeedback.jsp
index d444f858ad4ac0803d6d99e233a90ed4e809144b..1e37c9582154b7383dcfb87a57d520e512348676 100644
--- a/gemeinsamforschen/src/main/webapp/pages/viewfeedback.jsp
+++ b/gemeinsamforschen/src/main/webapp/feedback/viewfeedback.jsp
@@ -1,7 +1,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!DOCTYPE html>
<html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/createGroups.jsp b/gemeinsamforschen/src/main/webapp/groupfinding/createGroups.jsp
similarity index 64%
rename from gemeinsamforschen/src/main/webapp/pages/createGroups.jsp
rename to gemeinsamforschen/src/main/webapp/groupfinding/createGroups.jsp
index 4b22ba4e92ae53aeaf9abfc1a7a2ebdd16469a75..8907e054c3ab509a17150915d8eefeb9b5fe79ee 100644
--- a/gemeinsamforschen/src/main/webapp/pages/createGroups.jsp
+++ b/gemeinsamforschen/src/main/webapp/groupfinding/createGroups.jsp
@@ -1,7 +1,7 @@
<%@ page contentType="text/html;charset=UTF-8" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
<html>
<head>
diff --git a/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp b/gemeinsamforschen/src/main/webapp/journal/createJournal.jsp
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/pages/createJournal.jsp
rename to gemeinsamforschen/src/main/webapp/journal/createJournal.jsp
diff --git a/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp b/gemeinsamforschen/src/main/webapp/journal/eportfolio.jsp
similarity index 97%
rename from gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp
rename to gemeinsamforschen/src/main/webapp/journal/eportfolio.jsp
index ee473b420b8267986da32c0ed60a0d5543578e02..a84ef0f5bea306cb12bb7e93e0fc256051677ea7 100644
--- a/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp
+++ b/gemeinsamforschen/src/main/webapp/journal/eportfolio.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>
diff --git a/gemeinsamforschen/src/main/webapp/pages/project-student.jsp.orig b/gemeinsamforschen/src/main/webapp/pages/project-student.jsp.orig
deleted file mode 100644
index a5671b8ada831eeef0162fca442adfced0d10762..0000000000000000000000000000000000000000
--- a/gemeinsamforschen/src/main/webapp/pages/project-student.jsp.orig
+++ /dev/null
@@ -1,187 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-<%--suppress XmlDuplicatedId --%>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="footer" %>
-
-
-
-<!--todo: E-mail an Studenten als Notifikation für Phasenwechsel -->
-
-
-<!DOCTYPE html>
-<html>
-
-<head>
- <omniDependencies:omniDependencies/>
- <script src="../assets/js/project-student.js"></script>
- <link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
-
-</head>
-
-<body>
-<div id="wrapper">
- <menu:menu/>
-
- <div class="page-content-wrapper">
- <headLine:headLine/>
- <div>
- <table>
- <tr>
- <td id="yourContent">
- <h1>Feedbackable Students</h1>
- <!-- here will be all the content -->
- <table id="myGroupMembers">
- <tr>
-
- <td width="100px" valign="top">
- <h3>student1</h3>
- <img src="../assets/img/1.jpg">
- <a href="#">student1@uni.de</a>
- <hr>
- <ul>
-
- <li>
- Projektübersicht hochgeladen
- <a class="annotationview" role="button">
- <label style="font-size:10px;"><i class="far fa-comments"
- style="font-size:15px;"></i>feedback</label>
- </a>
- </li>
- <li>
- Blumen ins Hausaufgabenheft geklebt
- <a class="annotationview" role="button">
- <label style="font-size:10px;"><i class="far fa-comments"
- style="font-size:15px;"></i>feedback</label>
- </a>
- </li>
- </ul>
- </td>
- <td></td>
-
- <td width="100px" valign="top">
- <h3>student2</h3>
- <img src="../assets/img/2.jpg">
- <a href="#">student2@uni.de</a>
- <hr>
- <ul>
- <li>
- Blumen an Vegetarier verfüttert
- <a class="annotationview" role="button">
- <label style="font-size:10px;"><i class="far fa-comments"
- style="font-size:15px;"></i>feedback</label>
- </a>
- </li>
- <li>
- Literaturverzeichnis hochgeladen
- <a class="annotationview" role="button">
- <label style="font-size:10px;"><i class="far fa-comments"
- style="font-size:15px;"></i>feedback</label>
- </a>
- </li>
- <li>
- Die armen Vegetarier
- <a class="annotationview" role="button">
- <label style="font-size:10px;"><i class="far fa-comments"
- style="font-size:15px;"></i>feedback</label>
- </a>
- </li>
- </ul>
- </td>
- <td></td>
-
- <td width="100px" valign="top">
- <h3>student3</h3>
- <img src="../assets/img/3.jpg">
- <a href="#">student3@uni.de</a>
- <hr>
- <ul id="submissionUpload">
- </ul>
- </td>
-
- </tr>
- </table>
-
-<<<<<<< HEAD
- <button onclick="goBack()" class="btn btn-secondary">Zurück</button>
-
- <script>
- function goBack() {
- window.history.back();
- }
- </script>
-
- </td>
- <td id="chat">
- <div class="card">
- <div class="card-header">
- <h6 class="mb-0">Gruppen+Projekt Chat</h6>
- </div>
- <div class="card-body">
- <ul class="list-group">
- <li class="list-group-item">
- <div class="media">
- <div></div>
- <div class="media-body">
- <div class="media" style="overflow:visible;">
- <div><img src="../assets/img/1.jpg" class="mr-3"
- style="width: 25px; height:25px;"></div>
- <div class="media-body" style="overflow:visible;">
- <div class="row">
- <div class="col-md-12">
- <p><a href="#">Sara Doe:</a> This guy has been going
- 100+ MPH on side streets. <br>
- <small class="text-muted">August 6, 2016 @ 10:35am
- </small>
- </p>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- </li>
- <li class="list-group-item">
- <div class="media">
- <div></div>
- <div class="media-body">
- <div class="media" style="overflow:visible;">
- <div><img src="../assets/img/2.jpg" class="mr-3"
- style="width: 25px; height:25px;"></div>
- <div class="media-body" style="overflow:visible;">
- <div class="row">
- <div class="col-md-12">
- <p><a href="#">Brennan Prill:</a> This guy has been
- going 100+ MPH on side streets. <br>
- <small class="text-muted">August 6, 2016 @ 10:35am
- </small>
- </p>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- </li>
- </ul>
- <button class="btn btn-light">
- Add Comment
- </button>
- </div>
- </div>
-=======
- <button onclick="goBack()" class="btn btn-secondary">Zurueck</button>
->>>>>>> development_master
- </td>
- </tr>
- </table>
- </div>
- </div>
- <footer:footer/>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/profile.jsp b/gemeinsamforschen/src/main/webapp/profile/profile.jsp
similarity index 94%
rename from gemeinsamforschen/src/main/webapp/pages/profile.jsp
rename to gemeinsamforschen/src/main/webapp/profile/profile.jsp
index 18dfc349ff5b1a81f358595049b136b573734040..98d36fa484e39c8f95279241e4f44429c0d61794 100644
--- a/gemeinsamforschen/src/main/webapp/pages/profile.jsp
+++ b/gemeinsamforschen/src/main/webapp/profile/profile.jsp
@@ -1,9 +1,9 @@
<%@ page import="unipotsdam.gf.core.management.ManagementImpl" %>
<%@ page import="unipotsdam.gf.core.management.user.User" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="footer" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu"%>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="footer" %>
<!DOCTYPE html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportBibo.jsp b/gemeinsamforschen/src/main/webapp/researchReport/researchReportBibo.jsp
similarity index 92%
rename from gemeinsamforschen/src/main/webapp/pages/researchReportBibo.jsp
rename to gemeinsamforschen/src/main/webapp/researchReport/researchReportBibo.jsp
index edda05a84cad978cd2f722ce55a37f38ca9c0d06..67901c78ae4b015ee919e9fda4c4106e4af078b1 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportBibo.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/researchReportBibo.jsp
@@ -1,7 +1,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu"%>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!DOCTYPE html>
<html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportConcept.jsp b/gemeinsamforschen/src/main/webapp/researchReport/researchReportConcept.jsp
similarity index 91%
rename from gemeinsamforschen/src/main/webapp/pages/researchReportConcept.jsp
rename to gemeinsamforschen/src/main/webapp/researchReport/researchReportConcept.jsp
index 7e1516822394fcb490e0ebfc49a065b658cfd6e4..0a7e41bd14f2986999b5dc0ce9d06e1f2ce989d1 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportConcept.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/researchReportConcept.jsp
@@ -1,7 +1,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu"%>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!DOCTYPE html>
<html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportDo.jsp b/gemeinsamforschen/src/main/webapp/researchReport/researchReportDo.jsp
similarity index 92%
rename from gemeinsamforschen/src/main/webapp/pages/researchReportDo.jsp
rename to gemeinsamforschen/src/main/webapp/researchReport/researchReportDo.jsp
index 8fe4788e758133981ca9f02ff0345f100e2de69a..678bd32c9fc8a30dcfc83458bde7de0a9fb67c10 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportDo.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/researchReportDo.jsp
@@ -1,7 +1,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu"%>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!DOCTYPE html>
<html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportEvaluation.jsp b/gemeinsamforschen/src/main/webapp/researchReport/researchReportEvaluation.jsp
similarity index 89%
rename from gemeinsamforschen/src/main/webapp/pages/researchReportEvaluation.jsp
rename to gemeinsamforschen/src/main/webapp/researchReport/researchReportEvaluation.jsp
index 14e034a250e36e161926ccc873a9c08727e7fc9c..739957e128c02e9b5f95fc938b2bbed6585f16c7 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportEvaluation.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/researchReportEvaluation.jsp
@@ -1,7 +1,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu"%>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!DOCTYPE html>
<html>
@@ -36,7 +36,7 @@
</textarea>
</div>
<div class="ResearchReportButtons">
- <button class="researchReportButtons"><a href="project-student.jsp">Speichern & weiter</a></button>
+ <button class="researchReportButtons"><a href="../student/project-student.jsp">Speichern & weiter</a></button>
<button class="researchReportButtons"><a href="researchReportDo.jsp"> Zurück </a></button>
</div>
<div class="ResearchReportUpload">
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportMethod.jsp b/gemeinsamforschen/src/main/webapp/researchReport/researchReportMethod.jsp
similarity index 92%
rename from gemeinsamforschen/src/main/webapp/pages/researchReportMethod.jsp
rename to gemeinsamforschen/src/main/webapp/researchReport/researchReportMethod.jsp
index 1722e68b7d6ff471c3f4843d5dd3f843e47d9561..64b26b4e70042c0b5f2275ba52b599731f323164 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportMethod.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/researchReportMethod.jsp
@@ -1,7 +1,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu"%>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!DOCTYPE html>
<html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportOverview.jsp b/gemeinsamforschen/src/main/webapp/researchReport/researchReportOverview.jsp
similarity index 94%
rename from gemeinsamforschen/src/main/webapp/pages/researchReportOverview.jsp
rename to gemeinsamforschen/src/main/webapp/researchReport/researchReportOverview.jsp
index 014075eee00ae3a74cb07577d1df4d61ad550ea1..e103022c3e16b646eca78444c3fae271c8937b6c 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportOverview.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/researchReportOverview.jsp
@@ -1,7 +1,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu"%>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
<html>
<head>
<meta name="viewport" content="width=device-width, initial-scale=1", charset="utf-8">
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportQuestion.jsp b/gemeinsamforschen/src/main/webapp/researchReport/researchReportQuestion.jsp
similarity index 92%
rename from gemeinsamforschen/src/main/webapp/pages/researchReportQuestion.jsp
rename to gemeinsamforschen/src/main/webapp/researchReport/researchReportQuestion.jsp
index 8b69897fa00c07c0042cd6b0e645272351ce9576..413236f09ade2dbb39fb692d86acba5dfb7a4712 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportQuestion.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/researchReportQuestion.jsp
@@ -1,7 +1,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu"%>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!DOCTYPE html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportRecherche.jsp b/gemeinsamforschen/src/main/webapp/researchReport/researchReportRecherche.jsp
similarity index 92%
rename from gemeinsamforschen/src/main/webapp/pages/researchReportRecherche.jsp
rename to gemeinsamforschen/src/main/webapp/researchReport/researchReportRecherche.jsp
index 4dcecad36722f6527192a266331b945cbe566ab9..df8bde7155407bfec89e11db6d8a68f6e04b493e 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportRecherche.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/researchReportRecherche.jsp
@@ -1,7 +1,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu"%>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!DOCTYPE html>
<html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportTitle.jsp b/gemeinsamforschen/src/main/webapp/researchReport/researchReportTitle.jsp
similarity index 93%
rename from gemeinsamforschen/src/main/webapp/pages/researchReportTitle.jsp
rename to gemeinsamforschen/src/main/webapp/researchReport/researchReportTitle.jsp
index 87a24067f088992a897f101860c5b647c167885a..dd0126542b7374d627adc1ce4535c52b05510870 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportTitle.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/researchReportTitle.jsp
@@ -1,7 +1,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!DOCTYPE html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/overview-student.jsp b/gemeinsamforschen/src/main/webapp/student/overview-student.jsp
similarity index 94%
rename from gemeinsamforschen/src/main/webapp/pages/overview-student.jsp
rename to gemeinsamforschen/src/main/webapp/student/overview-student.jsp
index 8feef4d6d1bda9b41939b4bd5c2b386d070bbfec..16cf0099681d074d7cc7eb6b76a5be65e49f808e 100644
--- a/gemeinsamforschen/src/main/webapp/pages/overview-student.jsp
+++ b/gemeinsamforschen/src/main/webapp/student/overview-student.jsp
@@ -1,7 +1,7 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!DOCTYPE html>
<html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/project-student.jsp b/gemeinsamforschen/src/main/webapp/student/project-student.jsp
similarity index 94%
rename from gemeinsamforschen/src/main/webapp/pages/project-student.jsp
rename to gemeinsamforschen/src/main/webapp/student/project-student.jsp
index ddb3cae7992b5aa6647c19e7386f54ffef99c2ed..83486d62c544ac73167aa09d0af9d9629b59cbe8 100644
--- a/gemeinsamforschen/src/main/webapp/pages/project-student.jsp
+++ b/gemeinsamforschen/src/main/webapp/student/project-student.jsp
@@ -1,9 +1,9 @@
<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
<%--suppress XmlDuplicatedId --%>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
-<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="footer" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
+<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="footer" %>