diff --git a/gemeinsamforschen/src/main/webapp/assets/css/researchReport.css b/gemeinsamforschen/src/main/webapp/assets/css/researchReport.css
index bd132c97584a6d2df270969e785a565d28f9c3d6..d9074aad2960cacb3b11921b1aefbdede8bad780 100644
--- a/gemeinsamforschen/src/main/webapp/assets/css/researchReport.css
+++ b/gemeinsamforschen/src/main/webapp/assets/css/researchReport.css
@@ -1,5 +1,5 @@
-/*
-html, body
+/*Uncompiled for Codepen
+body, html
width: 100%
height: 100%
margin: 0
@@ -11,90 +11,67 @@ html, body
.researchReportForm
width: 100%
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 ."
-
-
-
-
-.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: #003f60
- color: White
- grid-area: header
- display: flex
- justify-content: center
- align-items: center
-
-
-.researchReportEditor
- grid-area: editor
- background: gray
- color: black
- display: flex
- justify-content: Left
- align-items: Center
- .editor-inhalt
- margin: 6rem
+ grid-template-rows: 5rem 100vh 7rem 5rem
+ grid-template-columns: 1fr 1fr 1fr 1fr 1fr
+ grid-template-areas: "header header header header header" "editor editor editor editor editor" ". . buttons upload ." "progress progress progress progress progress"
+ .researchReportTitlebar
+ grid-area: header
+ background-color: #003f60
+ color: white
+ display: flex
+ justify-content: center
+ align-items: center
+
+ .researchReportEditor
+ grid-area: editor
+ background: gray
+ color: black
+ display: flex
+ justify-content: Center
+ align-items: Center
+
+ .editor-inhalt
+ margin: 10rem
padding: 6rem
font-size: 2rem
color: #fff
text-align: Left
width: 10%
-
-
-.researchReportProgress
- background: #003f60
- color: red
- grid-area: progress
- display: flex
- justify-content: center
- align-items: center
- nav
- font-size: 1.2rem
- menu
- menuitem
- a
- color: white
- text-decoration: none
- margin: 0 0 0 0rem
- cursor: pointer
-
-
-
-
-
-.researchReportButtons
- background-color: #4CAF50
- border: 1.8px solid black
- color: black
- padding: 15px 25px
- text-align: center
- font-size: 16px
- cursor: pointer
-
-*/
-
-
-
-
-
-html, body {
+ .researchReportButtons
+ background-color: #4CAF50
+ border: 1.8px solid black
+ color: gray
+ grid-area: buttons
+ padding: 15px 25px
+ text-align: Center
+ font-size: 16px
+ cursor: pointer
+
+
+ .researchReportUpload
+ grid-area: upload
+
+
+ .researchReportProgress
+ background: #003f60
+ color: red
+ grid-area: progress
+ display: flex
+ justify-content: center
+ align-items: center
+ nav
+ font-size: 1.5rem
+ menu
+ menuitem
+ a
+ color: White
+ text-decoration: none
+ margin: 0 0 0 1rem
+ cursor: pointer
+ */
+
+body, html {
width: 100%;
height: 100%;
margin: 0;
@@ -107,52 +84,48 @@ html, body {
.researchReportForm {
width: 100%;
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 .";
-}
-
-.researchReportMenu {
- background: black;
- color: white;
- grid-area: sidebar;
-}
-.researchReportMenu nav {
- font-size: 1.5rem;
+ grid-template-rows: 5rem 100vh 7rem 5rem;
+ grid-template-columns: 1fr 1fr 1fr 1fr 1fr;
+ grid-template-areas: "header header header header header" "editor editor editor editor editor" ". . buttons upload ." "progress progress progress progress progress";
}
-.researchReportMenu nav menu menuitem a {
- color: White;
- text-decoration: none;
- margin: 0 0 0 1rem;
-}
-
-.researchReportTitlebar {
- background: #003f60;
- color: White;
+.researchReportForm .researchReportTitlebar {
grid-area: header;
+ background-color: #003f60;
+ color: white;
display: flex;
justify-content: center;
align-items: center;
}
-
-.researchReportEditor {
+.researchReportForm .researchReportEditor {
grid-area: editor;
background: gray;
color: black;
display: flex;
- justify-content: Left;
+ justify-content: Center;
align-items: Center;
}
-.researchReportEditor .editor-inhalt {
- margin: 6rem;
+.researchReportForm .researchReportEditor .editor-inhalt {
+ margin: 10rem;
padding: 6rem;
font-size: 2rem;
color: #fff;
text-align: Left;
width: 10%;
}
-
-.researchReportProgress {
+.researchReportForm .researchReportButtons {
+ background-color: #4CAF50;
+ border: 1.8px solid black;
+ color: gray;
+ grid-area: buttons;
+ padding: 15px 25px;
+ text-align: Center;
+ font-size: 16px;
+ cursor: pointer;
+}
+.researchReportForm .researchReportUpload {
+ grid-area: upload;
+}
+.researchReportForm .researchReportProgress {
background: #003f60;
color: red;
grid-area: progress;
@@ -160,23 +133,12 @@ html, body {
justify-content: center;
align-items: center;
}
-.researchReportProgress nav {
+.researchReportForm .researchReportProgress nav {
font-size: 1.5rem;
}
-.researchReportProgress nav menu menuitem a {
+.researchReportForm .researchReportProgress nav menu menuitem a {
color: White;
text-decoration: none;
margin: 0 0 0 1rem;
cursor: pointer;
}
-
-.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/assets/js/createReport.js b/gemeinsamforschen/src/main/webapp/assets/js/createReport.js
new file mode 100644
index 0000000000000000000000000000000000000000..63d98acc6166ad51597c412836904d282ee514ec
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/js/createReport.js
@@ -0,0 +1,4 @@
+$(document).ready(function() {
+ $('#backLink').on('click', function(){
+ location.href="researchReportTitle.jsp?token="+getUserTokenFromUrl();
+ })
\ No newline at end of file