From 9b334fbda3c3b6acaaa581fda06353dacc0e1e8c Mon Sep 17 00:00:00 2001
From: Julian Dehne <julian.dehne@uni-potsdam.de>
Date: Wed, 12 Sep 2018 16:29:26 +0200
Subject: [PATCH] - started working on group finding prototyp (basic group
management prototyp for development - not advanced groupfinding i.e. mirjams
project)
---
.../webapp/annotation/annotation-document.jsp | 10 ++++-----
.../create-unstructured-annotation.jsp | 4 ++--
.../upload-unstructured-annotation.jsp | 4 ++--
.../main/webapp/assessment/Quiz-docent.jsp | 2 +-
.../src/main/webapp/assessment/Quiz.jsp | 2 +-
.../main/webapp/assessment/assess-work.jsp | 2 +-
.../assessment/calculate-assessment.jsp | 2 +-
.../main/webapp/assessment/create-quiz.jsp | 2 +-
.../webapp/assessment/project-docent_CG.jsp | 6 ++---
.../webapp/assessment/rate-contribution.jsp | 2 +-
.../src/main/webapp/assessment/take-quiz.jsp | 2 +-
.../src/main/webapp/assessment/view-quiz.jsp | 2 +-
.../webapp/core/management/change-phase.jsp | 2 +-
.../webapp/core/management/edit-project.jsp | 6 ++---
.../main/webapp/core/management/groups.jsp | 8 +++----
.../webapp/core/management/join-project.jsp | 10 ++++-----
.../main/webapp/feedback/give-feedback.jsp | 22 +++++++++----------
.../main/webapp/feedback/view-feedback.jsp | 10 ++++-----
.../webapp/groupfinding/create-groups.jsp | 2 +-
.../src/main/webapp/hierachyLevel.js | 8 +++++++
.../main/webapp/{core/login => }/index.jsp | 2 +-
.../main/webapp/journal/create-journal.jsp | 6 ++---
.../src/main/webapp/journal/eportfolio.jsp | 6 ++---
.../src/main/webapp/overview-docent.jsp | 2 +-
.../src/main/webapp/overview-student.jsp | 2 +-
.../src/main/webapp/profile/profile.jsp | 2 +-
.../src/main/webapp/project-student.jsp | 4 ++--
.../main/webapp/{core/login => }/register.jsp | 4 ++--
.../researchReport/create-bibliography.jsp | 4 ++--
.../webapp/researchReport/create-concept.jsp | 4 ++--
.../researchReport/create-evaluation.jsp | 4 ++--
.../webapp/researchReport/create-method.jsp | 4 ++--
.../webapp/researchReport/create-overview.jsp | 2 +-
.../create-process-description.jsp | 4 ++--
.../webapp/researchReport/create-question.jsp | 4 ++--
.../webapp/researchReport/create-research.jsp | 4 ++--
.../webapp/researchReport/create-title.jsp | 4 ++--
37 files changed, 89 insertions(+), 81 deletions(-)
create mode 100644 gemeinsamforschen/src/main/webapp/hierachyLevel.js
rename gemeinsamforschen/src/main/webapp/{core/login => }/index.jsp (97%)
rename gemeinsamforschen/src/main/webapp/{core/login => }/register.jsp (97%)
diff --git a/gemeinsamforschen/src/main/webapp/annotation/annotation-document.jsp b/gemeinsamforschen/src/main/webapp/annotation/annotation-document.jsp
index 4fad61de..c1fb70a1 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 de6ef885..c3507bf4 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 92c6e31e..841201f1 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 f18d4b74..cadbae85 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 719048e0..269730f7 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 78c9235d..b9419ffe 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 4cfa0c32..7c9288d6 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 60ce0a73..01e2f596 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 b276788d..7aec0746 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 e706a9ea..1e5394cb 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 433023e0..e82ec96f 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 4c742cd7..905b5cfa 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 763926f0..0d839552 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 dec41640..87e634e0 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 6321b9c3..77b21ecc 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 0c108672..1f038c0e 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 be99ae9d..f859fb4f 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 1e37c958..d88f212e 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 8907e054..602a75f9 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 00000000..150cd4bd
--- /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 9af1d0e1..39e538d8 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 9a1809c9..3a367861 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 a84ef0f5..d0213af7 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 708c6b2b..da97fca3 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 16cf0099..214a8cf0 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 98d36fa4..f147f773 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 83486d62..980415f8 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 0396159d..680b7a81 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 c4daaf6e..8b16e537 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 81529a11..01c1cadd 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 19b5d2f9..97b54520 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 51128500..0099f3b7 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 e103022c..b6c3f389 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 1d8ca36e..83f10377 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 c8d3cc87..4ffe1241 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 2ab818ee..06e62b02 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 dd012654..5cd5013d 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 -->
--
GitLab