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 894babb0db1b7e6ba876ae5f0c700a9a0065792a..73c501bbb15274771422a796529a798599022519 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
@@ -48,13 +48,13 @@ public class Menu extends SimpleTagSupport {
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=\"researchReportTitle.jsp?token="+token+"&projectId="+projectId+"\">Beitrag</a></li>\n" +
+ " <li><a href=\"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" +
+ 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=\"researchReportTitle.jsp?token="+token+"&projectId="+projectId+"\">Beitrag</a></li>\n" +
+ " <li><a href=\"create-title.jsp?token="+token+"&projectId="+projectId+"\">Beitrag</a></li>\n" +
" <li><p>Bewertung</p></li>\n";
}
if (projectPhase.equals(ProjectPhase.Assessment)){
@@ -77,13 +77,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=\"quiz-docent.jsp?token="+token+"&projectId="+projectId+"\">Quizfrage</a></li>\n" +
" <li><p>Gruppen erstellen</p></li>\n" +
- " <li><a href=\"changePhase.jsp?token="+token+"&projectId="+projectId+"\">Projektphase ändern</a></li>\n";
+ " <li><a href=\"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=\"createGroups.jsp?token="+token+"&projectId="+projectId+"\">Gruppen erstellen</a></li>\n" +
- " <li><a href=\"changePhase.jsp?token="+token+"&projectId="+projectId+"\">Projektphase ändern</a></li>\n";
+ 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 id=\"logout\" style=\"cursor:pointer\">Logout</a></li>\n" +
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
index 2c8ef86655468bdb480a69bdf52f9c8c8d24324c..c4147ac2fccb6dd7d7b043cb343a5740f405f96d 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java
@@ -27,10 +27,10 @@ public class Menu extends SimpleTagSupport {
" <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=\"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=\"researchReportOverview.jsp?token="+token+"&projectId="+projectId+"\">Beitrag</a></li>\n" +
- " <li><a href=\"finalAssessments.jsp?token="+token+"&projectId="+projectId+"\">Bewertung</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>");
@@ -38,12 +38,12 @@ public class Menu extends SimpleTagSupport {
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=\"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=\"finalAssessments.jsp?token="+token+"\">Bewertung</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>");
diff --git a/gemeinsamforschen/src/main/webapp/annotation/annotation-document.jsp b/gemeinsamforschen/src/main/webapp/annotation/annotation-document.jsp
index f7700ab8d87be7d2a6f5ab56d09f2f9a8172185e..4fad61deb04cc2559e08863cda6703c5d6ad8d02 100644
--- a/gemeinsamforschen/src/main/webapp/annotation/annotation-document.jsp
+++ b/gemeinsamforschen/src/main/webapp/annotation/annotation-document.jsp
@@ -6,7 +6,6 @@
<!DOCTYPE html>
<html>
-<!-- TODO refactor @Sven: bitte nutze einen Unterordner für dein Modul z.B. webapp/annotation/ -->
<head>
<omniDependencies:omniDependencies/>
diff --git a/gemeinsamforschen/src/main/webapp/annotation/unstructured-annotation.jsp b/gemeinsamforschen/src/main/webapp/annotation/create-unstructured-annotation.jsp
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/annotation/unstructured-annotation.jsp
rename to gemeinsamforschen/src/main/webapp/annotation/create-unstructured-annotation.jsp
diff --git a/gemeinsamforschen/src/main/webapp/annotation/unstructured-upload.jsp b/gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-annotation.jsp
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/annotation/unstructured-upload.jsp
rename to gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-annotation.jsp
diff --git a/gemeinsamforschen/src/main/webapp/assessment/finalAssessments.jsp b/gemeinsamforschen/src/main/webapp/assessment/assess-work.jsp
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assessment/finalAssessments.jsp
rename to gemeinsamforschen/src/main/webapp/assessment/assess-work.jsp
diff --git a/gemeinsamforschen/src/main/webapp/assessment/assessmentCalculator.jsp b/gemeinsamforschen/src/main/webapp/assessment/calculate-assessment.jsp
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assessment/assessmentCalculator.jsp
rename to gemeinsamforschen/src/main/webapp/assessment/calculate-assessment.jsp
diff --git a/gemeinsamforschen/src/main/webapp/assessment/createQuiz.jsp b/gemeinsamforschen/src/main/webapp/assessment/create-quiz.jsp
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assessment/createQuiz.jsp
rename to gemeinsamforschen/src/main/webapp/assessment/create-quiz.jsp
diff --git a/gemeinsamforschen/src/main/webapp/docent/project-docent_CG.jsp b/gemeinsamforschen/src/main/webapp/assessment/project-docent_CG.jsp
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/docent/project-docent_CG.jsp
rename to gemeinsamforschen/src/main/webapp/assessment/project-docent_CG.jsp
diff --git a/gemeinsamforschen/src/main/webapp/assessment/rateContribution.jsp b/gemeinsamforschen/src/main/webapp/assessment/rate-contribution.jsp
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assessment/rateContribution.jsp
rename to gemeinsamforschen/src/main/webapp/assessment/rate-contribution.jsp
diff --git a/gemeinsamforschen/src/main/webapp/assessment/takeQuiz.jsp b/gemeinsamforschen/src/main/webapp/assessment/take-quiz.jsp
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assessment/takeQuiz.jsp
rename to gemeinsamforschen/src/main/webapp/assessment/take-quiz.jsp
diff --git a/gemeinsamforschen/src/main/webapp/assessment/viewQuiz.jsp b/gemeinsamforschen/src/main/webapp/assessment/view-quiz.jsp
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/assessment/viewQuiz.jsp
rename to gemeinsamforschen/src/main/webapp/assessment/view-quiz.jsp
diff --git a/gemeinsamforschen/src/main/webapp/docent/changePhase.jsp b/gemeinsamforschen/src/main/webapp/core/management/change-phase.jsp
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/docent/changePhase.jsp
rename to gemeinsamforschen/src/main/webapp/core/management/change-phase.jsp
diff --git a/gemeinsamforschen/src/main/webapp/course/editDescription.jsp b/gemeinsamforschen/src/main/webapp/core/management/edit-project.jsp
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/course/editDescription.jsp
rename to gemeinsamforschen/src/main/webapp/core/management/edit-project.jsp
diff --git a/gemeinsamforschen/src/main/webapp/course/createProject.jsp b/gemeinsamforschen/src/main/webapp/course/createProject.jsp
deleted file mode 100644
index 1812ed96777867afef58061e968415f4b2d5821b..0000000000000000000000000000000000000000
--- a/gemeinsamforschen/src/main/webapp/course/createProject.jsp
+++ /dev/null
@@ -1,34 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
-<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="headLine" %>
-<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
-<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
-
-
-<!DOCTYPE html>
-<html>
-
-<head>
- <omniDependencies:omniDependencies/>
- <script src="../assets/js/createProject.js"></script>
-
-</head>
-
-<body>
-<div id="wrapper">
- <menu:menu/>
- <div class="page-content-wrapper">
- <headLine:headLine/>
- <div style="margin-left: 2%;">
- <br><br>
- <label>Projektname: <input placeholder="Projektname"></label>
- <label>Passwort: <input placeholder="Passwort"></label>
- </div>
- <button class="btn btn-default" type="button" id="submit">beitreten</button>
- </div>
-</div>
-
-<footer:footer/>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/course/enrollProject.jsp b/gemeinsamforschen/src/main/webapp/course/enrollProject.jsp
deleted file mode 100644
index f44df07fd7fcba42d6ecc2bbf9001546b593ed5a..0000000000000000000000000000000000000000
--- a/gemeinsamforschen/src/main/webapp/course/enrollProject.jsp
+++ /dev/null
@@ -1,47 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
-
-<!DOCTYPE html>
-<html>
-
-<head>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <title>fltrail</title>
- <link rel="stylesheet" href="../assets/css/styles.css">
- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.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="../assets/js/utility.js"></script>
- <script src="../assets/js/enrollProject.js"></script>
-
-</head>
-
-<body>
-<div id="wrapper">
- <menu:menu></menu:menu>
- <div class="page-content-wrapper">
- <div class="container-fluid">
-
- <h1>Einschreiben in einen Kurs</h1>
- <a href="#"><span class="glyphicon glyphicon-envelope"
- style="font-size:27px;margin-top:-17px;margin-left:600px;"></span></a>
- <a href="#"><span class="glyphicon glyphicon-cog"
- style="font-size:29px;margin-left:5px;margin-top:-25px;"></span></a>
- </div>
- <div style="margin-left: 2%;">
- <br><br>
- <label>Projektname: <input placeholder="Projektname"></label>
- <label>Passwort: <input placeholder="Passwort"></label>
- </div>
- <button class="btn btn-default" type="button" id="submit">beitreten</button>
- </div>
-</div>
-
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/course/specificRequirement.jsp b/gemeinsamforschen/src/main/webapp/course/specificRequirement.jsp
deleted file mode 100644
index a5e9ba27fd1bf9b9fd8c40b665b5d0d290e46c37..0000000000000000000000000000000000000000
--- a/gemeinsamforschen/src/main/webapp/course/specificRequirement.jsp
+++ /dev/null
@@ -1,61 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
-
-<!DOCTYPE html>
-<html>
-
-<head>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <title>fltrail</title>
- <link rel="stylesheet" href="../assets/css/styles.css">
- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.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="../assets/js/utility.js"></script>
- <script src="../assets/js/specificSkills.js"></script>
-
-</head>
-
-<body>
-<div id="wrapper">
- <menu:menu/>
- <div class="page-content-wrapper">
- <div class="container-fluid">
-
- <h1>Einschreiben in einen Kurs</h1>
- <a href="#"><span class="glyphicon glyphicon-envelope"
- style="font-size:27px;margin-top:-17px;margin-left:600px;"></span></a>
- <a href="#"><span class="glyphicon glyphicon-cog"
- style="font-size:29px;margin-left:5px;margin-top:-25px;"></span></a>
- </div>
- <div align="center">
- <h2>Wie schätzen Sie sich in folgenden Kategorien ein?</h2>
- <br><br>
- <p><input placeholder="Kriterium1">
- <label>stark<input type="radio" name="groupCriterion1"></label>
- <input type="radio" name="groupCriterion1">
- <input type="radio" name="groupCriterion1">
- <input type="radio" name="groupCriterion1">
- <label><input type="radio" name="groupCriterion1">schwach</label>
- </p>
- <p><input placeholder="Kriterium2">
- <label>stark<input type="radio" name="groupCriterion2"></label>
- <input type="radio" name="groupCriterion2">
- <input type="radio" name="groupCriterion2">
- <input type="radio" name="groupCriterion2">
- <label><input type="radio" name="groupCriterion2">schwach</label>
- </p>
- <button type="button" class="btn btn-light"> + </button>
- </div>
- <button class="btn btn-default" type="button" id="submit">beitreten</button>
- </div>
-</div>
-
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/course/specificSkills.jsp b/gemeinsamforschen/src/main/webapp/course/specificSkills.jsp
deleted file mode 100644
index f1d3b559ea1522e1ca1bcba61ea7000fbf08ad58..0000000000000000000000000000000000000000
--- a/gemeinsamforschen/src/main/webapp/course/specificSkills.jsp
+++ /dev/null
@@ -1,51 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="menu" %>
-
-<!DOCTYPE html>
-<html>
-
-<head>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <title>fltrail</title>
- <link rel="stylesheet" href="../assets/css/styles.css">
- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.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="../assets/js/utility.js"></script>
- <script src="../assets/js/specificSkills.js"></script>
-
-</head>
-
-<body>
-<div id="wrapper">
- <menu:menu></menu:menu>
- <div class="page-content-wrapper">
- <div class="container-fluid">
-
- <h1>Einschreiben in einen Kurs</h1>
- <a href="#"><span class="glyphicon glyphicon-envelope"
- style="font-size:27px;margin-top:-17px;margin-left:600px;"></span></a>
- <a href="#"><span class="glyphicon glyphicon-cog"
- style="font-size:29px;margin-left:5px;margin-top:-25px;"></span></a>
- </div>
- <div align="center">
- <h2>Wie schätzen Sie sich in folgenden Kategorien ein?</h2>
- <br><br>
- <p>groupCriterion1
- </p>
- <p>groupCriterion2
- </p>
-
- </div>
- <button class="btn btn-default" type="button" id="submit">beitreten</button>
- </div>
-</div>
-
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/feedback/givefeedback.jsp b/gemeinsamforschen/src/main/webapp/feedback/give-feedback.jsp
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/feedback/givefeedback.jsp
rename to gemeinsamforschen/src/main/webapp/feedback/give-feedback.jsp
diff --git a/gemeinsamforschen/src/main/webapp/feedback/viewfeedback.jsp b/gemeinsamforschen/src/main/webapp/feedback/view-feedback.jsp
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/feedback/viewfeedback.jsp
rename to gemeinsamforschen/src/main/webapp/feedback/view-feedback.jsp
diff --git a/gemeinsamforschen/src/main/webapp/groupfinding/createGroups.jsp b/gemeinsamforschen/src/main/webapp/groupfinding/create-groups.jsp
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/groupfinding/createGroups.jsp
rename to gemeinsamforschen/src/main/webapp/groupfinding/create-groups.jsp
diff --git a/gemeinsamforschen/src/main/webapp/journal/createJournal.jsp b/gemeinsamforschen/src/main/webapp/journal/create-journal.jsp
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/journal/createJournal.jsp
rename to gemeinsamforschen/src/main/webapp/journal/create-journal.jsp
diff --git a/gemeinsamforschen/src/main/webapp/jsexample.html b/gemeinsamforschen/src/main/webapp/jsexample.html
deleted file mode 100644
index 1446e1e77948e200b185b78fb8051afc0e40a6d6..0000000000000000000000000000000000000000
--- a/gemeinsamforschen/src/main/webapp/jsexample.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <title>JSexample</title>
-
- <script src="http://code.jquery.com/jquery-3.3.1.min.js"
- integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8="
- crossorigin="anonymous"></script>
- <script src="munchkin/js/munschkinloader.js" type="application/javascript"></script>
-</head>
-<body>
-Hi Munschkinlieberhaber
-
-<div id="munschkin"></div>
-</body>
-</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/Quiz-docent.js b/gemeinsamforschen/src/main/webapp/libs/js/Quiz-docent.js
index 2eedd8af5d6c4a7690ae11b782dcfe0fecb8c017..8ddea17c89cace4cdfe23ce433ea226da5cf64a3 100644
--- a/gemeinsamforschen/src/main/webapp/libs/js/Quiz-docent.js
+++ b/gemeinsamforschen/src/main/webapp/libs/js/Quiz-docent.js
@@ -1,6 +1,6 @@
$(document).ready(function () {
$('#newQuiz').on('click', function(){
- location.href="createQuiz.jsp?token="+getUserTokenFromUrl()+"&projectId="+$('#projectId').html().trim();
+ location.href="create-quiz.jsp?token="+getUserTokenFromUrl()+"&projectId="+$('#projectId').html().trim();
});
let loading = $('#loadbar').hide();
@@ -77,7 +77,7 @@ $(document).ready(function () {
url: '../rest/assessments/quiz/' + encodeURIComponent(event.data.quizId),
type: 'POST',
success: function () {
- document.location.href="Quiz-docent.jsp?token="+getUserTokenFromUrl()+"&projectId="+$('#projectId').html().trim();
+ document.location.href="quiz-docent.jsp?token="+getUserTokenFromUrl()+"&projectId="+$('#projectId').html().trim();
},
error: function(a){
alert(a)
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/Quiz.js b/gemeinsamforschen/src/main/webapp/libs/js/Quiz.js
index fcb6ea709458eddd262301776d4e3fde08ae4a84..f79b9de9519fdb8b78d10842685c12cd20cf54c7 100644
--- a/gemeinsamforschen/src/main/webapp/libs/js/Quiz.js
+++ b/gemeinsamforschen/src/main/webapp/libs/js/Quiz.js
@@ -12,7 +12,7 @@ $(document).ready(function(){
let trQuestion = document.createElement('TR');
trQuestion.className="pageChanger";
trQuestion.innerHTML = '<td colspan="' + colspan + '"><h3>' +
- '<a href="viewQuiz.jsp' +
+ '<a href="view-quiz.jsp' +
'?token='+getUserTokenFromUrl()+
'&projectId='+projectId+
'&quizId='+ encodeURIComponent(data[quiz].question)+'"</a>' +
@@ -26,6 +26,6 @@ $(document).ready(function(){
});
$('#newQuiz').on('click', function(){
- location.href="createQuiz.jsp?token="+getUserTokenFromUrl()+"&projectId="+$('#projectId').html().trim();
+ location.href="create-quiz.jsp?token="+getUserTokenFromUrl()+"&projectId="+$('#projectId').html().trim();
});
});
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/annotationScript.js b/gemeinsamforschen/src/main/webapp/libs/js/annotationScript.js
index efc433eacb4af4735bab281066f3ed0703d80269..b356093d5bbd45e5e3fadf6d79b2426fee019556 100644
--- a/gemeinsamforschen/src/main/webapp/libs/js/annotationScript.js
+++ b/gemeinsamforschen/src/main/webapp/libs/js/annotationScript.js
@@ -68,7 +68,7 @@ $(document).ready(function() {
* continue button
*/
$('#btnContinue').click(function () {
- location.href="givefeedback.jsp?token=" + getUserTokenFromUrl();
+ location.href="give-feedback.jsp?token=" + getUserTokenFromUrl();
});
/**
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/createQuiz.js b/gemeinsamforschen/src/main/webapp/libs/js/createQuiz.js
index 37413173379a5a73600abf21938d1ef9be06dede..5353643dbcb0770b3aa7096c0011c6ac743c43f6 100644
--- a/gemeinsamforschen/src/main/webapp/libs/js/createQuiz.js
+++ b/gemeinsamforschen/src/main/webapp/libs/js/createQuiz.js
@@ -61,7 +61,7 @@ $(document).ready(function () {
},
type: 'POST',
success: function(){
- location.href="Quiz.jsp?token="+getUserTokenFromUrl()+"&projectId="+$('#projectId').html().trim();
+ location.href="quiz.jsp?token="+getUserTokenFromUrl()+"&projectId="+$('#projectId').html().trim();
},
error: function(a){
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/createReportOverview.js b/gemeinsamforschen/src/main/webapp/libs/js/createReportOverview.js
index 1c28d5e60c9e92d28fa0955d73310f5f63fb10c3..46d02dfecb3a3a02f7c83a92611f50696339229e 100644
--- a/gemeinsamforschen/src/main/webapp/libs/js/createReportOverview.js
+++ b/gemeinsamforschen/src/main/webapp/libs/js/createReportOverview.js
@@ -5,7 +5,7 @@ $(document).ready(function() {
$('#student').val(student);
$('#project').val(project);
$('#uploader').on('click', function(){
- //location.href="researchReportTitle.jsp?token="+getUserTokenFromUrl();
+ //location.href="create-title.jsp?token="+getUserTokenFromUrl();
//boolean uploaded=true;
});
$('#backLink').on('click', function(){
@@ -14,7 +14,7 @@ $(document).ready(function() {
});
$('#forwardLink').on('click', function(){
- location.href = "researchReportTitle.jsp?token=" + student + "&projectId=" + project;
+ location.href = "create-title.jsp?token=" + student + "&projectId=" + project;
return false;
});
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/createReportProgress.js b/gemeinsamforschen/src/main/webapp/libs/js/createReportProgress.js
index 943d90fccab49e3b57a87cbfca5382cc6e6cf68f..b578bcfe01c1988fa1eb4db9653bc2eaf94ebe2f 100644
--- a/gemeinsamforschen/src/main/webapp/libs/js/createReportProgress.js
+++ b/gemeinsamforschen/src/main/webapp/libs/js/createReportProgress.js
@@ -6,35 +6,35 @@ $(document).ready(function() {
$('#project').val(project);
$('#title').on('click', function(){
- location.href = "researchReportTitle.jsp?token=" + student + "&projectId=" + project;
+ location.href = "create-title.jsp?token=" + student + "&projectId=" + project;
return false;
});
$('#recherche').on('click', function(){
- location.href = "researchReportRecherche.jsp?token=" + student + "&projectId=" + project;
+ location.href = "create-research.jsp?token=" + student + "&projectId=" + project;
return false;
});
$('#bibo').on('click', function(){
- location.href = "researchReportBibo.jsp?token=" + student + "&projectId=" + project;
+ location.href = "create-bibliography.jsp?token=" + student + "&projectId=" + project;
return false;
});
$('#question').on('click', function(){
- location.href = "researchReportQuestion.jsp?token=" + student + "&projectId=" + project;
+ location.href = "create-question.jsp?token=" + student + "&projectId=" + project;
return false;
});
$('#concept').on('click', function(){
- location.href = "researchReportConcept.jsp?token=" + student + "&projectId=" + project;
+ location.href = "create-concept.jsp?token=" + student + "&projectId=" + project;
return false;
});
$('#method').on('click', function(){
- location.href = "researchReportMethod.jsp?token=" + student + "&projectId=" + project;
+ location.href = "create-method.jsp?token=" + student + "&projectId=" + project;
return false;
});
$('#reportDo').on('click', function(){
- location.href = "researchReportDo.jsp?token=" + student + "&projectId=" + project;
+ location.href = "create-process-description.jsp?token=" + student + "&projectId=" + project;
return false;
});
$('#evaluation').on('click', function(){
- location.href = "researchReportEvaluation.jsp?token=" + student + "&projectId=" + project;
+ location.href = "create-evaluation.jsp?token=" + student + "&projectId=" + project;
return false;
});
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/e-portfolio.js b/gemeinsamforschen/src/main/webapp/libs/js/e-portfolio.js
index 7ec0e356f132d559afe80381f3bd10cd1f7f79fb..c62bb17492bd881c8c3647f7cb76ac1c444fe88c 100644
--- a/gemeinsamforschen/src/main/webapp/libs/js/e-portfolio.js
+++ b/gemeinsamforschen/src/main/webapp/libs/js/e-portfolio.js
@@ -38,11 +38,11 @@ $(document).ready(function() {
});
$('#editDescriptionLink').on('click', function () {
- location.href = "editDescription.jsp?project=" + project + "&token=" + student + "&projectId=" + project;
+ location.href = "edit-project.jsp?project=" + project + "&token=" + student + "&projectId=" + project;
});
$('#createJournalLink').on('click', function () {
- location.href = "createJournal.jsp?token=" + student + "&projectId=" + project;
+ location.href = "create-journal.jsp?token=" + student + "&projectId=" + project;
});
});
@@ -95,7 +95,7 @@ function loadJournals(data) {
//TODO userToken...
if (data[journal].studentIdentifier.studentId == student && data[journal].open) {
journalString = journalString +
- '<a class="btn btn-default btn-sm" href="createJournal.jsp?token=' + student + '&projectId=' + project + '&journal=' + data[journal].id + '"><i class="fa fa-pencil"></i> Bearbeiten</a>' +
+ '<a class="btn btn-default btn-sm" href="create-journal.jsp?token=' + student + '&projectId=' + project + '&journal=' + data[journal].id + '"><i class="fa fa-pencil"></i> Bearbeiten</a>' +
'<a class="open-CloseJournalDialog btn btn-default btn-sm" data-toggle="modal" data-id ='
+ data[journal].id +
' data-target ="#closeJournalModal" > <i class="fa fa-check-square" aria-hidden = "true" ></i> Abschließen</a> '
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/finalAssessment.js b/gemeinsamforschen/src/main/webapp/libs/js/finalAssessment.js
index 0f57c3bec407e642306c68bb0fed7651af94a53b..98a0a9765f2bf8bbecceddce58b99688b9260162 100644
--- a/gemeinsamforschen/src/main/webapp/libs/js/finalAssessment.js
+++ b/gemeinsamforschen/src/main/webapp/libs/js/finalAssessment.js
@@ -172,7 +172,7 @@ function assessPeer() {
},
data: JSON.stringify(dataP),
success: function () {
- location.href = "takeQuiz.jsp?token=" + getUserTokenFromUrl() + "&projectId=" + $('#projectId').html().trim();
+ location.href = "take-quiz.jsp?token=" + getUserTokenFromUrl() + "&projectId=" + $('#projectId').html().trim();
},
error: function (a, b, c) {
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/peerfeedback.js b/gemeinsamforschen/src/main/webapp/libs/js/peerfeedback.js
index beb297c9c329233a74183dbcd35034cd89be3106..05bf9979063190089e21d01a32965c6d9016fa71 100644
--- a/gemeinsamforschen/src/main/webapp/libs/js/peerfeedback.js
+++ b/gemeinsamforschen/src/main/webapp/libs/js/peerfeedback.js
@@ -49,7 +49,7 @@ $(document).ready(function() {
});*/
//console.log(data);
- location.href="givefeedback.jsp?token=" + getUserTokenFromUrl();
+ location.href="give-feedback.jsp?token=" + getUserTokenFromUrl();
alert("Feedback wurde gesendet!");
});
})
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/project-student.js b/gemeinsamforschen/src/main/webapp/libs/js/project-student.js
index 91e62e10ffcba41e1d9200d943e1ae662256b591..83f391e0292fd8826edcb26564892f71b496ca52 100644
--- a/gemeinsamforschen/src/main/webapp/libs/js/project-student.js
+++ b/gemeinsamforschen/src/main/webapp/libs/js/project-student.js
@@ -30,10 +30,10 @@ $(document).ready(function(){
});
*/
$('.givefeedback').click(function () {
- location.href="givefeedback.jsp?token="+getUserTokenFromUrl();
+ location.href="give-feedback.jsp?token="+getUserTokenFromUrl();
});
$('.viewfeedback').click(function () {
- location.href="viewfeedback.jsp?token="+getUserTokenFromUrl();
+ location.href="view-feedback.jsp?token="+getUserTokenFromUrl();
});
$('.annotationview').click(function () {
@@ -41,7 +41,7 @@ $(document).ready(function(){
});
$('#btnUnstructuredUpload').click(function () {
- location.href="unstructured-upload.jsp?token="+getUserTokenFromUrl() + "&projectId=" + getQueryVariable("projectId");
+ location.href="upload-unstructured-annotation.jsp?token="+getUserTokenFromUrl() + "&projectId=" + getQueryVariable("projectId");
})
$('.viewprojectstudent').click(function () {
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/takeQuiz.js b/gemeinsamforschen/src/main/webapp/libs/js/takeQuiz.js
index 7c293a1a125ccc891df523fd6a1ea415968a28c4..75cf2fa1bd8b2abc54bfbd04d4246cb0beccd985 100644
--- a/gemeinsamforschen/src/main/webapp/libs/js/takeQuiz.js
+++ b/gemeinsamforschen/src/main/webapp/libs/js/takeQuiz.js
@@ -110,7 +110,7 @@ function safeQuizAnswers(){
},
data: JSON.stringify(dataP),
success: function(){
- location.href="rateContribution.jsp?token="+getUserTokenFromUrl()+"&projectId="+$('#projectId').html().trim();
+ location.href="rate-contribution.jsp?token="+getUserTokenFromUrl()+"&projectId="+$('#projectId').html().trim();
},
error: function(a,b,c){
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/unstructuredAnnotation.js b/gemeinsamforschen/src/main/webapp/libs/js/unstructuredAnnotation.js
index f420bbbd12047f018cbba3c6c4d306e03b3cf3e3..21e4a47aae77b6fd0203fcdb1c36e0f48ae3b23c 100644
--- a/gemeinsamforschen/src/main/webapp/libs/js/unstructuredAnnotation.js
+++ b/gemeinsamforschen/src/main/webapp/libs/js/unstructuredAnnotation.js
@@ -26,7 +26,7 @@ $(document).ready(function() {
}, function () {
// jump to upload page on error
- location.href="unstructured-upload.jsp?token=" + getUserTokenFromUrl() + "&projectId=" + getQueryVariable("projectId");
+ location.href="upload-unstructured-annotation.jsp?token=" + getUserTokenFromUrl() + "&projectId=" + getQueryVariable("projectId");
});
// set click listener to save button
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/unstructuredUpload.js b/gemeinsamforschen/src/main/webapp/libs/js/unstructuredUpload.js
index 66ef3253fb067df445fa217227415361f9b0ed33..9a2aa3d411d58df36cfa95201268d5ebc36e2211 100644
--- a/gemeinsamforschen/src/main/webapp/libs/js/unstructuredUpload.js
+++ b/gemeinsamforschen/src/main/webapp/libs/js/unstructuredUpload.js
@@ -23,7 +23,7 @@ $(document).ready(function() {
$('#upload-textarea').val("");
// jump to next page
- location.href="unstructured-annotation.jsp?token=" + getUserTokenFromUrl() + "&projectId=" + getQueryVariable("projectId") + "&submission=" + response.id;
+ location.href="create-unstructured-annotation.jsp?token=" + getUserTokenFromUrl() + "&projectId=" + getQueryVariable("projectId") + "&submission=" + response.id;
});
}
});
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/utility.js b/gemeinsamforschen/src/main/webapp/libs/js/utility.js
index f1e57818483d03a870abf92d5e24b23495bab11c..753e889a69d87884549b820971769023414eec50 100644
--- a/gemeinsamforschen/src/main/webapp/libs/js/utility.js
+++ b/gemeinsamforschen/src/main/webapp/libs/js/utility.js
@@ -33,11 +33,11 @@ function checkAssessementPhase(){
break;
}
case "quiz":{
- location.href = "takeQuiz.jsp?token=" + getUserTokenFromUrl() + "&projectId=" + $('#projectId').html().trim();
+ location.href = "take-quiz.jsp?token=" + getUserTokenFromUrl() + "&projectId=" + $('#projectId').html().trim();
break;
}
case "contributionRating":{
- location.href = "rateContribution.jsp?token=" + getUserTokenFromUrl() + "&projectId=" + $('#projectId').html().trim();
+ location.href = "rate-contribution.jsp?token=" + getUserTokenFromUrl() + "&projectId=" + $('#projectId').html().trim();
break;
}
case "done":{
diff --git a/gemeinsamforschen/src/main/webapp/libs/js/viewQuiz.js b/gemeinsamforschen/src/main/webapp/libs/js/viewQuiz.js
index a763697c7dd3fc87785125d29aabcc4e7978b715..8ebaac60bf99121d46d4fc6bc15bffb43b9e3ac7 100644
--- a/gemeinsamforschen/src/main/webapp/libs/js/viewQuiz.js
+++ b/gemeinsamforschen/src/main/webapp/libs/js/viewQuiz.js
@@ -67,7 +67,7 @@ $(document).ready(function () {
url: '../rest/assessments/quiz/' + encodeURIComponent(quizId),
type: 'POST',
success: function () {
- document.location.href="Quiz.jsp?token="+getUserTokenFromUrl()+"&projectId="+$('#projectId').html().trim();
+ document.location.href="quiz.jsp?token="+getUserTokenFromUrl()+"&projectId="+$('#projectId').html().trim();
},
error: function(a){
alert(a)
diff --git a/gemeinsamforschen/src/main/webapp/docent/overview-docent.jsp b/gemeinsamforschen/src/main/webapp/overview-docent.jsp
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/docent/overview-docent.jsp
rename to gemeinsamforschen/src/main/webapp/overview-docent.jsp
diff --git a/gemeinsamforschen/src/main/webapp/student/overview-student.jsp b/gemeinsamforschen/src/main/webapp/overview-student.jsp
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/student/overview-student.jsp
rename to gemeinsamforschen/src/main/webapp/overview-student.jsp
diff --git a/gemeinsamforschen/src/main/webapp/docent/project-docent.jsp b/gemeinsamforschen/src/main/webapp/project-docent.jsp
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/docent/project-docent.jsp
rename to gemeinsamforschen/src/main/webapp/project-docent.jsp
diff --git a/gemeinsamforschen/src/main/webapp/student/project-student.jsp b/gemeinsamforschen/src/main/webapp/project-student.jsp
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/student/project-student.jsp
rename to gemeinsamforschen/src/main/webapp/project-student.jsp
diff --git a/gemeinsamforschen/src/main/webapp/researchReport/researchReportBibo.jsp b/gemeinsamforschen/src/main/webapp/researchReport/create-bibliography.jsp
similarity index 89%
rename from gemeinsamforschen/src/main/webapp/researchReport/researchReportBibo.jsp
rename to gemeinsamforschen/src/main/webapp/researchReport/create-bibliography.jsp
index 67901c78ae4b015ee919e9fda4c4106e4af078b1..c4daaf6edc7c21133e6330b93268add1a189396c 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/researchReportBibo.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-bibliography.jsp
@@ -4,6 +4,11 @@
<%@ taglib uri="../core/gemeinsamForschen.tld" prefix="omniDependencies" %>
<!DOCTYPE html>
+
+<!-- Tipp @Johannes_: du kannst eine jsp verwenden anstatt 10, die immer wieder auf sich selber verweist und dabei
+den Zustand ändert
+-->
+
<html>
<head>
<omniDependencies:omniDependencies/>
@@ -37,8 +42,8 @@
</textarea>
</div>
<div class="ResearchReportButtons">
- <button class="researchReportButtons"><a href="researchReportQuestion.jsp">Speichern & weiter</a></button>
- <button class="researchReportButtons"><a href="researchReportRecherche.jsp"> Zurück </a></button>
+ <button class="researchReportButtons"><a href="create-question.jsp">Speichern & weiter</a></button>
+ <button class="researchReportButtons"><a href="create-research.jsp"> Zurück </a></button>
</div>
<div class="ResearchReportUpload">
<input type="file" class="filepond" name="filepond"> </input>
diff --git a/gemeinsamforschen/src/main/webapp/researchReport/researchReportConcept.jsp b/gemeinsamforschen/src/main/webapp/researchReport/create-concept.jsp
similarity index 91%
rename from gemeinsamforschen/src/main/webapp/researchReport/researchReportConcept.jsp
rename to gemeinsamforschen/src/main/webapp/researchReport/create-concept.jsp
index 0a7e41bd14f2986999b5dc0ce9d06e1f2ce989d1..81529a11fdb2eba23827c4c9abbbe1910dc76cf1 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/researchReportConcept.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-concept.jsp
@@ -30,8 +30,8 @@
</textarea>
</div>
<div class="ResearchReportButtons">
- <button class="researchReportButtons"><a href="researchReportMethod.jsp">Speichern & weiter</a></button>
- <button class="researchReportButtons"><a href="researchReportQuestion.jsp"> Zurück </a></button>
+ <button class="researchReportButtons"><a href="create-method.jsp">Speichern & weiter</a></button>
+ <button class="researchReportButtons"><a href="create-question.jsp"> Zurück </a></button>
</div>
<div class="ResearchReportUpload">
<input type="file" class="filepond" name="filepond"> </input>
diff --git a/gemeinsamforschen/src/main/webapp/researchReport/researchReportEvaluation.jsp b/gemeinsamforschen/src/main/webapp/researchReport/create-evaluation.jsp
similarity index 92%
rename from gemeinsamforschen/src/main/webapp/researchReport/researchReportEvaluation.jsp
rename to gemeinsamforschen/src/main/webapp/researchReport/create-evaluation.jsp
index 739957e128c02e9b5f95fc938b2bbed6585f16c7..19b5d2f9bd8a02744c97bcb441657af14bb9362b 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/researchReportEvaluation.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-evaluation.jsp
@@ -36,8 +36,8 @@
</textarea>
</div>
<div class="ResearchReportButtons">
- <button class="researchReportButtons"><a href="../student/project-student.jsp">Speichern & weiter</a></button>
- <button class="researchReportButtons"><a href="researchReportDo.jsp"> Zurück </a></button>
+ <button class="researchReportButtons"><a href="../project-student.jsp">Speichern & weiter</a></button>
+ <button class="researchReportButtons"><a href="create-process-description.jsp"> Zurück </a></button>
</div>
<div class="ResearchReportUpload">
<input type="file" class="filepond" name="filepond"> </input>
diff --git a/gemeinsamforschen/src/main/webapp/researchReport/researchReportMethod.jsp b/gemeinsamforschen/src/main/webapp/researchReport/create-method.jsp
similarity index 92%
rename from gemeinsamforschen/src/main/webapp/researchReport/researchReportMethod.jsp
rename to gemeinsamforschen/src/main/webapp/researchReport/create-method.jsp
index 64b26b4e70042c0b5f2275ba52b599731f323164..511285003d5d7b559f5536c0265a18e3830d20dd 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/researchReportMethod.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-method.jsp
@@ -37,8 +37,8 @@
</textarea>
</div>
<div class="ResearchReportButtons">
- <button class="researchReportButtons"><a href="researchReportDo.jsp">Speichern & weiter</a></button>
- <button class="researchReportButtons"><a href="researchReportConcept.jsp"> Zurück </a></button>
+ <button class="researchReportButtons"><a href="create-process-description.jsp">Speichern & weiter</a></button>
+ <button class="researchReportButtons"><a href="create-concept.jsp"> Zurück </a></button>
</div>
<div class="ResearchReportUpload">
<input type="file" class="filepond" name="filepond"> </input>
diff --git a/gemeinsamforschen/src/main/webapp/researchReport/researchReportOverview.jsp b/gemeinsamforschen/src/main/webapp/researchReport/create-overview.jsp
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/researchReport/researchReportOverview.jsp
rename to gemeinsamforschen/src/main/webapp/researchReport/create-overview.jsp
diff --git a/gemeinsamforschen/src/main/webapp/researchReport/researchReportDo.jsp b/gemeinsamforschen/src/main/webapp/researchReport/create-process-description.jsp
similarity index 92%
rename from gemeinsamforschen/src/main/webapp/researchReport/researchReportDo.jsp
rename to gemeinsamforschen/src/main/webapp/researchReport/create-process-description.jsp
index 678bd32c9fc8a30dcfc83458bde7de0a9fb67c10..1d8ca36e228ce951a065c7590df06dca63adec84 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/researchReportDo.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-process-description.jsp
@@ -36,8 +36,8 @@
</textarea>
</div>
<div class="ResearchReportButtons">
- <button class="researchReportButtons"><a href="researchReportEvaluation.jsp">Speichern & weiter</a></button>
- <button class="researchReportButtons"><a href="researchReportMethod.jsp"> Zurück </a></button>
+ <button class="researchReportButtons"><a href="create-evaluation.jsp">Speichern & weiter</a></button>
+ <button class="researchReportButtons"><a href="create-method.jsp"> Zurück </a></button>
</div>
<div class="ResearchReportUpload">
<input type="file" class="filepond" name="filepond"> </input>
diff --git a/gemeinsamforschen/src/main/webapp/researchReport/researchReportQuestion.jsp b/gemeinsamforschen/src/main/webapp/researchReport/create-question.jsp
similarity index 92%
rename from gemeinsamforschen/src/main/webapp/researchReport/researchReportQuestion.jsp
rename to gemeinsamforschen/src/main/webapp/researchReport/create-question.jsp
index 413236f09ade2dbb39fb692d86acba5dfb7a4712..c8d3cc87bee6fc2c33a636ed303232278b7f926e 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/researchReportQuestion.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-question.jsp
@@ -39,8 +39,8 @@
</textarea>
</div>
<div class="ResearchReportButtons">
- <button class="researchReportButtons"><a href="researchReportConcept.jsp">Speichern & weiter</a></button>
- <button class="researchReportButtons"><a href="researchReportBibo.jsp"> Zurück </a></button>
+ <button class="researchReportButtons"><a href="create-concept.jsp">Speichern & weiter</a></button>
+ <button class="researchReportButtons"><a href="create-bibliography.jsp"> Zurück </a></button>
</div>
<div class="ResearchReportUpload">
<input type="file" class="filepond" name="filepond"> </input>
diff --git a/gemeinsamforschen/src/main/webapp/researchReport/researchReportRecherche.jsp b/gemeinsamforschen/src/main/webapp/researchReport/create-research.jsp
similarity index 92%
rename from gemeinsamforschen/src/main/webapp/researchReport/researchReportRecherche.jsp
rename to gemeinsamforschen/src/main/webapp/researchReport/create-research.jsp
index df8bde7155407bfec89e11db6d8a68f6e04b493e..2ab818ee01a8cdc4d015a580f06bbc21ad2a1047 100644
--- a/gemeinsamforschen/src/main/webapp/researchReport/researchReportRecherche.jsp
+++ b/gemeinsamforschen/src/main/webapp/researchReport/create-research.jsp
@@ -37,8 +37,8 @@
</textarea>
</div>
<div class="ResearchReportButtons">
- <button class="researchReportButtons"><a href="researchReportBibo.jsp">Speichern & weiter</a></button>
- <button class="researchReportButtons"><a href="researchReportTitle.jsp"> Zurück </a></button>
+ <button class="researchReportButtons"><a href="create-bibliography.jsp">Speichern & weiter</a></button>
+ <button class="researchReportButtons"><a href="create-title.jsp"> Zurück </a></button>
</div>
<div class="ResearchReportUpload">
diff --git a/gemeinsamforschen/src/main/webapp/researchReport/researchReportTitle.jsp b/gemeinsamforschen/src/main/webapp/researchReport/create-title.jsp
similarity index 100%
rename from gemeinsamforschen/src/main/webapp/researchReport/researchReportTitle.jsp
rename to gemeinsamforschen/src/main/webapp/researchReport/create-title.jsp