fix: Journal tokens from url in js and html

gemeinsamforschen/src/main/webapp/assets/js/createJournal.js

@@ -10,6 +10,10 @@ function getQueryVariable(variable)
 }
 
 $(document).ready(function() {
+    $('#backLink').on('click', function(){
+        location.href="eportfolio.jsp?token="+getUserTokenFromUrl();
+    });
+
     var journalID = getQueryVariable("journal");
     console.log(journalID);
     if(journalID){

gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js

 //TODO Get student and project form context
 
 $(document).ready(function() {
+    $('#editDescriptionLink').on('click', function(){
+        /*TODO getJournal*/
+        location.href="editDescription.jsp?project=0&token="+getUserTokenFromUrl();
+    });
+
+    $('#createJournalLink').on('click', function(){
+        location.href="createJournal.jsp?token="+getUserTokenFromUrl();
+    });
+
     $.ajax({
         url: "../rest/projectdescription/0"
     }).then(function(data) {
@@ -64,7 +73,7 @@ function loadJournals(data) {
                     data[journal].category +
                 '</div>' +
                 '<div class="journal-edit" align="right">' +
-                    '<a class="btn btn-default btn-sm" href="createJournal.jsp?token=test&journal=' + data[journal].id + '"><i class="fa fa-pencil"></i> Bearbeiten</a>' +
+                    '<a class="btn btn-default btn-sm" href="createJournal.jsp?token='+getUserTokenFromUrl()+'&journal=' + data[journal].id + '"><i class="fa fa-pencil"></i> Bearbeiten</a>' +
                     '<a class="btn btn-default btn-sm" data-toggle="modal" data-target="#closeJournalModal"><i class="fa fa-check-square" aria-hidden="true"></i>Abschlie&szlig;en</a>' +
                 '</div>' +
                 '<div class="journal-text">' +

gemeinsamforschen/src/main/webapp/assets/js/editDescription.js

 $(document).ready(function() {
+    $('#backLink').on('click', function(){
+        location.href="eportfolio.jsp?token="+getUserTokenFromUrl();
+    });
+
     $.ajax({
         url: "../rest/projectdescription/0"
         }).then(function(data) {

gemeinsamforschen/src/main/webapp/pages/createJournal.jsp

@@ -13,6 +13,7 @@
 	<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>
+	<script src="../assets/js/utility.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">
@@ -82,7 +83,7 @@
 
 								<div class="journal-form-buttons">
 									<input class="btn btn-default btn-sm" type="submit">
-									<a class="btn btn-default btn-sm" href="eportfolio.jsp?token=test"> Zur&uuml;ck </a>
+									<a id="backLink" class="btn btn-default btn-sm"> Zur&uuml;ck </a>
 								</div>
 
 							</div>

gemeinsamforschen/src/main/webapp/pages/editDescription.jsp

@@ -13,6 +13,7 @@
     <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>
+    <script src="../assets/js/utility.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">
@@ -56,7 +57,7 @@
 
                                 <div class="description-form-buttons">
                                     <input class="btn btn-default btn-sm" type="submit">
-                                    <a class="btn btn-default btn-sm" href="eportfolio.jsp?token=test">Zur&uuml;ck</a>
+                                    <a id="backLink" class="btn btn-default btn-sm">Zur&uuml;ck</a>
                                 </div>
 
                             </div>

gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp

@@ -9,13 +9,15 @@
     <title>E-Portfolio</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">
-    <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>
     <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" href="../assets/css/e-portfolio.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="../assets/js/utility.js"></script>
+
 </head>
 
 <body>
@@ -51,7 +53,7 @@
                                     <div class="journal-description-title">
                                     </div>
                                     <div class="journal-description-edit" align="right">
-                                        <a class="btn btn-default btn-sm" href="editDescription.jsp?project=0&token=test">
+                                        <a id="editDescriptionLink" class="btn btn-default btn-sm">
                                             <i class="fa fa-pencil"></i> Bearbeiten</a>
                                         <a class="btn btn-default btn-sm" data-toggle="modal" data-target="#closeDescriptionModal"><i class="fa fa-check-square" aria-hidden="true"></i>Abschlie&szlig;en</a>
 
@@ -70,14 +72,14 @@
                             </div>
 
                             <div id="journal-container" class="tab-pane fade">
-                                    <h2>Lernatagebuch</h2>
+                                    <h2>Lerntagebuch</h2>
                                     <div class="input-group">
                                     <select id="journalfilter" class="form-control" style="width:auto;" onchange="filterJournals()">
                                         <option value="ALL">Alle</option>
                                         <option value="OWN">Eigene</option>
                                     </select>
 
-                                    <a class="btn btn-default btn-sm" href="createJournal.jsp?token=test">Neu</a>
+                                    <a id="createJournalLink"class="btn btn-default btn-sm" >Neu</a>
                                 </div>
                                 <div class="journal">
                                 </div>