From 79a6c5024f7062d703a0976300f8f88b375a809a Mon Sep 17 00:00:00 2001
From: quark <zeisse@uni-potsdam.de>
Date: Tue, 3 Jul 2018 18:40:28 +0200
Subject: [PATCH] linked researchReport pages
---
.../main/webapp/assets/css/researchReport.css | 9 ++++----
.../webapp/pages/createResearchReport.html | 21 ------------------
.../main/webapp/pages/researchReportBibo.html | 20 +++++++++++++++--
.../webapp/pages/researchReportConcept.html | 21 ++++++++++++++++--
.../main/webapp/pages/researchReportDo.html | 21 ++++++++++++++++--
.../pages/researchReportEvaluation.html | 21 ++++++++++++++++--
.../webapp/pages/researchReportMethod.html | 21 ++++++++++++++++--
.../webapp/pages/researchReportQuestion.html | 22 ++++++++++---------
.../webapp/pages/researchReportRecherche.html | 20 +++++++++++++++--
.../webapp/pages/researchReportTitle.html | 21 ++++++++++++++++--
10 files changed, 148 insertions(+), 49 deletions(-)
delete mode 100644 gemeinsamforschen/src/main/webapp/pages/createResearchReport.html
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/researchReport.css b/gemeinsamforschen/src/main/webapp/assets/css/researchReport.css
index 8769aec0..bd132c97 100644
--- a/gemeinsamforschen/src/main/webapp/assets/css/researchReport.css
+++ b/gemeinsamforschen/src/main/webapp/assets/css/researchReport.css
@@ -1,3 +1,4 @@
+/*
html, body
width: 100%
height: 100%
@@ -66,7 +67,7 @@ html, body
align-items: center
nav
font-size: 1.2rem
- menu
+ menu
menuitem
a
color: white
@@ -85,12 +86,13 @@ html, body
padding: 15px 25px
text-align: center
font-size: 16px
+ cursor: pointer
+*/
-/*
html, body {
width: 100%;
@@ -107,7 +109,7 @@ html, body {
display: grid;
grid-template-rows: 5rem 90vh 5rem;
grid-template-columns: 15% 85%;
- grid-template-areas: "sidebar header header" "sidebar editor editor" "sidebar buttons ." "sidebar progress .";
+ grid-template-areas: "sidebar header header" "sidebar editor editor" "sidebar . buttons " "sidebar progress .";
}
.researchReportMenu {
@@ -178,4 +180,3 @@ html, body {
cursor: pointer;
}
- */
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/createResearchReport.html b/gemeinsamforschen/src/main/webapp/pages/createResearchReport.html
deleted file mode 100644
index baeaed73..00000000
--- a/gemeinsamforschen/src/main/webapp/pages/createResearchReport.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
-
- <link rel="stylesheet" type="text/css" href="../assets/css/create-journal.css">
- <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
- <script src="../assets/js/utility.js"></script>
-
- <meta charset="UTF-8">
- <title>Forschungsbericht erstellen</title>
-</head>
-<body>
-
-<h1> Forschungsbericht erstellen </h1>
-
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportBibo.html b/gemeinsamforschen/src/main/webapp/pages/researchReportBibo.html
index 38d552ac..0a9dc598 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportBibo.html
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportBibo.html
@@ -1,11 +1,13 @@
<html>
<head>
+ <meta charset="utf-8">
<script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
<link rel="stylesheet" type="text/css" href="../assets/css/researchReport.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="../assets/js/utility.js"></script>
+ <script src="../assets/js/Sidebar-Menu.js"></script>
<title>Forschungsbericht erstellen</title>
</head>
<body>
@@ -36,8 +38,22 @@
</textarea>
</div>
<div class="ResearchReportButtons">
- <input type="submit" class="researchReportButtons">
- <button class="researchReportButtons"> Zurück </button>
+ <button type="submit" class="researchReportButtons"><a href="researchReportQuestion.html">Speichern & weiter</a></button>
+ <button class="researchReportButtons"><a href="researchReportRecherche.html"> Zurück </a></button>
+ </div>
+ <div class="researchReportProgress">
+ <nav>
+ <menu>
+ <menuitem><a href="researchReportTitle.html">Titel</a> </menuitem>
+ <menuitem><a href="researchReportRecherche.html">Recherche</a> </menuitem>
+ <menuitem><a href="researchReportBibo.html"><font color="#green">Literaturverzeichnis</font></a> </menuitem>
+ <menuitem><a href="researchReportQuestion.html">Forschnugsfrage</a> </menuitem>
+ <menuitem><a href="researchReportConcept.html">Konzept</a></menuitem>
+ <menuitem><a href="researchReportMethod.html">Methodik</a></menuitem>
+ <menuitem><a href="researchReportDo.html">Durchführung</a></menuitem>
+ <menuitem><a href="researchReportEvaluation.html">Evalution</a></menuitem>
+ </menu>
+ </nav>
</div>
</form>
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportConcept.html b/gemeinsamforschen/src/main/webapp/pages/researchReportConcept.html
index c586a0a6..51a85981 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportConcept.html
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportConcept.html
@@ -1,11 +1,13 @@
<html>
<head>
+ <meta charset="utf-8">
<script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
<link rel="stylesheet" type="text/css" href="../assets/css/researchReport.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="../assets/js/utility.js"></script>
+ <script src="../assets/js/Sidebar-Menu.js"></script>
<title>Forschungsbericht erstellen</title>
</head>
<body>
@@ -36,8 +38,23 @@
</textarea>
</div>
<div class="ResearchReportButtons">
- <input type="submit" class="researchReportButtons">
- <button class="researchReportButtons"> Zurück </button>
+ <button type="submit" class="researchReportButtons"><a href="researchReportMethod.html">Speichern & weiter</a></button>
+ <button class="researchReportButtons"><a href="researchReportQuestion.html"> Zurück </a></button>
+ </div>
+
+ <div class="researchReportProgress">
+ <nav>
+ <menu>
+ <menuitem><a href="researchReportTitle.html"Titel</a> </menuitem>
+ <menuitem><a href="researchReportRecherche.html">Recherche</a> </menuitem>
+ <menuitem><a href="researchReportBibo.html">Literaturverzeichnis</a> </menuitem>
+ <menuitem><a href="researchReportQuestion.html">Forschnugsfrage</a> </menuitem>
+ <menuitem><a href="researchReportConcept.html">><font color="#green">Konzept</font></a></menuitem>
+ <menuitem><a href="researchReportMethod.html">Methodik</a></menuitem>
+ <menuitem><a href="researchReportDo.html">Durchführung</a></menuitem>
+ <menuitem><a href="researchReportEvaluation.html">Evalution</a></menuitem>
+ </menu>
+ </nav>
</div>
</form>
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportDo.html b/gemeinsamforschen/src/main/webapp/pages/researchReportDo.html
index 2585ea3f..3c3d503e 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportDo.html
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportDo.html
@@ -1,11 +1,13 @@
<html>
<head>
+ <meta charset="utf-8">
<script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
<link rel="stylesheet" type="text/css" href="../assets/css/researchReport.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="../assets/js/utility.js"></script>
+ <script src="../assets/js/Sidebar-Menu.js"></script>
<title>Forschungsbericht erstellen</title>
</head>
<body>
@@ -36,8 +38,23 @@
</textarea>
</div>
<div class="ResearchReportButtons">
- <input type="submit" class="researchReportButtons">
- <button class="researchReportButtons"> Zurück </button>
+ <button type="submit" class="researchReportButtons"><a href="project-student.jsp">Speichern & weiter</a></button>
+ <button class="researchReportButtons"><a href="researchReportMethod.html"> Zurück </a></button>
+ </div>
+
+ <div class="researchReportProgress">
+ <nav>
+ <menu>
+ <menuitem><a href="researchReportTitle.html">Titel</a> </menuitem>
+ <menuitem><a href="researchReportRecherche.html">Recherche</a> </menuitem>
+ <menuitem><a href="researchReportBibo.html">Literaturverzeichnis</a> </menuitem>
+ <menuitem><a href="researchReportQuestion.html">Forschnugsfrage</a> </menuitem>
+ <menuitem><a href="researchReportConcept.html">Konzept</a></menuitem>
+ <menuitem><a href="researchReportMethod.html">Methodik</a></menuitem>
+ <menuitem><a href="researchReportDo.html"><font color="#green">Durchführung</font></a></menuitem>
+ <menuitem><a href="researchReportEvaluation.html">Evalution</a></menuitem>
+ </menu>
+ </nav>
</div>
</form>
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportEvaluation.html b/gemeinsamforschen/src/main/webapp/pages/researchReportEvaluation.html
index 4e63d53e..2555df4c 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportEvaluation.html
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportEvaluation.html
@@ -1,11 +1,13 @@
<html>
<head>
+ <meta charset="utf-8">
<script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
<link rel="stylesheet" type="text/css" href="../assets/css/researchReport.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="../assets/js/utility.js"></script>
+ <script src="../assets/js/Sidebar-Menu.js"></script>
<title>Forschungsbericht erstellen</title>
</head>
<body>
@@ -36,8 +38,23 @@
</textarea>
</div>
<div class="ResearchReportButtons">
- <input type="submit" class="researchReportButtons">
- <button class="researchReportButtons"> Zurück </button>
+ <button type="submit" class="researchReportButtons"><a href="researchReportEvaluation.html">Speichern & weiter</a></button>
+ <button class="researchReportButtons"><a href="researchReportDo.html"> Zurück </a></button>
+ </div>
+
+ <div class="researchReportProgress">
+ <nav>
+ <menu>
+ <menuitem><a href="researchReportTitle.html">Titel</a> </menuitem>
+ <menuitem><a href="researchReportRecherche.html">Recherche</a> </menuitem>
+ <menuitem><a href="researchReportBibo.html">Literaturverzeichnis</a> </menuitem>
+ <menuitem><a href="researchReportQuestion.html">Forschnugsfrage</a> </menuitem>
+ <menuitem><a href="researchReportConcept.html">Konzept</a></menuitem>
+ <menuitem><a href="researchReportMethod.html">Methodik</a></menuitem>
+ <menuitem><a href="researchReportDo.html">Durchführung</a></menuitem>
+ <menuitem><a href="researchReportEvaluation.html"><font color="#green">Evalution</font></a></menuitem>
+ </menu>
+ </nav>
</div>
</form>
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportMethod.html b/gemeinsamforschen/src/main/webapp/pages/researchReportMethod.html
index f02829c9..928fea62 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportMethod.html
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportMethod.html
@@ -1,11 +1,13 @@
<html>
<head>
+ <meta charset="utf-8">
<script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
<link rel="stylesheet" type="text/css" href="../assets/css/researchReport.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="../assets/js/utility.js"></script>
+ <script src="../assets/js/Sidebar-Menu.js"></script>
<title>Forschungsbericht erstellen</title>
</head>
<body>
@@ -36,8 +38,23 @@
</textarea>
</div>
<div class="ResearchReportButtons">
- <input type="submit" class="researchReportButtons">
- <button class="researchReportButtons"> Zurück </button>
+ <button type="submit" class="researchReportButtons"><a href="researchReportDo.html">Speichern & weiter</a></button>
+ <button class="researchReportButtons"><a href="researchReportConcept.html"> Zurück </a></button>
+ </div>
+
+ <div class="researchReportProgress">
+ <nav>
+ <menu>
+ <menuitem><a href="researchReportTitle.html">Titel</a> </menuitem>
+ <menuitem><a href="researchReportRecherche.html">Recherche</a> </menuitem>
+ <menuitem><a href="researchReportBibo.html">Literaturverzeichnis</a> </menuitem>
+ <menuitem><a href="researchReportQuestion.html">Forschnugsfrage</a> </menuitem>
+ <menuitem><a href="researchReportConcept.html">Konzept</a></menuitem>
+ <menuitem><a href="researchReportMethod.html"><font color="#green">Methodik</font></a></menuitem>
+ <menuitem><a href="researchReportDo.html">Durchführung</a></menuitem>
+ <menuitem><a href="researchReportEvaluation.html">Evalution</a></menuitem>
+ </menu>
+ </nav>
</div>
</form>
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportQuestion.html b/gemeinsamforschen/src/main/webapp/pages/researchReportQuestion.html
index b27ef662..00b32097 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportQuestion.html
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportQuestion.html
@@ -1,10 +1,12 @@
<html>
<head>
+ <meta charset="utf-8">
<script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
<link rel="stylesheet" type="text/css" href="../assets/css/researchReport.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="../assets/js/utility.js"></script>
+ <script src="../assets/js/Sidebar-Menu.js"></script>
<title>Forschungsbericht erstellen</title>
</head>
<body>
@@ -35,20 +37,20 @@
</textarea>
</div>
<div class="ResearchReportButtons">
- <input type="submit" class="researchReportButtons">
- <button class="researchReportButtons"> Zurück </button>
+ <button type="submit" class="researchReportButtons"><a href="researchReportConcept.html">Speichern & weiter</a></button>
+ <button class="researchReportButtons"><a href="researchReportBibo.html"> Zurück </a></button>
</div>
<div class="researchReportProgress">
<nav>
<menu>
- <menuitem><a href="">Titel</a> </menuitem>
- <menuitem><a href="">Recherche</a> </menuitem>
- <menuitem><a href="">Literaturverzeichnis</a> </menuitem>
- <menuitem><a href=""><font color="#green">Forschnugsfrage</font></a> </menuitem>
- <menuitem><a href="">Konzept</a></menuitem>
- <menuitem><a href="">Methodik</a></menuitem>
- <menuitem><a href="">Durchführung</a></menuitem>
- <menuitem><a href="">Evalution</a></menuitem>
+ <menuitem><a href="researchReportTitle.html">Titel</a> </menuitem>
+ <menuitem><a href="researchReportRecherche.html">Recherche</a> </menuitem>
+ <menuitem><a href="researchReportBibo.html">Literaturverzeichnis</a> </menuitem>
+ <menuitem><a href="researchReportQuestion.html"><font color="#green">Forschnugsfrage</font></a> </menuitem>
+ <menuitem><a href="researchReportConcept.html">Konzept</a></menuitem>
+ <menuitem><a href="researchReportMethod.html">Methodik</a></menuitem>
+ <menuitem><a href="researchReportDo.html">Durchführung</a></menuitem>
+ <menuitem><a href="researchReportEvaluation.html">Evalution</a></menuitem>
</menu>
</nav>
</div>
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportRecherche.html b/gemeinsamforschen/src/main/webapp/pages/researchReportRecherche.html
index d1005678..f8517378 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportRecherche.html
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportRecherche.html
@@ -1,11 +1,13 @@
<html>
<head>
+ <meta charset="utf-8">
<script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
<link rel="stylesheet" type="text/css" href="../assets/css/researchReport.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="../assets/js/utility.js"></script>
+ <script src="../assets/js/Sidebar-Menu.js"></script>
<title>Forschungsbericht erstellen</title>
</head>
<body>
@@ -36,8 +38,22 @@
</textarea>
</div>
<div class="ResearchReportButtons">
- <input type="submit" class="researchReportButtons">
- <button class="researchReportButtons"> Zurück </button>
+ <button type="submit" class="researchReportButtons"><a href="researchReportBibo.html">Speichern & weiter</a></button>
+ <button class="researchReportButtons"><a href="researchReportTitle.html"> Zurück </a></button>
+ </div>
+ <div class="researchReportProgress">
+ <nav>
+ <menu>
+ <menuitem><a href="researchReportTitle.html">Titel</a> </menuitem>
+ <menuitem><a href="researchReportRecherche.html"><font color="#green">Recherche</font></a> </menuitem>
+ <menuitem><a href="researchReportBibo.html">Literaturverzeichnis</a> </menuitem>
+ <menuitem><a href="researchReportQuestion.html">Forschnugsfrage</a> </menuitem>
+ <menuitem><a href="researchReportConcept.html">Konzept</a></menuitem>
+ <menuitem><a href="researchReportMethod.html">Methodik</a></menuitem>
+ <menuitem><a href="researchReportDo.html">Durchführung</a></menuitem>
+ <menuitem><a href="researchReportEvaluation.html">Evalution</a></menuitem>
+ </menu>
+ </nav>
</div>
</form>
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportTitle.html b/gemeinsamforschen/src/main/webapp/pages/researchReportTitle.html
index 54869f43..d93f73b9 100644
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportTitle.html
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportTitle.html
@@ -1,11 +1,13 @@
<html>
<head>
+ <meta charset="utf-8">
<script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
<link rel="stylesheet" type="text/css" href="../assets/css/researchReport.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="../assets/js/utility.js"></script>
+ <script src="../assets/js/Sidebar-Menu.js"></script>
<title>Forschungsbericht erstellen</title>
</head>
<body>
@@ -36,8 +38,23 @@
</textarea>
</div>
<div class="ResearchReportButtons">
- <input type="submit" class="researchReportButtons">
- <button class="researchReportButtons"> Zurück </button>
+ <button type="submit" class="researchReportButtons"><a href="researchReportRecherche.html">Speichern & weiter</a></button>
+ <button class="researchReportButtons"><a href="project-student.jsp"> Zurück </a></button>
+ </div>
+
+ <div class="researchReportProgress">
+ <nav>
+ <menu>
+ <menuitem><a href="researchReportTitle.html"><font color="#green">Titel</font></a> </menuitem>
+ <menuitem><a href="researchReportRecherche.html">Recherche</a> </menuitem>
+ <menuitem><a href="researchReportBibo.html">Literaturverzeichnis</a> </menuitem>
+ <menuitem><a href="researchReportQuestion.html">Forschnugsfrage</a> </menuitem>
+ <menuitem><a href="researchReportConcept.html">Konzept</a></menuitem>
+ <menuitem><a href="researchReportMethod.html">Methodik</a></menuitem>
+ <menuitem><a href="researchReportDo.html">Durchführung</a></menuitem>
+ <menuitem><a href="researchReportEvaluation.html">Evalution</a></menuitem>
+ </menu>
+ </nav>
</div>
</form>
--
GitLab