diff --git a/gemeinsamforschen/src/main/webapp/annotation/see-feedback.jsp b/gemeinsamforschen/src/main/webapp/annotation/see-feedback.jsp index badba6504bac5a8ab8c7b6526cb2a4ac16333e27..508409665b27e684ffea54d455841a18034cf4d3 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 4610fe8fe650751325f6ba663b65db50ebaa828c..ed29a6720b2decc5960e138e0091dd054abc165a 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 3621e6e4bbb551063cdc50295c5a070f7d3e9b8f..48ba23e59eca0f7d0d03bbd4d6837cee04bfbf48 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 06342ab52afcf41632961a612492f399af45d56a..69eddb784c1c8b16a6d005534a69cf304072c680 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 1b0154800711dec64074f6a7c4ab6f0f07b96a97..83a236d77b01fce26ccaa426e478fb06eae902d0 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 77ae7f383cf9fb28680dcdb6fe1910ccee0f44aa..35760eec6d83491ef1c59e3950259b41d5371c0e 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 d3ecab2d952533290437ef7eb7fbcda24296f819..678ecf82e7a32884208efeb384e6ff0046eb6f3d 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 8e8f2fe2bbe62c3c1b88551297253d73eefd0e29..67f8caf57a1782f332c3e976183bbbebec59cad6 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 46295c74034613d3929b6a51e6ba62caa950a147..1d8c81f138a64040d6e2863be7702ad93fba5cf9 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 ecc02a0c96d8c8349e5b8f227c1ce8471a7ab024..5d6386e287b0b5efbf7f99883305454a355adade 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 d28a1e5672d7533db99fab754ecc38741b7d7c9f..dcd2c620c92a838e68918096315a48c952408a83 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 ab4947622b80ab055221bece971ea584f7f31cb8..d81b23b7509844f60d0e5c35995f56a78ec15733 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 738c83f6cb02e6d83a0c812929737b58d5176e4b..2cf5978a9efd93116c0f34007f09043d63d1f5aa 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>