From ab6d63381b964eb951bd0946e1f206fb158c6ab7 Mon Sep 17 00:00:00 2001
From: Julian Dehne <julian.dehne@uni-potsdam.de>
Date: Wed, 12 Sep 2018 16:37:34 +0200
Subject: [PATCH] - started working on group finding prototyp (basic group
management prototyp for development - not advanced groupfinding i.e. mirjams
project)
---
.../webapp/annotation/upload-unstructured-annotation.jsp | 2 +-
.../src/main/webapp/assessment/Quiz-docent.jsp | 2 +-
gemeinsamforschen/src/main/webapp/assessment/Quiz.jsp | 2 +-
.../src/main/webapp/assessment/assess-work.jsp | 2 +-
.../src/main/webapp/assessment/calculate-assessment.jsp | 2 +-
.../src/main/webapp/assessment/create-quiz.jsp | 2 +-
.../src/main/webapp/assessment/rate-contribution.jsp | 2 +-
.../src/main/webapp/assessment/take-quiz.jsp | 2 +-
.../src/main/webapp/assessment/view-quiz.jsp | 2 +-
.../src/main/webapp/feedback/give-feedback.jsp | 2 +-
.../src/main/webapp/feedback/view-feedback.jsp | 2 +-
.../src/main/webapp/groupfinding/create-groups.jsp | 2 +-
gemeinsamforschen/src/main/webapp/hierachyLevel.js | 8 --------
gemeinsamforschen/src/main/webapp/journal/eportfolio.jsp | 2 +-
.../src/main/webapp/management/change-phase.jsp | 2 +-
gemeinsamforschen/src/main/webapp/overview-docent.jsp | 2 +-
gemeinsamforschen/src/main/webapp/overview-student.jsp | 2 +-
gemeinsamforschen/src/main/webapp/profile/profile.jsp | 2 +-
gemeinsamforschen/src/main/webapp/project-student.jsp | 2 +-
19 files changed, 18 insertions(+), 26 deletions(-)
delete mode 100644 gemeinsamforschen/src/main/webapp/hierachyLevel.js
diff --git a/gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-annotation.jsp b/gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-annotation.jsp
index 841201f1..7a8b20cc 100644
--- a/gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-annotation.jsp
+++ b/gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-annotation.jsp
@@ -26,7 +26,7 @@
<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/assessment/Quiz-docent.jsp b/gemeinsamforschen/src/main/webapp/assessment/Quiz-docent.jsp
index cadbae85..f89ae966 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/Quiz-docent.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/Quiz-docent.jsp
@@ -12,7 +12,7 @@
<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 269730f7..217456d0 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/Quiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/Quiz.jsp
@@ -12,7 +12,7 @@
<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 b9419ffe..c0808372 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/assess-work.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/assess-work.jsp
@@ -15,7 +15,7 @@
<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 7c9288d6..8f7735d9 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/calculate-assessment.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/calculate-assessment.jsp
@@ -13,7 +13,7 @@
<script src="../libs/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 01e2f596..bd089a28 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/create-quiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/create-quiz.jsp
@@ -12,7 +12,7 @@
<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/rate-contribution.jsp b/gemeinsamforschen/src/main/webapp/assessment/rate-contribution.jsp
index 1e5394cb..92b842c7 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/rate-contribution.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/rate-contribution.jsp
@@ -16,7 +16,7 @@
<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 e82ec96f..15d5f145 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/take-quiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/take-quiz.jsp
@@ -14,7 +14,7 @@
<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 905b5cfa..480d9480 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/view-quiz.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/view-quiz.jsp
@@ -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/feedback/give-feedback.jsp b/gemeinsamforschen/src/main/webapp/feedback/give-feedback.jsp
index f859fb4f..cc3f1dce 100644
--- a/gemeinsamforschen/src/main/webapp/feedback/give-feedback.jsp
+++ b/gemeinsamforschen/src/main/webapp/feedback/give-feedback.jsp
@@ -42,7 +42,7 @@
<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/feedback/view-feedback.jsp b/gemeinsamforschen/src/main/webapp/feedback/view-feedback.jsp
index d88f212e..82d61d9d 100644
--- a/gemeinsamforschen/src/main/webapp/feedback/view-feedback.jsp
+++ b/gemeinsamforschen/src/main/webapp/feedback/view-feedback.jsp
@@ -17,7 +17,7 @@
<body>
<div id="wrapper">
- <menu:menu/>
+ <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.jsp b/gemeinsamforschen/src/main/webapp/groupfinding/create-groups.jsp
index 602a75f9..d6add537 100644
--- a/gemeinsamforschen/src/main/webapp/groupfinding/create-groups.jsp
+++ b/gemeinsamforschen/src/main/webapp/groupfinding/create-groups.jsp
@@ -11,7 +11,7 @@
<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/hierachyLevel.js b/gemeinsamforschen/src/main/webapp/hierachyLevel.js
deleted file mode 100644
index 150cd4bd..00000000
--- a/gemeinsamforschen/src/main/webapp/hierachyLevel.js
+++ /dev/null
@@ -1,8 +0,0 @@
-
-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/journal/eportfolio.jsp b/gemeinsamforschen/src/main/webapp/journal/eportfolio.jsp
index d0213af7..03c5f197 100644
--- a/gemeinsamforschen/src/main/webapp/journal/eportfolio.jsp
+++ b/gemeinsamforschen/src/main/webapp/journal/eportfolio.jsp
@@ -13,7 +13,7 @@
<body>
<div id="wrapper">
- <menu:menu/>
+ <menu:menu hierarchy="1"/>
<div class="page-content-wrapper">
<div class="container-fluid">
diff --git a/gemeinsamforschen/src/main/webapp/management/change-phase.jsp b/gemeinsamforschen/src/main/webapp/management/change-phase.jsp
index 0d839552..b9593ad8 100644
--- a/gemeinsamforschen/src/main/webapp/management/change-phase.jsp
+++ b/gemeinsamforschen/src/main/webapp/management/change-phase.jsp
@@ -13,7 +13,7 @@
<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/overview-docent.jsp b/gemeinsamforschen/src/main/webapp/overview-docent.jsp
index da97fca3..9c6923cc 100644
--- a/gemeinsamforschen/src/main/webapp/overview-docent.jsp
+++ b/gemeinsamforschen/src/main/webapp/overview-docent.jsp
@@ -13,7 +13,7 @@
<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 214a8cf0..16152f87 100644
--- a/gemeinsamforschen/src/main/webapp/overview-student.jsp
+++ b/gemeinsamforschen/src/main/webapp/overview-student.jsp
@@ -14,7 +14,7 @@
<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 f147f773..3cf72006 100644
--- a/gemeinsamforschen/src/main/webapp/profile/profile.jsp
+++ b/gemeinsamforschen/src/main/webapp/profile/profile.jsp
@@ -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-student.jsp b/gemeinsamforschen/src/main/webapp/project-student.jsp
index 980415f8..879292b0 100644
--- a/gemeinsamforschen/src/main/webapp/project-student.jsp
+++ b/gemeinsamforschen/src/main/webapp/project-student.jsp
@@ -22,7 +22,7 @@
<body>
<div id="wrapper">
- <menu:menu/>
+ <menu:menu hierarchy="0"/>
<div class="page-content-wrapper">
<headLine:headLine/>
--
GitLab