From 155ce981faff9e0429bfe047f179828c8eabda40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sven=20K=C3=A4stle?= <sven.kaestle@gmx.de>
Date: Sun, 5 Aug 2018 14:55:42 +0200
Subject: [PATCH] feat: New style for unstructured upload page
---
.../webapp/assets/css/upload-unstructured.css | 152 ++++--------------
.../main/webapp/pages/unstructured-upload.jsp | 16 +-
2 files changed, 31 insertions(+), 137 deletions(-)
diff --git a/gemeinsamforschen/src/main/webapp/assets/css/upload-unstructured.css b/gemeinsamforschen/src/main/webapp/assets/css/upload-unstructured.css
index 16ff7e4c..bf6698e2 100644
--- a/gemeinsamforschen/src/main/webapp/assets/css/upload-unstructured.css
+++ b/gemeinsamforschen/src/main/webapp/assets/css/upload-unstructured.css
@@ -1,143 +1,51 @@
-ol {
- padding: 0px;
- margin: 0px;
- list-style-type: none;
+body, html {
+ height: 100vh;
+ width: 100vw;
}
-.mainpage {
+.content-mainpage {
display: flex;
box-sizing: border-box;
font-family: Arial;
height: 100%;
+ overflow-y: scroll;
+ flex-flow: column nowrap;
}
-.rightcolumn {
- float: right;
- width: 25%;
- display: inline-block;
- /* background-color: blue; */
-}
-.leftcolumn {
- float: left;
- width: 75%;
- display: inline-block;
- /* background-color: yellow; */
-}
-.rightcontent {
- margin: 10px;
-}
-.leftcontent {
- margin: 10px;
- /* background-color: white; */
-}
-.spacing {
- height: 10px;
- /* background-color: orange; */
-}
-
-.annotation-card {
- width: 100%;
- box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2);
- transition: 0.3s;
- border-radius: 5px;
- display: inline-block;
- background-color: white;
-}
-.annotation-card:hover {
- box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2);
-}
-.annotation-header {
- padding: 5px;
- display: flex;
- flex-wrap: wrap;
- align-items: center;
- border-top-right-radius: 5px;
- border-top-left-radius: 5px;
- color: white; }
-.annotation-header i {
- font-size: 11px;
-}
-.annotation-header span {
- font-size: 11px;
- margin-left: 5px;
- margin-right: 5px;
-}
-.annotation-header a:link {
- color: white;
- text-decoration: none;
-}
-.annotation-header a:visited {
- color: white;
- text-decoration: none;
-}
-.annotation-header a:active {
- color: white;
- text-decoration: none;
-}
-.annotation-header a:hover {
- color: #e6e6e6;
- text-decoration: none;
-}
-.annotation-header-title {
+.container-fluid-content {
display: flex;
flex-flow: column;
- width: calc(100% - 40px);
-}
-.annotation-header-toggle {
- height: 40px;
- width: 40px;
- display: flex;
- align-items: center;
- justify-content: center;
- cursor: pointer;
-}
-.annotation-body {
- padding: 8px;
- border-bottom-right-radius: 5px;
- border-bottom-left-radius: 5px;
-}
-.annotation-body p {
- margin: 0px;
- font-size: 13px;
+ height: 100%;
}
-.overflow-hidden {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
+.full-height {
+ height: 100%;
}
-.annotation-footer {
- padding: 5px;
- padding-top: 0px;
- text-align: right;
- font-size: 9px;
- color: lightgrey;
+.flex {
display: flex;
}
-.annotation-footer span {
- margin-left: 5px;
-}
-.annotation-footer-delete {
- margin-right: 5px;
- cursor: pointer;
-}
-.annotation-footer-date {
- flex: 1
-}
-
-
-
-.unstructured-textarea {
- resize: none;
-}
.document-text-buttons {
- margin-top: 10px;
+ margin-bottom: 15px;
+ margin-top: 15px;
display: inline;
}
-.document-text-buttons-lock {
- float: left;
-}
.document-text-buttons-back {
float: left;
}
-.document-text-buttons-save {
+.document-text-buttons-next {
float: right;
}
+.file-upload-area {
+ background-color: blue;
+ height: 20%;
+}
+.upload-text {
+ display: flex;
+ flex-flow: column;
+ height: 100%;
+}
+.upload-text-textarea {
+ resize: none;
+ flex: 1;
+}
+.flex .container-fluid{
+ flex: 1;
+}
diff --git a/gemeinsamforschen/src/main/webapp/pages/unstructured-upload.jsp b/gemeinsamforschen/src/main/webapp/pages/unstructured-upload.jsp
index eed040e2..ad247c26 100644
--- a/gemeinsamforschen/src/main/webapp/pages/unstructured-upload.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/unstructured-upload.jsp
@@ -11,21 +11,7 @@
<!-- 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>
--
GitLab