Skip to content

Commit 2d53546

Browse files
fakitfakit
authored
Merge pull request #2 from OpenHistoricalDataMap/fakit
Mergin fakit into Master for the 2nd Step of the importprozess.
2 parents 3fcd1d0 + fc8490d commit 2d53546

File tree

16 files changed

+802
-113
lines changed

16 files changed

+802
-113
lines changed

‎.idea/codeStyles/Project.xml‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/codeStyles/codeStyleConfig.xml‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/jarRepositories.xml‎

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/uiDesigner.xml‎

Lines changed: 124 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/main/webapp/ShapeUpdate.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
<!-- Bootstrap CSS -->
99
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
10+
<link href="https://netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet">
1011

1112
<!-- Optional JavaScript -->
1213
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
@@ -30,10 +31,10 @@
3031
<body>
3132
<div class="container">
3233
<div class="row">
33-
<h1>OHM-Shapefile Import</h1>
34+
<h1>OHDM-Shapefile Import</h1>
3435
</div>
3536
<div class="row">
36-
<form>
37+
<form >
3738
<div class="form-group row">
3839
<label for="key">Key</label>
3940
<input type="text" id="key" name="tableKey"/>
@@ -43,7 +44,6 @@ <h1>OHM-Shapefile Import</h1>
4344
</div>
4445
</form>
4546
</div>
46-
4747
<div id="importedShapes">
4848

4949
</div>

‎src/main/webapp/css/main.css‎

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,54 @@
11
body {
22
background-color: dimgrey;
33
color: white;
4+
font-size: 25px;
45
}
6+
#main {
7+
width: 60em;
8+
margin: 6em auto;
9+
display: flex;
10+
flex-direction: column;
11+
align-items: center;
12+
background: #e2e2e2;
13+
padding: 2em;
14+
min-height:100% ;
15+
}
16+
17+
* {
18+
transition: all .2s ease;
19+
}
20+
.extra-info {
21+
display: none;
22+
line-height: 30px;
23+
font-size: 25px;
24+
top: 0;
25+
left: 50px;
26+
}
27+
28+
.info:hover .extra-info {
29+
display: block;
30+
}
31+
32+
.info {
33+
font-size: 25px;
34+
padding-left: 5px;
35+
width: 30px;
36+
border-radius: 15px;
37+
}
38+
39+
.info:hover {
40+
background-color: white;
41+
padding: 0 0 0 5px;
42+
width: 315px;
43+
text-align: left !important;
44+
}
45+
label{
46+
width: 100px;
47+
}
48+
549
@media screen and (prefers-color-scheme: light) {
650
body {
7-
background-color: white;
51+
background-color: dodgerblue;
852
color: black;
953
}
1054
}

‎src/main/webapp/index.html‎

Lines changed: 66 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,37 +7,93 @@
77

88
<!-- Bootstrap CSS -->
99
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
10-
10+
<link href="https://netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet">
11+
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
1112
<!-- Optional JavaScript -->
1213
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
1314
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
1415
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
1516
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
16-
17+
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
1718
<link rel="stylesheet" href="css/main.css">
1819
<script src="js/main.js"></script>
1920
<title>OHM Import</title>
2021
</head>
2122
<body>
22-
<div class="container">
23+
<div class="container" id="main">
2324
<div class="row">
2425
<h1>OHM-Shapefile Import</h1>
2526
</div>
26-
<div class="row">
27-
<form method="POST" action="/ShapeImport" enctype="multipart/form-data">
27+
<div class="row" style="width: 90%" >
28+
<form method="POST" action="/ShapeImport" enctype="multipart/form-data" >
2829
<div class="form-group row">
29-
<label for="inputFile">Shapefile</label>
30-
<input type="file" id="inputFile" name="shapefile" accept="application/zip"/>
30+
<div class="first-col"> <label for="inputFile">Shapefile</label></div>
31+
<div class="sec-col"><input class="required" type="file" id="inputFile" name="shapefile" accept="application/zip"/></div>
32+
33+
<div class="info">
34+
<i class="icon-info-sign"></i>
35+
36+
<span class="extra-info">
37+
Hier wird die zu importierte Shapefile ausgewählt und geladen.
38+
39+
40+
</span>
41+
</div>
3142
</div>
3243
<div class="form-group row">
33-
<label for="userName">Username</label>
34-
<input type="text" id="userName" name="userName"/>
44+
<div class="first-col"><label for="userName">Username</label></div>
45+
<div class="sec-col"> <input class="required" type="text" id="userName" name="userName"/></div>
46+
47+
<div class="info">
48+
<i class="icon-info-sign"></i>
49+
50+
<span class="extra-info"> Bitte geben Sie der Name der aktuellen User fur den Import ein.
51+
</span>
52+
</div>
53+
</div>
54+
<!-- <div class="form-group row">
55+
<div class="first-col"><label for="startDate">Valid since</label></div>
56+
<div class="sec-col"><input class="required" type="date" value="" id="startDate" name="startDate"/></div>
57+
58+
<div class="info">
59+
<i class="icon-info-sign"></i>
60+
61+
<span class="extra-info">
62+
A little column extra info. Aaand just a little bit more
63+
</span>
64+
</div>
65+
</div>
66+
<div class="form-group row">
67+
<div class="first-col"><label for="endDate">Valid until</label></div>
68+
<div class="sec-col"><input class="required" type="date" value="" id="endDate" name="endDate"/></div>
69+
70+
<div class="info">
71+
<i class="icon-info-sign"></i>
72+
73+
<span class="extra-info">
74+
A little column extra info. Aaand just a little bit more
75+
</span>
76+
</div>
3577
</div>
3678
<div class="form-group row">
37-
<button type="submit" class="btn btn-primary" id="btnSubmit">Upload</button>
79+
<div class="first-col"><label for="classificationId">Classification Id</label></div>
80+
<div class="sec-col"><input class="required" type="text" value="" id="classificationId" name="classificationId"/></div>
81+
82+
<div class="info">
83+
<i class="icon-info-sign"></i>
84+
85+
<span class="extra-info">
86+
A little column extra info. Aaand just a little bit more
87+
</span>
88+
</div>
89+
</div>-->
90+
<div class="form-group row">
91+
<button type="submit" class="btn btn-primary toggle-disabled" id="btnSubmit" >Upload</button>
92+
3893
</div>
3994
</form>
4095
</div>
96+
4197
</div>
4298
</body>
4399
</html>

0 commit comments

Comments
 (0)