Skip to content
Snippets Groups Projects
Commit 7ce0c286 authored by tudtianus's avatar tudtianus
Browse files

fix: Add menu to createJournal page

parent 6d2eeb64
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
gemeinsamforschen/src/main/resources/log4j2.xml
+ 1
− 1
View file @ 7ce0c286
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</Console> </Console>
</Appenders> </Appenders>
<Loggers> <Loggers>
<Root level="info"> <Root level="debug">
<AppenderRef ref="Console"/> <AppenderRef ref="Console"/>
</Root> </Root>
</Loggers> </Loggers>
......
gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js
+ 1
− 1
View file @ 7ce0c286
...@@ -29,7 +29,7 @@ $(document).ready(function() { ...@@ -29,7 +29,7 @@ $(document).ready(function() {
'</div><div class="journal-category">' + '</div><div class="journal-category">' +
data[journal].category + data[journal].category +
'</div><div class="journal-edit">' + '</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">' + ' </div><div class="journal-text">' +
data[journal].entry + data[journal].entry +
'</div>') '</div>')
......
gemeinsamforschen/src/main/webapp/pages/createJournal.html → gemeinsamforschen/src/main/webapp/pages/createJournal.jsp
+ 134
− 0
View file @ 7ce0c286
<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu"%>
<!DOCTYPE html> <!DOCTYPE html>
<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"> <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"> <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://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="../assets/js/utility.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">
<title>Tagebucheintrag erstellen</title>
</head> </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"> <body>
<div id="wrapper">
<div class = "journal-form-visibility"> <menu:menu></menu:menu>
Sichtbarkeit:
<select id="visibility" name="visibility" form="journalform"> <div class="page-content-wrapper">
<option value="ALL"> Alle </option> <div class="container-fluid">
<option value="GROUP"> Gruppe </option> <h1 id="projectId">project1
<option value="DOZENT"> Dozent </option> <a href="#">
<option value="NONE"> Niemand </option> <span class="glyphicon glyphicon-envelope"
</select> style="font-size:27px;margin-top:-17px;margin-left:600px;"></span>
</div> </a>
<a href="#">
<div class = "journal-form-category"> <span class="glyphicon glyphicon-cog" style="font-size:29px;margin-left:5px;margin-top:-25px;"></span>
Kategorie: </a></h1>
<select name="category" form="journalform">
<option value="A"> A </option>
<option value="B"> B </option>
</select>
</div> </div>
<div>
<table>
<div class ="journal-form-editor"> <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 id = "editor" name="text" form="journalform" >
</textarea> </textarea>
</div> </div>
<div class="journal-form-buttons"> <div class="journal-form-buttons">
<input type="submit"> <input type="submit">
<button> Zur&uuml;ck </button> <button> Zur&uuml;ck </button>
</div> </div>
</div>
</form>
</td>
</tr>
</table>
</div>
</div> </div>
</form> </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> <script>
/* /*
*/ */
...@@ -78,18 +116,19 @@ ...@@ -78,18 +116,19 @@
//TODO preselet in select tags //TODO preselet in select tags
new InscrybMDE({
element: document.getElementById("editor"),
spellChecker: false,
forceSync: true,
});
console.log(data); console.log(data);
}); });
} }
new InscrybMDE({
element: document.getElementById("editor"),
spellChecker: false,
forceSync: true,
});
}) })
</script> </script>
</body> </body>
</html>
</html>
\ No newline at end of file
gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp
+ 1
− 1
View file @ 7ce0c286
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<option>Eigene</option> <option>Eigene</option>
</select> </select>
<a href="createJournal.html">Neu</a> <a href="createJournal.jsp">Neu</a>
<div class="journal"> <div class="journal">
</div> </div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment