diff --git a/gemeinsamforschen/src/main/webapp/assets/js/project-student.js b/gemeinsamforschen/src/main/webapp/assets/js/project-student.js
index ffc7facbdd443de53ce28d7faeb0cefd84298e7a..b8f739b417098461694312ea541feebd73292769 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/project-student.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/project-student.js
@@ -18,6 +18,6 @@ $(document).ready(function(){
});
$('#btnUnstructuredUpload').click(function () {
- location.href="upload-unstructured.jsp?token="+getUserTokenFromUrl();
+ location.href="unstructured-upload.jsp?token="+getUserTokenFromUrl();
})
});
\ No newline at end of file
diff --git a/gemeinsamforschen/src/main/webapp/pages/unstructured-upload.jsp b/gemeinsamforschen/src/main/webapp/pages/unstructured-upload.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..eed040e2434d5c0cb219b14f1abca46e0d59299d
--- /dev/null
+++ b/gemeinsamforschen/src/main/webapp/pages/unstructured-upload.jsp
@@ -0,0 +1,60 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="menu" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="headLine" %>
+<%@ taglib uri="../core/pages/gemeinsamForschen.tld" prefix="omniDependencies" %>
+
+<!DOCTYPE html>
+<html>
+
+<head>
+ <omniDependencies:omniDependencies/>
+
+ <!-- css - upload-unstructured -->
+ <link rel="stylesheet" type="text/css" href="../assets/css/upload-unstructured.css">
+ <!-- css - contextMenu -->
+ <link href="https://swisnl.github.io/jQuery-contextMenu/dist/jquery.contextMenu.css" rel="stylesheet" type="text/css" />
+
+ <!-- js - jQuery validation plugin -->
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.14.0/jquery.validate.min.js"></script>
+ <!-- js - jQuery ui position -->
+ <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 - annotation websocket script -->
+ <script src="../assets/js/annotationWebsocket.js"></script>
+ <!-- js - annotation REST script -->
+ <script src="../assets/js/annotationRest.js"></script>
+ <!-- js - annotationScript -->
+ <script src="../assets/js/annotationScript.js"></script>
+</head>
+
+<body>
+<div id="wrapper" class="full-height">
+ <menu:menu></menu:menu>
+ <div class="page-content-wrapper full-height">
+ <div class="container-fluid full-height">
+ <div class="container-fluid-content">
+ <div class="flex">
+ <headLine:headLine/>
+ </div>
+ <div class="content-mainpage">
+ <div class="form-group upload-text" id="documentText">
+ <label for="upload-textarea">Texteingabe</label>
+ <textarea class="upload-text-textarea form-control" placeholder="Text einfügen..." id="upload-textarea"></textarea>
+ </div>
+ <div>
+ <label for="file">Alternativ bitte Datei wählen</label>
+ <input type="file" id="file" name="file">
+ </div>
+ <div class="document-text-buttons">
+ <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-next" id="btnSave">Weiter</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+</body>
+
+</html>
diff --git a/gemeinsamforschen/src/main/webapp/pages/upload-unstructured.jsp b/gemeinsamforschen/src/main/webapp/pages/upload-unstructured.jsp
deleted file mode 100644
index 98dba6d3b364f74390ee3854c86089c0fec1f224..0000000000000000000000000000000000000000
--- a/gemeinsamforschen/src/main/webapp/pages/upload-unstructured.jsp
+++ /dev/null
@@ -1,90 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@ 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>muster-gemeinsam-forschen</title>
-
- <!-- css - annotationStyle -->
- <link rel="stylesheet" type="text/css" href="../assets/css/upload-unstructured.css">
- <!-- css - contextMenu -->
- <link href="https://swisnl.github.io/jQuery-contextMenu/dist/jquery.contextMenu.css" rel="stylesheet" type="text/css" />
- <!-- css - bootstrap -->
- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
- <!-- css - styles -->
- <link rel="stylesheet" href="../assets/css/styles.css">
- <!-- css - font awesome -->
- <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.1.0/css/all.css" integrity="sha384-lKuwvrZot6UHsBSfcMvOkWwlCMgc0TaWr+30HWe3a4ltaBwTZhyTEggF5tJv8tbt" crossorigin="anonymous">
- <!-- css - sidebar -->
- <link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
-
- <!-- js - jQuery -->
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
- <!-- js - bootstrap -->
- <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
- <!-- js - jQuery ui position -->
- <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>
-
-</head>
-
-<body>
-<div id="wrapper">
- <menu:menu></menu:menu>
- <div class="page-content-wrapper">
- <div class="container-fluid">
- <h1>Unstrukturierte Abgabe
- <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 class="mainpage">
- <div class="leftcolumn">
- <div class="leftcontent ">
- <div class="context-menu-one form-group" id="documentText">
- <label for="upload-area">Texteingabe:</label>
- <textarea class="unstructured-textarea form-control" rows="20" id="upload-area">
-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.
-
-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 sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat.
- </textarea>
- </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-back" id="btnBack">Zurück</button>
- <button type="button" class="btn btn-primary document-text-buttons-save" id="btnSave">Speichern</button>
- </div>
- </div>
- </div>
- <div class="rightcolumn">
- <div class="rightcontent">
- <ol id="annotations">
- </ol>
- </div>
- </div>
- </div>
- </div>
- </div>
-</div>
-</body>
-
-</html>
\ No newline at end of file