diff --git a/gemeinsamforschen/src/main/resources/log4j2.xml b/gemeinsamforschen/src/main/resources/log4j2.xml
index fccc9f408e851d4bf039588024aba0cea9771354..44a5bde6b293c2233cb735339118c356d16db9dc 100644
--- a/gemeinsamforschen/src/main/resources/log4j2.xml
+++ b/gemeinsamforschen/src/main/resources/log4j2.xml
@@ -6,7 +6,7 @@
</Console>
</Appenders>
<Loggers>
- <Root level="info">
+ <Root level="debug">
<AppenderRef ref="Console"/>
</Root>
</Loggers>
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js b/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js
index 0043b48b7876275c000ed72f260ec7ce8b4691b0..e26ac7846c8acf905108449153324a8efdbd7574 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js
@@ -29,7 +29,7 @@ $(document).ready(function() {
'</div><div class="journal-category">' +
data[journal].category +
'</div><div class="journal-edit">' +
- '<a href="createJournal.html?journal='+ data[journal].id + '"><i class="fa fa-pencil" aria-hidden="true"></i></a>' +
+ '<a href="createJournal.jsp?journal='+ data[journal].id + '"><i class="fa fa-pencil" aria-hidden="true"></i></a>' +
' </div><div class="journal-text">' +
data[journal].entry +
'</div>')
diff --git a/gemeinsamforschen/src/main/webapp/pages/createJournal.html b/gemeinsamforschen/src/main/webapp/pages/createJournal.html
deleted file mode 100644
index 451fa3274da6261d53f18cbee400b7233606c4ea..0000000000000000000000000000000000000000
--- a/gemeinsamforschen/src/main/webapp/pages/createJournal.html
+++ /dev/null
@@ -1,95 +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/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>
-
- <title>Tagebucheintrag erstellen</title>
-</head>
-<body>
-
-<h1> Tagebucheintrag erstellen </h1>
-
-<form id="journalform" class="form-journal" method="POST" action="../rest/journal/save">
-
- <input type="hidden" name="student" value="0">
- <input type="hidden" name="project" value="0">
-
- <div class="journal-form-container">
-
- <div class = "journal-form-visibility">
- Sichtbarkeit:
- <select id="visibility" name="visibility" form="journalform">
- <option value="ALL"> Alle </option>
- <option value="GROUP"> Gruppe </option>
- <option value="DOZENT"> Dozent </option>
- <option value="NONE"> Niemand </option>
- </select>
- </div>
-
- <div class = "journal-form-category">
- Kategorie:
- <select name="category" form="journalform">
- <option value="A"> A </option>
- <option value="B"> B </option>
- </select>
- </div>
-
-
- <div class ="journal-form-editor">
- <textarea id = "editor" name="text" form="journalform" >
- </textarea>
- </div>
-
- <div class="journal-form-buttons">
- <input type="submit">
- <button> Zurück </button>
- </div>
-
- </div>
-</form>
-
-<script>
- /*
-*/
- function getQueryVariable(variable)
- {
- var query = window.location.search.substring(1);
- var vars = query.split("&");
- for (var i=0;i<vars.length;i++) {
- var pair = vars[i].split("=");
- if(pair[0] == variable){return pair[1];}
- }
- return(false);
- }
-
- $(document).ready(function() {
- var journalID = getQueryVariable("journal");
- console.log(journalID);
- if(journalID){
- $.ajax({
- url: "../rest/journal/"+journalID
- }).then(function(data) {
- $('#editor').append(data.entry);
-
- //TODO preselet in select tags
-
- new InscrybMDE({
- element: document.getElementById("editor"),
- spellChecker: false,
- forceSync: true,
- });
-
- console.log(data);
-
- });
- }
- })
-</script>
-
-</body>
-</html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp b/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..5fc2dbfd35bdd35d10c7179fa1687775ad9006a6
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp
@@ -0,0 +1,134 @@
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
+
+<!DOCTYPE html>
+<html>
+
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>Tagebucheintrag erstellen</title>
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+ <link rel="stylesheet" href="../assets/css/styles.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="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.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">
+ <link rel="stylesheet" type="text/css" href="../assets/css/create-journal.css">
+
+</head>
+
+<body>
+<div id="wrapper">
+ <menu:menu></menu:menu>
+
+ <div class="page-content-wrapper">
+ <div class="container-fluid">
+ <h1 id="projectId">project1
+ <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></h1>
+ </div>
+ <div>
+ <table>
+ <tr>
+ <td id="yourContent">
+ <h1> Tagebucheintrag erstellen </h1>
+
+ <form id="journalform" class="form-journal" method="POST" action="../rest/journal/save">
+
+ <input type="hidden" name="student" value="0">
+ <input type="hidden" name="project" value="0">
+
+ <div class="journal-form-container">
+
+ <div class = "journal-form-visibility">
+ Sichtbarkeit:
+ <select id="visibility" name="visibility" form="journalform">
+ <option value="ALL"> Alle </option>
+ <option value="GROUP"> Gruppe </option>
+ <option value="DOZENT"> Dozent </option>
+ <option value="NONE"> Niemand </option>
+ </select>
+ </div>
+
+ <div class = "journal-form-category">
+ Kategorie:
+ <select name="category" form="journalform">
+ <option value="A"> A </option>
+ <option value="B"> B </option>
+ </select>
+ </div>
+
+
+ <div class ="journal-form-editor">
+ <textarea id = "editor" name="text" form="journalform" >
+ </textarea>
+ </div>
+
+ <div class="journal-form-buttons">
+ <input type="submit">
+ <button> Zurück </button>
+ </div>
+
+ </div>
+ </form>
+
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+</div>
+
+<script src="../assets/js/jquery.min.js"></script>
+<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
+<script src="../assets/js/Sidebar-Menu.js"></script>
+<script>
+ /*
+*/
+ function getQueryVariable(variable)
+ {
+ var query = window.location.search.substring(1);
+ var vars = query.split("&");
+ for (var i=0;i<vars.length;i++) {
+ var pair = vars[i].split("=");
+ if(pair[0] == variable){return pair[1];}
+ }
+ return(false);
+ }
+
+ $(document).ready(function() {
+ var journalID = getQueryVariable("journal");
+ console.log(journalID);
+ if(journalID){
+ $.ajax({
+ url: "../rest/journal/"+journalID
+ }).then(function(data) {
+ $('#editor').append(data.entry);
+
+ //TODO preselet in select tags
+
+
+ console.log(data);
+
+ });
+ }
+ new InscrybMDE({
+ element: document.getElementById("editor"),
+ spellChecker: false,
+ forceSync: true,
+ });
+
+ })
+</script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp b/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp
index 92ce665040881e51a443090fc250e4729867c3ae..4cd3b008e9206e766f113c46eeff8c7127ed17ac 100644
--- a/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp
@@ -62,7 +62,7 @@
<option>Eigene</option>
</select>
- <a href="createJournal.html">Neu</a>
+ <a href="createJournal.jsp">Neu</a>
<div class="journal">
</div>