diff --git a/gemeinsamforschen/src/main/webapp/annotation/annotation-document.jsp b/gemeinsamforschen/src/main/webapp/annotation/annotation-document.jsp
index 4fad61deb04cc2559e08863cda6703c5d6ad8d02..c1fb70a122d791e29a20d79cd30b6db6b3c219f4 100644
--- a/gemeinsamforschen/src/main/webapp/annotation/annotation-document.jsp
+++ b/gemeinsamforschen/src/main/webapp/annotation/annotation-document.jsp
@@ -28,15 +28,15 @@
<!-- js - rangy TextRange Module -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/rangy/1.3.0/rangy-textrange.js" type="text/javascript"></script>
<!-- js - utility -->
- <script src="../assets/js/utility.js"></script>
+ <script src="../libs/js/utility.js"></script>
<!-- js - annotation websocket script -->
- <script src="../assets/js/annotationWebsocket.js"></script>
+ <script src="../libs/js/annotationWebsocket.js"></script>
<!-- js - annotation REST script -->
- <script src="../assets/js/annotationRest.js"></script>
+ <script src="../libs/js/annotationRest.js"></script>
<!-- js - unstructuredRest -->
- <script src="../assets/js/unstructuredRest.js"></script>
+ <script src="../libs/js/unstructuredRest.js"></script>
<!-- js - annotationScript -->
- <script src="../assets/js/annotationScript.js"></script>
+ <script src="../libs/js/annotationScript.js"></script>
</head>
<body>
diff --git a/gemeinsamforschen/src/main/webapp/annotation/create-unstructured-annotation.jsp b/gemeinsamforschen/src/main/webapp/annotation/create-unstructured-annotation.jsp
index de6ef8857c2085b42cb76e54da6369e2bdfa3f61..c3507bf4dc7931dd1647ec5e45571859fbca0eb4 100644
--- a/gemeinsamforschen/src/main/webapp/annotation/create-unstructured-annotation.jsp
+++ b/gemeinsamforschen/src/main/webapp/annotation/create-unstructured-annotation.jsp
@@ -25,9 +25,9 @@
<!-- js - rangy TextRange Module -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/rangy/1.3.0/rangy-textrange.js" type="text/javascript"></script>
<!-- js - unstructuredRest -->
- <script src="../assets/js/unstructuredRest.js"></script>
+ <script src="../libs/js/unstructuredRest.js"></script>
<!-- js - unstructuredUpload -->
- <script src="../assets/js/unstructuredAnnotation.js"></script>
+ <script src="../libs/js/unstructuredAnnotation.js"></script>
</head>
diff --git a/gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-annotation.jsp b/gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-annotation.jsp
index 92c6e31e5f4f8d8370f7d25a62d9be795b5b7191..841201f1eadae8a2dbe19deb85ec8aee7b75458d 100644
--- a/gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-annotation.jsp
+++ b/gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-annotation.jsp
@@ -18,9 +18,9 @@
<!-- css - upload-unstructured -->
<link rel="stylesheet" type="text/css" href="../assets/css/unstructured-upload.css">
<!-- js - unstructuredUpload -->
- <script src="../assets/js/unstructuredUpload.js"></script>
+ <script src="../libs/js/unstructuredUpload.js"></script>
<!-- js - unstructuredRest -->
- <script src="../assets/js/unstructuredRest.js"></script>
+ <script src="../libs/js/unstructuredRest.js"></script>
</head>
diff --git a/gemeinsamforschen/src/main/webapp/assessment/Quiz-docent.jsp b/gemeinsamforschen/src/main/webapp/assessment/Quiz-docent.jsp
index f18d4b7436ddf84330f301e83f989bd238118205..cadbae85b36ad01ebf834e95a947c07909209a4b 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/Quiz-docent.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/Quiz-docent.jsp
@@ -7,7 +7,7 @@
<html>
<head>
<omniDependencies:omniDependencies/>
- <script src="../assets/js/Quiz-docent.js"></script>
+ <script src="../libs/js/Quiz-docent.js"></script>
</head>
<body>
diff --git a/gemeinsamforschen/src/main/webapp/assessment/Quiz.jsp b/gemeinsamforschen/src/main/webapp/assessment/Quiz.jsp
index 719048e061aed5dac831fccec8e14b79e622ae7b..269730f72d2bf6b12b8186b29c733f1d37e4ce92 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/Quiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/Quiz.jsp
@@ -7,7 +7,7 @@
<html>
<head>
<omniDependencies:omniDependencies/>
- <script src="../assets/js/Quiz.js"></script>
+ <script src="../libs/js/Quiz.js"></script>
</head>
<body>
diff --git a/gemeinsamforschen/src/main/webapp/assessment/assess-work.jsp b/gemeinsamforschen/src/main/webapp/assessment/assess-work.jsp
index 78c9235d2324ddbe4cd42eb4d1940106a042eb5b..b9419ffee6a453e0d560230331917da7004146e6 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/assess-work.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/assess-work.jsp
@@ -9,7 +9,7 @@
<head>
<omniDependencies:omniDependencies/>
- <script src="../assets/js/finalAssessment.js"></script>
+ <script src="../libs/js/finalAssessment.js"></script>
</head>
diff --git a/gemeinsamforschen/src/main/webapp/assessment/calculate-assessment.jsp b/gemeinsamforschen/src/main/webapp/assessment/calculate-assessment.jsp
index 4cfa0c32a23f9074b83ac916483208e3b578c7d8..7c9288d64f308483656cea4b7e1e01bdd2333c3c 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/calculate-assessment.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/calculate-assessment.jsp
@@ -10,7 +10,7 @@
<html lang="en">
<head>
<omniDependencies:omniDependencies/>
- <script src="../assets/js/assessmentCalculator.js"></script>
+ <script src="../libs/js/assessmentCalculator.js"></script>
</head>
<body>
<menu:menu/>
diff --git a/gemeinsamforschen/src/main/webapp/assessment/create-quiz.jsp b/gemeinsamforschen/src/main/webapp/assessment/create-quiz.jsp
index 60ce0a732ef2177ed9dde1435bdcc1c65f59cc72..01e2f596546225e3bd5b5ab391d78924d49e488b 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/create-quiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/create-quiz.jsp
@@ -7,7 +7,7 @@
<html>
<head>
<omniDependencies:omniDependencies/>
- <script src="../assets/js/createQuiz.js"></script>
+ <script src="../libs/js/createQuiz.js"></script>
</head>
<body>
diff --git a/gemeinsamforschen/src/main/webapp/assessment/project-docent_CG.jsp b/gemeinsamforschen/src/main/webapp/assessment/project-docent_CG.jsp
index b276788dcf1c79f3a39737cfb02afcf93c50ef7c..7aec07461c935c93ae274c6efc0ac286d25ff276 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/project-docent_CG.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/project-docent_CG.jsp
@@ -9,9 +9,9 @@
<head>
<omniDependencies:omniDependencies/>
- <script src="../assets/js/utility.js"></script>
- <script src="../assets/js/AlertAssessmentOutlier.js"></script>
- <script src="../assets/js/grading.js"></script>
+ <script src="../libs/js/utility.js"></script>
+ <script src="../libs/js/AlertAssessmentOutlier.js"></script>
+ <script src="../libs/js/grading.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.js"></script>
</head>
diff --git a/gemeinsamforschen/src/main/webapp/assessment/rate-contribution.jsp b/gemeinsamforschen/src/main/webapp/assessment/rate-contribution.jsp
index e706a9eae47b8b3187613fc3caa94e849d75340d..1e5394cb562472e41d68c4ebe819741a750c64f4 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/rate-contribution.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/rate-contribution.jsp
@@ -11,7 +11,7 @@
<script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
<script src="https://cdn.rawgit.com/showdownjs/showdown/1.8.5/dist/showdown.min.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
- <script src="../assets/js/rateContribution.js"></script>
+ <script src="../libs/js/rateContribution.js"></script>
</head>
<body>
diff --git a/gemeinsamforschen/src/main/webapp/assessment/take-quiz.jsp b/gemeinsamforschen/src/main/webapp/assessment/take-quiz.jsp
index 433023e0bd5714a1e5d395a3609aee02d22551c4..e82ec96f7cd2a0a083bdbde8b3f5cc9f1ab4c269 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/take-quiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/take-quiz.jsp
@@ -8,7 +8,7 @@
<head>
<omniDependencies:omniDependencies/>
- <script src="../assets/js/takeQuiz.js"></script>
+ <script src="../libs/js/takeQuiz.js"></script>
</head>
diff --git a/gemeinsamforschen/src/main/webapp/assessment/view-quiz.jsp b/gemeinsamforschen/src/main/webapp/assessment/view-quiz.jsp
index 4c742cd78d807d65d0011afee36c50cd84e09542..905b5cfa014967af6fa28b2dc4810bb45decade8 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/view-quiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/view-quiz.jsp
@@ -8,7 +8,7 @@
<head>
<omniDependencies:omniDependencies/>
- <script src="../assets/js/viewQuiz.js"></script>
+ <script src="../libs/js/viewQuiz.js"></script>
</head>
diff --git a/gemeinsamforschen/src/main/webapp/core/management/change-phase.jsp b/gemeinsamforschen/src/main/webapp/core/management/change-phase.jsp
index 763926f0c09af8ee56ba9a769c3914b34dea5b59..0d8395524b5f95813b75ccfe13311d97f62157fd 100644
--- a/gemeinsamforschen/src/main/webapp/core/management/change-phase.jsp
+++ b/gemeinsamforschen/src/main/webapp/core/management/change-phase.jsp
@@ -8,7 +8,7 @@
<html>
<head>
<omniDependencies:omniDependencies/>
- <script src="../assets/js/changePhase.js"></script>
+ <script src="../libs/js/changePhase.js"></script>
</head>
<body>
diff --git a/gemeinsamforschen/src/main/webapp/core/management/edit-project.jsp b/gemeinsamforschen/src/main/webapp/core/management/edit-project.jsp
index dec41640e22c911f3499eca39c9d9f0519260cbb..87e634e09dc74dadc77171e66849ac7b99530228 100644
--- a/gemeinsamforschen/src/main/webapp/core/management/edit-project.jsp
+++ b/gemeinsamforschen/src/main/webapp/core/management/edit-project.jsp
@@ -60,10 +60,10 @@
</div>
</div>
-<script src="../assets/js/jquery.min.js"></script>
+<script src="../libs/js/jquery.min.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
-<script src="../assets/js/Sidebar-Menu.js"></script>
-<script src="../assets/js/editDescription.js"></script>
+<script src="../libs/js/Sidebar-Menu.js"></script>
+<script src="../libs/js/editDescription.js"></script>
</body>
</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/core/management/groups.jsp b/gemeinsamforschen/src/main/webapp/core/management/groups.jsp
index 6321b9c39018d90850a9b37c79e6c2590b9f4a24..77b21eccdd406bbf4a12af3adfc064a62c9de522 100644
--- a/gemeinsamforschen/src/main/webapp/core/management/groups.jsp
+++ b/gemeinsamforschen/src/main/webapp/core/management/groups.jsp
@@ -14,11 +14,11 @@
<link rel="stylesheet" href="../assets/css/Sidebar-Menu1.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
- <script src="../assets/js/config.js"></script>
- <script src="../assets/js/myGroupsInit.js"></script>
- <script src="../assets/js/getProjects.js"></script>
+ <script src="../libs/js/config.js"></script>
+ <script src="../libs/js/myGroupsInit.js"></script>
+ <script src="../libs/js/getProjects.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
- <script src="../assets/js/Sidebar-Menu.js"></script>
+ <script src="../libs/js/Sidebar-Menu.js"></script>
diff --git a/gemeinsamforschen/src/main/webapp/core/management/join-project.jsp b/gemeinsamforschen/src/main/webapp/core/management/join-project.jsp
index 0c108672309961676b0b63448d26f331800b493a..1f038c0eeb7c8dc5f96f63d62bbffff16866b2c8 100644
--- a/gemeinsamforschen/src/main/webapp/core/management/join-project.jsp
+++ b/gemeinsamforschen/src/main/webapp/core/management/join-project.jsp
@@ -14,12 +14,12 @@
<link rel="stylesheet" href="../assets/css/Sidebar-Menu1.css">
<link rel="stylesheet" href="../assets/css/styles.css">
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
- <script src="../assets/js/config.js"></script>
- <script src="../assets/js/utility.js"></script>
- <script src="../assets/js/showProjects.js"></script>
- <script src="../assets/js/GETfile.js"></script>
+ <script src="../libs/js/config.js"></script>
+ <script src="../libs/js/utility.js"></script>
+ <script src="../libs/js/showProjects.js"></script>
+ <script src="../libs/js/GETfile.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
- <script src="../assets/js/Sidebar-Menu.js"></script>
+ <script src="../libs/js/Sidebar-Menu.js"></script>
</head>
diff --git a/gemeinsamforschen/src/main/webapp/feedback/give-feedback.jsp b/gemeinsamforschen/src/main/webapp/feedback/give-feedback.jsp
index be99ae9d34cdfc8f87d8bc18744389173a6e1cea..f859fb4f7ccceea22f46a4bf2193b6eb58da9deb 100644
--- a/gemeinsamforschen/src/main/webapp/feedback/give-feedback.jsp
+++ b/gemeinsamforschen/src/main/webapp/feedback/give-feedback.jsp
@@ -22,21 +22,21 @@
<script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
<script src="https://cdn.rawgit.com/showdownjs/showdown/1.8.5/dist/showdown.min.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
- <script src="../assets/js/utility.js"></script>
- <script src="../assets/js/project-student.js"></script>
+ <script src="../libs/js/utility.js"></script>
+ <script src="../libs/js/project-student.js"></script>
<link rel="stylesheet" type="text/css" href="../assets/css/editDescription.css">
- <script src="../assets/js/jquery.min.js"></script>
+ <script src="../libs/js/jquery.min.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
- <script src="../assets/js/Sidebar-Menu.js"></script>
- <script src="../assets/js/editDescription.js"></script>
+ <script src="../libs/js/Sidebar-Menu.js"></script>
+ <script src="../libs/js/editDescription.js"></script>
--%>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
<script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
<link rel="stylesheet" type="text/css" href="../assets/css/create-journal.css">
- <script src="../assets/js/utility.js"></script>
- <script src="../assets/js/project-student.js"></script>
- <script src="../assets/js/peerfeedback.js"></script>
+ <script src="../libs/js/utility.js"></script>
+ <script src="../libs/js/project-student.js"></script>
+ <script src="../libs/js/peerfeedback.js"></script>
<omniDependencies:omniDependencies/>
</head>
@@ -139,10 +139,10 @@
</div>
</div>
-<script src="../assets/js/jquery.min.js"></script>
+<script src="../libs/js/jquery.min.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
-<script src="../assets/js/Sidebar-Menu.js"></script>
-<script src="../assets/js/createJournal.js"></script>
+<script src="../libs/js/Sidebar-Menu.js"></script>
+<script src="../libs/js/createJournal.js"></script>
</body>
</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/feedback/view-feedback.jsp b/gemeinsamforschen/src/main/webapp/feedback/view-feedback.jsp
index 1e37c9582154b7383dcfb87a57d520e512348676..d88f212e99403ac001512abb2eb24649f45a8b7d 100644
--- a/gemeinsamforschen/src/main/webapp/feedback/view-feedback.jsp
+++ b/gemeinsamforschen/src/main/webapp/feedback/view-feedback.jsp
@@ -9,9 +9,9 @@
<head>
<link rel="stylesheet" href="../assets/css/viewfeedback.css">
<omniDependencies:omniDependencies/>
- <script src="../assets/js/utility.js"></script>
- <script src="../assets/js/project-student.js"></script>
- <script src="../assets/js/givepeerfeedback.js"></script>
+ <script src="../libs/js/utility.js"></script>
+ <script src="../libs/js/project-student.js"></script>
+ <script src="../libs/js/givepeerfeedback.js"></script>
</head>
@@ -167,9 +167,9 @@
</div>
</div>
-<script src="../assets/js/jquery.min.js"></script>
+<script src="../libs/js/jquery.min.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
-<script src="../assets/js/Sidebar-Menu.js"></script>
+<script src="../libs/js/Sidebar-Menu.js"></script>
</body>
</html>
diff --git a/gemeinsamforschen/src/main/webapp/groupfinding/create-groups.jsp b/gemeinsamforschen/src/main/webapp/groupfinding/create-groups.jsp
index 8907e054c3ab509a17150915d8eefeb9b5fe79ee..602a75f939faf0ec05e343152f5da2000c668421 100644
--- a/gemeinsamforschen/src/main/webapp/groupfinding/create-groups.jsp
+++ b/gemeinsamforschen/src/main/webapp/groupfinding/create-groups.jsp
@@ -6,7 +6,7 @@
<html>
<head>
<omniDependencies:omniDependencies/>
- <script src="../assets/js/changePhase.js"></script>
+ <script src="../libs/js/changePhase.js"></script>
</head>
<body>
diff --git a/gemeinsamforschen/src/main/webapp/hierachyLevel.js b/gemeinsamforschen/src/main/webapp/hierachyLevel.js
new file mode 100644
index 0000000000000000000000000000000000000000..150cd4bd34881dd99bfdebf50725b13383d619d1
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/hierachyLevel.js
@@ -0,0 +1,8 @@
+
+function calculateHierachy(level) {
+ if (level == 0) {
+ return "";
+ } else {
+ return calculateHierachy(level-1)+"../";
+ }
+}
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/core/login/index.jsp b/gemeinsamforschen/src/main/webapp/index.jsp
similarity index 97%
rename from gemeinsamforschen/src/main/webapp/core/login/index.jsp
rename to gemeinsamforschen/src/main/webapp/index.jsp
index 9af1d0e1043f1f5eb65ebcf07875971e42da3cfa..39e538d86d5dda8e8b6ab4c4586ca8f221a94796 100644
--- a/gemeinsamforschen/src/main/webapp/core/login/index.jsp
+++ b/gemeinsamforschen/src/main/webapp/index.jsp
@@ -13,7 +13,7 @@
<link rel="stylesheet" href="assets/css/Sidebar-Menu.css">
<link rel="stylesheet" href="assets/css/Sidebar-Menu1.css">
- <script src="assets/js/jquery.min.js"></script>
+ <script src="libs/js/jquery.min.js"></script>
<script src="assets/bootstrap/js/bootstrap.min.js"></script>
</head>
diff --git a/gemeinsamforschen/src/main/webapp/journal/create-journal.jsp b/gemeinsamforschen/src/main/webapp/journal/create-journal.jsp
index 9a1809c98f502df96dd866854609e8b0d335e860..3a3678617c0ebf04d585d5fa8386b2f2f24d92c6 100644
--- a/gemeinsamforschen/src/main/webapp/journal/create-journal.jsp
+++ b/gemeinsamforschen/src/main/webapp/journal/create-journal.jsp
@@ -87,10 +87,10 @@
</div>
</div>
-<script src="../assets/js/jquery.min.js"></script>
+<script src="../libs/js/jquery.min.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
-<script src="../assets/js/Sidebar-Menu.js"></script>
-<script src="../assets/js/createJournal.js"></script>
+<script src="../libs/js/Sidebar-Menu.js"></script>
+<script src="../libs/js/createJournal.js"></script>
</body>
</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/journal/eportfolio.jsp b/gemeinsamforschen/src/main/webapp/journal/eportfolio.jsp
index a84ef0f5bea306cb12bb7e93e0fc256051677ea7..d0213af7556d242a93763e9a7da3ea644a7c1ecc 100644
--- a/gemeinsamforschen/src/main/webapp/journal/eportfolio.jsp
+++ b/gemeinsamforschen/src/main/webapp/journal/eportfolio.jsp
@@ -153,10 +153,10 @@
</div>
</div>
-<script src="../assets/js/jquery.min.js"></script>
+<script src="../libs/js/jquery.min.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
-<script src="../assets/js/Sidebar-Menu.js"></script>
-<script src="../assets/js/e-portfolio.js"></script>
+<script src="../libs/js/Sidebar-Menu.js"></script>
+<script src="../libs/js/e-portfolio.js"></script>
</body>
</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/overview-docent.jsp b/gemeinsamforschen/src/main/webapp/overview-docent.jsp
index 708c6b2b3d3a7f8ce67b9edf7c4610ed303e7d41..da97fca3e36bf8aa042b094b049f8622230be508 100644
--- a/gemeinsamforschen/src/main/webapp/overview-docent.jsp
+++ b/gemeinsamforschen/src/main/webapp/overview-docent.jsp
@@ -8,7 +8,7 @@
<head>
<omniDependencies:omniDependencies/>
- <script src="../assets/js/overview-docent.js"></script>
+ <script src="../libs/js/overview-docent.js"></script>
</head>
<body>
diff --git a/gemeinsamforschen/src/main/webapp/overview-student.jsp b/gemeinsamforschen/src/main/webapp/overview-student.jsp
index 16cf0099681d074d7cc7eb6b76a5be65e49f808e..214a8cf008d19ea6dad25040207105e4229bec2f 100644
--- a/gemeinsamforschen/src/main/webapp/overview-student.jsp
+++ b/gemeinsamforschen/src/main/webapp/overview-student.jsp
@@ -8,7 +8,7 @@
<head>
<omniDependencies:omniDependencies/>
- <script src="../assets/js/overview-student.js"></script>
+ <script src="../libs/js/overview-student.js"></script>
</head>
diff --git a/gemeinsamforschen/src/main/webapp/profile/profile.jsp b/gemeinsamforschen/src/main/webapp/profile/profile.jsp
index 98d36fa484e39c8f95279241e4f44429c0d61794..f147f773f215b33cd56d6d37724b037608e41b86 100644
--- a/gemeinsamforschen/src/main/webapp/profile/profile.jsp
+++ b/gemeinsamforschen/src/main/webapp/profile/profile.jsp
@@ -12,7 +12,7 @@
<head>
<omniDependencies:omniDependencies/>
<link href='http://fonts.googleapis.com/css?family=Roboto+Condensed|Open+Sans+Condensed:300' rel='stylesheet' type='text/css'>
- <script src="../assets/js/profile.js"></script>
+ <script src="../libs/js/profile.js"></script>
</head>
diff --git a/gemeinsamforschen/src/main/webapp/project-student.jsp b/gemeinsamforschen/src/main/webapp/project-student.jsp
index 83486d62c544ac73167aa09d0af9d9629b59cbe8..980415f868f961269f74f3c614da49abed4c8632 100644
--- a/gemeinsamforschen/src/main/webapp/project-student.jsp
+++ b/gemeinsamforschen/src/main/webapp/project-student.jsp
@@ -15,8 +15,8 @@
<head>
<omniDependencies:omniDependencies/>
- <script src="../assets/js/project-student.js"></script>
- <link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
+ <script src="../libs/js/project-student.js"></script>
+ <link rel="stylesheet" href="../libs/css/Community-ChatComments.css">
</head>
diff --git a/gemeinsamforschen/src/main/webapp/core/login/register.jsp b/gemeinsamforschen/src/main/webapp/register.jsp
similarity index 97%
rename from gemeinsamforschen/src/main/webapp/core/login/register.jsp
rename to gemeinsamforschen/src/main/webapp/register.jsp
index 0396159dbb413f1b82940e19458f550474e000bc..680b7a81779a1ffaadb13883bf42b919932b2f3b 100644
--- a/gemeinsamforschen/src/main/webapp/core/login/register.jsp
+++ b/gemeinsamforschen/src/main/webapp/register.jsp
@@ -14,9 +14,9 @@
<link rel="stylesheet" href="assets/css/Sidebar-Menu1.css">
<link rel="stylesheet" href="assets/css/styles.css">
- <script src="assets/js/jquery.min.js"></script>
+ <script src="libs/js/jquery.min.js"></script>
<script src="assets/bootstrap/js/bootstrap.min.js"></script>
- <script src="assets/js/Sidebar-Menu.js"></script>
+ <script src="libs/js/Sidebar-Menu.js"></script>
</head>
<body>
diff --git a/gemeinsamforschen/src/main/webapp/researchReport/create-bibliography.jsp b/gemeinsamforschen/src/main/webapp/researchReport/create-bibliography.jsp
index c4daaf6edc7c21133e6330b93268add1a189396c..8b16e537d0f54c6f59d39eb19de9afaefaace9fe 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/create-bibliography.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-bibliography.jsp
@@ -73,8 +73,8 @@ den Zustand ändert
</div>
-<script src="../assets/js/createReportBibo.js"></script>
-<script src="../assets/js/createReportProgress.js"></script>
+<script src="../libs/js/createReportBibo.js"></script>
+<script src="../libs/js/createReportProgress.js"></script>
<script src="https://unpkg.com/filepond/dist/filepond.js"></script> <!--FilePond -->
<script src="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.js"></script> <!--FilePond -->
<script>FilePond.parse(document.body);</script> <!--FilePond -->
diff --git a/gemeinsamforschen/src/main/webapp/researchReport/create-concept.jsp b/gemeinsamforschen/src/main/webapp/researchReport/create-concept.jsp
index 81529a11fdb2eba23827c4c9abbbe1910dc76cf1..01c1cadd5d88aeaed07b673850dd4223472e378b 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/create-concept.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-concept.jsp
@@ -55,8 +55,8 @@
</form>
-<script src="../assets/js/createReportConcept.js"></script>
-<script src="../assets/js/createReportProgress.js"></script>
+<script src="../libs/js/createReportConcept.js"></script>
+<script src="../libs/js/createReportProgress.js"></script>
<script src="https://unpkg.com/filepond/dist/filepond.js"></script> <!--FilePond -->
<script src="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.js"></script> <!--FilePond -->
<script>FilePond.parse(document.body);</script> <!--FilePond -->
diff --git a/gemeinsamforschen/src/main/webapp/researchReport/create-evaluation.jsp b/gemeinsamforschen/src/main/webapp/researchReport/create-evaluation.jsp
index 19b5d2f9bd8a02744c97bcb441657af14bb9362b..97b54520e9a83d87c93fe6a1aa06edef166980bc 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/create-evaluation.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-evaluation.jsp
@@ -67,8 +67,8 @@
</div>
-<script src="../assets/js/createReportEvaluation.js"></script>
-<script src="../assets/js/createReportProgress.js"></script>
+<script src="../libs/js/createReportEvaluation.js"></script>
+<script src="../libs/js/createReportProgress.js"></script>
<script src="https://unpkg.com/filepond/dist/filepond.js"></script> <!--FilePond -->
<script src="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.js"></script> <!--FilePond -->
<script>FilePond.parse(document.body);</script> <!--FilePond -->
diff --git a/gemeinsamforschen/src/main/webapp/researchReport/create-method.jsp b/gemeinsamforschen/src/main/webapp/researchReport/create-method.jsp
index 511285003d5d7b559f5536c0265a18e3830d20dd..0099f3b71f0552f494e28832f51ed2e1b0459484 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/create-method.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-method.jsp
@@ -68,8 +68,8 @@
</div>
-<script src="../assets/js/createReportMethod.js"></script>
-<script src="../assets/js/createReportProgress.js"></script>
+<script src="../libs/js/createReportMethod.js"></script>
+<script src="../libs/js/createReportProgress.js"></script>
<script src="https://unpkg.com/filepond/dist/filepond.js"></script> <!--FilePond -->
<script src="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.js"></script> <!--FilePond -->
<script>FilePond.parse(document.body);</script> <!--FilePond -->
diff --git a/gemeinsamforschen/src/main/webapp/researchReport/create-overview.jsp b/gemeinsamforschen/src/main/webapp/researchReport/create-overview.jsp
index e103022c3e16b646eca78444c3fae271c8937b6c..b6c3f3890516a0bbf37b25f342f09ac94693b945 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/create-overview.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-overview.jsp
@@ -11,7 +11,7 @@
<link href="https://unpkg.com/filepond/dist/filepond.css" rel="stylesheet"> <!--FilePond -->
<link href="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.css" rel="stylesheet"> <!--FilePond -->
<link rel="stylesheet" type="text/css" href="../assets/css/researchReportOverview.css">
- <script src="../assets/js/createReportOverview.js"></script>
+ <script src="../libs/js/createReportOverview.js"></script>
<title>Forschungsbericht Ãœbersicht</title>
diff --git a/gemeinsamforschen/src/main/webapp/researchReport/create-process-description.jsp b/gemeinsamforschen/src/main/webapp/researchReport/create-process-description.jsp
index 1d8ca36e228ce951a065c7590df06dca63adec84..83f10377f62368d0dfadf36b2fd074a29e2cf19a 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/create-process-description.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-process-description.jsp
@@ -67,8 +67,8 @@
</div>
-<script src="../assets/js/createReportDo.js"></script>
-<script src="../assets/js/createReportProgress.js"></script>
+<script src="../libs/js/createReportDo.js"></script>
+<script src="../libs/js/createReportProgress.js"></script>
<script src="https://unpkg.com/filepond/dist/filepond.js"></script> <!--FilePond -->
<script src="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.js"></script> <!--FilePond -->
<script>FilePond.parse(document.body);</script> <!--FilePond -->
diff --git a/gemeinsamforschen/src/main/webapp/researchReport/create-question.jsp b/gemeinsamforschen/src/main/webapp/researchReport/create-question.jsp
index c8d3cc87bee6fc2c33a636ed303232278b7f926e..4ffe124190b9974f90be9438f13c3cfc048f5132 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/create-question.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-question.jsp
@@ -69,8 +69,8 @@
</div>
-<script src="../assets/js/createReportQuestion.js"></script>
-<script src="../assets/js/createReportProgress.js"></script>
+<script src="../libs/js/createReportQuestion.js"></script>
+<script src="../libs/js/createReportProgress.js"></script>
<script src="https://unpkg.com/filepond/dist/filepond.js"></script> <!--FilePond -->
<script src="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.js"></script> <!--FilePond -->
<script>FilePond.parse(document.body);</script> <!--FilePond -->
diff --git a/gemeinsamforschen/src/main/webapp/researchReport/create-research.jsp b/gemeinsamforschen/src/main/webapp/researchReport/create-research.jsp
index 2ab818ee01a8cdc4d015a580f06bbc21ad2a1047..06e62b024e0303ec9c61916c5547fd28d4c211cd 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/create-research.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-research.jsp
@@ -71,8 +71,8 @@
-<script src="../assets/js/createReportRecherche.js"></script>
-<script src="../assets/js/createReportProgress.js"></script>
+<script src="../libs/js/createReportRecherche.js"></script>
+<script src="../libs/js/createReportProgress.js"></script>
<script src="https://unpkg.com/filepond/dist/filepond.js"></script> <!--FilePond -->
<script src="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.js"></script> <!--FilePond -->
<script>FilePond.parse(document.body);</script> <!--FilePond -->
diff --git a/gemeinsamforschen/src/main/webapp/researchReport/create-title.jsp b/gemeinsamforschen/src/main/webapp/researchReport/create-title.jsp
index dd0126542b7374d627adc1ce4535c52b05510870..5cd5013d36756f8258b330450d4c5d45494c24f7 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/create-title.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-title.jsp
@@ -80,8 +80,8 @@
</div>
-<script src="../assets/js/createReportTitle.js"></script>
-<script src="../assets/js/createReportProgress.js"></script>
+<script src="../libs/js/createReportTitle.js"></script>
+<script src="../libs/js/createReportProgress.js"></script>
<script src="https://unpkg.com/filepond/dist/filepond.js"></script> <!--FilePond -->
<script src="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.js"></script> <!--FilePond -->
<script>FilePond.parse(document.body);</script> <!--FilePond -->