From 726eb9ed0e99a004a0cd495280fea63e90b476c4 Mon Sep 17 00:00:00 2001
From: quark <zeisse@uni-potsdam.de>
Date: Tue, 26 Jun 2018 22:18:53 +0200
Subject: [PATCH] added researchReportPage
---
.../main/webapp/assets/css/researchReport.css | 94 +++++++++++--------
.../main/webapp/pages/researchReportOne.html | 41 --------
.../webapp/pages/researchReportTitle.html | 50 ++++++++++
3 files changed, 104 insertions(+), 81 deletions(-)
delete mode 100644 gemeinsamforschen/src/main/webapp/pages/researchReportOne.html
create mode 100644 gemeinsamforschen/src/main/webapp/pages/researchReportTitle.html
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/researchReport.css b/gemeinsamforschen/src/main/webapp/assets/css/researchReport.css
index b184e379..cf10a820 100644
--- a/gemeinsamforschen/src/main/webapp/assets/css/researchReport.css
+++ b/gemeinsamforschen/src/main/webapp/assets/css/researchReport.css
@@ -1,41 +1,55 @@
-html, body {
-width: 100%;
-height: 100%;
-margin: 0;
-padding: 0;
-}
-
-.researchReportForm{
-display: grid;
-grid-gap: 10px;
-grid-template-columns: 1fr 1fr 1fr;
-grid-template-areas:
-"sidebar header ."
-"sidebar editor editor"
-"sidebar editor buttons"
-}
-
-.researchReportMenu{
-background: gray;
-color: White;
-grid-area: sidebar;
-}
-
-.researchReportTitlebar{
-background: white;
-color: black;
-grid-area: header;
-}
-
-.researchReportEditor{
-grid-area: editor;
-background: white;
-color: black;
-}
-
-.researchReportButtons{
-grid-area: buttons;
-background: gray;
-color: black;
-}
+html, body
+ width: 100%
+ height: 100%
+ margin: 0
+ padding: 0
+ font-size: 10px
+ font-family: 'Roboto', sans-serif
+ background-color: gray
+
+.researchReportForm
+ width: 100%
+ display: grid
+ grid-template-rows: 5rem 90vh 5rem
+ grid-template-columns: 15% 75% 10%
+ grid-template-areas: "sidebar header header" "sidebar editor editor" "sidebar buttons ."
+
+
+
+
+.researchReportMenu
+ background: black
+ color: white
+ grid-area: sidebar
+ nav
+ font-size: 1.5rem
+ menu
+ menuitem
+ a
+ color: White
+ text-decoration: none
+ margin: 0 0 0 1rem
+
+
+.researchReportTitlebar
+ background: #303d9b
+ color: White
+ grid-area: header
+
+
+.researchReportEditor
+ grid-area: editor
+ background: gray
+ color: black
+
+
+.researchReportButtons
+ background-color: #4CAF50
+ border: 1.8px solid black
+ color: black
+ padding: 15px 25px
+ text-align: center
+ font-size: 16px
+ cursor: pointer
+
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportOne.html b/gemeinsamforschen/src/main/webapp/pages/researchReportOne.html
deleted file mode 100644
index 1bc7c16c..00000000
--- a/gemeinsamforschen/src/main/webapp/pages/researchReportOne.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<html>
-<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/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>
-
- <title>Forschungsbericht erstellen</title>
-</head>
-<body>
-
-<h1> Forschunhsbericht erstellen </h1>
-
-<form id="researchReportform" class="form-researchReport" method="POST" action="../rest/researchReport/save">
-
- <input type="hidden" name="student" value="0">
- <input type="hidden" name="project" value="0">
-
- <div class="researchReportForm">
- <div class = "researchReportMenu"></div>
- <div class = "researchReportTitlebar"></div>
- <div class ="researchReportEditor">
- <textarea id = "editor" name="text" form="researchReportForm" >
- </textarea>
- </div>
- <div class="ResearchReportButtons">
- <input type="submit">
- <button> Zurück </button>
- </div>
-
- </div>
-</form>
-
-<script>
-
-</script>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/researchReportTitle.html b/gemeinsamforschen/src/main/webapp/pages/researchReportTitle.html
new file mode 100644
index 00000000..1fed1405
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/researchReportTitle.html
@@ -0,0 +1,50 @@
+
+<html>
+<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/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>
+ <title>Forschungsbericht erstellen</title>
+</head>
+<body>
+
+
+
+<form id="researchReportform" class="researchReportForm" method="POST" action="../rest/researchReport/save">
+
+ <div class = "researchReportMenu">
+ <nav>
+ <menu>
+ <menuitem><p><a href="">Gruppe</a></p> </menuitem>
+ <menuitem><p><a href="">Projekt erstellen</a> </p></menuitem>
+ <menuitem><p><a href="">Forschungsbericht erstellen</a></p></menuitem>
+ <menuitem><p><a href="">Review</a></p></menuitem>
+ <menuitem><p><a href="">User</a></p></menuitem>
+ </menu>
+ </nav>
+ </div>
+
+ <div class = "researchReportTitlebar">
+ <h1> Forschunhsbericht erstellen </h1>
+ </div>
+
+ <div class ="researchReportEditor">
+ <h2>Titel eingeben</h2>
+ <textarea id = "editor" name="text" form="researchReportForm" rows="20" cols="100">
+ </textarea>
+ </div>
+ <div class="ResearchReportButtons">
+ <input type="submit" class="researchReportButtons">
+ <button class="researchReportButtons"> Zurück </button>
+ </div>
+
+</form>
+
+<script>
+
+</script>
+
+</body>
+</html>
\ No newline at end of file
--
GitLab