diff --git a/gemeinsamforschen/src/main/webapp/assets/css/journal.css b/gemeinsamforschen/src/main/webapp/assets/css/create-journal.css
similarity index 78%
rename from gemeinsamforschen/src/main/webapp/assets/css/journal.css
rename to gemeinsamforschen/src/main/webapp/assets/css/create-journal.css
index 434182408c82e3e848693ac8651d7846dae57fe3..c7d58208e89f8c5df5f49f9c6b35ce46e93aae59 100644
--- a/gemeinsamforschen/src/main/webapp/assets/css/journal.css
+++ b/gemeinsamforschen/src/main/webapp/assets/css/create-journal.css
@@ -5,38 +5,31 @@
grid-template-columns: 40% 40% 20%;
}
-.visibility{
+.jounral-form-visibility{
grid-column-start:1;
grid-column-end:1;
grid-row-start:1;
grid-row-end:1;
}
-.category{
+.jounral-form-category{
grid-column-start:2;
grid-column-end:2;
grid-row-start:1;
grid-row-end:1;
}
-.editor{
+.jounral-form-editor{
grid-column-start:1;
grid-column-end:3;
grid-row-start:2;
grid-row-end:2;
}
-.save{
+.jounral-form-buttons{
grid-column-start:1;
grid-column-end:1;
grid-row-start:3;
grid-row-end:3;
}
-.back{
- grid-column-start:2;
- grid-column-end:2;
- grid-row-start:3;
- grid-row-end:3;
-}
-
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/eportfolio.css b/gemeinsamforschen/src/main/webapp/assets/css/eportfolio.css
new file mode 100644
index 0000000000000000000000000000000000000000..20c6422fcdf8ba05645a00ff5aceee9d9ccea919
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/assets/css/eportfolio.css
@@ -0,0 +1,90 @@
+.journal-description-container{
+ height:50vh;
+ display: grid;
+ grid-template-rows: 10% 20% 10% 50%;
+ grid-template-columns: 75% 5% 5% 15%;
+}
+
+.journal-description-title{
+ grid-column-start:1;
+ grid-column-end:1;
+ grid-row-start:1;
+ grid-row-end:1;
+}
+
+.journal-description-edit{
+ grid-column-start:2;
+ grid-column-end:2;
+ grid-row-start:1;
+ grid-row-end:1;
+}
+
+.journal-description-group{
+ grid-column-start:4;
+ grid-column-end:4;
+ grid-row-start:1;
+ grid-row-end:2;
+}
+
+.journal-description-text{
+ grid-column-start:1;
+ grid-column-end:3;
+ grid-row-start:2;
+ grid-row-end:4;
+}
+
+.journal-description-links{
+ grid-column-start:4;
+ grid-column-end:4;
+ grid-row-start:3;
+ grid-row-end:4;
+}
+
+.journal-container{
+ height:50vh;
+ display: grid;
+ grid-template-rows: 10% 90%;
+ grid-template-columns: 20% 30% 25% 5% 5% 15%;
+}
+
+.journal-name{
+ grid-column-start:1;
+ grid-column-end:1;
+ grid-row-start:1;
+ grid-row-end:1;
+}
+
+.journal-date{
+ grid-column-start:2;
+ grid-column-end:2;
+ grid-row-start:1;
+ grid-row-end:1;
+}
+
+.journal-category{
+ grid-column-start:3;
+ grid-column-end:3;
+ grid-row-start:1;
+ grid-row-end:1;
+}
+
+.journal-edit{
+ grid-column-start:4;
+ grid-column-end:4;
+ grid-row-start:1;
+ grid-row-end:1;
+}
+
+.journal-avatar{
+ grid-column-start:1;
+ grid-column-end:1;
+ grid-row-start:2;
+ grid-row-end:2;
+}
+
+.journal-text{
+ grid-column-start:2;
+ grid-column-end:5;
+ grid-row-start:2;
+ grid-row-end:2;
+}
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/createJournal.html b/gemeinsamforschen/src/main/webapp/pages/createJournal.html
index dc71b6ac580362a3f01292d34abb20946e90ac4d..5ce9435a5bd79bcccecac27378caeaab73d64162 100644
--- a/gemeinsamforschen/src/main/webapp/pages/createJournal.html
+++ b/gemeinsamforschen/src/main/webapp/pages/createJournal.html
@@ -3,9 +3,10 @@
<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/journal.css">
+ <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">
+ <title>Tagebucheintrag erstellen</title>
</head>
<body>
@@ -18,7 +19,7 @@
<div class="jounral-form-container">
- <div class = "visibility">
+ <div class = "jounral-form-visibility">
Sichtbarkeit:
<select name="visibility" form="journalform">
<option value="ALL"> Alle </option>
@@ -28,7 +29,7 @@
</select>
</div>
- <div class = "category">
+ <div class = "jounral-form-category">
Kategorie:
<select name="category" form="journalform">
<option value="A"> A </option>
@@ -37,18 +38,16 @@
</div>
- <div class ="editor">
+ <div class ="jounral-form-editor">
<textarea id = "editor" name="text" form="journalform" >
</textarea>
</div>
- <div class="save">
+ <div class="jounral-form-buttons">
<input type="submit">
+ <button> Zurü ü k </button>
</div>
- <div class="back">
- <button> Zurück </button>
- </div>
</div>
</form>
diff --git a/gemeinsamforschen/src/main/webapp/pages/eportfolio.html b/gemeinsamforschen/src/main/webapp/pages/eportfolio.html
new file mode 100644
index 0000000000000000000000000000000000000000..58fb15c81bd8b8b98bae08f793c0ff16ab00d86c
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/eportfolio.html
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <title>E Portfolio</title>
+
+ <link rel="stylesheet" type="text/css" href="../assets/css/eportfolio.css">
+
+</head>
+<body>
+
+<h1>E-Portfolio</h1>
+<div class="journal-description-container">
+ <div class="journal-description-title">
+ <h2>Projektname</h2>
+ </div>
+ <div class="journal-description-edit">
+ <button>ändern</button>
+ </div>
+ <div class="journal-description-text">
+ Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+
+ Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
+
+ Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.
+
+ Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.
+
+ Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis.
+
+ At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, At accusam aliquyam diam diam dolore dolores duo eirmod eos erat, et nonumy sed tempor et et invidunt justo labore Stet clita ea et gubergren, kasd magna no rebum. sanctus sea sed takimata ut vero voluptua. est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur
+ </div>
+ <div class="journal-description-group">
+ <h3>Gruppe</h3>
+ Test Testname<br/>
+ Test Testname<br/>
+ Test Testname<br/>
+ </div>
+ <div class="journal-description-links">
+ <h3>Links</h3>
+ <a href="www.google.de">Test</a><br/>
+ <a href="www.google.de">Test</a><br/>
+ <a href="www.google.de">Test</a><br/>
+ </div>
+
+</div>
+
+<h2>Lernatagebuch</h2>
+ <select>
+ <option>Alle</option>
+ <option>Eigene</option>
+ </select>
+
+
+<div class="journal-container">
+ <div class="journal-avatar">
+ BIld
+ </div>
+
+ <div class="journal-date">
+ 01.01.2000
+ </div>
+ <div class="journal-name">
+ Max Mustermann
+ </div>
+ <div class="journal-category">
+ Methodik
+ </div>
+ <div class="journal-edit">
+ <button>ändern</button>
+ </div>
+ <div class="journal-text">
+ Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+ </div>
+</div>
+</body>
+</html>
\ No newline at end of file