diff --git a/gemeinsamforschen/src/main/webapp/assets/css/upload-unstructured.css b/gemeinsamforschen/src/main/webapp/assets/css/upload-unstructured.css index 4acd0827e4474b522b925dbf0c972e2dde285b89..16ff7e4ce9ecbb4d462b22445ac2bbe064279705 100644 --- a/gemeinsamforschen/src/main/webapp/assets/css/upload-unstructured.css +++ b/gemeinsamforschen/src/main/webapp/assets/css/upload-unstructured.css @@ -134,6 +134,9 @@ ol { .document-text-buttons-lock { float: left; } +.document-text-buttons-back { + float: left; +} .document-text-buttons-save { float: right; } diff --git a/gemeinsamforschen/src/main/webapp/assets/js/project-student.js b/gemeinsamforschen/src/main/webapp/assets/js/project-student.js index 9a7b01bf581634f5e54b27001da6f658bb8e01a7..ffc7facbdd443de53ce28d7faeb0cefd84298e7a 100644 --- a/gemeinsamforschen/src/main/webapp/assets/js/project-student.js +++ b/gemeinsamforschen/src/main/webapp/assets/js/project-student.js @@ -16,4 +16,8 @@ $(document).ready(function(){ $('.annotationview').click(function () { location.href="annotation-document.jsp?token="+getUserTokenFromUrl(); }); + + $('#btnUnstructuredUpload').click(function () { + location.href="upload-unstructured.jsp?token="+getUserTokenFromUrl(); + }) }); \ No newline at end of file diff --git a/gemeinsamforschen/src/main/webapp/assets/js/uploadUnstructured.js b/gemeinsamforschen/src/main/webapp/assets/js/uploadUnstructured.js index ac630c6de342fc057ec52a67f8082a3c8eeaa242..dd85243d662c9bf71e25212e89c42597e830c3d9 100644 --- a/gemeinsamforschen/src/main/webapp/assets/js/uploadUnstructured.js +++ b/gemeinsamforschen/src/main/webapp/assets/js/uploadUnstructured.js @@ -51,9 +51,13 @@ $(document).ready(function() { } }); - /* - * PAGE LOADED - */ + $('#btnSave').click(function () { + location.href="project-student.jsp?token="+getUserTokenFromUrl(); + }); + + $('#btnBack').click(function () { + location.href="project-student.jsp?token="+getUserTokenFromUrl(); + }); documentText = $('#documentText').html(); diff --git a/gemeinsamforschen/src/main/webapp/pages/project-student.jsp b/gemeinsamforschen/src/main/webapp/pages/project-student.jsp index 5e04db86418a93cc02d7a2ba0638316429492249..99969f2b225d63cb6dddda7a23552eb02b5cc96b 100644 --- a/gemeinsamforschen/src/main/webapp/pages/project-student.jsp +++ b/gemeinsamforschen/src/main/webapp/pages/project-student.jsp @@ -213,6 +213,7 @@ </div> </div> <button id="nextPhase" class="btn btn-light">nächste Phase</button> + <button id="btnUnstructuredUpload" class="btn btn-light">Unstrukturierte Abgabe</button> </div> </footer> </div> diff --git a/gemeinsamforschen/src/main/webapp/pages/upload-unstructured.jsp b/gemeinsamforschen/src/main/webapp/pages/upload-unstructured.jsp index cc3d48dad61e01c03d693b144b11380df1406dea..98dba6d3b364f74390ee3854c86089c0fec1f224 100644 --- a/gemeinsamforschen/src/main/webapp/pages/upload-unstructured.jsp +++ b/gemeinsamforschen/src/main/webapp/pages/upload-unstructured.jsp @@ -30,6 +30,8 @@ <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js" type="text/javascript"></script> <!-- js - contextMenu script --> <script src="https://swisnl.github.io/jQuery-contextMenu/dist/jquery.contextMenu.js" type="text/javascript"></script> + <!-- js - utility script --> + <script src="../assets/js/utility.js"></script> <!-- js - annotationScript --> <script src="../assets/js/uploadUnstructured.js"></script> @@ -68,7 +70,8 @@ At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergr </div> <div class="document-text-buttons"> <button onclick="lockButtonHandler()" type="button" class="btn btn-secondary document-text-buttons-lock" id="btnLock"><i class="fas fa-lock-open" id="lock"></i></button> - <button type="button" class="btn btn-secondary document-text-buttons-save" id="btnSave">Speichern</i></button> + <button type="button" class="btn btn-secondary document-text-buttons-back" id="btnBack">Zurück</button> + <button type="button" class="btn btn-primary document-text-buttons-save" id="btnSave">Speichern</button> </div> </div> </div>