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 29d366cb5ad8af659610937da34707c4c70d6628..c4a98679e1b5417894290ce38e45a5f88a774352 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 36f2e74bcc9ebd0708ee4225d60a6c54a0a22a52..ea026238ac67bffb444d4b2107ac4460f1a3f546 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 73c501bbb15274771422a796529a798599022519..e1cc24762b0b5ef15a424119e47ba1ca480f8470 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 a3042c94ec08f3e35425638baa1980c3ff755415..fdfd9f66379e32808e9f754f1338bc93c40a7401 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 f64942fbc64dbe3ae6bc6b04b0d2bb291f713961..0000000000000000000000000000000000000000
--- 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 c4147ac2fccb6dd7d7b043cb343a5740f405f96d..0000000000000000000000000000000000000000
--- 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/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 753e889a69d87884549b820971769023414eec50..0c674ce7e11611a7c2674a5220fc7f3dd263697a 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/core/gemeinsamForschen.tld b/gemeinsamforschen/src/main/webapp/core/gemeinsamForschen.tld
index b32f459cea3a6a036b622c85cb47749d45a1d3a0..b5381f6988790ab92047f0b29c512d14daa80f68 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/core/management/change-phase.jsp b/gemeinsamforschen/src/main/webapp/management/change-phase.jsp
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/core/management/change-phase.jsp
rename to gemeinsamforschen/src/main/webapp/management/change-phase.jsp
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 fd2d2015c526193a9cf892d587f4a326f30326ba..c7be48010ccca471a7ea94968845991f6c889c62 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 ea71a5a58f80dbe1f3196b1f03de8185a6faa35a..497cfb219bb50fe80183fca7a8062daaeb5e7e74 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 100%
rename from gemeinsamforschen/src/main/webapp/core/management/edit-project.jsp
rename to gemeinsamforschen/src/main/webapp/management/edit-project.jsp
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 100%
rename from gemeinsamforschen/src/main/webapp/core/management/groups.jsp
rename to gemeinsamforschen/src/main/webapp/management/groups.jsp
diff --git a/gemeinsamforschen/src/main/webapp/core/management/join-project.jsp b/gemeinsamforschen/src/main/webapp/management/join-project.jsp
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/core/management/join-project.jsp
rename to gemeinsamforschen/src/main/webapp/management/join-project.jsp
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/project-docent.jsp b/gemeinsamforschen/src/main/webapp/project-docent.jsp
index d22be2837be9dad091e7b50a71f7344bfbcc8f8c..c9d73b608c4a8aacd74b020445a7db1d93349534 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/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