From 4a1bb5e0eca083aa04da94072795e2be6063ca2e Mon Sep 17 00:00:00 2001
From: Axel <wiepke@uni-potsdam.de>
Date: Thu, 13 Sep 2018 10:20:36 +0200
Subject: [PATCH] fix: all pages have their css and js again. menu works,
omnidependencies work
---
.../core/management/pageAppearance/Menu.java | 4 ++--
.../webapp/annotation/annotation-document.jsp | 14 +++++-------
.../create-unstructured-annotation.jsp | 8 +++----
.../css/annotationStyle.css | 0
.../upload-unstructured-annotation.jsp | 6 ++---
.../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 +-
.../js/{finalAssessment.js => assess-work.js} | 0
.../js/{createQuiz.js => create-quiz.js} | 0
.../js/{takeQuiz.js => take-quiz.js} | 0
.../js/{viewQuiz.js => view-quiz.js} | 0
.../webapp/assessment/project-docent_CG.jsp | 7 +++---
.../webapp/assessment/rate-contribution.jsp | 2 +-
.../src/main/webapp/assessment/take-quiz.jsp | 2 +-
.../src/main/webapp/assessment/view-quiz.jsp | 2 +-
.../main/webapp/feedback/give-feedback.jsp | 22 +++++++++----------
.../main/webapp/feedback/view-feedback.jsp | 10 ++++-----
.../webapp/groupfinding/create-groups.jsp | 2 +-
.../main/webapp/journal/create-journal.jsp | 12 ++++------
.../css/{e-portfolio.css => eportfolio.css} | 0
.../src/main/webapp/journal/eportfolio.jsp | 8 ++-----
.../{editDescription.js => create-journal.js} | 0
.../js/{e-portfolio.js => eportfolio.js} | 0
.../main/webapp/management/change-phase.jsp | 4 ++--
.../main/webapp/management/create-project.jsp | 4 ++--
.../main/webapp/management/delete-project.jsp | 16 ++++++++------
.../main/webapp/management/edit-project.jsp | 10 +++------
.../webapp/management/enter-preferences.jsp | 2 +-
.../src/main/webapp/management/groups.jsp | 14 ++++++------
.../main/webapp/management/join-project.jsp | 10 ++++-----
.../src/main/webapp/project-docent.jsp | 2 +-
.../src/main/webapp/project-student.jsp | 6 ++---
.../researchReport/create-bibliography.jsp | 9 ++++----
.../webapp/researchReport/create-concept.jsp | 7 +++---
.../researchReport/create-evaluation.jsp | 8 +++----
.../webapp/researchReport/create-method.jsp | 8 +++----
.../webapp/researchReport/create-overview.jsp | 6 ++---
.../create-process-description.jsp | 8 +++----
.../webapp/researchReport/create-question.jsp | 8 +++----
.../webapp/researchReport/create-research.jsp | 8 +++----
.../webapp/researchReport/create-title.jsp | 8 +++----
44 files changed, 114 insertions(+), 133 deletions(-)
rename gemeinsamforschen/src/main/webapp/{assessment => annotation}/css/annotationStyle.css (100%)
rename gemeinsamforschen/src/main/webapp/assessment/js/{finalAssessment.js => assess-work.js} (100%)
rename gemeinsamforschen/src/main/webapp/assessment/js/{createQuiz.js => create-quiz.js} (100%)
rename gemeinsamforschen/src/main/webapp/assessment/js/{takeQuiz.js => take-quiz.js} (100%)
rename gemeinsamforschen/src/main/webapp/assessment/js/{viewQuiz.js => view-quiz.js} (100%)
rename gemeinsamforschen/src/main/webapp/journal/css/{e-portfolio.css => eportfolio.css} (100%)
rename gemeinsamforschen/src/main/webapp/journal/js/{editDescription.js => create-journal.js} (100%)
rename gemeinsamforschen/src/main/webapp/journal/js/{e-portfolio.js => eportfolio.js} (100%)
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/Menu.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/Menu.java
index 51805747..a6538bca 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/Menu.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/Menu.java
@@ -77,12 +77,12 @@ public class Menu extends SimpleTagSupport {
} else {
String menuString ="<div id=\"sidebar-wrapper\">\n" +
" <ul class=\"sidebar-nav\">\n" +
- " <li class=\"sidebar-brand\"><a href=\"overview-docent.jsp?token="+token+"&projectId="+projectId+"\">overview</a></li>\n";
+ " <li class=\"sidebar-brand\"><a href=\""+OmniDependencies.hierarchyToString(hierarchyLevel)+"overview-docent.jsp?token="+token+"&projectId="+projectId+"\">overview</a></li>\n";
if (projectPhase!=null) {
if (!projectPhase.equals(ProjectPhase.GroupFormation)) {
menuString += "<li><a href=\""+OmniDependencies.hierarchyToString(hierarchyLevel)+"assessment/Quiz-docent.jsp?token="+token+"&projectId="+projectId+"\">Quizfrage</a></li>\n" +
" <li><p>Gruppen erstellen</p></li>\n" +
- " <li><a href=\""+OmniDependencies.hierarchyToString(hierarchyLevel)+"core/management/change-phase.jsp?token="+token+"&projectId="+projectId+"\">Projektphase ändern</a></li>\n";
+ " <li><a href=\""+OmniDependencies.hierarchyToString(hierarchyLevel)+"management/change-phase.jsp?token="+token+"&projectId="+projectId+"\">Projektphase ändern</a></li>\n";
}else {
menuString += "<li><a href=\""+OmniDependencies.hierarchyToString(hierarchyLevel)+"assessment/quiz-docent.jsp?token="+token+"&projectId="+projectId+"\">Quizfrage</a></li>\n" +
" <li><a href=\""+OmniDependencies.hierarchyToString(hierarchyLevel)+"groupfinding/create-groups.jsp?token="+token+"&projectId="+projectId+"\">Gruppen erstellen</a></li>\n" +
diff --git a/gemeinsamforschen/src/main/webapp/annotation/annotation-document.jsp b/gemeinsamforschen/src/main/webapp/annotation/annotation-document.jsp
index d9dc514d..0e876cb6 100644
--- a/gemeinsamforschen/src/main/webapp/annotation/annotation-document.jsp
+++ b/gemeinsamforschen/src/main/webapp/annotation/annotation-document.jsp
@@ -11,7 +11,7 @@
<omniDependencies:omniDependencies hierarchy="1"/>
<!-- css - annotationStyle -->
- <link rel="stylesheet" type="text/css" href="../assets/css/annotationStyle.css">
+ <link rel="stylesheet" type="text/css" href="css/annotationStyle.css">
<!-- css - contextMenu -->
<link href="https://swisnl.github.io/jQuery-contextMenu/dist/jquery.contextMenu.css" rel="stylesheet" type="text/css" />
@@ -27,21 +27,19 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/rangy/1.3.0/rangy-core.js" type="text/javascript"></script>
<!-- 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="../libs/js/utility.js"></script>
<!-- js - annotation websocket script -->
- <script src="../libs/js/annotationWebsocket.js"></script>
+ <script src="js/annotationWebsocket.js"></script>
<!-- js - annotation REST script -->
- <script src="../libs/js/annotationRest.js"></script>
+ <script src="js/annotationRest.js"></script>
<!-- js - unstructuredRest -->
- <script src="../libs/js/unstructuredRest.js"></script>
+ <script src="js/unstructuredRest.js"></script>
<!-- js - annotationScript -->
- <script src="../libs/js/annotationScript.js"></script>
+ <script src="js/annotationScript.js"></script>
</head>
<body>
<div id="wrapper" class="full-height">
- <menu:menu></menu:menu>
+ <menu:menu hierarchy="1"/>
<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/annotation/create-unstructured-annotation.jsp b/gemeinsamforschen/src/main/webapp/annotation/create-unstructured-annotation.jsp
index 311f5cc9..4d78a097 100644
--- a/gemeinsamforschen/src/main/webapp/annotation/create-unstructured-annotation.jsp
+++ b/gemeinsamforschen/src/main/webapp/annotation/create-unstructured-annotation.jsp
@@ -10,7 +10,7 @@
<omniDependencies:omniDependencies hierarchy="1"/>
<!-- css - unstructured-annotation -->
- <link rel="stylesheet" type="text/css" href="../assets/css/unstructured-annotation.css">
+ <link rel="stylesheet" type="text/css" href="css/unstructured-annotation.css">
<!-- css - contextMenu -->
<link href="https://swisnl.github.io/jQuery-contextMenu/dist/jquery.contextMenu.css" rel="stylesheet" type="text/css" />
@@ -25,16 +25,16 @@
<!-- 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="../libs/js/unstructuredRest.js"></script>
+ <script src="js/unstructuredRest.js"></script>
<!-- js - unstructuredUpload -->
- <script src="../libs/js/unstructuredAnnotation.js"></script>
+ <script src="js/unstructuredAnnotation.js"></script>
</head>
<body>
<div id="wrapper" class="full-height">
- <menu:menu></menu:menu>
+ <menu:menu hierarchy="1"/>
<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/assessment/css/annotationStyle.css b/gemeinsamforschen/src/main/webapp/annotation/css/annotationStyle.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assessment/css/annotationStyle.css
rename to gemeinsamforschen/src/main/webapp/annotation/css/annotationStyle.css
diff --git a/gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-annotation.jsp b/gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-annotation.jsp
index 8d2aa72c..43f3340f 100644
--- a/gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-annotation.jsp
+++ b/gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-annotation.jsp
@@ -16,11 +16,11 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js" type="text/javascript"></script>
<!-- css - upload-unstructured -->
- <link rel="stylesheet" type="text/css" href="../assets/css/unstructured-upload.css">
+ <link rel="stylesheet" type="text/css" href="css/unstructured-upload.css">
<!-- js - unstructuredUpload -->
- <script src="../libs/js/unstructuredUpload.js"></script>
+ <script src="js/unstructuredUpload.js"></script>
<!-- js - unstructuredRest -->
- <script src="../libs/js/unstructuredRest.js"></script>
+ <script src="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 4fd48f20..65a0540c 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 hierarchy="1"/>
- <script src="../libs/js/Quiz-docent.js"></script>
+ <script src="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 95e1da16..79121dd6 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 hierarchy="1"/>
- <script src="../libs/js/Quiz.js"></script>
+ <script src="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 0fcf8918..e8128b03 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 hierarchy="1"/>
- <script src="../libs/js/finalAssessment.js"></script>
+ <script src="js/assess-work.js"></script>
</head>
diff --git a/gemeinsamforschen/src/main/webapp/assessment/calculate-assessment.jsp b/gemeinsamforschen/src/main/webapp/assessment/calculate-assessment.jsp
index 75ebcfd8..a8f39bfa 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 hierarchy="1"/>
- <script src="../libs/js/assessmentCalculator.js"></script>
+ <script src="js/assessmentCalculator.js"></script>
</head>
<body>
<menu:menu hierarchy="1"/>
diff --git a/gemeinsamforschen/src/main/webapp/assessment/create-quiz.jsp b/gemeinsamforschen/src/main/webapp/assessment/create-quiz.jsp
index d4e9984d..229b2409 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 hierarchy="1"/>
- <script src="../libs/js/createQuiz.js"></script>
+ <script src="js/create-quiz.js"></script>
</head>
<body>
diff --git a/gemeinsamforschen/src/main/webapp/assessment/js/finalAssessment.js b/gemeinsamforschen/src/main/webapp/assessment/js/assess-work.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assessment/js/finalAssessment.js
rename to gemeinsamforschen/src/main/webapp/assessment/js/assess-work.js
diff --git a/gemeinsamforschen/src/main/webapp/assessment/js/createQuiz.js b/gemeinsamforschen/src/main/webapp/assessment/js/create-quiz.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assessment/js/createQuiz.js
rename to gemeinsamforschen/src/main/webapp/assessment/js/create-quiz.js
diff --git a/gemeinsamforschen/src/main/webapp/assessment/js/takeQuiz.js b/gemeinsamforschen/src/main/webapp/assessment/js/take-quiz.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assessment/js/takeQuiz.js
rename to gemeinsamforschen/src/main/webapp/assessment/js/take-quiz.js
diff --git a/gemeinsamforschen/src/main/webapp/assessment/js/viewQuiz.js b/gemeinsamforschen/src/main/webapp/assessment/js/view-quiz.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assessment/js/viewQuiz.js
rename to gemeinsamforschen/src/main/webapp/assessment/js/view-quiz.js
diff --git a/gemeinsamforschen/src/main/webapp/assessment/project-docent_CG.jsp b/gemeinsamforschen/src/main/webapp/assessment/project-docent_CG.jsp
index 7e4fb730..f8ec92fc 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/project-docent_CG.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/project-docent_CG.jsp
@@ -9,9 +9,8 @@
<head>
<omniDependencies:omniDependencies hierarchy="1"/>
- <script src="../libs/js/utility.js"></script>
- <script src="../libs/js/AlertAssessmentOutlier.js"></script>
- <script src="../libs/js/grading.js"></script>
+ <script src="js/AlertAssessmentOutlier.js"></script>
+ <script src="js/grading.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.js"></script>
</head>
@@ -19,7 +18,7 @@
<body>
<div id="wrapper">
- <menu:menu></menu:menu>
+ <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<div class="container-fluid">
diff --git a/gemeinsamforschen/src/main/webapp/assessment/rate-contribution.jsp b/gemeinsamforschen/src/main/webapp/assessment/rate-contribution.jsp
index 82e62851..0aca0617 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="../libs/js/rateContribution.js"></script>
+ <script src="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 c472fd2c..78e16475 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 hierarchy="1"/>
- <script src="../libs/js/takeQuiz.js"></script>
+ <script src="js/take-quiz.js"></script>
</head>
diff --git a/gemeinsamforschen/src/main/webapp/assessment/view-quiz.jsp b/gemeinsamforschen/src/main/webapp/assessment/view-quiz.jsp
index 15262b40..4fc3d8b8 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 hierarchy="1"/>
- <script src="../libs/js/viewQuiz.js"></script>
+ <script src="js/view-quiz.js"></script>
</head>
diff --git a/gemeinsamforschen/src/main/webapp/feedback/give-feedback.jsp b/gemeinsamforschen/src/main/webapp/feedback/give-feedback.jsp
index bbe37b9c..26e9ed28 100644
--- a/gemeinsamforschen/src/main/webapp/feedback/give-feedback.jsp
+++ b/gemeinsamforschen/src/main/webapp/feedback/give-feedback.jsp
@@ -22,21 +22,19 @@
<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="../libs/js/utility.js"></script>
- <script src="../libs/js/project-student.js"></script>
+ <script src="js/utility.js"></script>
+ <script src="js/project-student.js"></script>
<link rel="stylesheet" type="text/css" href="../assets/css/editDescription.css">
- <script src="../libs/js/jquery.min.js"></script>
+ <script src="js/jquery.min.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
- <script src="../libs/js/Sidebar-Menu.js"></script>
- <script src="../libs/js/editDescription.js"></script>
+ <script src="js/Sidebar-Menu.js"></script>
+ <script src="js/create-journal.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="../libs/js/utility.js"></script>
- <script src="../libs/js/project-student.js"></script>
- <script src="../libs/js/peerfeedback.js"></script>
+ <link rel="stylesheet" type="text/css" href="../journal/css/create-journal.css">
+ <script src="js/peerfeedback.js"></script>
<omniDependencies:omniDependencies hierarchy="1"/>
</head>
@@ -139,10 +137,10 @@
</div>
</div>
-<script src="../libs/js/jquery.min.js"></script>
+<script src="js/jquery.min.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
-<script src="../libs/js/Sidebar-Menu.js"></script>
-<script src="../libs/js/createJournal.js"></script>
+<script src="js/Sidebar-Menu.js"></script>
+<script src="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 f35ec973..4673f4eb 100644
--- a/gemeinsamforschen/src/main/webapp/feedback/view-feedback.jsp
+++ b/gemeinsamforschen/src/main/webapp/feedback/view-feedback.jsp
@@ -7,11 +7,9 @@
<html>
<head>
- <link rel="stylesheet" href="../assets/css/viewfeedback.css">
+ <link rel="stylesheet" href="css/viewfeedback.css">
<omniDependencies:omniDependencies hierarchy="1"/>
- <script src="../libs/js/utility.js"></script>
- <script src="../libs/js/project-student.js"></script>
- <script src="../libs/js/givepeerfeedback.js"></script>
+ <script src="js/givepeerfeedback.js"></script>
</head>
@@ -167,9 +165,9 @@
</div>
</div>
-<script src="../libs/js/jquery.min.js"></script>
+<script src="js/jquery.min.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
-<script src="../libs/js/Sidebar-Menu.js"></script>
+<script src="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 7a1f6b20..2959e4b7 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 hierarchy="1"/>
- <script src="../libs/js/changePhase.js"></script>
+ <script src="js/changePhase.js"></script>
</head>
<body>
diff --git a/gemeinsamforschen/src/main/webapp/journal/create-journal.jsp b/gemeinsamforschen/src/main/webapp/journal/create-journal.jsp
index c4ebb96b..b0ef3c22 100644
--- a/gemeinsamforschen/src/main/webapp/journal/create-journal.jsp
+++ b/gemeinsamforschen/src/main/webapp/journal/create-journal.jsp
@@ -8,13 +8,14 @@
<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">
+ <link rel="stylesheet" type="text/css" href="css/create-journal.css">
<omniDependencies:omniDependencies hierarchy="1"/>
+ <script src="js/create-journal.js"></script>
</head>
<body>
<div id="wrapper">
- <menu:menu></menu:menu>
+ <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<div class="container-fluid">
@@ -34,7 +35,7 @@
<td id="yourContent">
<h1> Tagebucheintrag erstellen </h1>
- <form id="journalform" class="form-journal" method="POST" action="../rest/journal/save">
+ <form id="journalform" class="form-journal" method="POST" action="rest/journal/save">
<input type="hidden" id="student" name="student">
<input type="hidden" id="project" name="project">
@@ -86,11 +87,6 @@
</div>
</div>
</div>
-
-<script src="../libs/js/jquery.min.js"></script>
-<script src="../assets/bootstrap/js/bootstrap.min.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/css/e-portfolio.css b/gemeinsamforschen/src/main/webapp/journal/css/eportfolio.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/journal/css/e-portfolio.css
rename to gemeinsamforschen/src/main/webapp/journal/css/eportfolio.css
diff --git a/gemeinsamforschen/src/main/webapp/journal/eportfolio.jsp b/gemeinsamforschen/src/main/webapp/journal/eportfolio.jsp
index 82eedee2..a21688a5 100644
--- a/gemeinsamforschen/src/main/webapp/journal/eportfolio.jsp
+++ b/gemeinsamforschen/src/main/webapp/journal/eportfolio.jsp
@@ -6,8 +6,9 @@
<head>
- <link rel="stylesheet" href="../assets/css/e-portfolio.css">
+ <link rel="stylesheet" href="css/eportfolio.css">
<omniDependencies:omniDependencies hierarchy="1"/>
+ <script src="js/eportfolio.js"></script>
</head>
@@ -152,11 +153,6 @@
</div>
</div>
</div>
-
-<script src="../libs/js/jquery.min.js"></script>
-<script src="../assets/bootstrap/js/bootstrap.min.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/journal/js/editDescription.js b/gemeinsamforschen/src/main/webapp/journal/js/create-journal.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/journal/js/editDescription.js
rename to gemeinsamforschen/src/main/webapp/journal/js/create-journal.js
diff --git a/gemeinsamforschen/src/main/webapp/journal/js/e-portfolio.js b/gemeinsamforschen/src/main/webapp/journal/js/eportfolio.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/journal/js/e-portfolio.js
rename to gemeinsamforschen/src/main/webapp/journal/js/eportfolio.js
diff --git a/gemeinsamforschen/src/main/webapp/management/change-phase.jsp b/gemeinsamforschen/src/main/webapp/management/change-phase.jsp
index 89ebb29a..33d0d5a0 100644
--- a/gemeinsamforschen/src/main/webapp/management/change-phase.jsp
+++ b/gemeinsamforschen/src/main/webapp/management/change-phase.jsp
@@ -8,7 +8,7 @@
<html>
<head>
<omniDependencies:omniDependencies hierarchy="1"/>
- <script src="../libs/js/changePhase.js"></script>
+ <script src="js/changePhase.js"></script>
</head>
<body>
@@ -16,7 +16,7 @@
<menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<headLine:headLine/>
- <div class="alert"id="CourseCreation">
+ <div class="alert" id="CourseCreation">
<button id="btnCourseCreation" class="btn btn-secondary">Projekterstellungsphase</button>
</div>
<div class="alert" id="GroupFormation">
diff --git a/gemeinsamforschen/src/main/webapp/management/create-project.jsp b/gemeinsamforschen/src/main/webapp/management/create-project.jsp
index c7be4801..25502138 100644
--- a/gemeinsamforschen/src/main/webapp/management/create-project.jsp
+++ b/gemeinsamforschen/src/main/webapp/management/create-project.jsp
@@ -5,7 +5,7 @@
Time: 12:06
To change this template use File | Settings | File Templates.
--%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ page contentType="text/html;charset=UTF-8" %>
<!DOCTYPE html>
<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
@@ -30,7 +30,7 @@
<div class="sk-cube3 sk-cube"></div>
</div>
-<div id="wrapper" style="margin:0px;">
+<div id="wrapper">
<menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<div class="container-fluid">
diff --git a/gemeinsamforschen/src/main/webapp/management/delete-project.jsp b/gemeinsamforschen/src/main/webapp/management/delete-project.jsp
index 497cfb21..d3cdd4cd 100644
--- a/gemeinsamforschen/src/main/webapp/management/delete-project.jsp
+++ b/gemeinsamforschen/src/main/webapp/management/delete-project.jsp
@@ -5,14 +5,15 @@
Time: 12:06
To change this template use File | Settings | File Templates.
--%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ page contentType="text/html;charset=UTF-8" %>
<!DOCTYPE html>
<%@ 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>
- <meta charset="utf-8">
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <title>Gruppenmatcher</title>
+ <omniDependencies:omniDependencies hierarchy="1"/>
<script src="js/config.js"></script>
<script src="js/deleteProject.js"></script>
@@ -20,7 +21,7 @@
<body>
<div class="loader-inactive" id="loader"></div>
-<div id="wrapper" class="wrapper" style="margin:0px;">
+<div id="wrapper" class="wrapper">
<menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<div class="container-fluid"><a class="btn btn-link" role="button" href="#menu-toggle" id="menu-toggle"></a>
@@ -36,7 +37,7 @@
<legend style="margin-left:13px;">Projektnamen</legend>
<input class="form-control" type="text" id="projectName" name="Project" required=""
placeholder="Projekt1" autofocus=""
- style="margin:0px;max-width:417px;margin-left:14px;padding-top:10px;margin-top:2px;margin-bottom:13px;">
+ style="max-width:417px;margin-left:14px;padding-top:10px;margin-top:2px;margin-bottom:13px;">
<div class="alert alert-warning" role="alert" id="projectIsMissing">
Dieser Projektname existiert nicht oder das Passwort ist falsch.
</div>
@@ -46,12 +47,13 @@
<legend style="margin-left:13px;">Passwort zum löschen</legend>
<input class="form-control" type="password" id="projectPassword" name="Password" required=""
placeholder="******"
- style="margin:0px;max-width:417px;margin-left:14px;padding-top:10px;margin-top:2px;margin-bottom:13px;">
+ style="max-width:417px;margin-left:14px;padding-top:10px;margin-top:2px;margin-bottom:13px;">
<div class="alert alert-warning" role="alert" id="projectWrongPassword">
Falsches Passwort.
</div>
</fieldset>
<button id="deleteProject" class="btn btn-danger">löschen</button>
+ <footer:footer/>
</div>
</body>
diff --git a/gemeinsamforschen/src/main/webapp/management/edit-project.jsp b/gemeinsamforschen/src/main/webapp/management/edit-project.jsp
index 5eda653a..3e585224 100644
--- a/gemeinsamforschen/src/main/webapp/management/edit-project.jsp
+++ b/gemeinsamforschen/src/main/webapp/management/edit-project.jsp
@@ -15,7 +15,7 @@
<body>
<div id="wrapper">
- <menu:menu></menu:menu>
+ <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<div class="container-fluid">
@@ -34,7 +34,7 @@
<td id="yourContent">
<h1> Projektbeschreibung bearbeiten </h1>
- <form id="descriptionform" class="form-journal" method="POST" action="../rest/projectdescription/saveText">
+ <form id="descriptionform" class="form-journal" method="POST" action="rest/projectdescription/saveText">
<input type="hidden" id="student" name="student">
<input type="hidden" id="project" name="project">
@@ -59,11 +59,7 @@
</div>
</div>
</div>
-
-<script src="../libs/js/jquery.min.js"></script>
-<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
-<script src="../libs/js/Sidebar-Menu.js"></script>
-<script src="../libs/js/editDescription.js"></script>
+<script src="js/editDescription.js"></script>
</body>
</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/management/enter-preferences.jsp b/gemeinsamforschen/src/main/webapp/management/enter-preferences.jsp
index 4683e6e5..f5aaa888 100644
--- a/gemeinsamforschen/src/main/webapp/management/enter-preferences.jsp
+++ b/gemeinsamforschen/src/main/webapp/management/enter-preferences.jsp
@@ -20,7 +20,7 @@
<div class="sk-cube4 sk-cube"></div>
<div class="sk-cube3 sk-cube"></div>
</div>
-<div id="wrapper" class="wrapper" style="margin:0px;">
+<div id="wrapper" class="wrapper">
<?php
include_once 'menu.php'
?>
diff --git a/gemeinsamforschen/src/main/webapp/management/groups.jsp b/gemeinsamforschen/src/main/webapp/management/groups.jsp
index 77b21ecc..ce3bbf59 100644
--- a/gemeinsamforschen/src/main/webapp/management/groups.jsp
+++ b/gemeinsamforschen/src/main/webapp/management/groups.jsp
@@ -1,4 +1,4 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ page contentType="text/html;charset=UTF-8" %>
<!DOCTYPE html>
<html>
@@ -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="../libs/js/config.js"></script>
- <script src="../libs/js/myGroupsInit.js"></script>
- <script src="../libs/js/getProjects.js"></script>
+ <script src="js/config.js"></script>
+ <script src="js/myGroupsInit.js"></script>
+ <script src="js/getProjects.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
- <script src="../libs/js/Sidebar-Menu.js"></script>
+ <script src="js/Sidebar-Menu.js"></script>
@@ -27,7 +27,7 @@
<body>
<p id="user" hidden><?php echo $userName; ?></p>
-<div id="wrapper" style="margin:0px;">
+<div id="wrapper">
<?php
include_once 'menu.php'
?>
@@ -43,7 +43,7 @@
</div>
<div>
- <div class="container" style="margin-left:0px;">
+ <div class="container">
<div class="row">
<div class="col-md-offset-3 col-sm-8 col-xs-1">
<h3>Projekt</h3>
diff --git a/gemeinsamforschen/src/main/webapp/management/join-project.jsp b/gemeinsamforschen/src/main/webapp/management/join-project.jsp
index 1f038c0e..3dca2a07 100644
--- a/gemeinsamforschen/src/main/webapp/management/join-project.jsp
+++ b/gemeinsamforschen/src/main/webapp/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="../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="js/config.js"></script>
+ <script src="js/utility.js"></script>
+ <script src="js/showProjects.js"></script>
+ <script src="js/GETfile.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
- <script src="../libs/js/Sidebar-Menu.js"></script>
+ <script src="js/Sidebar-Menu.js"></script>
</head>
diff --git a/gemeinsamforschen/src/main/webapp/project-docent.jsp b/gemeinsamforschen/src/main/webapp/project-docent.jsp
index 986e89be..1533c0d4 100644
--- a/gemeinsamforschen/src/main/webapp/project-docent.jsp
+++ b/gemeinsamforschen/src/main/webapp/project-docent.jsp
@@ -92,9 +92,9 @@
</div>
</div>
</div>
+ <footer:footer/>
</div>
<communication:chatWindow orientation="right" />
-<footer:footer/>
</body>
</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/project-student.jsp b/gemeinsamforschen/src/main/webapp/project-student.jsp
index b37482f5..ccf60351 100644
--- a/gemeinsamforschen/src/main/webapp/project-student.jsp
+++ b/gemeinsamforschen/src/main/webapp/project-student.jsp
@@ -37,7 +37,7 @@
<td width="100px" valign="top">
<h3>student1</h3>
- <img src="../assets/img/1.jpg">
+ <img src="libs/img/1.jpg">
<a href="#">student1@uni.de</a>
<hr>
<ul>
@@ -62,7 +62,7 @@
<td width="100px" valign="top">
<h3>student2</h3>
- <img src="../assets/img/2.jpg">
+ <img src="libs/img/2.jpg">
<a href="#">student2@uni.de</a>
<hr>
<ul>
@@ -93,7 +93,7 @@
<td width="100px" valign="top">
<h3>student3</h3>
- <img src="../assets/img/3.jpg">
+ <img src="libs/img/3.jpg">
<a href="#">student3@uni.de</a>
<hr>
<ul id="submissionUpload">
diff --git a/gemeinsamforschen/src/main/webapp/researchReport/create-bibliography.jsp b/gemeinsamforschen/src/main/webapp/researchReport/create-bibliography.jsp
index 809e5d3e..c873d1f9 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/create-bibliography.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-bibliography.jsp
@@ -14,15 +14,14 @@ den Zustand ändert
<omniDependencies:omniDependencies hierarchy="1"/>
<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/researchReport.css">
- <title>Forschungsbericht erstellen</title>
+ <link rel="stylesheet" type="text/css" href="css/researchReport.css">
</head>
<body>
<div id="wrapper">
- <menu:menu></menu:menu>
+ <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<headLine:headLine/>
<div style="margin-left:50px;">
@@ -73,8 +72,8 @@ den Zustand ändert
</div>
-<script src="../libs/js/createReportBibo.js"></script>
-<script src="../libs/js/createReportProgress.js"></script>
+<script src="js/createReportBibo.js"></script>
+<script src="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 f855660d..01503908 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/create-concept.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-concept.jsp
@@ -9,8 +9,7 @@
<omniDependencies:omniDependencies hierarchy="1"/>
<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/researchReport.css">
- <title>Forschungsbericht erstellen</title>
+ <link rel="stylesheet" type="text/css" href="css/researchReport.css">
</head>
<body>
@@ -55,8 +54,8 @@
</form>
-<script src="../libs/js/createReportConcept.js"></script>
-<script src="../libs/js/createReportProgress.js"></script>
+<script src="js/createReportConcept.js"></script>
+<script src="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 32dd642f..51d848e9 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/create-evaluation.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-evaluation.jsp
@@ -9,7 +9,7 @@
<omniDependencies:omniDependencies hierarchy="1"/>
<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/researchReport.css">
+ <link rel="stylesheet" type="text/css" href="css/researchReport.css">
<title>Forschungsbericht erstellen</title>
</head>
<body>
@@ -17,7 +17,7 @@
<div id="wrapper">
- <menu:menu></menu:menu>
+ <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<headLine:headLine/>
<div style="margin-left:50px;">
@@ -67,8 +67,8 @@
</div>
-<script src="../libs/js/createReportEvaluation.js"></script>
-<script src="../libs/js/createReportProgress.js"></script>
+<script src="js/createReportEvaluation.js"></script>
+<script src="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 e0326a2f..1749e973 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/create-method.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-method.jsp
@@ -9,7 +9,7 @@
<omniDependencies:omniDependencies hierarchy="1"/>
<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/researchReport.css">
+ <link rel="stylesheet" type="text/css" href="css/researchReport.css">
<title>Forschungsbericht erstellen</title>
</head>
<body>
@@ -17,7 +17,7 @@
<div id="wrapper">
- <menu:menu></menu:menu>
+ <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<headLine:headLine/>
<div style="margin-left:50px;">
@@ -68,8 +68,8 @@
</div>
-<script src="../libs/js/createReportMethod.js"></script>
-<script src="../libs/js/createReportProgress.js"></script>
+<script src="js/createReportMethod.js"></script>
+<script src="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 95be3ab9..46f297f0 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/create-overview.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-overview.jsp
@@ -10,8 +10,8 @@
<link href="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.css" rel="stylesheet"> <!--FilePond -->
<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="../libs/js/createReportOverview.js"></script>
+ <link rel="stylesheet" type="text/css" href="css/researchReportOverview.css">
+ <script src="js/createReportOverview.js"></script>
<title>Forschungsbericht Ãœbersicht</title>
@@ -20,7 +20,7 @@
<body>
<div id="wrapper">
- <menu:menu></menu:menu>
+ <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<headLine:headLine/>
<div style="margin-left:50px;">
diff --git a/gemeinsamforschen/src/main/webapp/researchReport/create-process-description.jsp b/gemeinsamforschen/src/main/webapp/researchReport/create-process-description.jsp
index 656030a0..1e8d3e7d 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/create-process-description.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-process-description.jsp
@@ -9,7 +9,7 @@
<omniDependencies:omniDependencies hierarchy="1"/>
<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/researchReport.css">
+ <link rel="stylesheet" type="text/css" href="css/researchReport.css">
<title>Forschungsbericht erstellen</title>
</head>
<body>
@@ -17,7 +17,7 @@
<div id="wrapper">
- <menu:menu></menu:menu>
+ <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<headLine:headLine/>
<div style="margin-left:50px;">
@@ -67,8 +67,8 @@
</div>
-<script src="../libs/js/createReportDo.js"></script>
-<script src="../libs/js/createReportProgress.js"></script>
+<script src="js/createReportDo.js"></script>
+<script src="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 d64af396..f70436ce 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/create-question.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-question.jsp
@@ -10,7 +10,7 @@
<omniDependencies:omniDependencies hierarchy="1"/>
<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/researchReport.css">
+ <link rel="stylesheet" type="text/css" href="css/researchReport.css">
<title>Forschungsbericht erstellen</title>
</head>
<body>
@@ -19,7 +19,7 @@
<div id="wrapper">
- <menu:menu></menu:menu>
+ <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<headLine:headLine/>
<div style="margin-left:50px;">
@@ -69,8 +69,8 @@
</div>
-<script src="../libs/js/createReportQuestion.js"></script>
-<script src="../libs/js/createReportProgress.js"></script>
+<script src="js/createReportQuestion.js"></script>
+<script src="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 0f5d25e7..ce4f3d40 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/create-research.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-research.jsp
@@ -9,14 +9,14 @@
<omniDependencies:omniDependencies hierarchy="1"/>
<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/researchReport.css">
+ <link rel="stylesheet" type="text/css" href="css/researchReport.css">
<title>Forschungsbericht erstellen</title>
</head>
<body>
<div id="wrapper">
- <menu:menu></menu:menu>
+ <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<headLine:headLine/>
<div style="margin-left:50px;">
@@ -71,8 +71,8 @@
-<script src="../libs/js/createReportRecherche.js"></script>
-<script src="../libs/js/createReportProgress.js"></script>
+<script src="js/createReportRecherche.js"></script>
+<script src="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 c370b46a..d2b1a0a5 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/create-title.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-title.jsp
@@ -10,13 +10,13 @@
<omniDependencies:omniDependencies hierarchy="1"/>
<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/researchReport.css">
+ <link rel="stylesheet" type="text/css" href="css/researchReport.css">
<title>Forschungsbericht erstellen</title>
</head>
<body>
<div id="wrapper">
- <menu:menu></menu:menu>
+ <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<headLine:headLine/>
<div style="margin-left:50px;">
@@ -80,8 +80,8 @@
</div>
-<script src="../libs/js/createReportTitle.js"></script>
-<script src="../libs/js/createReportProgress.js"></script>
+<script src="js/createReportTitle.js"></script>
+<script src="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