From fd7727fbcac5ebc63b9e9abdb426246702bf2611 Mon Sep 17 00:00:00 2001
From: Axel <wiepke@uni-potsdam.de>
Date: Wed, 12 Sep 2018 14:16:04 +0200
Subject: [PATCH] beaut: new packages for every web-app-module
---
.../annotation-document.jsp | 6 +-
.../unstructured-annotation.jsp | 6 +-
.../unstructured-upload.jsp | 9 +-
.../{pages => assessment}/Quiz-docent.jsp | 8 +-
.../webapp/{pages => assessment}/Quiz.jsp | 8 +-
.../assessmentCalculator.jsp | 6 +-
.../{pages => assessment}/createQuiz.jsp | 8 +-
.../finalAssessments.jsp | 8 +-
.../rateContribution.jsp | 8 +-
.../webapp/{pages => assessment}/takeQuiz.jsp | 8 +-
.../webapp/{pages => assessment}/viewQuiz.jsp | 8 +-
.../webapp/core/session/session_example_1.jsp | 2 +-
.../webapp/core/session/session_example_2.jsp | 2 +-
.../{pages => course}/createProject.jsp | 8 +-
.../{pages => course}/editDescription.jsp | 4 +-
.../{pages => course}/enrollProject.jsp | 2 +-
.../{pages => course}/specificRequirement.jsp | 6 +-
.../{pages => course}/specificSkills.jsp | 2 +-
.../webapp/{pages => docent}/changePhase.jsp | 8 +-
.../{pages => docent}/overview-docent.jsp | 6 +-
.../{pages => docent}/project-docent.jsp | 8 +-
.../{pages => docent}/project-docent_CG.jsp | 6 +-
.../{pages => feedback}/givefeedback.jsp | 6 +-
.../{pages => feedback}/viewfeedback.jsp | 6 +-
.../{pages => groupfinding}/createGroups.jsp | 6 +-
.../{pages => journal}/createJournal.jsp | 4 +-
.../webapp/{pages => journal}/eportfolio.jsp | 4 +-
.../webapp/pages/project-student.jsp.orig | 187 ------------------
.../webapp/{pages => profile}/profile.jsp | 8 +-
.../researchReportBibo.jsp | 6 +-
.../researchReportConcept.jsp | 6 +-
.../researchReportDo.jsp | 6 +-
.../researchReportEvaluation.jsp | 8 +-
.../researchReportMethod.jsp | 6 +-
.../researchReportOverview.jsp | 6 +-
.../researchReportQuestion.jsp | 6 +-
.../researchReportRecherche.jsp | 6 +-
.../researchReportTitle.jsp | 6 +-
.../{pages => student}/overview-student.jsp | 6 +-
.../{pages => student}/project-student.jsp | 8 +-
40 files changed, 121 insertions(+), 307 deletions(-)
rename gemeinsamforschen/src/main/webapp/{pages => annotation}/annotation-document.jsp (96%)
rename gemeinsamforschen/src/main/webapp/{pages => annotation}/unstructured-annotation.jsp (95%)
rename gemeinsamforschen/src/main/webapp/{pages => annotation}/unstructured-upload.jsp (89%)
rename gemeinsamforschen/src/main/webapp/{pages => assessment}/Quiz-docent.jsp (63%)
rename gemeinsamforschen/src/main/webapp/{pages => assessment}/Quiz.jsp (63%)
rename gemeinsamforschen/src/main/webapp/{pages => assessment}/assessmentCalculator.jsp (69%)
rename gemeinsamforschen/src/main/webapp/{pages => assessment}/createQuiz.jsp (81%)
rename gemeinsamforschen/src/main/webapp/{pages => assessment}/finalAssessments.jsp (98%)
rename gemeinsamforschen/src/main/webapp/{pages => assessment}/rateContribution.jsp (92%)
rename gemeinsamforschen/src/main/webapp/{pages => assessment}/takeQuiz.jsp (76%)
rename gemeinsamforschen/src/main/webapp/{pages => assessment}/viewQuiz.jsp (75%)
rename gemeinsamforschen/src/main/webapp/{pages => course}/createProject.jsp (69%)
rename gemeinsamforschen/src/main/webapp/{pages => course}/editDescription.jsp (94%)
rename gemeinsamforschen/src/main/webapp/{pages => course}/enrollProject.jsp (96%)
rename gemeinsamforschen/src/main/webapp/{pages => course}/specificRequirement.jsp (93%)
rename gemeinsamforschen/src/main/webapp/{pages => course}/specificSkills.jsp (96%)
rename gemeinsamforschen/src/main/webapp/{pages => docent}/changePhase.jsp (80%)
rename gemeinsamforschen/src/main/webapp/{pages => docent}/overview-docent.jsp (94%)
rename gemeinsamforschen/src/main/webapp/{pages => docent}/project-docent.jsp (92%)
rename gemeinsamforschen/src/main/webapp/{pages => docent}/project-docent_CG.jsp (97%)
rename gemeinsamforschen/src/main/webapp/{pages => feedback}/givefeedback.jsp (96%)
rename gemeinsamforschen/src/main/webapp/{pages => feedback}/viewfeedback.jsp (97%)
rename gemeinsamforschen/src/main/webapp/{pages => groupfinding}/createGroups.jsp (64%)
rename gemeinsamforschen/src/main/webapp/{pages => journal}/createJournal.jsp (96%)
rename gemeinsamforschen/src/main/webapp/{pages => journal}/eportfolio.jsp (97%)
delete mode 100644 gemeinsamforschen/src/main/webapp/pages/project-student.jsp.orig
rename gemeinsamforschen/src/main/webapp/{pages => profile}/profile.jsp (94%)
rename gemeinsamforschen/src/main/webapp/{pages => researchReport}/researchReportBibo.jsp (92%)
rename gemeinsamforschen/src/main/webapp/{pages => researchReport}/researchReportConcept.jsp (91%)
rename gemeinsamforschen/src/main/webapp/{pages => researchReport}/researchReportDo.jsp (92%)
rename gemeinsamforschen/src/main/webapp/{pages => researchReport}/researchReportEvaluation.jsp (89%)
rename gemeinsamforschen/src/main/webapp/{pages => researchReport}/researchReportMethod.jsp (92%)
rename gemeinsamforschen/src/main/webapp/{pages => researchReport}/researchReportOverview.jsp (94%)
rename gemeinsamforschen/src/main/webapp/{pages => researchReport}/researchReportQuestion.jsp (92%)
rename gemeinsamforschen/src/main/webapp/{pages => researchReport}/researchReportRecherche.jsp (92%)
rename gemeinsamforschen/src/main/webapp/{pages => researchReport}/researchReportTitle.jsp (93%)
rename gemeinsamforschen/src/main/webapp/{pages => student}/overview-student.jsp (94%)
rename gemeinsamforschen/src/main/webapp/{pages => student}/project-student.jsp (94%)
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 3e7d05ba..f7700ab8 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 94b29c07..de6ef885 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 083f71f4..92c6e31e 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 6d693e27..f18d4b74 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 5e734136..719048e0 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 c7d44f13..4cfa0c32 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 7601ff88..60ce0a73 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 4a690859..78c9235d 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 cfda957f..e706a9ea 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 a0c99526..433023e0 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 8cadd01e..4c742cd7 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 4f2ddf97..e1b81b46 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 a6e570bc..4e58d95d 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 84f529a5..1812ed96 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 5a5bd034..dec41640 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 4de718d3..f44df07f 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 7c2a0432..a5e9ba27 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 1f5f24e2..f1d3b559 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 c3d7c07a..763926f0 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 736db5bd..708c6b2b 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 5aafa195..d22be283 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 ab4ab32c..b276788d 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 688a5df9..be99ae9d 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 d444f858..1e37c958 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 4b22ba4e..8907e054 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 96%
rename from gemeinsamforschen/src/main/webapp/pages/createJournal.jsp
rename to gemeinsamforschen/src/main/webapp/journal/createJournal.jsp
index 047334f6..9a1809c9 100644
--- a/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp
+++ b/gemeinsamforschen/src/main/webapp/journal/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>
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 ee473b42..a84ef0f5 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 a5671b8a..00000000
--- 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 18dfc349..98d36fa4 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 edda05a8..67901c78 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 7e151682..0a7e41bd 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 8fe4788e..678bd32c 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 14e034a2..739957e1 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 1722e68b..64b26b4e 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 014075ee..e103022c 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 8b69897f..413236f0 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 4dcecad3..df8bde71 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 87a24067..dd012654 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 8feef4d6..16cf0099 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 ddb3cae7..83486d62 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" %>
--
GitLab