From f3c62d75893de7d498fc674c6d33771269bd3ae9 Mon Sep 17 00:00:00 2001
From: Axel <wiepke@uni-potsdam.de>
Date: Wed, 12 Sep 2018 16:28:20 +0200
Subject: [PATCH] debug: fixed relative paths in menu and js's
---
.../{footer.java => Footer.java} | 6 +-
.../{headLine.java => HeadLine.java} | 2 +-
.../core/management/pageAppearance/Menu.java | 46 +++--
...ependencies.java => OmniDependencies.java} | 6 +-
.../core/management/project/Project.java.orig | 165 ------------------
.../gf/core/management/user/Menu.java | 67 -------
.../webapp/annotation/annotation-document.jsp | 18 +-
.../create-unstructured-annotation.jsp | 8 +-
.../upload-unstructured-annotation.jsp | 8 +-
.../css => appearance}/Contact-Form-Clean.css | 0
.../css => appearance}/Login-Form-Clean.css | 0
.../css => appearance}/Sidebar-Menu-1.css | 0
.../login/css => appearance}/Sidebar-Menu.css | 0
.../css => appearance}/Sidebar-Menu1.css | 0
.../webapp/{core => }/appearance/footer.css | 0
.../webapp/{core => }/appearance/footer.js | 0
.../{core/login/js => appearance}/register.js | 0
.../webapp/{core => }/appearance/utility.js | 33 +++-
.../main/webapp/assessment/Quiz-docent.jsp | 4 +-
.../src/main/webapp/assessment/Quiz.jsp | 4 +-
.../main/webapp/assessment/assess-work.jsp | 4 +-
.../assessment/calculate-assessment.jsp | 7 +-
.../main/webapp/assessment/create-quiz.jsp | 4 +-
.../webapp/assessment/project-docent_CG.jsp | 8 +-
.../webapp/assessment/rate-contribution.jsp | 4 +-
.../src/main/webapp/assessment/take-quiz.jsp | 4 +-
.../src/main/webapp/assessment/view-quiz.jsp | 4 +-
.../main/webapp/core/gemeinsamForschen.tld | 11 +-
.../main/webapp/feedback/give-feedback.jsp | 36 ++--
.../main/webapp/feedback/view-feedback.jsp | 14 +-
.../webapp/groupfinding/create-groups.jsp | 4 +-
.../main/webapp/{core/login => }/index.jsp | 0
.../main/webapp/journal/create-journal.jsp | 10 +-
.../src/main/webapp/journal/eportfolio.jsp | 10 +-
.../{core => }/management/change-phase.jsp | 4 +-
.../{core => }/management/create-project.jsp | 2 +-
.../{core => }/management/css/projects.css | 0
.../{core => }/management/delete-project.jsp | 2 +-
.../{core => }/management/edit-project.jsp | 10 +-
.../management/enter-preferences.jsp | 0
.../webapp/{core => }/management/groups.jsp | 16 +-
.../{core => }/management/join-project.jsp | 20 +--
.../{docent => management}/js/changePhase.js | 0
.../webapp/{core => }/management/js/config.js | 0
.../management/js/createPreferences.js | 0
.../{core => }/management/js/deleteProject.js | 0
.../{core => }/management/js/getProjects.js | 0
.../{core => }/management/js/myGroupsInit.js | 0
.../{core => }/management/js/newProject.js | 0
.../js/overview-docent.js | 0
.../js/overview-student.js | 0
.../{core => }/management/js/overview.js | 0
.../js/project-student.js | 0
.../{core => }/management/js/register.js | 0
.../{core => }/management/js/showProjects.js | 0
.../src/main/webapp/overview-docent.jsp | 4 +-
.../src/main/webapp/overview-student.jsp | 4 +-
.../src/main/webapp/profile/profile.jsp | 4 +-
.../src/main/webapp/project-docent.jsp | 2 +-
.../src/main/webapp/project-student.jsp | 6 +-
.../main/webapp/{core/login => }/register.jsp | 0
.../researchReport/create-bibliography.jsp | 8 +-
.../webapp/researchReport/create-concept.jsp | 6 +-
.../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 +-
.../{core => }/session/session_example_1.jsp | 0
.../{core => }/session/session_example_2.jsp | 0
72 files changed, 220 insertions(+), 409 deletions(-)
rename gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/{footer.java => Footer.java} (95%)
rename gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/{headLine.java => HeadLine.java} (98%)
rename gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/{omniDependencies.java => OmniDependencies.java} (92%)
delete mode 100644 gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/project/Project.java.orig
delete mode 100644 gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java
rename gemeinsamforschen/src/main/webapp/{core/login/css => appearance}/Contact-Form-Clean.css (100%)
rename gemeinsamforschen/src/main/webapp/{core/login/css => appearance}/Login-Form-Clean.css (100%)
rename gemeinsamforschen/src/main/webapp/{core/login/css => appearance}/Sidebar-Menu-1.css (100%)
rename gemeinsamforschen/src/main/webapp/{core/login/css => appearance}/Sidebar-Menu.css (100%)
rename gemeinsamforschen/src/main/webapp/{core/login/css => appearance}/Sidebar-Menu1.css (100%)
rename gemeinsamforschen/src/main/webapp/{core => }/appearance/footer.css (100%)
rename gemeinsamforschen/src/main/webapp/{core => }/appearance/footer.js (100%)
rename gemeinsamforschen/src/main/webapp/{core/login/js => appearance}/register.js (100%)
rename gemeinsamforschen/src/main/webapp/{core => }/appearance/utility.js (65%)
rename gemeinsamforschen/src/main/webapp/{core/login => }/index.jsp (100%)
rename gemeinsamforschen/src/main/webapp/{core => }/management/change-phase.jsp (94%)
rename gemeinsamforschen/src/main/webapp/{core => }/management/create-project.jsp (99%)
rename gemeinsamforschen/src/main/webapp/{core => }/management/css/projects.css (100%)
rename gemeinsamforschen/src/main/webapp/{core => }/management/delete-project.jsp (98%)
rename gemeinsamforschen/src/main/webapp/{core => }/management/edit-project.jsp (89%)
rename gemeinsamforschen/src/main/webapp/{core => }/management/enter-preferences.jsp (100%)
rename gemeinsamforschen/src/main/webapp/{core => }/management/groups.jsp (83%)
rename gemeinsamforschen/src/main/webapp/{core => }/management/join-project.jsp (79%)
rename gemeinsamforschen/src/main/webapp/{docent => management}/js/changePhase.js (100%)
rename gemeinsamforschen/src/main/webapp/{core => }/management/js/config.js (100%)
rename gemeinsamforschen/src/main/webapp/{core => }/management/js/createPreferences.js (100%)
rename gemeinsamforschen/src/main/webapp/{core => }/management/js/deleteProject.js (100%)
rename gemeinsamforschen/src/main/webapp/{core => }/management/js/getProjects.js (100%)
rename gemeinsamforschen/src/main/webapp/{core => }/management/js/myGroupsInit.js (100%)
rename gemeinsamforschen/src/main/webapp/{core => }/management/js/newProject.js (100%)
rename gemeinsamforschen/src/main/webapp/{docent => management}/js/overview-docent.js (100%)
rename gemeinsamforschen/src/main/webapp/{student => management}/js/overview-student.js (100%)
rename gemeinsamforschen/src/main/webapp/{core => }/management/js/overview.js (100%)
rename gemeinsamforschen/src/main/webapp/{student => management}/js/project-student.js (100%)
rename gemeinsamforschen/src/main/webapp/{core => }/management/js/register.js (100%)
rename gemeinsamforschen/src/main/webapp/{core => }/management/js/showProjects.js (100%)
rename gemeinsamforschen/src/main/webapp/{core/login => }/register.jsp (100%)
rename gemeinsamforschen/src/main/webapp/{core => }/session/session_example_1.jsp (100%)
rename gemeinsamforschen/src/main/webapp/{core => }/session/session_example_2.jsp (100%)
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/footer.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/Footer.java
similarity index 95%
rename from gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/footer.java
rename to gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/Footer.java
index 29d366cb..c4a98679 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/footer.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/Footer.java
@@ -9,7 +9,7 @@ import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.SimpleTagSupport;
import java.io.IOException;
-public class footer extends SimpleTagSupport {
+public class Footer extends SimpleTagSupport {
public void doTag() throws IOException {
PageContext pageContext = (PageContext) getJspContext();
HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
@@ -22,7 +22,7 @@ public class footer extends SimpleTagSupport {
projectPhase = null;
}
JspWriter out = getJspContext().getOut();
- String footerString = "<footer>\n" +
+ String footerString = "<Footer>\n" +
" <div class=\"container\">\n";
if (projectPhase != null) {
footerString += " <div class=\"progress\">\n" +
@@ -48,7 +48,7 @@ public class footer extends SimpleTagSupport {
footerString += "<button id=\"btnUnstructuredUpload\" class=\"btn btn-light\">Unstrukturierte Abgabe</button>\n" +
"<button id=\"footerBack\" class=\"btn btn-light\">zurück</button>\n" +
" </div>\n" +
- " </footer>";
+ " </Footer>";
out.println(footerString);
}
}
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/headLine.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/HeadLine.java
similarity index 98%
rename from gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/headLine.java
rename to gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/HeadLine.java
index 36f2e74b..ea026238 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/headLine.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/HeadLine.java
@@ -9,7 +9,7 @@ import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.SimpleTagSupport;
import java.io.IOException;
-public class headLine extends SimpleTagSupport {
+public class HeadLine extends SimpleTagSupport {
public void doTag() throws IOException {
PageContext pageContext = (PageContext) getJspContext();
HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
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 73c501bb..e1cc2476 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
@@ -11,7 +11,10 @@ import javax.servlet.jsp.tagext.SimpleTagSupport;
import java.io.IOException;
public class Menu extends SimpleTagSupport {
+ private Integer hierarchyLevel = 0;
+
public void doTag() throws IOException {
+ hierarchyLevel = getHierarchy();
PageContext pageContext = (PageContext) getJspContext();
HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
String token = request.getParameter("token");
@@ -30,31 +33,31 @@ public class Menu extends SimpleTagSupport {
if (isStudent){
String menuString = "<div id=\"sidebar-wrapper\">\n" +
" <ul class=\"sidebar-nav\">\n" +
- " <li class=\"sidebar-brand\"><a href=\"overview-student.jsp?token="+token+"&projectId="+projectId+"\">overview</a></li>\n" +
- " <li><a href=\"profile.jsp?token="+token+"&projectId="+projectId+"\">Profil</a></li>\n";
+ " <li class=\"sidebar-brand\"><a href=\""+hierarchyToString(hierarchyLevel-1)+"overview-student.jsp?token="+token+"&projectId="+projectId+"\">overview</a></li>\n" +
+ " <li><a href=\""+hierarchyToString(hierarchyLevel)+"profile/profile.jsp?token="+token+"&projectId="+projectId+"\">Profil</a></li>\n";
if (projectPhase!=null){
if (projectPhase.equals(ProjectPhase.CourseCreation)){
menuString += " <li><p>Quizfrage</p></li>\n" +
- " <li><a href=\"eportfolio.jsp?token="+token+"&projectId="+projectId+"\">ePortfolio</a></li>\n" +
+ " <li><a href=\""+hierarchyToString(hierarchyLevel)+"journal/eportfolio.jsp?token="+token+"&projectId="+projectId+"\">ePortfolio</a></li>\n" +
" <li><p>Beitrag</p></li>\n" +
" <li><p>Bewertung</p></li>\n";
}
if (projectPhase.equals(ProjectPhase.GroupFormation)){
menuString += " <li><p>Quizfrage</p></li>\n" +
- " <li><a href=\"eportfolio.jsp?token="+token+"&projectId="+projectId+"\">ePortfolio</a></li>\n" +
+ " <li><a href=\""+hierarchyToString(hierarchyLevel)+"journal/eportfolio.jsp?token="+token+"&projectId="+projectId+"\">ePortfolio</a></li>\n" +
" <li><p>Beitrag</p></li>\n" +
" <li><p>Bewertung</p></li>\n";
}
if (projectPhase.equals(ProjectPhase.DossierFeedback)){
menuString += " <li><p>Quizfrage</p></li>\n" +
- " <li><a href=\"eportfolio.jsp?token="+token+"&projectId="+projectId+"\">ePortfolio</a></li>\n" +
- " <li><a href=\"create-title.jsp?token="+token+"&projectId="+projectId+"\">Beitrag</a></li>\n" +
+ " <li><a href=\""+hierarchyToString(hierarchyLevel)+"journal/eportfolio.jsp?token="+token+"&projectId="+projectId+"\">ePortfolio</a></li>\n" +
+ " <li><a href=\""+hierarchyToString(hierarchyLevel)+"researchReport/create-title.jsp?token="+token+"&projectId="+projectId+"\">Beitrag</a></li>\n" +
" <li><p>Bewertung</p></li>\n";
}
if (projectPhase.equals(ProjectPhase.Execution)){
- menuString += " <li><a href=\"quiz.jsp?token="+token+"&projectId="+projectId+"\">Quizfrage</a></li>\n" +
- " <li><a href=\"eportfolio.jsp?token="+token+"&projectId="+projectId+"\">ePortfolio</a></li>\n" +
- " <li><a href=\"create-title.jsp?token="+token+"&projectId="+projectId+"\">Beitrag</a></li>\n" +
+ menuString += " <li><a href=\""+hierarchyToString(hierarchyLevel)+"assessment/Quiz.jsp?token="+token+"&projectId="+projectId+"\">Quizfrage</a></li>\n" +
+ " <li><a href=\""+hierarchyToString(hierarchyLevel)+"journal/eportfolio.jsp?token="+token+"&projectId="+projectId+"\">ePortfolio</a></li>\n" +
+ " <li><a href=\""+hierarchyToString(hierarchyLevel)+"researchReport/create-title.jsp?token="+token+"&projectId="+projectId+"\">Beitrag</a></li>\n" +
" <li><p>Bewertung</p></li>\n";
}
if (projectPhase.equals(ProjectPhase.Assessment)){
@@ -77,13 +80,13 @@ public class Menu extends SimpleTagSupport {
" <li class=\"sidebar-brand\"><a href=\"overview-docent.jsp?token="+token+"&projectId="+projectId+"\">overview</a></li>\n";
if (projectPhase!=null) {
if (!projectPhase.equals(ProjectPhase.GroupFormation)) {
- menuString += "<li><a href=\"quiz-docent.jsp?token="+token+"&projectId="+projectId+"\">Quizfrage</a></li>\n" +
+ menuString += "<li><a href=\""+hierarchyToString(hierarchyLevel)+"assessment/Quiz-docent.jsp?token="+token+"&projectId="+projectId+"\">Quizfrage</a></li>\n" +
" <li><p>Gruppen erstellen</p></li>\n" +
- " <li><a href=\"change-phase.jsp?token="+token+"&projectId="+projectId+"\">Projektphase ändern</a></li>\n";
+ " <li><a href=\""+hierarchyToString(hierarchyLevel)+"core/management/change-phase.jsp?token="+token+"&projectId="+projectId+"\">Projektphase ändern</a></li>\n";
}else {
- menuString += "<li><a href=\"quiz-docent.jsp?token="+token+"&projectId="+projectId+"\">Quizfrage</a></li>\n" +
- " <li><a href=\"create-groups.jsp?token="+token+"&projectId="+projectId+"\">Gruppen erstellen</a></li>\n" +
- " <li><a href=\"change-phase.jsp?token="+token+"&projectId="+projectId+"\">Projektphase ändern</a></li>\n";
+ menuString += "<li><a href=\""+hierarchyToString(hierarchyLevel)+"assessment/quiz-docent.jsp?token="+token+"&projectId="+projectId+"\">Quizfrage</a></li>\n" +
+ " <li><a href=\""+hierarchyToString(hierarchyLevel)+"groupfinding/create-groups.jsp?token="+token+"&projectId="+projectId+"\">Gruppen erstellen</a></li>\n" +
+ " <li><a href=\""+hierarchyToString(hierarchyLevel)+"management/change-phase.jsp?token="+token+"&projectId="+projectId+"\">Projektphase ändern</a></li>\n";
}
}
menuString +="<li><a id=\"logout\" style=\"cursor:pointer\">Logout</a></li>\n" +
@@ -103,10 +106,25 @@ public class Menu extends SimpleTagSupport {
User user = management.getUserByToken(token);
if (user != null)
out.println("<p id=\"user\" hidden>"+user.getName()+"</p>");
+ out.println("<p id=\"hierarchyLevel\" hidden>"+hierarchyLevel.toString()+"</p>");
+
+ }
+ private String hierarchyToString(Integer hierarchyLevel){
+ String result = "";
+ for(Integer count=0; count<hierarchyLevel; count++){
+ result += "../";
+ }
+ return result;
}
+ public Integer getHierarchy() {
+ return hierarchyLevel;
+ }
+ public void setHierarchy(Integer hierarchyLevel) {
+ this.hierarchyLevel = hierarchyLevel;
+ }
}
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/omniDependencies.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/OmniDependencies.java
similarity index 92%
rename from gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/omniDependencies.java
rename to gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/OmniDependencies.java
index a3042c94..fdfd9f66 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/omniDependencies.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/pageAppearance/OmniDependencies.java
@@ -4,7 +4,7 @@ import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.tagext.SimpleTagSupport;
import java.io.IOException;
-public class omniDependencies extends SimpleTagSupport {
+public class OmniDependencies extends SimpleTagSupport {
public void doTag() throws IOException {
JspWriter out = getJspContext().getOut();
out.println("<meta charset=\"utf-8\">\n" +
@@ -12,7 +12,7 @@ public class omniDependencies extends SimpleTagSupport {
" <title>fltrail</title>\n" +
" <link rel=\"stylesheet\" href=\"https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css\">\n" +
" <link rel=\"stylesheet\" href=\"../libs/css/styles.css\">\n" +
- " <link rel=\"stylesheet\" href=\"../libs/css/footer.css\">\n" +
+ " <link rel=\"stylesheet\" href=\"../libs/css/Footer.css\">\n" +
" <script src=\"https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js\"></script>\n" +
" <script src=\"https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js\"></script>\n" +
" <link rel=\"stylesheet\" href=\"../libs/fonts/font-awesome.min.css\">\n" +
@@ -20,7 +20,7 @@ public class omniDependencies extends SimpleTagSupport {
" <link rel=\"stylesheet\" href=\"../libs/css/Sidebar-Menu.css\">\n" +
" <script src=\"../libs/js/Sidebar-Menu.js\"></script>\n" +
" <script src=\"../libs/js/utility.js\"></script>\n" +
- " <script src=\"../libs/js/footer.js\"></script>\n" +
+ " <script src=\"../libs/js/Footer.js\"></script>\n" +
" <link rel=\"stylesheet\" href=\"https://use.fontawesome.com/releases/v5.1.0/css/all.css\"\n" +
" integrity=\"sha384-lKuwvrZot6UHsBSfcMvOkWwlCMgc0TaWr+30HWe3a4ltaBwTZhyTEggF5tJv8tbt\" crossorigin=\"anonymous\">");
}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/project/Project.java.orig b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/project/Project.java.orig
deleted file mode 100644
index f64942fb..00000000
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/project/Project.java.orig
+++ /dev/null
@@ -1,165 +0,0 @@
-package unipotsdam.gf.core.management.project;
-
-import unipotsdam.gf.core.states.ProjectPhase;
-
-import java.sql.Timestamp;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-
-/**
- * Created by dehne on 31.05.2018.
- */
-public class Project {
-
- private String id;
- private String password;
- private Boolean active;
- private Timestamp timecreated;
- private String author;
- private String adminPassword;
- private String token;
-<<<<<<< HEAD
- // using enum ProjectPhase
- private ProjectPhase phase;
-=======
- // TODO: using enum ProjectPhase
- private String phase;
->>>>>>> origin/#40_dummyProjectCreation
-
- public Project() {
- }
-
- public Project(String id, String password, Boolean active, String author, String adminPassword) {
- this.id = id;
- this.password = password;
- this.active = active;
- this.author = author;
- this.adminPassword = adminPassword;
- this.timecreated = Timestamp.valueOf(LocalDateTime.now(ZoneId.of("UTC")));
- // default starting at course creation if new
- this.setPhase(ProjectPhase.CourseCreation);
- }
-
-<<<<<<< HEAD
- public ProjectPhase getPhase() {
- return phase;
- }
-
- /**
- * setting phase only with enum
- * @param phase
- */
- public void setPhase(ProjectPhase phase) {
- this.phase = phase;
- }
-
- public Project(String id, String password, Boolean active, String author, String adminPassword, String token) {
-=======
- public Project(String id, String password, Boolean active, String author, String adminPassword, String token, ProjectPhase projectPhase) {
->>>>>>> origin/#40_dummyProjectCreation
- this.id = id;
- this.password = password;
- this.active = active;
- this.author = author;
- this.adminPassword = adminPassword;
- this.token = token;
- this.phase = projectPhase.name();
-
- this.timecreated = Timestamp.valueOf(LocalDateTime.now(ZoneId.of("UTC")));
- }
-
- public Project(String id, String password, Boolean active, Timestamp timecreated, String author, String adminPassword, String token, String phase) {
- this.id = id;
- this.password = password;
- this.active = active;
- this.timecreated = timecreated;
- this.author = author;
- this.adminPassword = adminPassword;
- this.token = token;
- this.phase = phase;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getPassword() {
- return password;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-
- public Boolean isActive() {
- return active;
- }
-
- public void setActive(Boolean active) {
- this.active = active;
- }
-
- public String getAuthor() {
- return author;
- }
-
- public void setAuthor(String author) {
- this.author = author;
- }
-
- public String getAdminPassword() {
- return adminPassword;
- }
-
- public void setAdminPassword(String adminPassword) {
- this.adminPassword = adminPassword;
- }
-
- public String getToken() {
- return token;
- }
-
- public void setToken(String token) {
- this.token = token;
- }
-
- public Timestamp getTimecreated() {
- return timecreated;
- }
-
-<<<<<<< HEAD
- @Override
- public String toString() {
- final StringBuilder sb = new StringBuilder("Project{");
- sb.append("id='").append(id).append('\'');
- sb.append(", password='").append(password).append('\'');
- sb.append(", active=").append(active);
- sb.append(", timecreated=").append(timecreated);
- sb.append(", author='").append(author).append('\'');
- sb.append(", adminPassword='").append(adminPassword).append('\'');
- sb.append(", token='").append(token).append('\'');
- sb.append(", phase='").append(phase).append('\'');
- sb.append('}');
- return sb.toString();
- }
-=======
- public String getPhase() {
- return phase;
- }
-
- /**
- * setting phase only with enum
- *
- * @param phase
- */
- public void setPhase(ProjectPhase phase) {
- this.phase = phase.name();
- }
-
-
->>>>>>> origin/#40_dummyProjectCreation
-}
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java
deleted file mode 100644
index c4147ac2..00000000
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package unipotsdam.gf.core.management.user;
-
-import unipotsdam.gf.core.management.ManagementImpl;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.SimpleTagSupport;
-import java.io.IOException;
-
-
-// TODO: please move this to a view package at the top of the hierarchy as this is not part of the user package
-public class Menu extends SimpleTagSupport {
- public void doTag() throws JspException, IOException {
- PageContext pageContext = (PageContext) getJspContext();
- HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
- String token = request.getParameter("token");
- String projectId = request.getParameter("projectId");
- ManagementImpl management = new ManagementImpl();
- JspWriter out = getJspContext().getOut();
- if (token!=null){
- User user = management.getUserByToken(token);
- Boolean isStudent = user.getStudent();
- if (isStudent){
- out.println("<div id=\"sidebar-wrapper\">\n" +
- " <ul class=\"sidebar-nav\">\n" +
- " <li class=\"sidebar-brand\"><a href=\"overview-student.jsp?token="+token+"&projectId="+projectId+"\">overview</a></li>\n" +
- " <li><a href=\"profile.jsp?token="+token+"&projectId="+projectId+"\">Profil</a></li>\n" +
- " <li><a href=\"quiz.jsp?token="+token+"&projectId="+projectId+"\">Quizfrage</a></li>\n" +
- " <li><a href=\"eportfolio.jsp?token="+token+"&projectId="+projectId+"\">ePortfolio</a></li>\n" +
- " <li><a href=\"create-overview.jsp?token="+token+"&projectId="+projectId+"\">Beitrag</a></li>\n" +
- " <li><a href=\"assess-work.jsp?token="+token+"&projectId="+projectId+"\">Bewertung</a></li>\n" +
- " <li><a href=\"../index.jsp\">Logout</a></li>\n" +
- " </ul>\n" +
- " </div>");
- } else {
- out.println("<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><a href=\"quiz-docent.jsp?token="+token+"&projectId="+projectId+"\">Quizfrage</a></li>\n" +
- " <li><a href=\"#\">ePortfolio</a></li>\n" +
- " <li><a href=\"#\">Beitrag</a></li>\n" +
- " <li><a href=\"#\">Gruppen erstellen</a></li>\n" +
- " <li><a href=\"#\">Projektphase ändern</a></li>\n" +
- " <li><a href=\"assess-work.jsp?token="+token+"\">Bewertung</a></li>\n" +
- " <li><a href=\"../index.jsp\">Logout</a></li>\n" +
- " </ul>\n" +
- " </div>");
- }
- }else{
- out.println("<div class='alert alert-warning'>" +
- "You probably did not give the token to the url" +
- "</div>");
- //in active System this will be the point to redirect to index.jsp, because token is "wrong"
- }
- if (projectId!=null)
- out.println("<p id=\"projectId\" hidden>"+projectId+"</p>");
- User user = management.getUserByToken(token);
- if (user != null)
- out.println("<p id=\"user\" hidden>"+user.getName()+"</p>");
-
-
- }
-
-
-}
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/annotation/annotation-document.jsp b/gemeinsamforschen/src/main/webapp/annotation/annotation-document.jsp
index 4fad61de..cf43de81 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/>
<!-- 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" />
@@ -28,20 +28,20 @@
<!-- 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="js/utility.js"></script>
<!-- js - annotation websocket script -->
- <script src="../assets/js/annotationWebsocket.js"></script>
+ <script src="js/annotationWebsocket.js"></script>
<!-- js - annotation REST script -->
- <script src="../assets/js/annotationRest.js"></script>
+ <script src="js/annotationRest.js"></script>
<!-- js - unstructuredRest -->
- <script src="../assets/js/unstructuredRest.js"></script>
+ <script src="js/unstructuredRest.js"></script>
<!-- js - annotationScript -->
- <script src="../assets/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">
@@ -96,7 +96,7 @@
<textarea class="form-control resize-vertical" id="annotation-form-comment" name="comment"></textarea>
</div>
</form>
- <!-- modal footer -->
+ <!-- modal Footer -->
<div class="modal-footer">
<button id="btnSave" type="button" class="btn btn-success">Speichern</button>
</div>
@@ -128,7 +128,7 @@
<textarea class="form-control resize-vertical" id="annotation-edit-form-comment" name="comment"></textarea>
</div>
</form>
- <!-- modal footer -->
+ <!-- modal Footer -->
<div class="modal-footer">
<button id="btnDelete" type="button" class="btn btn-danger">Löschen</button>
<button id="btnEdit" type="button" class="btn btn-success">Bearbeiten</button>
diff --git a/gemeinsamforschen/src/main/webapp/annotation/create-unstructured-annotation.jsp b/gemeinsamforschen/src/main/webapp/annotation/create-unstructured-annotation.jsp
index de6ef885..f423e209 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/>
<!-- 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="../assets/js/unstructuredRest.js"></script>
+ <script src="js/unstructuredRest.js"></script>
<!-- js - unstructuredUpload -->
- <script src="../assets/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/annotation/upload-unstructured-annotation.jsp b/gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-annotation.jsp
index 92c6e31e..d0483f04 100644
--- a/gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-annotation.jsp
+++ b/gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-annotation.jsp
@@ -16,17 +16,17 @@
<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="../assets/js/unstructuredUpload.js"></script>
+ <script src="js/unstructuredUpload.js"></script>
<!-- js - unstructuredRest -->
- <script src="../assets/js/unstructuredRest.js"></script>
+ <script src="js/unstructuredRest.js"></script>
</head>
<body>
<div id="wrapper" class="full-height">
- <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/core/login/css/Contact-Form-Clean.css b/gemeinsamforschen/src/main/webapp/appearance/Contact-Form-Clean.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/core/login/css/Contact-Form-Clean.css
rename to gemeinsamforschen/src/main/webapp/appearance/Contact-Form-Clean.css
diff --git a/gemeinsamforschen/src/main/webapp/core/login/css/Login-Form-Clean.css b/gemeinsamforschen/src/main/webapp/appearance/Login-Form-Clean.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/core/login/css/Login-Form-Clean.css
rename to gemeinsamforschen/src/main/webapp/appearance/Login-Form-Clean.css
diff --git a/gemeinsamforschen/src/main/webapp/core/login/css/Sidebar-Menu-1.css b/gemeinsamforschen/src/main/webapp/appearance/Sidebar-Menu-1.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/core/login/css/Sidebar-Menu-1.css
rename to gemeinsamforschen/src/main/webapp/appearance/Sidebar-Menu-1.css
diff --git a/gemeinsamforschen/src/main/webapp/core/login/css/Sidebar-Menu.css b/gemeinsamforschen/src/main/webapp/appearance/Sidebar-Menu.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/core/login/css/Sidebar-Menu.css
rename to gemeinsamforschen/src/main/webapp/appearance/Sidebar-Menu.css
diff --git a/gemeinsamforschen/src/main/webapp/core/login/css/Sidebar-Menu1.css b/gemeinsamforschen/src/main/webapp/appearance/Sidebar-Menu1.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/core/login/css/Sidebar-Menu1.css
rename to gemeinsamforschen/src/main/webapp/appearance/Sidebar-Menu1.css
diff --git a/gemeinsamforschen/src/main/webapp/core/appearance/footer.css b/gemeinsamforschen/src/main/webapp/appearance/footer.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/core/appearance/footer.css
rename to gemeinsamforschen/src/main/webapp/appearance/footer.css
diff --git a/gemeinsamforschen/src/main/webapp/core/appearance/footer.js b/gemeinsamforschen/src/main/webapp/appearance/footer.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/core/appearance/footer.js
rename to gemeinsamforschen/src/main/webapp/appearance/footer.js
diff --git a/gemeinsamforschen/src/main/webapp/core/login/js/register.js b/gemeinsamforschen/src/main/webapp/appearance/register.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/core/login/js/register.js
rename to gemeinsamforschen/src/main/webapp/appearance/register.js
diff --git a/gemeinsamforschen/src/main/webapp/core/appearance/utility.js b/gemeinsamforschen/src/main/webapp/appearance/utility.js
similarity index 65%
rename from gemeinsamforschen/src/main/webapp/core/appearance/utility.js
rename to gemeinsamforschen/src/main/webapp/appearance/utility.js
index 753e889a..0c674ce7 100644
--- a/gemeinsamforschen/src/main/webapp/core/appearance/utility.js
+++ b/gemeinsamforschen/src/main/webapp/appearance/utility.js
@@ -1,8 +1,16 @@
+function changeLocationTo(target) {
+ let level = $('#hierarchyLevel').html().trim();
+ let link = calculateHierachy(level) + target;
+ return link;
+}
+
$(document).ready(function(){
$('#headLineProject').html($('#projectId').html());
$('#logout').click(function(){
//todo: delete cookies / reset session
- document.location="../index.jsp";
+ let target = "index.jsp";
+ let link = changeLocationTo(target);
+ document.location=link;
});
$('#assessment').click(function(){
checkAssessementPhase();
@@ -29,19 +37,19 @@ function checkAssessementPhase(){
success: function (phase) {
switch (phase){
case "workRating":{
- document.location="finalAssessment.jsp?token=" + getUserTokenFromUrl() + "&projectId=" + $('#projectId').html().trim();
+ changeLocationTo("finalAssessment.jsp?token=" + getUserTokenFromUrl() + "&projectId=" + $('#projectId').html().trim());
break;
}
case "quiz":{
- location.href = "take-quiz.jsp?token=" + getUserTokenFromUrl() + "&projectId=" + $('#projectId').html().trim();
+ changeLocationTo("take-quiz.jsp?token=" + getUserTokenFromUrl() + "&projectId=" + $('#projectId').html().trim());
break;
}
case "contributionRating":{
- location.href = "rate-contribution.jsp?token=" + getUserTokenFromUrl() + "&projectId=" + $('#projectId').html().trim();
+ changeLocationTo("rate-contribution.jsp?token=" + getUserTokenFromUrl() + "&projectId=" + $('#projectId').html().trim());
break;
}
case "done":{
- location.href = "project-student.jsp?token=" + getUserTokenFromUrl() + "&projectId=" + $('#projectId').html().trim();
+ changeLocationTo("project-student.jsp?token=" + getUserTokenFromUrl() + "&projectId=" + $('#projectId').html().trim());
break;
}
}
@@ -74,3 +82,18 @@ function getQueryVariable(variable) {
return (false);
}
+
+
+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/assessment/Quiz-docent.jsp b/gemeinsamforschen/src/main/webapp/assessment/Quiz-docent.jsp
index f18d4b74..80ece89d 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/Quiz-docent.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/Quiz-docent.jsp
@@ -7,12 +7,12 @@
<html>
<head>
<omniDependencies:omniDependencies/>
- <script src="../assets/js/Quiz-docent.js"></script>
+ <script src="js/Quiz-docent.js"></script>
</head>
<body>
<div id="wrapper">
- <menu:menu/>
+ <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<headLine:headLine/>
<table class="table-striped">
diff --git a/gemeinsamforschen/src/main/webapp/assessment/Quiz.jsp b/gemeinsamforschen/src/main/webapp/assessment/Quiz.jsp
index 719048e0..f5f76c50 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/Quiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/Quiz.jsp
@@ -7,12 +7,12 @@
<html>
<head>
<omniDependencies:omniDependencies/>
- <script src="../assets/js/Quiz.js"></script>
+ <script src="js/Quiz.js"></script>
</head>
<body>
<div id="wrapper">
- <menu:menu/>
+ <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<headLine:headLine/>
<table class="table-striped">
diff --git a/gemeinsamforschen/src/main/webapp/assessment/assess-work.jsp b/gemeinsamforschen/src/main/webapp/assessment/assess-work.jsp
index 78c9235d..9888e655 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/assess-work.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/assess-work.jsp
@@ -9,13 +9,13 @@
<head>
<omniDependencies:omniDependencies/>
- <script src="../assets/js/finalAssessment.js"></script>
+ <script src="js/finalAssessment.js"></script>
</head>
<body>
<div id="wrapper">
- <menu:menu/>
+ <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<headLine:headLine/>
<div>
diff --git a/gemeinsamforschen/src/main/webapp/assessment/calculate-assessment.jsp b/gemeinsamforschen/src/main/webapp/assessment/calculate-assessment.jsp
index 4cfa0c32..fc7f7c34 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/calculate-assessment.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/calculate-assessment.jsp
@@ -3,17 +3,14 @@
<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
-<!-- TODO refactor @Sven: bitte nutze einen Unterordner für dein Modul z.B. webapp/annotation/ -->
-
-
<!DOCTYPE html>
<html lang="en">
<head>
<omniDependencies:omniDependencies/>
- <script src="../assets/js/assessmentCalculator.js"></script>
+ <script src="js/assessmentCalculator.js"></script>
</head>
<body>
-<menu:menu/>
+<menu:menu hierarchy="1"/>
<button id="calculateNow">Post Performance</button>
<button id="giveItBack">Get TotalPerformance</button>
<headLine:headLine/>
diff --git a/gemeinsamforschen/src/main/webapp/assessment/create-quiz.jsp b/gemeinsamforschen/src/main/webapp/assessment/create-quiz.jsp
index 60ce0a73..05d806ab 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/create-quiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/create-quiz.jsp
@@ -7,12 +7,12 @@
<html>
<head>
<omniDependencies:omniDependencies/>
- <script src="../assets/js/createQuiz.js"></script>
+ <script src="js/createQuiz.js"></script>
</head>
<body>
<div id="wrapper">
- <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/assessment/project-docent_CG.jsp b/gemeinsamforschen/src/main/webapp/assessment/project-docent_CG.jsp
index b276788d..e0e09cc6 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="js/utility.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 +19,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 e706a9ea..16ae14c8 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/rate-contribution.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/rate-contribution.jsp
@@ -11,12 +11,12 @@
<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="js/rateContribution.js"></script>
</head>
<body>
<div id="wrapper">
- <menu:menu/>
+ <menu:menu hierarchy="1"/>
<p id="groupId" hidden>Hier steht jetzt das richtige</p>
<div class="page-content-wrapper">
<headLine:headLine/>
diff --git a/gemeinsamforschen/src/main/webapp/assessment/take-quiz.jsp b/gemeinsamforschen/src/main/webapp/assessment/take-quiz.jsp
index 433023e0..243c2c3f 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/take-quiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/take-quiz.jsp
@@ -8,13 +8,13 @@
<head>
<omniDependencies:omniDependencies/>
- <script src="../assets/js/takeQuiz.js"></script>
+ <script src="js/takeQuiz.js"></script>
</head>
<body>
<div id="wrapper">
- <menu:menu/>
+ <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<headLine:headLine/>
<div>
diff --git a/gemeinsamforschen/src/main/webapp/assessment/view-quiz.jsp b/gemeinsamforschen/src/main/webapp/assessment/view-quiz.jsp
index 4c742cd7..f7ec88e9 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="js/viewQuiz.js"></script>
</head>
@@ -16,7 +16,7 @@
<div id="wrapper">
- <menu:menu/>
+ <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<headLine:headLine/>
<div>
diff --git a/gemeinsamforschen/src/main/webapp/core/gemeinsamForschen.tld b/gemeinsamforschen/src/main/webapp/core/gemeinsamForschen.tld
index b32f459c..b5381f69 100644
--- a/gemeinsamforschen/src/main/webapp/core/gemeinsamForschen.tld
+++ b/gemeinsamforschen/src/main/webapp/core/gemeinsamForschen.tld
@@ -13,6 +13,11 @@
<name>menu</name>
<tag-class>unipotsdam.gf.core.management.pageAppearance.Menu</tag-class>
<body-content>empty</body-content>
+ <attribute>
+ <name>hierarchy</name>
+ <required>yes</required>
+ <rtexprvalue>no</rtexprvalue>
+ </attribute>
</tag>
<tag>
@@ -23,19 +28,19 @@
<tag>
<name>omniDependencies</name>
- <tag-class>unipotsdam.gf.core.management.pageAppearance.omniDependencies</tag-class>
+ <tag-class>unipotsdam.gf.core.management.pageAppearance.OmniDependencies</tag-class>
<body-content>empty</body-content>
</tag>
<tag>
<name>headLine</name>
- <tag-class>unipotsdam.gf.core.management.pageAppearance.headLine</tag-class>
+ <tag-class>unipotsdam.gf.core.management.pageAppearance.HeadLine</tag-class>
<body-content>empty</body-content>
</tag>
<tag>
<name>footer</name>
- <tag-class>unipotsdam.gf.core.management.pageAppearance.footer</tag-class>
+ <tag-class>unipotsdam.gf.core.management.pageAppearance.Footer</tag-class>
<body-content>empty</body-content>
</tag>
diff --git a/gemeinsamforschen/src/main/webapp/feedback/give-feedback.jsp b/gemeinsamforschen/src/main/webapp/feedback/give-feedback.jsp
index be99ae9d..d0639886 100644
--- a/gemeinsamforschen/src/main/webapp/feedback/give-feedback.jsp
+++ b/gemeinsamforschen/src/main/webapp/feedback/give-feedback.jsp
@@ -12,37 +12,37 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>muster-gemeinsam-forschen</title>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
- <link rel="stylesheet" href="../assets/css/styles.css">
+ <link rel="stylesheet" href="css/styles.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<link rel="stylesheet" href="../assets/fonts/font-awesome.min.css">
- <link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
- <link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.css">
- <link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
+ <link rel="stylesheet" href="css/Community-ChatComments.css">
+ <link rel="stylesheet" href="css/Sidebar-Menu-1.css">
+ <link rel="stylesheet" href="css/Sidebar-Menu.css">
<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>
- <link rel="stylesheet" type="text/css" href="../assets/css/editDescription.css">
- <script src="../assets/js/jquery.min.js"></script>
+ <script src="js/utility.js"></script>
+ <script src="js/project-student.js"></script>
+ <link rel="stylesheet" type="text/css" href="css/editDescription.css">
+ <script src="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="js/Sidebar-Menu.js"></script>
+ <script src="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>
+ <link rel="stylesheet" type="text/css" href="css/create-journal.css">
+ <script src="js/utility.js"></script>
+ <script src="js/project-student.js"></script>
+ <script src="js/peerfeedback.js"></script>
<omniDependencies:omniDependencies/>
</head>
<body>
<div id="wrapper">
- <menu:menu/>
+ <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<headLine:headLine/>
<div>
@@ -139,10 +139,10 @@
</div>
</div>
-<script src="../assets/js/jquery.min.js"></script>
+<script src="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="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 1e37c958..f8d66152 100644
--- a/gemeinsamforschen/src/main/webapp/feedback/view-feedback.jsp
+++ b/gemeinsamforschen/src/main/webapp/feedback/view-feedback.jsp
@@ -7,17 +7,17 @@
<html>
<head>
- <link rel="stylesheet" href="../assets/css/viewfeedback.css">
+ <link rel="stylesheet" href="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="js/utility.js"></script>
+ <script src="js/project-student.js"></script>
+ <script src="js/givepeerfeedback.js"></script>
</head>
<body>
<div id="wrapper">
- <menu:menu/>
+ <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<headLine:headLine/>
<div class="container-fluid">
@@ -167,9 +167,9 @@
</div>
</div>
-<script src="../assets/js/jquery.min.js"></script>
+<script src="js/jquery.min.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
-<script src="../assets/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 8907e054..f8902c56 100644
--- a/gemeinsamforschen/src/main/webapp/groupfinding/create-groups.jsp
+++ b/gemeinsamforschen/src/main/webapp/groupfinding/create-groups.jsp
@@ -6,12 +6,12 @@
<html>
<head>
<omniDependencies:omniDependencies/>
- <script src="../assets/js/changePhase.js"></script>
+ <script src="js/changePhase.js"></script>
</head>
<body>
<div id="wrapper">
- <menu:menu/>
+ <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<headLine:headLine/>
student1<br>
diff --git a/gemeinsamforschen/src/main/webapp/core/login/index.jsp b/gemeinsamforschen/src/main/webapp/index.jsp
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/core/login/index.jsp
rename to gemeinsamforschen/src/main/webapp/index.jsp
diff --git a/gemeinsamforschen/src/main/webapp/journal/create-journal.jsp b/gemeinsamforschen/src/main/webapp/journal/create-journal.jsp
index 9a1809c9..973e0200 100644
--- a/gemeinsamforschen/src/main/webapp/journal/create-journal.jsp
+++ b/gemeinsamforschen/src/main/webapp/journal/create-journal.jsp
@@ -8,13 +8,13 @@
<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/>
</head>
<body>
<div id="wrapper">
- <menu:menu></menu:menu>
+ <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<div class="container-fluid">
@@ -87,10 +87,10 @@
</div>
</div>
-<script src="../assets/js/jquery.min.js"></script>
+<script src="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="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/journal/eportfolio.jsp b/gemeinsamforschen/src/main/webapp/journal/eportfolio.jsp
index a84ef0f5..e476522b 100644
--- a/gemeinsamforschen/src/main/webapp/journal/eportfolio.jsp
+++ b/gemeinsamforschen/src/main/webapp/journal/eportfolio.jsp
@@ -6,14 +6,14 @@
<head>
- <link rel="stylesheet" href="../assets/css/e-portfolio.css">
+ <link rel="stylesheet" href="css/e-portfolio.css">
<omniDependencies:omniDependencies/>
</head>
<body>
<div id="wrapper">
- <menu:menu/>
+ <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<div class="container-fluid">
@@ -153,10 +153,10 @@
</div>
</div>
-<script src="../assets/js/jquery.min.js"></script>
+<script src="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="js/Sidebar-Menu.js"></script>
+<script src="js/e-portfolio.js"></script>
</body>
</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/core/management/change-phase.jsp b/gemeinsamforschen/src/main/webapp/management/change-phase.jsp
similarity index 94%
rename from gemeinsamforschen/src/main/webapp/core/management/change-phase.jsp
rename to gemeinsamforschen/src/main/webapp/management/change-phase.jsp
index 763926f0..4bb9ce1d 100644
--- a/gemeinsamforschen/src/main/webapp/core/management/change-phase.jsp
+++ b/gemeinsamforschen/src/main/webapp/management/change-phase.jsp
@@ -8,12 +8,12 @@
<html>
<head>
<omniDependencies:omniDependencies/>
- <script src="../assets/js/changePhase.js"></script>
+ <script src="js/changePhase.js"></script>
</head>
<body>
<div id="wrapper">
- <menu:menu/>
+ <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<headLine:headLine/>
<div class="alert"id="CourseCreation">
diff --git a/gemeinsamforschen/src/main/webapp/core/management/create-project.jsp b/gemeinsamforschen/src/main/webapp/management/create-project.jsp
similarity index 99%
rename from gemeinsamforschen/src/main/webapp/core/management/create-project.jsp
rename to gemeinsamforschen/src/main/webapp/management/create-project.jsp
index fd2d2015..c7be4801 100644
--- a/gemeinsamforschen/src/main/webapp/core/management/create-project.jsp
+++ b/gemeinsamforschen/src/main/webapp/management/create-project.jsp
@@ -31,7 +31,7 @@
</div>
<div id="wrapper" style="margin:0px;">
- <menu:menu/>
+ <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<div class="container-fluid">
<div class="row">
diff --git a/gemeinsamforschen/src/main/webapp/core/management/css/projects.css b/gemeinsamforschen/src/main/webapp/management/css/projects.css
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/core/management/css/projects.css
rename to gemeinsamforschen/src/main/webapp/management/css/projects.css
diff --git a/gemeinsamforschen/src/main/webapp/core/management/delete-project.jsp b/gemeinsamforschen/src/main/webapp/management/delete-project.jsp
similarity index 98%
rename from gemeinsamforschen/src/main/webapp/core/management/delete-project.jsp
rename to gemeinsamforschen/src/main/webapp/management/delete-project.jsp
index ea71a5a5..497cfb21 100644
--- a/gemeinsamforschen/src/main/webapp/core/management/delete-project.jsp
+++ b/gemeinsamforschen/src/main/webapp/management/delete-project.jsp
@@ -21,7 +21,7 @@
<body>
<div class="loader-inactive" id="loader"></div>
<div id="wrapper" class="wrapper" style="margin:0px;">
- <menu:menu></menu:menu>
+ <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>
<div class="row">
diff --git a/gemeinsamforschen/src/main/webapp/core/management/edit-project.jsp b/gemeinsamforschen/src/main/webapp/management/edit-project.jsp
similarity index 89%
rename from gemeinsamforschen/src/main/webapp/core/management/edit-project.jsp
rename to gemeinsamforschen/src/main/webapp/management/edit-project.jsp
index dec41640..dd9e7987 100644
--- a/gemeinsamforschen/src/main/webapp/core/management/edit-project.jsp
+++ b/gemeinsamforschen/src/main/webapp/management/edit-project.jsp
@@ -8,14 +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/editDescription.css">
+ <link rel="stylesheet" type="text/css" href="css/editDescription.css">
<omniDependencies:omniDependencies/>
</head>
<body>
<div id="wrapper">
- <menu:menu></menu:menu>
+ <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<div class="container-fluid">
@@ -60,10 +60,10 @@
</div>
</div>
-<script src="../assets/js/jquery.min.js"></script>
+<script src="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="js/Sidebar-Menu.js"></script>
+<script src="js/editDescription.js"></script>
</body>
</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/core/management/enter-preferences.jsp b/gemeinsamforschen/src/main/webapp/management/enter-preferences.jsp
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/core/management/enter-preferences.jsp
rename to gemeinsamforschen/src/main/webapp/management/enter-preferences.jsp
diff --git a/gemeinsamforschen/src/main/webapp/core/management/groups.jsp b/gemeinsamforschen/src/main/webapp/management/groups.jsp
similarity index 83%
rename from gemeinsamforschen/src/main/webapp/core/management/groups.jsp
rename to gemeinsamforschen/src/main/webapp/management/groups.jsp
index 6321b9c3..8c31bdb0 100644
--- a/gemeinsamforschen/src/main/webapp/core/management/groups.jsp
+++ b/gemeinsamforschen/src/main/webapp/management/groups.jsp
@@ -8,17 +8,17 @@
<title>student-form-design</title>
<link rel="stylesheet" href="../assets/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Ubuntu:400,700">
- <link rel="stylesheet" href="../assets/css/Login-Form-Clean.css">
- <link rel="stylesheet" href="../assets/css/Navigation-with-Button1.css">
- <link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
- <link rel="stylesheet" href="../assets/css/Sidebar-Menu1.css">
+ <link rel="stylesheet" href="css/Login-Form-Clean.css">
+ <link rel="stylesheet" href="css/Navigation-with-Button1.css">
+ <link rel="stylesheet" href="css/Sidebar-Menu.css">
+ <link rel="stylesheet" href="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="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="../assets/js/Sidebar-Menu.js"></script>
+ <script src="js/Sidebar-Menu.js"></script>
diff --git a/gemeinsamforschen/src/main/webapp/core/management/join-project.jsp b/gemeinsamforschen/src/main/webapp/management/join-project.jsp
similarity index 79%
rename from gemeinsamforschen/src/main/webapp/core/management/join-project.jsp
rename to gemeinsamforschen/src/main/webapp/management/join-project.jsp
index 0c108672..8c8bd1d8 100644
--- a/gemeinsamforschen/src/main/webapp/core/management/join-project.jsp
+++ b/gemeinsamforschen/src/main/webapp/management/join-project.jsp
@@ -8,18 +8,18 @@
<title>Gruppenmatcher</title>
<link rel="stylesheet" href="../assets/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Ubuntu:400,700">
- <link rel="stylesheet" href="../assets/css/Login-Form-Clean.css">
- <link rel="stylesheet" href="../assets/css/Navigation-with-Button1.css">
- <link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
- <link rel="stylesheet" href="../assets/css/Sidebar-Menu1.css">
- <link rel="stylesheet" href="../assets/css/styles.css">
+ <link rel="stylesheet" href="css/Login-Form-Clean.css">
+ <link rel="stylesheet" href="css/Navigation-with-Button1.css">
+ <link rel="stylesheet" href="css/Sidebar-Menu.css">
+ <link rel="stylesheet" href="css/Sidebar-Menu1.css">
+ <link rel="stylesheet" href="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="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="../assets/js/Sidebar-Menu.js"></script>
+ <script src="js/Sidebar-Menu.js"></script>
</head>
diff --git a/gemeinsamforschen/src/main/webapp/docent/js/changePhase.js b/gemeinsamforschen/src/main/webapp/management/js/changePhase.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/docent/js/changePhase.js
rename to gemeinsamforschen/src/main/webapp/management/js/changePhase.js
diff --git a/gemeinsamforschen/src/main/webapp/core/management/js/config.js b/gemeinsamforschen/src/main/webapp/management/js/config.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/core/management/js/config.js
rename to gemeinsamforschen/src/main/webapp/management/js/config.js
diff --git a/gemeinsamforschen/src/main/webapp/core/management/js/createPreferences.js b/gemeinsamforschen/src/main/webapp/management/js/createPreferences.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/core/management/js/createPreferences.js
rename to gemeinsamforschen/src/main/webapp/management/js/createPreferences.js
diff --git a/gemeinsamforschen/src/main/webapp/core/management/js/deleteProject.js b/gemeinsamforschen/src/main/webapp/management/js/deleteProject.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/core/management/js/deleteProject.js
rename to gemeinsamforschen/src/main/webapp/management/js/deleteProject.js
diff --git a/gemeinsamforschen/src/main/webapp/core/management/js/getProjects.js b/gemeinsamforschen/src/main/webapp/management/js/getProjects.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/core/management/js/getProjects.js
rename to gemeinsamforschen/src/main/webapp/management/js/getProjects.js
diff --git a/gemeinsamforschen/src/main/webapp/core/management/js/myGroupsInit.js b/gemeinsamforschen/src/main/webapp/management/js/myGroupsInit.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/core/management/js/myGroupsInit.js
rename to gemeinsamforschen/src/main/webapp/management/js/myGroupsInit.js
diff --git a/gemeinsamforschen/src/main/webapp/core/management/js/newProject.js b/gemeinsamforschen/src/main/webapp/management/js/newProject.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/core/management/js/newProject.js
rename to gemeinsamforschen/src/main/webapp/management/js/newProject.js
diff --git a/gemeinsamforschen/src/main/webapp/docent/js/overview-docent.js b/gemeinsamforschen/src/main/webapp/management/js/overview-docent.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/docent/js/overview-docent.js
rename to gemeinsamforschen/src/main/webapp/management/js/overview-docent.js
diff --git a/gemeinsamforschen/src/main/webapp/student/js/overview-student.js b/gemeinsamforschen/src/main/webapp/management/js/overview-student.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/student/js/overview-student.js
rename to gemeinsamforschen/src/main/webapp/management/js/overview-student.js
diff --git a/gemeinsamforschen/src/main/webapp/core/management/js/overview.js b/gemeinsamforschen/src/main/webapp/management/js/overview.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/core/management/js/overview.js
rename to gemeinsamforschen/src/main/webapp/management/js/overview.js
diff --git a/gemeinsamforschen/src/main/webapp/student/js/project-student.js b/gemeinsamforschen/src/main/webapp/management/js/project-student.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/student/js/project-student.js
rename to gemeinsamforschen/src/main/webapp/management/js/project-student.js
diff --git a/gemeinsamforschen/src/main/webapp/core/management/js/register.js b/gemeinsamforschen/src/main/webapp/management/js/register.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/core/management/js/register.js
rename to gemeinsamforschen/src/main/webapp/management/js/register.js
diff --git a/gemeinsamforschen/src/main/webapp/core/management/js/showProjects.js b/gemeinsamforschen/src/main/webapp/management/js/showProjects.js
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/core/management/js/showProjects.js
rename to gemeinsamforschen/src/main/webapp/management/js/showProjects.js
diff --git a/gemeinsamforschen/src/main/webapp/overview-docent.jsp b/gemeinsamforschen/src/main/webapp/overview-docent.jsp
index 708c6b2b..4c7353bf 100644
--- a/gemeinsamforschen/src/main/webapp/overview-docent.jsp
+++ b/gemeinsamforschen/src/main/webapp/overview-docent.jsp
@@ -8,12 +8,12 @@
<head>
<omniDependencies:omniDependencies/>
- <script src="../assets/js/overview-docent.js"></script>
+ <script src="js/overview-docent.js"></script>
</head>
<body>
<div id="wrapper">
- <menu:menu/>
+ <menu:menu hierarchy="0"/>
<div class="page-content-wrapper">
<headLine:headLine/>
diff --git a/gemeinsamforschen/src/main/webapp/overview-student.jsp b/gemeinsamforschen/src/main/webapp/overview-student.jsp
index 16cf0099..56e618ef 100644
--- a/gemeinsamforschen/src/main/webapp/overview-student.jsp
+++ b/gemeinsamforschen/src/main/webapp/overview-student.jsp
@@ -8,13 +8,13 @@
<head>
<omniDependencies:omniDependencies/>
- <script src="../assets/js/overview-student.js"></script>
+ <script src="js/overview-student.js"></script>
</head>
<body>
<div id="wrapper">
- <menu:menu/>
+ <menu:menu hierarchy="0"/>
<div class="page-content-wrapper">
<headLine:headLine/>
<div>
diff --git a/gemeinsamforschen/src/main/webapp/profile/profile.jsp b/gemeinsamforschen/src/main/webapp/profile/profile.jsp
index 98d36fa4..01d8d3b0 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="js/profile.js"></script>
</head>
@@ -25,7 +25,7 @@
<body>
<div id="wrapper">
- <menu:menu/>
+ <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<headLine:headLine/>
diff --git a/gemeinsamforschen/src/main/webapp/project-docent.jsp b/gemeinsamforschen/src/main/webapp/project-docent.jsp
index d22be283..c9d73b60 100644
--- a/gemeinsamforschen/src/main/webapp/project-docent.jsp
+++ b/gemeinsamforschen/src/main/webapp/project-docent.jsp
@@ -16,7 +16,7 @@
<body>
<div id="wrapper">
- <menu:menu/>
+ <menu:menu hierarchy="0"/>
<div class="page-content-wrapper">
<headLine:headLine/>
<button
diff --git a/gemeinsamforschen/src/main/webapp/project-student.jsp b/gemeinsamforschen/src/main/webapp/project-student.jsp
index 83486d62..1b3d01d0 100644
--- a/gemeinsamforschen/src/main/webapp/project-student.jsp
+++ b/gemeinsamforschen/src/main/webapp/project-student.jsp
@@ -15,14 +15,14 @@
<head>
<omniDependencies:omniDependencies/>
- <script src="../assets/js/project-student.js"></script>
- <link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
+ <script src="js/project-student.js"></script>
+ <link rel="stylesheet" href="css/Community-ChatComments.css">
</head>
<body>
<div id="wrapper">
- <menu:menu/>
+ <menu:menu hierarchy="0"/>
<div class="page-content-wrapper">
<headLine:headLine/>
diff --git a/gemeinsamforschen/src/main/webapp/core/login/register.jsp b/gemeinsamforschen/src/main/webapp/register.jsp
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/core/login/register.jsp
rename to gemeinsamforschen/src/main/webapp/register.jsp
diff --git a/gemeinsamforschen/src/main/webapp/researchReport/create-bibliography.jsp b/gemeinsamforschen/src/main/webapp/researchReport/create-bibliography.jsp
index c4daaf6e..1cf7b506 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/create-bibliography.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-bibliography.jsp
@@ -14,7 +14,7 @@ den Zustand ändert
<omniDependencies:omniDependencies/>
<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>
@@ -22,7 +22,7 @@ den Zustand ändert
<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 +73,8 @@ den Zustand ändert
</div>
-<script src="../assets/js/createReportBibo.js"></script>
-<script src="../assets/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 81529a11..fd8deec6 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/create-concept.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-concept.jsp
@@ -9,7 +9,7 @@
<omniDependencies:omniDependencies/>
<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>
@@ -55,8 +55,8 @@
</form>
-<script src="../assets/js/createReportConcept.js"></script>
-<script src="../assets/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 19b5d2f9..e3da7537 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/>
<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="../assets/js/createReportEvaluation.js"></script>
-<script src="../assets/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 51128500..c62d945a 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/>
<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="../assets/js/createReportMethod.js"></script>
-<script src="../assets/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 e103022c..65ad9e2e 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="../assets/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 1d8ca36e..943bbf9f 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/>
<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="../assets/js/createReportDo.js"></script>
-<script src="../assets/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 c8d3cc87..98d32d47 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/>
<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="../assets/js/createReportQuestion.js"></script>
-<script src="../assets/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 2ab818ee..5fe79fde 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/>
<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="../assets/js/createReportRecherche.js"></script>
-<script src="../assets/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 dd012654..dbfb2eb4 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/>
<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="../assets/js/createReportTitle.js"></script>
-<script src="../assets/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 -->
diff --git a/gemeinsamforschen/src/main/webapp/core/session/session_example_1.jsp b/gemeinsamforschen/src/main/webapp/session/session_example_1.jsp
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/core/session/session_example_1.jsp
rename to gemeinsamforschen/src/main/webapp/session/session_example_1.jsp
diff --git a/gemeinsamforschen/src/main/webapp/core/session/session_example_2.jsp b/gemeinsamforschen/src/main/webapp/session/session_example_2.jsp
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/core/session/session_example_2.jsp
rename to gemeinsamforschen/src/main/webapp/session/session_example_2.jsp
--
GitLab