From 83122f460c4fdc11b3a2391d5b17ca86806f0845 Mon Sep 17 00:00:00 2001
From: Axel <wiepke@uni-potsdam.de>
Date: Thu, 4 Oct 2018 15:32:30 +0200
Subject: [PATCH] horizontal menu
---
.../main/java/unipotsdam/gf/taglibs/Menu.java | 97 ++---------
.../webapp/annotation/annotation-document.jsp | 163 +++++++++---------
.../create-unstructured-annotation.jsp | 4 +-
.../upload-unstructured-annotation.jsp | 4 +-
.../main/webapp/assessment/Quiz-docent.jsp | 2 +-
.../src/main/webapp/assessment/Quiz.jsp | 2 +-
.../main/webapp/assessment/assess-work.jsp | 2 +-
.../main/webapp/assessment/create-quiz.jsp | 2 +-
.../webapp/assessment/project-docent_CG.jsp | 2 +-
.../webapp/assessment/rate-contribution.jsp | 2 +-
.../src/main/webapp/assessment/take-quiz.jsp | 2 +-
.../src/main/webapp/assessment/view-quiz.jsp | 4 +-
.../main/webapp/feedback/give-feedback.jsp | 21 +--
.../main/webapp/feedback/view-feedback.jsp | 2 +-
.../create-groups-learninggoal.jsp | 4 +-
.../webapp/groupfinding/enter-preferences.jsp | 6 +-
.../main/webapp/journal/create-journal.jsp | 3 +-
.../main/webapp/journal/edit-description.jsp | 6 +-
.../src/main/webapp/journal/eportfolio.jsp | 3 +-
.../src/main/webapp/profile/profile.jsp | 2 +-
.../src/main/webapp/project/change-phase.jsp | 2 +-
.../main/webapp/project/create-project.jsp | 3 +-
.../main/webapp/project/delete-project.jsp | 4 +-
.../project/edit-assessment-settings.jsp | 5 +-
.../webapp/project/edit-group-settings.jsp | 5 +-
.../main/webapp/project/enroll-project.jsp | 1 +
.../src/main/webapp/project/join-project.jsp | 4 +-
.../main/webapp/project/overview-docent.jsp | 2 +-
.../main/webapp/project/overview-student.jsp | 2 +-
.../src/main/webapp/project/tasks-docent.jsp | 1 +
.../src/main/webapp/project/tasks-student.jsp | 20 +--
.../researchReport/create-bibliography.jsp | 4 +-
.../webapp/researchReport/create-concept.jsp | 2 +-
.../researchReport/create-evaluation.jsp | 4 +-
.../webapp/researchReport/create-method.jsp | 4 +-
.../webapp/researchReport/create-overview.jsp | 3 +-
.../create-process-description.jsp | 4 +-
.../webapp/researchReport/create-question.jsp | 4 +-
.../webapp/researchReport/create-research.jsp | 4 +-
.../webapp/researchReport/create-title.jsp | 3 +-
40 files changed, 150 insertions(+), 264 deletions(-)
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/taglibs/Menu.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/taglibs/Menu.java
index abf0f193..a6d08a81 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/taglibs/Menu.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/taglibs/Menu.java
@@ -1,15 +1,11 @@
package unipotsdam.gf.taglibs;
import unipotsdam.gf.mysql.MysqlConnect;
-import unipotsdam.gf.modules.project.ProjectDAO;
import unipotsdam.gf.modules.user.User;
import unipotsdam.gf.modules.user.UserDAO;
import unipotsdam.gf.session.GFContexts;
-import unipotsdam.gf.modules.states.ProjectPhase;
-import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.SimpleTagSupport;
@@ -30,95 +26,26 @@ public class Menu extends SimpleTagSupport {
String userEmail = request.getSession().getAttribute(GFContexts.USEREMAIL).toString();
String projectName=request.getParameter(GFContexts.PROJECTNAME);
- ProjectPhase projectPhase;
- try {
- ProjectDAO projectDAO = new ProjectDAO(new MysqlConnect());
- projectPhase = projectDAO.getProjectByName(projectName).getPhase();
- } catch (Exception e) {
- projectPhase = null;
- }
JspWriter out = getJspContext().getOut();
UserDAO userDAO = new UserDAO(new MysqlConnect());
if (userEmail != null) {
User user = userDAO.getUserByEmail(userEmail);
Boolean isStudent = user.getStudent();
+ String menuString = "" +
+ " <nav class=\"navbar navbar-dark\" style=\"background-color:#2020D0;\">\n" +
+ " <ul class=\"nav navbar-nav navbar-left\">\n" +
+ " <li class=\"nav-item\"><a class=\"nav-link\" href=\"" + OmniDependencies.hierarchyToString(hierarchyLevel) + "overview-student.jsp?projectName=" + projectName + "\">meine Projekte</a></li>\n" +
+ " <li class=\"nav-item\"><a class=\"nav-link\" href=\"" + OmniDependencies.hierarchyToString(hierarchyLevel) + "profile/profile.jsp?projectName=" + projectName + "\">Profil</a></li>\n"+
+ " </ul>" +
+ " <ul class=\"nav navbar-nav navbar-right\">" +
+ " <li class=\"nav-item\"><a class=\"nav-link\" id=\"logout\" style=\"cursor:pointer\">Logout</a></li>\n" +
+ " <li class=\"nav-item\"><a> </a></li>"+
+ " </ul>\n" +
+ " </nav>";
+ out.println(menuString);
if (isStudent) {
- String menuString = "<div id=\"sidebar-wrapper\">\n" +
- " <ul class=\"sidebar-nav\">\n" +
- " <li class=\"sidebar-brand\"><a href=\"" + OmniDependencies.hierarchyToString(hierarchyLevel) + "overview-student.jsp" + userEmail + "&projectName=" + projectName + "\">overview</a></li>\n" +
- " <li><a href=\"" + OmniDependencies.hierarchyToString(hierarchyLevel) + "profile/profile.jsp" + userEmail + "&projectName=" + projectName + "\">Profil</a></li>\n";
- if (projectPhase != null) {
- switch (projectPhase){
- case CourseCreation:{
- menuString += " <li><p>Quizfrage</p></li>\n" +
- " <li><a href=\"" + OmniDependencies.hierarchyToString(hierarchyLevel) + "journal/eportfolio.jsp" + userEmail + "&projectName=" + projectName + "\">ePortfolio</a></li>\n" +
- " <li><p>Beitrag</p></li>\n" +
- " <li><p>Bewertung</p></li>\n";
- break;
- }
- case GroupFormation:{
- menuString += " <li><p>Quizfrage</p></li>\n" +
- " <li><a href=\"" + OmniDependencies.hierarchyToString(hierarchyLevel) + "journal/eportfolio.jsp" + userEmail + "&projectName=" + projectName + "\">ePortfolio</a></li>\n" +
- " <li><p>Beitrag</p></li>\n" +
- " <li><p>Bewertung</p></li>\n";
- break;
- }
- case DossierFeedback:{
- menuString += " <li><p>Quizfrage</p></li>\n" +
- " <li><a href=\"" + OmniDependencies.hierarchyToString(hierarchyLevel) + "journal/eportfolio.jsp" + userEmail + "&projectName=" + projectName + "\">ePortfolio</a></li>\n" +
- " <li><a href=\"" + OmniDependencies.hierarchyToString(hierarchyLevel) + "researchReport/create-title.jsp" + userEmail + "&projectName=" + projectName + "\">Beitrag</a></li>\n" +
- " <li><p>Bewertung</p></li>\n";
- break;
- }
- case Execution:{
- menuString += " <li><a href=\"" + OmniDependencies.hierarchyToString(hierarchyLevel) + "assessment/Quiz.jsp" + userEmail + "&projectName=" + projectName + "\">Quizfrage</a></li>\n" +
- " <li><a href=\"" + OmniDependencies.hierarchyToString(hierarchyLevel) + "journal/eportfolio.jsp" + userEmail + "&projectName=" + projectName + "\">ePortfolio</a></li>\n" +
- " <li><a href=\"" + OmniDependencies.hierarchyToString(hierarchyLevel) + "researchReport/create-title.jsp" + userEmail + "&projectName=" + projectName + "\">Beitrag</a></li>\n" +
- " <li><p>Bewertung</p></li>\n";
- break;
- }
- case Assessment:{
- menuString += " <li><p>Quizfrage</p></li>\n" +
- " <li><p>ePortfolio</p></li>\n" +
- " <li><p>Beitrag</p></li>\n" +
- " <li><a id=\"assessment\" style=\"cursor:pointer\">Bewertung</a></li>\n";
- break;
- }
- case Projectfinished:{
- menuString += " <li><p>Quizfrage</p></li>\n" +
- " <li><p>ePortfolio</p></li>\n" +
- " <li><p>Beitrag</p></li>\n" +
- " <li><p>Bewertung</p></li>\n";
- break;
- }
- }
- }
-
- menuString += "<li>" +
- "<a id=\"logout\" style=\"cursor:pointer\">Logout</a></li>\n" +
- "</ul>\n" +
- " </div>";
- out.println(menuString);
out.println("<p id=\"userRole\" hidden>isStudent</p>");
} else {
- String menuString = "<div id=\"sidebar-wrapper\">\n" +
- " <ul class=\"sidebar-nav\">\n" +
- " <li class=\"sidebar-brand\"><a href=\"" + OmniDependencies.hierarchyToString(hierarchyLevel) + "overview-docent.jsp" + userEmail + "&projectName=" + projectName + "\">overview</a></li>\n";
- if (projectPhase != null) {
- if (!projectPhase.equals(ProjectPhase.GroupFormation)) {
- menuString += "<li><a href=\"" + OmniDependencies.hierarchyToString(hierarchyLevel) + "assessment/Quiz-docent.jsp" + userEmail + "&projectName=" + projectName + "\">Quizfrage</a></li>\n" +
- " <li><p>Gruppen erstellen</p></li>\n" +
- " <li><a href=\"" + OmniDependencies.hierarchyToString(hierarchyLevel) + "management/change-phase.jsp" + userEmail + "&projectName=" + projectName + "\">Projektphase ändern</a></li>\n";
- } else {
- menuString += "<li><a href=\"" + OmniDependencies.hierarchyToString(hierarchyLevel) + "assessment/quiz-docent.jsp" + userEmail + "&projectName=" + projectName + "\">Quizfrage</a></li>\n" +
- " <li><a href=\"" + OmniDependencies.hierarchyToString(hierarchyLevel) + "groupfinding/create-groups.jsp" + userEmail + "&projectName=" + projectName + "\">Gruppen erstellen</a></li>\n" +
- " <li><a href=\"" + OmniDependencies.hierarchyToString(hierarchyLevel) + "management/change-phase.jsp" + userEmail + "&projectName=" + projectName + "\">Projektphase ändern</a></li>\n";
- }
- }
- menuString += "<li><a id=\"logout\" style=\"cursor:pointer\">Logout</a></li>\n" +
- "</ul>\n" +
- " </div>";
- out.println(menuString);
out.println("<p id=\"userRole\" hidden>isDocent</p>");
}
} else {
diff --git a/gemeinsamforschen/src/main/webapp/annotation/annotation-document.jsp b/gemeinsamforschen/src/main/webapp/annotation/annotation-document.jsp
index 18f8fa15..80936e47 100644
--- a/gemeinsamforschen/src/main/webapp/annotation/annotation-document.jsp
+++ b/gemeinsamforschen/src/main/webapp/annotation/annotation-document.jsp
@@ -1,4 +1,4 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
<%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="menu" %>
<%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="headLine" %>
<%@ taglib uri="../taglibs/gemeinsamForschen.tld" prefix="omniDependencies" %>
@@ -13,14 +13,17 @@
<!-- css - annotationStyle -->
<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" />
+ <link href="https://swisnl.github.io/jQuery-contextMenu/dist/jquery.contextMenu.css" rel="stylesheet"
+ type="text/css"/>
<!-- js - jQuery validation plugin -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.14.0/jquery.validate.min.js"></script>
<!-- js - jQuery ui position -->
- <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js" type="text/javascript"></script>
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"
+ type="text/javascript"></script>
<!-- js - contextMenu script -->
- <script src="https://swisnl.github.io/jQuery-contextMenu/dist/jquery.contextMenu.js" type="text/javascript"></script>
+ <script src="https://swisnl.github.io/jQuery-contextMenu/dist/jquery.contextMenu.js"
+ type="text/javascript"></script>
<!-- js - scrollTo -->
<script src="//cdn.jsdelivr.net/npm/jquery.scrollto@2.1.2/jquery.scrollTo.min.js"></script>
<!-- js - rangy Core -->
@@ -38,105 +41,107 @@
</head>
<body>
- <div id="wrapper" class="full-height">
- <menu:menu hierarchy="1"/>
- <div class="page-content-wrapper full-height">
- <div class="container-fluid full-height">
- <div class="container-fluid-content">
- <div class="flex">
- <headLine:headLine/>
- </div>
- <div class="content-mainpage">
- <div class="leftcolumn">
- <div class="leftcontent">
- <div class="leftcontent-text context-menu-one" id="documentText"></div>
- <div class="leftcontent-buttons">
- <div class="leftcontent-buttons-back">
- <button id="btnBack" type="button" class="btn btn-secondary">Zurück</button>
- </div>
- <div class="leftcontent-buttons-next">
- <button id="btnContinue" type="button" class="btn btn-primary">Weiter</button>
- </div>
+<menu:menu hierarchy="1"/>
+<div id="wrapper">
+ <div class="page-content-wrapper full-height">
+ <div class="container-fluid full-height">
+ <div class="container-fluid-content">
+ <div class="flex">
+ <headLine:headLine/>
+ </div>
+ <div class="content-mainpage">
+ <div class="leftcolumn">
+ <div class="leftcontent">
+ <div class="leftcontent-text context-menu-one" id="documentText"></div>
+ <div class="leftcontent-buttons">
+ <div class="leftcontent-buttons-back">
+ <button id="btnBack" type="button" class="btn btn-secondary">Zurück</button>
+ </div>
+ <div class="leftcontent-buttons-next">
+ <button id="btnContinue" type="button" class="btn btn-primary">Weiter</button>
</div>
</div>
</div>
- <div class="rightcolumn">
- <input type="text" id="annotation-search" onkeyup="searchAnnotation()"
- placeholder="Suchen...">
- <div class="rightcontent">
- <ol id="annotations">
- </ol>
- </div>
+ </div>
+ <div class="rightcolumn">
+ <input type="text" id="annotation-search" onkeyup="searchAnnotation()"
+ placeholder="Suchen...">
+ <div class="rightcontent">
+ <ol id="annotations">
+ </ol>
</div>
</div>
</div>
</div>
</div>
- <!-- annotation create modal -->
- <div id="annotation-create-modal" class="modal fade" role="dialog">
- <div class="modal-dialog modal-dialog-centered modal-sm">
- <div class="modal-content">
+ </div>
+ <!-- annotation create modal -->
+ <div id="annotation-create-modal" class="modal fade" role="dialog">
+ <div class="modal-dialog modal-dialog-centered modal-sm">
+ <div class="modal-content">
- <!-- modal header -->
- <div class="modal-header flex">
- <h4 class="modal-title flex-one">Annotation</h4>
- <button type="button" class="close" data-dismiss="modal">×</button>
- </div>
+ <!-- modal header -->
+ <div class="modal-header flex">
+ <h4 class="modal-title flex-one">Annotation</h4>
+ <button type="button" class="close" data-dismiss="modal">×</button>
+ </div>
- <!-- modal body -->
- <div class="modal-body">
- <form id="annotation-create-form">
- <div class="form-group">
- <label for="annotation-form-title" class="col-form-label">Titel:</label>
- <input type="text" class="form-control" id="annotation-form-title" name="title">
- </div>
- <div class="form-group">
- <label for="annotation-form-comment" class="col-form-label">Kommentar:</label>
- <textarea class="form-control resize-vertical" id="annotation-form-comment" name="comment"></textarea>
- </div>
- </form>
- <!-- modal footer -->
- <div class="modal-footer">
- <button id="btnSave" type="button" class="btn btn-success">Speichern</button>
+ <!-- modal body -->
+ <div class="modal-body">
+ <form id="annotation-create-form">
+ <div class="form-group">
+ <label for="annotation-form-title" class="col-form-label">Titel:</label>
+ <input type="text" class="form-control" id="annotation-form-title" name="title">
+ </div>
+ <div class="form-group">
+ <label for="annotation-form-comment" class="col-form-label">Kommentar:</label>
+ <textarea class="form-control resize-vertical" id="annotation-form-comment"
+ name="comment"></textarea>
</div>
+ </form>
+ <!-- modal footer -->
+ <div class="modal-footer">
+ <button id="btnSave" type="button" class="btn btn-success">Speichern</button>
</div>
</div>
</div>
</div>
+ </div>
- <!-- annotation edit modal -->
- <div id="annotation-edit-modal" class="modal fade" role="dialog">
- <div class="modal-dialog modal-dialog-centered modal-sm">
- <div class="modal-content">
+ <!-- annotation edit modal -->
+ <div id="annotation-edit-modal" class="modal fade" role="dialog">
+ <div class="modal-dialog modal-dialog-centered modal-sm">
+ <div class="modal-content">
- <!-- modal header -->
- <div class="modal-header flex">
- <h4 class="modal-title flex-one">Annotation bearbeiten</h4>
- <button type="button" class="close" data-dismiss="modal">×</button>
- </div>
+ <!-- modal header -->
+ <div class="modal-header flex">
+ <h4 class="modal-title flex-one">Annotation bearbeiten</h4>
+ <button type="button" class="close" data-dismiss="modal">×</button>
+ </div>
- <!-- modal body -->
- <div class="modal-body">
- <form id="annotation-edit-form">
- <div class="form-group">
- <label for="annotation-form-title" class="col-form-label">Titel:</label>
- <input type="text" class="form-control" id="annotation-edit-form-title" name="title">
- </div>
- <div class="form-group">
- <label for="annotation-form-comment" class="col-form-label">Kommentar:</label>
- <textarea class="form-control resize-vertical" id="annotation-edit-form-comment" name="comment"></textarea>
- </div>
- </form>
- <!-- 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>
+ <!-- modal body -->
+ <div class="modal-body">
+ <form id="annotation-edit-form">
+ <div class="form-group">
+ <label for="annotation-form-title" class="col-form-label">Titel:</label>
+ <input type="text" class="form-control" id="annotation-edit-form-title" name="title">
+ </div>
+ <div class="form-group">
+ <label for="annotation-form-comment" class="col-form-label">Kommentar:</label>
+ <textarea class="form-control resize-vertical" id="annotation-edit-form-comment"
+ name="comment"></textarea>
</div>
+ </form>
+ <!-- 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>
</div>
</div>
</div>
</div>
</div>
+</div>
</body>
</html>
diff --git a/gemeinsamforschen/src/main/webapp/annotation/create-unstructured-annotation.jsp b/gemeinsamforschen/src/main/webapp/annotation/create-unstructured-annotation.jsp
index 6e6244b5..38e1e307 100644
--- a/gemeinsamforschen/src/main/webapp/annotation/create-unstructured-annotation.jsp
+++ b/gemeinsamforschen/src/main/webapp/annotation/create-unstructured-annotation.jsp
@@ -36,8 +36,8 @@
</head>
<body>
-<div id="wrapper" class="full-height">
- <menu:menu hierarchy="1"/>
+<menu:menu hierarchy="1"/>
+<div id="wrapper">
<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 fd4b1034..95f98345 100644
--- a/gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-annotation.jsp
+++ b/gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-annotation.jsp
@@ -26,8 +26,8 @@
</head>
<body>
-<div id="wrapper" class="full-height">
- <menu:menu hierarchy="1"/>
+<menu:menu hierarchy="1"/>
+<div id="wrapper">
<div class="page-content-wrapper full-height">
<div class="container-fluid full-height">
<div class="container-fluid-content">
diff --git a/gemeinsamforschen/src/main/webapp/assessment/Quiz-docent.jsp b/gemeinsamforschen/src/main/webapp/assessment/Quiz-docent.jsp
index a660be75..96d72b69 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/Quiz-docent.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/Quiz-docent.jsp
@@ -11,8 +11,8 @@
</head>
<body>
+<menu:menu hierarchy="1"/>
<div id="wrapper">
- <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 273f075e..c35db38b 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/Quiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/Quiz.jsp
@@ -11,8 +11,8 @@
</head>
<body>
+<menu:menu hierarchy="1"/>
<div id="wrapper">
- <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 396f22ab..bd7cec42 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/assess-work.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/assess-work.jsp
@@ -14,8 +14,8 @@
</head>
<body>
+<menu:menu hierarchy="1"/>
<div id="wrapper">
- <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<headLine:headLine/>
<div>
diff --git a/gemeinsamforschen/src/main/webapp/assessment/create-quiz.jsp b/gemeinsamforschen/src/main/webapp/assessment/create-quiz.jsp
index 84606766..8d3ff770 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/create-quiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/create-quiz.jsp
@@ -11,8 +11,8 @@
</head>
<body>
+<menu:menu hierarchy="1"/>
<div id="wrapper">
- <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 0d13f30e..4af66443 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/project-docent_CG.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/project-docent_CG.jsp
@@ -16,8 +16,8 @@
<body>
+<menu:menu hierarchy="1"/>
<div id="wrapper">
- <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 39092072..f85e9e34 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/rate-contribution.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/rate-contribution.jsp
@@ -15,8 +15,8 @@
</head>
<body>
+<menu:menu hierarchy="1"/>
<div id="wrapper">
- <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 60b9d9fc..2a03069f 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/take-quiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/take-quiz.jsp
@@ -13,8 +13,8 @@
</head>
<body>
+<menu:menu hierarchy="1"/>
<div id="wrapper">
- <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 ff2252ab..2c2ba7e6 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/view-quiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/view-quiz.jsp
@@ -13,10 +13,8 @@
</head>
<body>
-
-
+<menu:menu hierarchy="1"/>
<div id="wrapper">
- <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<headLine:headLine/>
<div>
diff --git a/gemeinsamforschen/src/main/webapp/feedback/give-feedback.jsp b/gemeinsamforschen/src/main/webapp/feedback/give-feedback.jsp
index 44721af0..4a554ea1 100644
--- a/gemeinsamforschen/src/main/webapp/feedback/give-feedback.jsp
+++ b/gemeinsamforschen/src/main/webapp/feedback/give-feedback.jsp
@@ -8,24 +8,7 @@
<html>
<head>
- <%--
- <meta charset="utf-8">
- <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">
- <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">
- <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="js/utility.js"></script>
- <script src="js/project-student.js"></script>
- <link rel="stylesheet" type="text/css" href="../assets/css/editDescription.css">
+
<script src="js/jquery.min.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
<script src="js/Sidebar-Menu.js"></script>
@@ -40,8 +23,8 @@
</head>
<body>
+<menu:menu hierarchy="1"/>
<div id="wrapper">
- <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<headLine:headLine/>
<div>
diff --git a/gemeinsamforschen/src/main/webapp/feedback/view-feedback.jsp b/gemeinsamforschen/src/main/webapp/feedback/view-feedback.jsp
index 83658721..3ff1324a 100644
--- a/gemeinsamforschen/src/main/webapp/feedback/view-feedback.jsp
+++ b/gemeinsamforschen/src/main/webapp/feedback/view-feedback.jsp
@@ -15,8 +15,8 @@
</head>
<body>
+<menu:menu hierarchy="1"/>
<div id="wrapper">
- <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<headLine:headLine/>
<div class="container-fluid">
diff --git a/gemeinsamforschen/src/main/webapp/groupfinding/create-groups-learninggoal.jsp b/gemeinsamforschen/src/main/webapp/groupfinding/create-groups-learninggoal.jsp
index 70b6ccfb..081e7b3f 100644
--- a/gemeinsamforschen/src/main/webapp/groupfinding/create-groups-learninggoal.jsp
+++ b/gemeinsamforschen/src/main/webapp/groupfinding/create-groups-learninggoal.jsp
@@ -24,10 +24,8 @@
</head>
<body>
-
-
+<menu:menu hierarchy="1"/>
<div id="wrapper">
- <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<div class="container-fluid"><a class="btn btn-link" role="button" href="#menu-toggle" id="menu-toggle"></a>
<div class="row">
diff --git a/gemeinsamforschen/src/main/webapp/groupfinding/enter-preferences.jsp b/gemeinsamforschen/src/main/webapp/groupfinding/enter-preferences.jsp
index dbae110c..4d8d1e07 100644
--- a/gemeinsamforschen/src/main/webapp/groupfinding/enter-preferences.jsp
+++ b/gemeinsamforschen/src/main/webapp/groupfinding/enter-preferences.jsp
@@ -6,7 +6,7 @@
<html>
<head>
- <omniDependencies:omniDependencies hierarchy="1"></omniDependencies:omniDependencies>
+ <omniDependencies:omniDependencies hierarchy="1"/>
<script src="js/config.js"></script>
<script src="js/create-preferences.js"></script>
</head>
@@ -18,8 +18,8 @@
<div class="sk-cube4 sk-cube"></div>
<div class="sk-cube3 sk-cube"></div>
</div>
-<div id="wrapper" class="wrapper">
- <menu:menu hierarchy="1"></menu:menu>
+<menu:menu hierarchy="1"/>
+<div id="wrapper">
<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/journal/create-journal.jsp b/gemeinsamforschen/src/main/webapp/journal/create-journal.jsp
index cbfae944..a92e5fbb 100644
--- a/gemeinsamforschen/src/main/webapp/journal/create-journal.jsp
+++ b/gemeinsamforschen/src/main/webapp/journal/create-journal.jsp
@@ -14,9 +14,8 @@
</head>
<body>
+<menu:menu hierarchy="1"/>
<div id="wrapper">
- <menu:menu hierarchy="1"/>
-
<div class="page-content-wrapper">
<div class="container-fluid">
<h1 id="projectName">project1
diff --git a/gemeinsamforschen/src/main/webapp/journal/edit-description.jsp b/gemeinsamforschen/src/main/webapp/journal/edit-description.jsp
index 028d1b87..4cabd404 100644
--- a/gemeinsamforschen/src/main/webapp/journal/edit-description.jsp
+++ b/gemeinsamforschen/src/main/webapp/journal/edit-description.jsp
@@ -11,14 +11,16 @@
</head>
<body>
-
+<menu:menu hierarchy="1"/>
+<div id="wrapper">
<h1> Projektbeschreibung bearbeiten </h1>
<form id="descriptionform" class="form-journal" method="POST"
action="rest/projectdescription/saveText">
<textarea id="editor" name="text" form="descriptionform"></textarea>
-
+ </form>
+</div>
</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 c4149fd0..ecaaf630 100644
--- a/gemeinsamforschen/src/main/webapp/journal/eportfolio.jsp
+++ b/gemeinsamforschen/src/main/webapp/journal/eportfolio.jsp
@@ -13,9 +13,8 @@
</head>
<body>
+<menu:menu hierarchy="1"/>
<div id="wrapper">
- <menu:menu hierarchy="1"/>
-
<div class="page-content-wrapper">
<div class="container-fluid">
<h1 id="projectName">project1
diff --git a/gemeinsamforschen/src/main/webapp/profile/profile.jsp b/gemeinsamforschen/src/main/webapp/profile/profile.jsp
index 4582fe79..685f021e 100644
--- a/gemeinsamforschen/src/main/webapp/profile/profile.jsp
+++ b/gemeinsamforschen/src/main/webapp/profile/profile.jsp
@@ -25,8 +25,8 @@
%>
<body>
+<menu:menu hierarchy="1"/>
<div id="wrapper">
- <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<headLine:headLine/>
diff --git a/gemeinsamforschen/src/main/webapp/project/change-phase.jsp b/gemeinsamforschen/src/main/webapp/project/change-phase.jsp
index 777d8659..7fd80360 100644
--- a/gemeinsamforschen/src/main/webapp/project/change-phase.jsp
+++ b/gemeinsamforschen/src/main/webapp/project/change-phase.jsp
@@ -13,8 +13,8 @@
</head>
<body>
+<menu:menu hierarchy="1"/>
<div id="wrapper">
- <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<headLine:headLine/>
<div class="container-fluid">
diff --git a/gemeinsamforschen/src/main/webapp/project/create-project.jsp b/gemeinsamforschen/src/main/webapp/project/create-project.jsp
index 9ad13e6d..20bf9d1b 100644
--- a/gemeinsamforschen/src/main/webapp/project/create-project.jsp
+++ b/gemeinsamforschen/src/main/webapp/project/create-project.jsp
@@ -24,9 +24,8 @@
</head>
<body>
-
+<menu:menu hierarchy="1"/>
<div id="wrapper">
- <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<div class="container-fluid">
<div class="row">
diff --git a/gemeinsamforschen/src/main/webapp/project/delete-project.jsp b/gemeinsamforschen/src/main/webapp/project/delete-project.jsp
index 808c3964..330fc8e4 100644
--- a/gemeinsamforschen/src/main/webapp/project/delete-project.jsp
+++ b/gemeinsamforschen/src/main/webapp/project/delete-project.jsp
@@ -21,8 +21,8 @@
<body>
<div class="loader-inactive" id="loader"></div>
-<div id="wrapper" class="wrapper">
- <menu:menu hierarchy="1"/>
+<menu:menu hierarchy="1"/>
+<div id="wrapper">
<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/project/edit-assessment-settings.jsp b/gemeinsamforschen/src/main/webapp/project/edit-assessment-settings.jsp
index 23d731bb..536f3138 100644
--- a/gemeinsamforschen/src/main/webapp/project/edit-assessment-settings.jsp
+++ b/gemeinsamforschen/src/main/webapp/project/edit-assessment-settings.jsp
@@ -9,14 +9,15 @@
</head>
<body>
-
+<menu:menu hierarchy="1"/>
+<div id="wrapper">
<h1> Bewertungsverfahren einstellen </h1>
<a
href="edit-group-settings.jsp">
Weiter </a>
-
+</div>
</body>
</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/project/edit-group-settings.jsp b/gemeinsamforschen/src/main/webapp/project/edit-group-settings.jsp
index 5e41f0d0..06250455 100644
--- a/gemeinsamforschen/src/main/webapp/project/edit-group-settings.jsp
+++ b/gemeinsamforschen/src/main/webapp/project/edit-group-settings.jsp
@@ -11,7 +11,8 @@
</head>
<body>
-
+<menu:menu hierarchy="1"/>
+<div id="wrapper">
<h1> Gruppenverfahren festlegen </h1>
@@ -24,7 +25,7 @@
<label for="bp">Basierend auf Präferenzen</label>
<button class="btn btn-primary" style="margin-left:129px;" id="selectGFM">wählen</button>
-
+</div>
</body>
</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/project/enroll-project.jsp b/gemeinsamforschen/src/main/webapp/project/enroll-project.jsp
index c5729bcf..08126dcd 100644
--- a/gemeinsamforschen/src/main/webapp/project/enroll-project.jsp
+++ b/gemeinsamforschen/src/main/webapp/project/enroll-project.jsp
@@ -17,6 +17,7 @@
</head>
<body>
+<menu:menu hierarchy="1"/>
<div class="loader-inactive" id="loader"></div>
<div id="wrapper" class="wrapper">
<div class="page-content-wrapper">
diff --git a/gemeinsamforschen/src/main/webapp/project/join-project.jsp b/gemeinsamforschen/src/main/webapp/project/join-project.jsp
index 0193c522..66ba1f3b 100644
--- a/gemeinsamforschen/src/main/webapp/project/join-project.jsp
+++ b/gemeinsamforschen/src/main/webapp/project/join-project.jsp
@@ -15,8 +15,8 @@
</head>
<body>
-<div id="wrapper" class="wrapper">
- <menu:menu hierarchy="1"/>
+<menu:menu hierarchy="1"/>
+<div id="wrapper">
<div class="page-content-wrapper">
<headLine:headLine/>
<fieldset>
diff --git a/gemeinsamforschen/src/main/webapp/project/overview-docent.jsp b/gemeinsamforschen/src/main/webapp/project/overview-docent.jsp
index 1fa10c25..19f5447c 100644
--- a/gemeinsamforschen/src/main/webapp/project/overview-docent.jsp
+++ b/gemeinsamforschen/src/main/webapp/project/overview-docent.jsp
@@ -12,8 +12,8 @@
</head>
<body>
+<menu:menu hierarchy="1"/>
<div id="wrapper">
- <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<headLine:headLine/>
diff --git a/gemeinsamforschen/src/main/webapp/project/overview-student.jsp b/gemeinsamforschen/src/main/webapp/project/overview-student.jsp
index 725246c6..b2457201 100644
--- a/gemeinsamforschen/src/main/webapp/project/overview-student.jsp
+++ b/gemeinsamforschen/src/main/webapp/project/overview-student.jsp
@@ -12,8 +12,8 @@
</head>
<body>
+<menu:menu hierarchy="1"/>
<div id="wrapper">
- <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<headLine:headLine/>
<div>
diff --git a/gemeinsamforschen/src/main/webapp/project/tasks-docent.jsp b/gemeinsamforschen/src/main/webapp/project/tasks-docent.jsp
index 21be1573..504085e7 100644
--- a/gemeinsamforschen/src/main/webapp/project/tasks-docent.jsp
+++ b/gemeinsamforschen/src/main/webapp/project/tasks-docent.jsp
@@ -11,6 +11,7 @@
<title>Title</title>
</head>
<body>
+<menu:menu hierarchy="1"/>
</body>
</html>
diff --git a/gemeinsamforschen/src/main/webapp/project/tasks-student.jsp b/gemeinsamforschen/src/main/webapp/project/tasks-student.jsp
index efb58806..b7d3132b 100644
--- a/gemeinsamforschen/src/main/webapp/project/tasks-student.jsp
+++ b/gemeinsamforschen/src/main/webapp/project/tasks-student.jsp
@@ -21,22 +21,8 @@
<title>Projecttitle | Gemeinsam Forschen</title>
</head>
<body>
-<header>
- <div class="row ">
- <div class="nav-group-left">
- <a>Home</a>
- <a>Meine Projekte</a>
- </div>
- <div class="nav-group-right">
- <a>Wiki</a>
- <a>Einstellungen</a>
- <a>Logout</a>
-
- </div>
- </div>
-
-
-</header>
+<menu:menu hierarchy="1"/>
+<div id="wrapper">
<main>
<div class="row group">
@@ -116,7 +102,7 @@
</div>
<ul class="list">
<li><a href="#">Feedback 1</a></li>
- <li><a href="#"></a>Feedback 2</a></li>
+ <li><a href="#">Feedback 2</a></li>
</ul>
</div>
diff --git a/gemeinsamforschen/src/main/webapp/researchReport/create-bibliography.jsp b/gemeinsamforschen/src/main/webapp/researchReport/create-bibliography.jsp
index ba62464f..d9a2410b 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/create-bibliography.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-bibliography.jsp
@@ -18,10 +18,8 @@ den Zustand ändert
<link rel="stylesheet" type="text/css" href="css/researchReport.css">
</head>
<body>
-
-
+<menu:menu hierarchy="1"/>
<div id="wrapper">
- <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-concept.jsp b/gemeinsamforschen/src/main/webapp/researchReport/create-concept.jsp
index c91fe86d..a87727de 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/create-concept.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-concept.jsp
@@ -13,7 +13,7 @@
<link rel="stylesheet" type="text/css" href="css/researchReport.css">
</head>
<body>
-
+<menu:menu hierarchy="1"/>
<form id="researchReportform" class="researchReportForm" method="POST" action="../rest/researchReport/save">
diff --git a/gemeinsamforschen/src/main/webapp/researchReport/create-evaluation.jsp b/gemeinsamforschen/src/main/webapp/researchReport/create-evaluation.jsp
index 53e0df42..fa63213f 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/create-evaluation.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-evaluation.jsp
@@ -14,10 +14,8 @@
<title>Forschungsbericht erstellen</title>
</head>
<body>
-
-
+<menu:menu hierarchy="1"/>
<div id="wrapper">
- <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-method.jsp b/gemeinsamforschen/src/main/webapp/researchReport/create-method.jsp
index fa8e8d16..e20f449b 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/create-method.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-method.jsp
@@ -14,10 +14,8 @@
<title>Forschungsbericht erstellen</title>
</head>
<body>
-
-
+<menu:menu hierarchy="1"/>
<div id="wrapper">
- <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-overview.jsp b/gemeinsamforschen/src/main/webapp/researchReport/create-overview.jsp
index 8d74188d..6363e046 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/create-overview.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-overview.jsp
@@ -20,9 +20,8 @@
</head>
<body>
-
+<menu:menu hierarchy="1"/>
<div id="wrapper">
- <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 de418d25..89c31b46 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/create-process-description.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-process-description.jsp
@@ -14,10 +14,8 @@
<title>Forschungsbericht erstellen</title>
</head>
<body>
-
-
+<menu:menu hierarchy="1"/>
<div id="wrapper">
- <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-question.jsp b/gemeinsamforschen/src/main/webapp/researchReport/create-question.jsp
index ef8b20f8..2ff984a8 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/create-question.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-question.jsp
@@ -15,10 +15,8 @@
<title>Forschungsbericht erstellen</title>
</head>
<body>
-
-
+<menu:menu hierarchy="1"/>
<div id="wrapper">
- <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-research.jsp b/gemeinsamforschen/src/main/webapp/researchReport/create-research.jsp
index 28159ce7..914846d7 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/create-research.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-research.jsp
@@ -14,10 +14,8 @@
<title>Forschungsbericht erstellen</title>
</head>
<body>
-
-
+<menu:menu hierarchy="1"/>
<div id="wrapper">
- <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-title.jsp b/gemeinsamforschen/src/main/webapp/researchReport/create-title.jsp
index 17a6e1e8..3078157d 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/create-title.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-title.jsp
@@ -15,9 +15,8 @@
<title>Forschungsbericht erstellen</title>
</head>
<body>
-
+<menu:menu hierarchy="1"/>
<div id="wrapper">
- <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<headLine:headLine/>
<div style="margin-left:50px;">
--
GitLab