From 8956063c6debe6e6fe2759ea34dcffc3bb10612f Mon Sep 17 00:00:00 2001
From: wiepke <wiepke@uni-potsdam.de>
Date: Fri, 21 Jun 2019 15:12:53 +0200
Subject: [PATCH] fixing issue #60
---
.../main/webapp/annotation/see-feedback.jsp | 2 +-
.../upload-unstructured-dossier.jsp | 2 +-
.../main/webapp/assessment/final-grades.jsp | 2 +-
.../assessment/rate-contribution-teacher.jsp | 2 +-
.../webapp/assessment/rate-contribution.jsp | 2 +-
.../webapp/assessment/upload-final-report.jsp | 2 +-
.../webapp/assessment/upload-presentation.jsp | 2 +-
.../groupfinding/create-groups-manual.jsp | 2 +-
.../main/webapp/project/delete-project.jsp | 2 +-
.../src/main/webapp/project/js/tasks.js | 4 +-
.../src/main/webapp/survey/assess-group.jsp | 6 +--
.../src/main/webapp/survey/enterGFM.jsp | 2 +-
.../src/main/webapp/taglibs/timeLine.jsp | 40 +++++++++----------
13 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/gemeinsamforschen/src/main/webapp/annotation/see-feedback.jsp b/gemeinsamforschen/src/main/webapp/annotation/see-feedback.jsp
index badba650..50840966 100644
--- a/gemeinsamforschen/src/main/webapp/annotation/see-feedback.jsp
+++ b/gemeinsamforschen/src/main/webapp/annotation/see-feedback.jsp
@@ -59,7 +59,7 @@
<main id="seeFeedback" class="">
<div class="row group">
<div class="col span_2_of_2">
- <h3>Das Feedback für ihr <span class="fileRole"></span></h3>
+ <h1>Feedback für ihr <span class="fileRole"></span></h1>
<br>
<div class="three_rows">
diff --git a/gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-dossier.jsp b/gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-dossier.jsp
index 4610fe8f..ed29a672 100644
--- a/gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-dossier.jsp
+++ b/gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-dossier.jsp
@@ -65,7 +65,7 @@
<div id="headerTemplateResult"></div>
<script id="headerTemplate" type="text/x-jsrender">
<div></div>
- <h2>{{:header}} anlegen</h2>
+ <h1>{{:header}} anlegen</h1>
</script>
diff --git a/gemeinsamforschen/src/main/webapp/assessment/final-grades.jsp b/gemeinsamforschen/src/main/webapp/assessment/final-grades.jsp
index 3621e6e4..48ba23e5 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/final-grades.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/final-grades.jsp
@@ -31,7 +31,7 @@
<main>
<div class="row group">
<div class="col span_content span_l_of_2">
- <h2>Abschließende Noten vergeben</h2>
+ <h1>Abschließende Noten vergeben</h1>
<div class="alert alert-success" id="taskCompleted">
Die Zensuren wurden gespeichert.
</div>
diff --git a/gemeinsamforschen/src/main/webapp/assessment/rate-contribution-teacher.jsp b/gemeinsamforschen/src/main/webapp/assessment/rate-contribution-teacher.jsp
index 06342ab5..69eddb78 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/rate-contribution-teacher.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/rate-contribution-teacher.jsp
@@ -28,7 +28,7 @@
<main>
<div class="row group">
<div class="col span_content span_1_of_2">
- <h2>Bewerte Gruppe <span id="groupId"></span></h2>
+ <h1>Bewerte Gruppe <span id="groupId"></span></h1>
<div id="listOfContributions">
</div>
<script id="contributionTemplate" type="text/x-jQuery-tmpl">
diff --git a/gemeinsamforschen/src/main/webapp/assessment/rate-contribution.jsp b/gemeinsamforschen/src/main/webapp/assessment/rate-contribution.jsp
index 1b015480..83a236d7 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/rate-contribution.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/rate-contribution.jsp
@@ -28,7 +28,7 @@
<main>
<div class="row group">
<div class="col span_content span_l_of_2">
- <h2>Bewerte Gruppe <span id="groupId"></span></h2>
+ <h1>Bewerte Gruppe <span id="groupId"></span></h1>
<div id="listOfContributions">
</div>
<script id="contributionTemplate" type="text/x-jQuery-tmpl">
diff --git a/gemeinsamforschen/src/main/webapp/assessment/upload-final-report.jsp b/gemeinsamforschen/src/main/webapp/assessment/upload-final-report.jsp
index 77ae7f38..35760eec 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/upload-final-report.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/upload-final-report.jsp
@@ -36,7 +36,7 @@
<main>
<div class="row group">
<div class="col span_content span_2_of_2">
- <h2>Abschlussbericht hochladen</h2>
+ <h1>Abschlussbericht hochladen</h1>
<div id="result"></div>
<script id="headerTemplate" type="text/x-jsrender">
diff --git a/gemeinsamforschen/src/main/webapp/assessment/upload-presentation.jsp b/gemeinsamforschen/src/main/webapp/assessment/upload-presentation.jsp
index d3ecab2d..678ecf82 100644
--- a/gemeinsamforschen/src/main/webapp/assessment/upload-presentation.jsp
+++ b/gemeinsamforschen/src/main/webapp/assessment/upload-presentation.jsp
@@ -36,7 +36,7 @@
<main>
<div class="row group">
<div class="col span_content span_2_of_2">
- <h2>Präsentation hochladen</h2>
+ <h1>Präsentation hochladen</h1>
<div id="result"></div>
<script id="headerTemplate" type="text/x-jsrender">
<h2>{{:header}} anlegen</h2>
diff --git a/gemeinsamforschen/src/main/webapp/groupfinding/create-groups-manual.jsp b/gemeinsamforschen/src/main/webapp/groupfinding/create-groups-manual.jsp
index 8e8f2fe2..67f8caf5 100644
--- a/gemeinsamforschen/src/main/webapp/groupfinding/create-groups-manual.jsp
+++ b/gemeinsamforschen/src/main/webapp/groupfinding/create-groups-manual.jsp
@@ -55,7 +55,7 @@
<div class="row group">
- <h2>Gruppeneinteilung</h2>
+ <h1>Gruppeneinteilung</h1>
<div class="info-message">
<p>Wählen Sie die Studenten an, die sie verschieben wollen. Dann die Gruppe,
diff --git a/gemeinsamforschen/src/main/webapp/project/delete-project.jsp b/gemeinsamforschen/src/main/webapp/project/delete-project.jsp
index 46295c74..1d8c81f1 100644
--- a/gemeinsamforschen/src/main/webapp/project/delete-project.jsp
+++ b/gemeinsamforschen/src/main/webapp/project/delete-project.jsp
@@ -26,7 +26,7 @@
</jsp:include>
<main>
<div class="col span_2_of_2">
- <h2>Löschen eines Projekts</h2>
+ <h1>Löschen eines Projekts</h1>
<p style="margin-left:10px;">Bestätigen Sie das Löschen des Projekts durch Eingabe des Projektnamens:</p>
<input class="form-control" type="text" id="projectNameInput" name="Project" required
placeholder="Projekt1" autofocus
diff --git a/gemeinsamforschen/src/main/webapp/project/js/tasks.js b/gemeinsamforschen/src/main/webapp/project/js/tasks.js
index ecc02a0c..5d6386e2 100644
--- a/gemeinsamforschen/src/main/webapp/project/js/tasks.js
+++ b/gemeinsamforschen/src/main/webapp/project/js/tasks.js
@@ -60,7 +60,7 @@ function handlePhases(object, result) {
break;
case "DossierFeedback":
result.phase = "card-feedback";
- result.headLine = "Entwurfsphase";
+ result.headLine = "Entwurf";
break;
case "Execution":
result.phase = "card-execution";
@@ -68,7 +68,7 @@ function handlePhases(object, result) {
break;
case "Assessment":
result.phase = "card-assessment";
- result.headLine = "Bewertungsphase";
+ result.headLine = "Bewertung";
break;
case "GRADING":
result.phase = "card-grades";
diff --git a/gemeinsamforschen/src/main/webapp/survey/assess-group.jsp b/gemeinsamforschen/src/main/webapp/survey/assess-group.jsp
index d28a1e56..dcd2c620 100644
--- a/gemeinsamforschen/src/main/webapp/survey/assess-group.jsp
+++ b/gemeinsamforschen/src/main/webapp/survey/assess-group.jsp
@@ -15,7 +15,7 @@
<body>
<div id="theTextPageGer">
<div class="row group">
- <h2>Bewertung Ihrer Gruppe</h2>
+ <h1>Bewertung Ihrer Gruppe</h1>
<br>
<p> Vielen Dank für Ihre Zeit und Ihr Interesse an dieser Studie bis zum Ende teil zu nehmen.
Hier bewerten Sie die Teamfähigkeit Ihrer Gruppenmitglieder.<br>
@@ -29,7 +29,7 @@
</div>
<div id="theTextPageEn" class="collapse">
<div class="row group">
- <h2>Assess your group</h2>
+ <h1>Assess your group</h1>
<br>
<p> Thanks a lot for your time and your interest to participate in this study.
Here you can evaluate your group members by meanings of their skills to work in a team.<br>
@@ -42,7 +42,7 @@
</div>
<div class="row group">
<div id="groupAssessment">
- <h2>under Construction</h2>
+ <h1>under Construction</h1>
<div id="ifUserIsSet">
<jsp:include page="../assessment/assess-work-body.jsp"/>
</div>
diff --git a/gemeinsamforschen/src/main/webapp/survey/enterGFM.jsp b/gemeinsamforschen/src/main/webapp/survey/enterGFM.jsp
index ab494762..d81b23b7 100644
--- a/gemeinsamforschen/src/main/webapp/survey/enterGFM.jsp
+++ b/gemeinsamforschen/src/main/webapp/survey/enterGFM.jsp
@@ -53,7 +53,7 @@
<div id="welcomeTextHolder" class="collapse in"></div>
<script id="welcomeTextTemplate" type="text/x-jQuery-tmpl">
<div class="row group">
- <h2>${welcomeTitle}</h2>
+ <h1>${welcomeTitle}</h2>
${welcomeText}
<button id="welcomeNextButton" class="btn btn-primary right">${buttonLabel}</button>
</div>
diff --git a/gemeinsamforschen/src/main/webapp/taglibs/timeLine.jsp b/gemeinsamforschen/src/main/webapp/taglibs/timeLine.jsp
index 738c83f6..2cf5978a 100644
--- a/gemeinsamforschen/src/main/webapp/taglibs/timeLine.jsp
+++ b/gemeinsamforschen/src/main/webapp/taglibs/timeLine.jsp
@@ -13,35 +13,35 @@
<ul>
<% if (phase != null) {%>
<% if (phase == Phase.GroupFormation) {%>
- <li class="icon phase1">Projektinitialisierung</li>
- <li class="icon inactive phase2 ">Entwurfsphase</li>
+ <li class="icon phase1">Gruppenbildung</li>
+ <li class="icon inactive phase2 ">Entwurf</li>
<li class="icon inactive phase4">Durchführung</li>
- <li class="icon inactive phase5">Assessment</li>
- <li class="icon inactive phase6">Noten</li>
+ <li class="icon inactive phase5">Bewertung</li>
+ <li class="icon inactive phase6">Projektabschluss</li>
<%} else if (phase == Phase.DossierFeedback) {%>
- <li class="icon closed phase1">Projektinitialisierung</li>
- <li class="icon phase2">Entwurfsphase</li>
+ <li class="icon closed phase1">Gruppenbildung</li>
+ <li class="icon phase2">Entwurf</li>
<li class="icon inactive phase4">Durchführung</li>
- <li class="icon inactive phase5">Assessment</li>
- <li class="icon inactive phase6">Noten</li>
+ <li class="icon inactive phase5">Bewertung</li>
+ <li class="icon inactive phase6">Projektabschluss</li>
<%} else if (phase == Phase.Execution) {%>
- <li class="neutral icon closed phase1">Projektinitialisierung</li>
- <li class="draft icon closed phase2">Entwurfsphase</li>
+ <li class="neutral icon closed phase1">Gruppenbildung</li>
+ <li class="draft icon closed phase2">Entwurf</li>
<li class="icon phase4">Durchführung</li>
- <li class="icon inactive phase5">Assessment</li>
- <li class="icon inactive phase6">Noten</li>
+ <li class="icon inactive phase5">Bewertung</li>
+ <li class="icon inactive phase6">Projektabschluss</li>
<%} else if (phase == Phase.Assessment) {%>
- <li class="neutral icon closed phase1">Projektinitialisierung</li>
- <li class="draft icon closed phase2">Entwurfsphase</li>
+ <li class="neutral icon closed phase1">Gruppenbildung</li>
+ <li class="draft icon closed phase2">Entwurf</li>
<li class="icon closed phase4">Durchführung</li>
- <li class="icon phase5">Assessment</li>
- <li class="icon inactive phase6">Noten</li>
+ <li class="icon phase5">Bewertung</li>
+ <li class="icon inactive phase6">Projektabschluss</li>
<%} else if (phase == Phase.GRADING) {%>
- <li class="icon closed phase1">Projektinitialisierung</li>
- <li class="icon closed phase2">Entwurfsphase</li>
+ <li class="icon closed phase1">Gruppenbildung</li>
+ <li class="icon closed phase2">Entwurf</li>
<li class="icon closed phase4">Durchführung</li>
- <li class="icon closed phase5">Assessment</li>
- <li class="icon phase6">Noten</li>
+ <li class="icon closed phase5">Bewertung</li>
+ <li class="icon phase6">Projektabschluss</li>
<%}%>
<%}%>
</ul>
--
GitLab