Skip to content

Commit 0fd435f

Browse files
goekaygoekay
committed
more ui changes
1 parent ebc02a3 commit 0fd435f

4 files changed

Lines changed: 37 additions & 38 deletions

File tree

‎src/main/java/de/rwth/idsg/steve/html/ServletChargePoints.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ private String printAddChargeBox() {
106106
+ "<table class=\"bc\">\n"
107107
+ "<tr><td>chargeBoxId (string):</td><td><input type=\"text\" name=\"chargeBoxId\"></td></tr>\n"
108108
+ "<tr><td><i>chargeBoxId is sufficient enough to register a charge point.<br> "
109-
+ "After every reset of a charge point the remaining fields are updated.</i></td><td></td></tr>"
109+
+ "After every reset of a charge point the remaining fields are updated.</i></td><td></td></tr>\n"
110110
+ "<tr><td></td><td id=\"add_space\"><input type=\"submit\" value=\"Add\"></td></tr>\n"
111111
+ "</table>\n"
112112
+ "</form>\n"

‎src/main/java/de/rwth/idsg/steve/html/ServletOperationsV12.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ private String printChangeAvail() {
158158
+ "<div class=\"op-content\">\n<form method=\"POST\" action=\"" + contextPath + servletPath + "/ChangeAvailability\">\n"
159159
+ Common.printChargePointsMultipleSelect(chargePointsList, "1.2")
160160
+ "<b>Parameters</b><hr>\n"
161-
+ "<table class=\"params\">\n"
161+
+ "<table>\n"
162162
+ "<tr><td>Connector Id (integer):</td><td><input type=\"number\" min=\"0\" name=\"connectorId\" placeholder=\"if empty, 0 = charge point as a whole\"></td></tr>\n"
163163
+ "<tr><td>Availability Type:</td><td><input type=\"radio\" name=\"availType\" value=\"Inoperative\" checked> Inoperative</td></tr>\n"
164164
+ "<tr><td></td><td><input type=\"radio\" name=\"availType\" value=\"Operative\"> Operative</td></tr>\n"
@@ -188,7 +188,7 @@ private String printChangeConf() {
188188
+ "<div class=\"op-content\">\n<form method=\"POST\" action=\"" + contextPath + servletPath + "/ChangeConfiguration\">\n"
189189
+ Common.printChargePointsMultipleSelect(chargePointsList, "1.2")
190190
+ "<b>Parameters</b><hr>\n"
191-
+ "<table class=\"params\">\n"
191+
+ "<table>\n"
192192
+ "<tr><td>Configuration key:</td><td>\n"
193193
+ "<select name=\"confKey\">\n"
194194
+ "<option value=\"HeartBeatInterval\">HeartBeatInterval (in seconds)</option>\n"
@@ -255,7 +255,7 @@ private String printGetDiagnostics() {
255255
+ "<div class=\"op-content\">\n<form method=\"POST\" action=\"" + contextPath + servletPath + "/GetDiagnostics\">\n"
256256
+ Common.printChargePointsMultipleSelect(chargePointsList, "1.2")
257257
+ "<b>Parameters</b><hr>\n"
258-
+ "<table class=\"params\">\n"
258+
+ "<table>\n"
259259
+ "<tr><td>Location (directory URI):</td><td><input type=\"text\" name=\"location\"></td></tr>\n"
260260
+ "<tr><td>Retries (integer):</td><td><input type=\"number\" min=\"0\" name=\"retries\"></td></tr>\n"
261261
+ "<tr><td>Retry Interval (integer):</td><td><input type=\"number\" min=\"0\" name=\"retryInterval\"></td></tr>\n"
@@ -287,7 +287,7 @@ private String printRemoteStartTrans() {
287287
+ "<div class=\"op-content\">\n<form method=\"POST\" action=\"" + contextPath + servletPath + "/RemoteStartTransaction\">\n"
288288
+ Common.printChargePointsSingleSelect(chargePointsList, "1.2")
289289
+ "<b>Parameters</b><hr>\n"
290-
+ "<table class=\"params\">\n"
290+
+ "<table>\n"
291291
+ "<tr><td>Connector Id (integer, not 0):</td><td><input type=\"number\" min=\"1\" name=\"connectorId\"></td></tr>\n"
292292
+ "<tr><td>idTag (string):</td><td><input type=\"text\" name=\"idTag\"></td></tr>\n"
293293
+ "</table>\n"
@@ -316,7 +316,7 @@ private String printRemoteStopTrans() {
316316
+ "<div class=\"op-content\">\n<form method=\"POST\" action=\"" + contextPath + servletPath + "/RemoteStopTransaction\">\n"
317317
+ Common.printChargePointsSingleSelect(chargePointsList, "1.2")
318318
+ "<b>Parameters</b><hr>\n"
319-
+ "<table class=\"params\">\n"
319+
+ "<table>\n"
320320
+ "<tr><td>Transaction Id (integer):</td><td><input type=\"number\" name=\"transactionId\"></td></tr>\n"
321321
+ "</table>\n"
322322
+ "<div class=\"submit-button\"><input type=\"submit\" value=\"Perform\"></div>\n"
@@ -344,7 +344,7 @@ private String printReset() {
344344
+ "<div class=\"op-content\">\n<form method=\"POST\" action=\"" + contextPath + servletPath + "/Reset\">\n"
345345
+ Common.printChargePointsMultipleSelect(chargePointsList, "1.2")
346346
+ "<b>Parameters</b><hr>\n"
347-
+ "<table class=\"params\">\n"
347+
+ "<table>\n"
348348
+ "<tr><td>Reset Type:</td><td><input type=\"radio\" name=\"resetType\" value=\"Hard\" checked> Hard</td></tr>\n"
349349
+ "<tr><td></td><td><input type=\"radio\" name=\"resetType\" value=\"Soft\"> Soft</td></tr>\n"
350350
+ "</table>\n"
@@ -373,7 +373,7 @@ private String printUnlockConnector() {
373373
+ "<div class=\"op-content\">\n<form method=\"POST\" action=\"" + contextPath + servletPath + "/UnlockConnector\">\n"
374374
+ Common.printChargePointsSingleSelect(chargePointsList, "1.2")
375375
+ "<b>Parameters</b><hr>\n"
376-
+ "<table class=\"params\">\n"
376+
+ "<table>\n"
377377
+ "<tr><td>Connector Id (integer, not 0):</td><td><input type=\"number\" min=\"1\" name=\"connectorId\"></td></tr>\n"
378378
+ "</table>\n"
379379
+ "<div class=\"submit-button\"><input type=\"submit\" value=\"Perform\"></div>\n"
@@ -401,7 +401,7 @@ private String printUpdateFirmware() {
401401
+ "<div class=\"op-content\">\n<form method=\"POST\" action=\"" + contextPath + servletPath + "/UpdateFirmware\">\n"
402402
+ Common.printChargePointsMultipleSelect(chargePointsList, "1.2")
403403
+ "<b>Parameters</b><hr>\n"
404-
+ "<table class=\"params\">\n"
404+
+ "<table>\n"
405405
+ "<tr><td>Location (URI):</td><td><input type=\"text\" name=\"location\"></td></tr>\n"
406406
+ "<tr><td>Retries (integer):</td><td><input type=\"number\" min=\"0\" name=\"retries\"></td></tr>\n"
407407
+ "<tr><td>Retry Interval (integer):</td><td><input type=\"number\" min=\"0\" name=\"retryInterval\"></td></tr>\n"

‎src/main/java/de/rwth/idsg/steve/html/ServletOperationsV15.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ private String printChangeAvail() {
207207
+ "<div class=\"op-content\">\n<form method=\"POST\" action=\"" + contextPath + servletPath + "/ChangeAvailability\">\n"
208208
+ Common.printChargePointsMultipleSelect(chargePointsList, "1.5")
209209
+ "<b>Parameters</b><hr>\n"
210-
+ "<table class=\"params\">\n"
210+
+ "<table>\n"
211211
+ "<tr><td>Connector Id (integer):</td><td><input type=\"number\" min=\"0\" name=\"connectorId\" placeholder=\"if empty, 0 = charge point as a whole\"></td></tr>\n"
212212
+ "<tr><td>Availability Type:</td><td><input type=\"radio\" name=\"availType\" value=\"Inoperative\" checked> Inoperative</td></tr>\n"
213213
+ "<tr><td></td><td><input type=\"radio\" name=\"availType\" value=\"Operative\"> Operative</td></tr>\n"
@@ -244,7 +244,7 @@ private String printChangeConf() {
244244
+ "<div class=\"op-content\">\n<form method=\"POST\" action=\"" + contextPath + servletPath + "/ChangeConfiguration\">\n"
245245
+ Common.printChargePointsMultipleSelect(chargePointsList, "1.5")
246246
+ "<b>Parameters</b><hr>\n"
247-
+ "<table class=\"params\">\n"
247+
+ "<table>\n"
248248
+ "<tr><td>Configuration key:</td><td>\n"
249249
+ "<select name=\"confKey\">\n"
250250
+ "<option value=\"HeartBeatInterval\">HeartBeatInterval (in seconds)</option>\n"
@@ -330,7 +330,7 @@ private String printGetDiagnostics() {
330330
+ "<div class=\"op-content\">\n<form method=\"POST\" action=\"" + contextPath + servletPath + "/GetDiagnostics\">\n"
331331
+ Common.printChargePointsMultipleSelect(chargePointsList, "1.5")
332332
+ "<b>Parameters</b><hr>\n"
333-
+ "<table class=\"params\">\n"
333+
+ "<table>\n"
334334
+ "<tr><td>Location (directory URI):</td><td><input type=\"text\" name=\"location\"></td></tr>\n"
335335
+ "<tr><td>Retries (integer):</td><td><input type=\"number\" min=\"0\" name=\"retries\"></td></tr>\n"
336336
+ "<tr><td>Retry Interval (integer):</td><td><input type=\"number\" min=\"0\" name=\"retryInterval\"></td></tr>\n"
@@ -369,7 +369,7 @@ private String printRemoteStartTrans() {
369369
+ "<div class=\"op-content\">\n<form method=\"POST\" action=\"" + contextPath + servletPath + "/RemoteStartTransaction\">\n"
370370
+ Common.printChargePointsSingleSelect(chargePointsList, "1.5")
371371
+ "<b>Parameters</b><hr>\n"
372-
+ "<table class=\"params\">\n"
372+
+ "<table>\n"
373373
+ "<tr><td>Connector Id (integer, not 0):</td><td><input type=\"number\" min=\"1\" name=\"connectorId\"></td></tr>\n"
374374
+ "<tr><td>idTag (string):</td><td><input type=\"text\" name=\"idTag\"></td></tr>\n"
375375
+ "</table>\n"
@@ -405,7 +405,7 @@ private String printRemoteStopTrans() {
405405
+ "<div class=\"op-content\">\n<form method=\"POST\" action=\"" + contextPath + servletPath + "/RemoteStopTransaction\">\n"
406406
+ Common.printChargePointsSingleSelect(chargePointsList, "1.5")
407407
+ "<b>Parameters</b><hr>\n"
408-
+ "<table class=\"params\">\n"
408+
+ "<table>\n"
409409
+ "<tr><td>Transaction Id (integer):</td><td><input type=\"number\" name=\"transactionId\"></td></tr>\n"
410410
+ "</table>\n"
411411
+ "<div class=\"submit-button\"><input type=\"submit\" value=\"Perform\"></div>\n"
@@ -440,7 +440,7 @@ private String printReset() {
440440
+ "<div class=\"op-content\">\n<form method=\"POST\" action=\"" + contextPath + servletPath + "/Reset\">\n"
441441
+ Common.printChargePointsMultipleSelect(chargePointsList, "1.5")
442442
+ "<b>Parameters</b><hr>\n"
443-
+ "<table class=\"params\">\n"
443+
+ "<table>\n"
444444
+ "<tr><td>Reset Type:</td><td><input type=\"radio\" name=\"resetType\" value=\"Hard\" checked> Hard</td></tr>\n"
445445
+ "<tr><td></td><td><input type=\"radio\" name=\"resetType\" value=\"Soft\"> Soft</td></tr>\n"
446446
+ "</table>\n"
@@ -476,7 +476,7 @@ private String printUnlockConnector() {
476476
+ "<div class=\"op-content\">\n<form method=\"POST\" action=\"" + contextPath + servletPath + "/UnlockConnector\">\n"
477477
+ Common.printChargePointsSingleSelect(chargePointsList, "1.5")
478478
+ "<b>Parameters</b><hr>\n"
479-
+ "<table class=\"params\">\n"
479+
+ "<table>\n"
480480
+ "<tr><td>Connector Id (integer, not 0):</td><td><input type=\"number\" min=\"1\" name=\"ConnectorId\"></td></tr>\n"
481481
+ "</table>\n"
482482
+ "<div class=\"submit-button\"><input type=\"submit\" value=\"Perform\"></div>\n"
@@ -511,7 +511,7 @@ private String printUpdateFirmware() {
511511
+ "<div class=\"op-content\">\n<form method=\"POST\" action=\"" + contextPath + servletPath + "/UpdateFirmware\">\n"
512512
+ Common.printChargePointsMultipleSelect(chargePointsList, "1.5")
513513
+ "<b>Parameters</b><hr>\n"
514-
+ "<table class=\"params\">\n"
514+
+ "<table>\n"
515515
+ "<tr><td>Location (URI):</td><td><input type=\"text\" name=\"location\"></td></tr>\n"
516516
+ "<tr><td>Retries (integer):</td><td><input type=\"number\" min=\"0\" name=\"retries\"></td></tr>\n"
517517
+ "<tr><td>Retry Interval (integer):</td><td><input type=\"number\" min=\"0\" name=\"retryInterval\"></td></tr>\n"
@@ -549,7 +549,7 @@ private String printReserveNow() {
549549
+ "<div class=\"op-content\">\n<form method=\"POST\" action=\"" + contextPath + servletPath + "/ReserveNow\">\n"
550550
+ Common.printChargePointsSingleSelect(chargePointsList, "1.5")
551551
+ "<b>Parameters</b><hr>\n"
552-
+ "<table class=\"params\">\n"
552+
+ "<table>\n"
553553
+ "<tr><td>Connector Id (integer):</td><td><input type=\"number\" min=\"0\" name=\"connectorId\" placeholder=\"if empty, 0 = not for a specific connector\"></td></tr>\n"
554554
+ "<tr><td>Expiry Date (ex: 2011-12-21 11:33):</td><td><input type=\"datetime\" name=\"expiryDate\"></td></tr>\n"
555555
+ "<tr><td>idTag (string):</td><td><input type=\"text\" name=\"idTag\"></td></tr>\n"
@@ -587,7 +587,7 @@ private String printCancelReservation() {
587587
+ "<div class=\"op-content\">\n<form method=\"POST\" action=\"" + contextPath + servletPath + "/CancelReservation\">\n"
588588
+ Common.printChargePointsSingleSelect(chargePointsList, "1.5")
589589
+ "<b>Parameters</b><hr>\n"
590-
+ "<table class=\"params\">\n"
590+
+ "<table>\n"
591591
+ "<tr><td>Reservation Id (integer):</td><td><input type=\"number\" min=\"0\" name=\"reservationId\"></td></tr>\n"
592592
+ "</table>\n"
593593
+ "<div class=\"submit-button\"><input type=\"submit\" value=\"Perform\"></div>\n"
@@ -622,7 +622,7 @@ private String printDataTransfer() {
622622
+ "<div class=\"op-content\">\n<form method=\"POST\" action=\"" + contextPath + servletPath + "/DataTransfer\">\n"
623623
+ Common.printChargePointsMultipleSelect(chargePointsList, "1.5")
624624
+ "<b>Parameters</b><hr>\n"
625-
+ "<table class=\"params\">\n"
625+
+ "<table>\n"
626626
+ "<tr><td>Vendor Id (String):</td><td><input type=\"text\" name=\"vendorId\"></td></tr>\n"
627627
+ "<tr><td>Message Id (String):</td><td><input type=\"text\" name=\"messageId\"></td></tr>\n"
628628
+ "<tr><td>data (Text):</td><td><input type=\"text\" name=\"data\"></td></tr>\n"
@@ -666,7 +666,7 @@ private String printGetConfiguration() {
666666
+ "<input type=\"button\" value=\"Select None\" onClick=\"selectNone(document.getElementById('confKeys'))\">\n"
667667
+ "</td>\n"
668668
+ "<td>\n"
669-
+ "<select name=\"confKeys\" id=\"confKeys\" size=\"15\" multiple>\n"
669+
+ "<select name=\"confKeys\" id=\"confKeys\" size=\"14\" multiple>\n"
670670
+ "<option value=\"HeartBeatInterval\">HeartBeatInterval</option>\n"
671671
+ "<option value=\"ConnectionTimeOut\">ConnectionTimeOut</option>\n"
672672
+ "<option value=\"ProximityContactRetries\">ProximityContactRetries</option>\n"
@@ -749,7 +749,7 @@ private Object printSendLocalList() {
749749
+ "<div class=\"op-content\">\n<form method=\"POST\" action=\"" + contextPath + servletPath + "/SendLocalList\">\n"
750750
+ Common.printChargePointsMultipleSelect(chargePointsList, "1.5")
751751
+ "<b>Parameters</b><hr>\n"
752-
+ "<table class=\"params\">\n"
752+
+ "<table class=\"sll\">\n"
753753
+ "<tr><td>hash (String):</td><td><i>Optional, omitted for now</i></td></tr>\n"
754754
+ "<tr><td>listVersion (integer):</td><td><input type=\"number\" name=\"listVersion\"></td></tr>\n"
755755
+ "<tr><td>Update Type:</td><td><input type=\"radio\" name=\"updateType\" value=\"Full\" onclick=\"removeElements()\" checked> Full</td></tr>\n"

‎src/main/webapp/style.css‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ table td:first-child {
2929
padding: 3px;
3030
}
3131

32-
table.params {margin-bottom:40px;}
33-
3432
table.bc td {width: 50%;}
3533

34+
table.sll { margin-bottom: 40px; }
35+
3636
table.res {
3737
width: 90%;
3838
border-collapse: collapse;
@@ -83,16 +83,15 @@ input[type="button"] {
8383
input[type="submit"] {
8484
width: 100px;
8585
font-size: 12px;
86-
background: #8e865b;
87-
background: -webkit-gradient(linear, left top, left bottom, from(#26759e), to(#133d5b));
88-
background: -moz-linear-gradient(top, #26759e, #133d5b);
86+
background: #71797d;
87+
background: -webkit-gradient(linear, left top, left bottom, from(#aec0c9), to(#4c5e67));
88+
background: -moz-linear-gradient(top, #aec0c9, #4c5e67);
8989
color: #fff;
90-
font-weight: bold;
91-
text-shadow: -1px -1px 0 rgba(0,0,0,0.3);
90+
text-shadow: -1px -1px 0 rgba(0,0,0,0.4);
9291
cursor: pointer;
9392
cursor: hand;
9493
height: 25px;
95-
border: 1px solid #25729a;
94+
border: 1px solid #a4a7a4;
9695
border-radius: 3px;
9796
-moz-border-radius: 3px;
9897
-webkit-border-radius: 3px;
@@ -119,7 +118,7 @@ ul.navigation li {
119118
ul.navigation li a {
120119
padding-left:10px;
121120
padding-right:10px;
122-
line-height: 40px;
121+
line-height: 35px;
123122
color:#CCC;
124123
text-decoration:none;
125124
display:inline-block;
@@ -162,6 +161,7 @@ ul.navigation ul li a {
162161
.op-menu {
163162
float: left;
164163
width: 180px;
164+
height: 100%;
165165
margin: 0;
166166
padding: 0;
167167
border-right: 1px solid #CCC;
@@ -182,7 +182,7 @@ ul.navigation ul li a {
182182
padding: 0;
183183
outline: none;
184184
background: #fff;
185-
padding: 8px;
185+
padding: 7px;
186186
}
187187

188188
.op-menu li a:link,#menu5 li a:visited {
@@ -192,19 +192,18 @@ ul.navigation ul li a {
192192

193193
.op-menu li a:hover,#menu li a:active {
194194
color: #000;
195-
background: #CCC;
196-
border-radius: 3px 0 0 3px;
195+
background: #cddecf;
196+
border-radius: 2px 0 0 2px;
197197
}
198198

199199
.op-menu li a.highlight {
200200
color: #000;
201201
background: #CCC;
202-
border-radius: 3px 0 0 3px;
202+
border-radius: 2px 0 0 2px;
203203
}
204204

205205
.op-content {
206206
min-height: 350px;
207-
margin-bottom: 20px;
208207
margin: 0 0 0 192px; /* 180 (op-menu width) + 12 (padding) - the content should not float under the first div*/
209208
}
210209

@@ -223,7 +222,7 @@ ul.navigation ul li a {
223222
}
224223

225224
.top-menu {
226-
height: 40px;
225+
height: 35px;
227226
border-radius: 0;
228227
background: #000;
229228
}
@@ -249,7 +248,7 @@ ul.navigation ul li a {
249248
.submit-button {
250249
position: absolute;
251250
bottom: 12px;
252-
right: 12px;
251+
right: 354px;
253252
}
254253

255254
.footer {

0 commit comments

Comments
 (0)