Skip to content
This repository was archived by the owner on Mar 30, 2024. It is now read-only.

Commit 9b10565

Browse files
kimbtechkimbtech
committed
GUI Update
1 parent 6f96e9f commit 9b10565

12 files changed

Lines changed: 234 additions & 132 deletions

File tree

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
latest
2-
0.1.0
2+
0.1.1
33
0.1
44
0

‎php/core/WebGUI.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public function accountManage() : void {
129129
foreach($this->login->getGroupList()->getArray() as $group => $data){
130130
$gr[] = array(
131131
"ANAME" => $group,
132-
"AADMIN" => $data['admin'] ? 'Yes' : 'No',
132+
"AADMIN" => $data['admin'] ? '<span class="badge badge-success">Yes</span>' : '<span class="badge badge-danger">No</span>',
133133
"AID" => $group
134134
);
135135
}

‎php/core/templates/account_en.html‎

Lines changed: 53 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
1-
<div class="note %%NOTEDISABLE%%" >
2-
%%NOTEMSG%%
1+
<div class="alert alert-info %%NOTEDISABLE%%" role="alert">
2+
%%NOTEMSG%%
33
</div>
44

55
<h3>Change Password</h3>
66
<form action="%%SERVERURL%%/?task=account" method="post">
77
<input type="hidden" value="change" name="type">
8-
<table>
9-
<tr>
10-
<td>Password</td>
11-
<td><input type="password" placeholder="Password" name="password"></td>
12-
</tr>
13-
<tr>
14-
<td></td>
15-
<td><input type="submit" value="Change"></td>
16-
</tr>
17-
</table>
8+
<div class="form-group row">
9+
<label for="passwordC" class="col-sm-2 col-form-label">Password</label>
10+
<div class="col-sm-10">
11+
<input type="password" placeholder="Password" name="password" id="passwordC" class="form-control">
12+
</div>
13+
</div>
14+
<div class="form-group row">
15+
<div class="col-sm-2">&nbsp;</div>
16+
<div class="col-sm-10">
17+
<input type="submit" value="Change" class="btn btn-secondary">
18+
</div>
19+
</div>
1820
</form>
1921

2022
<h3>Administration</h3>
@@ -35,39 +37,54 @@ <h4>Other accounts</h4>
3537
<td><code>%%ANAME%%</code></td>
3638
<td>%%AADMIN%%</td>
3739
<td>
38-
<form action="%%SERVERURL%%/?task=account" method="post">
39-
<input type="hidden" value="edit" name="type">
40-
<input type="hidden" value="%%AID%%" name="group">
41-
<input type="password" placeholder="New password" name="password">
42-
<input type="submit" value="Change password">
40+
<form action="%%SERVERURL%%/?task=account" method="post" class="form-inline">
41+
<input type="hidden" value="edit" name="type">
42+
<input type="hidden" value="%%AID%%" name="group">
43+
<div class="input-group">
44+
<input type="password" placeholder="New password" name="password" class="form-control"> &nbsp;
45+
</div>
46+
<input type="submit" class="btn btn-secondary" value="Change password">
4347
</form>
4448
</td>
45-
<td><a href="%%SERVERURL%%/?task=account&delete=%%AID%%" onclick="return confirm('Delete Account %%ANAME%%?');">Delete</a></td>
49+
<td><a href="%%SERVERURL%%/?task=account&delete=%%AID%%" onclick="return confirm('Delete Account \'%%ANAME%%\'?');"><button type="button" class="btn btn-danger">Delete</button></a></td>
4650
</tr>
4751
<!--MULTIPLE-Accounts-END-->
4852
</table>
4953

5054
<h4>Add new account</h4>
5155
<form action="%%SERVERURL%%/?task=account" method="post">
5256
<input type="hidden" value="new" name="type">
53-
<table>
54-
<tr>
55-
<td>Name</td>
56-
<td><input type="text" placeholder="Account" name="group"></td>
57-
</tr>
58-
<tr>
59-
<td>Password</td>
60-
<td><input type="password" placeholder="Password" name="password"></td>
61-
</tr>
62-
<tr>
63-
<td>Admin?</td>
64-
<td><input type="radio" name="admin" value="yes"> Yes <input type="radio" name="admin" value="no" checked="checked"> No</td>
65-
</tr>
66-
<tr>
67-
<td></td>
68-
<td><input type="submit" value="Create"></td>
69-
</tr>
70-
</table>
57+
<div class="form-group row">
58+
<label for="groupN" class="col-sm-2 col-form-label">Name/ Account</label>
59+
<div class="col-sm-10">
60+
<input type="text" placeholder="Group" name="group" id="groupN" class="form-control">
61+
</div>
62+
</div>
63+
<div class="form-group row">
64+
<label for="passwordN" class="col-sm-2 col-form-label">Password</label>
65+
<div class="col-sm-10">
66+
<input type="password" placeholder="Password" name="password" id="passwordN" class="form-control">
67+
</div>
68+
</div>
69+
<div class="form-group row">
70+
<label for="passwordN" class="col-sm-2 col-form-label">Is Admin?</label>
71+
<div class="col-sm-10">
72+
<div class="custom-control custom-radio custom-control-inline">
73+
<input type="radio" id="adminNY" name="admin" value="yes" class="custom-control-input">
74+
<label class="custom-control-label" for="adminNY">Yes</label>
75+
</div>
76+
<div class="custom-control custom-radio custom-control-inline">
77+
<input type="radio" id="adminNN" name="admin" value="no" checked="checked" class="custom-control-input">
78+
<label class="custom-control-label" for="adminNN">No</label>
79+
</div>
80+
</div>
81+
</div>
82+
<div class="form-group row">
83+
<div class="col-sm-2">&nbsp;</div>
84+
<div class="col-sm-10">
85+
<input type="submit" value="Create" class="btn btn-secondary">
86+
</div>
87+
</div>
7188
</form>
7289
</div>
7390

‎php/core/templates/device_en.html‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<div class="note %%NOTEDISABLE%%" >
2-
%%NOTEMSG%%
1+
<div class="alert alert-info %%NOTEDISABLE%%" role="alert">
2+
%%NOTEMSG%%
33
</div>
44

55
<h3>Active devices</h3>
@@ -12,36 +12,37 @@ <h3>Active devices</h3>
1212
<!--MULTIPLE-Devices-BEGIN-->
1313
<tr>
1414
<td><code>%%NAME%%</code></td>
15-
<td><a href="%%SERVERURL%%/?task=devices&regenerate=%%DID%%" onclick="return confirm('Regenerate token for %%NAME%%?');">Regenerate</a></td>
16-
<td><a href="%%SERVERURL%%/?task=devices&delete=%%DID%%" onclick="return confirm('Delete device %%NAME%%?');">Delete</a></td>
15+
<td><a href="%%SERVERURL%%/?task=devices&regenerate=%%DID%%" onclick="return confirm('Regenerate token for \'%%NAME%%\'?');"><button type="button" class="btn btn-warning">Regenerate</button></a></td>
16+
<td><a href="%%SERVERURL%%/?task=devices&delete=%%DID%%" onclick="return confirm('Delete device \'%%NAME%%\'?');"><button type="button" class="btn btn-danger">Delete</button></a></td>
1717
</tr>
1818
<!--MULTIPLE-Devices-END-->
1919
</table>
2020
<p>
21-
Deleting a device does not delete the data of this device. Only the access to the api will be blocked.<br>
22-
21+
Deleting a device does not delete the data of this device. Only the access to the api will be blocked.
2322
</p>
2423

2524
<h3>Add new device</h3>
2625
<form action="%%SERVERURL%%/?task=devices" method="post">
27-
<table>
28-
<tr>
29-
<td>Devicename</td>
30-
<td><input type="text" placeholder="Name" name="device"></td>
31-
</tr>
32-
<tr>
33-
<td></td>
34-
<td><input type="submit" value="Create"></td>
35-
</tr>
36-
</table>
26+
<div class="form-group row">
27+
<label for="deviceN" class="col-sm-2 col-form-label">Devicename</label>
28+
<div class="col-sm-10">
29+
<input type="text" placeholder="Name" name="device" id="deviceN" class="form-control">
30+
</div>
31+
</div>
32+
<div class="form-group row">
33+
<div class="col-sm-2">&nbsp;</div>
34+
<div class="col-sm-10">
35+
<input type="submit" value="Create" class="btn btn-secondary">
36+
</div>
37+
</div>
3738
</form>
3839

3940
<h3>Available data in storage</h3>
4041
<p>
4142
This list shows all devices (technically their data) available in the storage and accessible via API.
4243
</p>
43-
<ul>
44+
<ul class="list-group">
4445
<!--MULTIPLE-Data-BEGIN-->
45-
<li><code>%%NAME%%</code></li>
46+
<li class="list-group-item"><code>%%NAME%%</code></li>
4647
<!--MULTIPLE-Data-END-->
4748
</ul>

‎php/core/templates/edit_en.html‎

Lines changed: 109 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,116 @@
1-
<div class="note %%NOTEDISABLE%%" >
2-
%%NOTEMSG%%
1+
<div class="alert alert-info %%NOTEDISABLE%%" role="alert">
2+
%%NOTEMSG%%
33
</div>
44

55
<h3>Add task</h3>
6-
<p>Add a task to the virtual device <code>server</code>.</p>
6+
<p>Add a task to the virtual device <code>Server</code>.</p>
77
<form action="%%SERVERURL%%/?task=record" method="post">
8-
<table>
9-
<tr>
10-
<td>Category</td>
11-
<td><input type="text" placeholder="Category" name="category"></td>
12-
</tr>
13-
<tr>
14-
<td>Task</td>
15-
<td><input type="text" placeholder="Task" name="task"></td>
16-
</tr>
17-
<tr>
18-
<td>Begin</td>
19-
<td>
20-
<input type="number" placeholder="YYYY" name="begin_Y" size=4 max=3000 min=1970 value="%%YEAR%%">
21-
<input type="number" placeholder="mm" name="begin_m" size=2 max=12 min=1 value="%%MON%%">
22-
<input type="number" placeholder="dd" name="begin_d" size=2 max=31 min=1 value="%%DAY%%">
23-
&nbsp;&nbsp; &nbsp;&nbsp;
24-
<input type="number" placeholder="hh" name="begin_H" size=2 max=23 min=0 value="%%HOUR%%">
25-
<input type="number" placeholder="mm" name="begin_i" size=2 max=59 min=0 value="%%MIN%%">
26-
</td>
27-
</tr>
28-
<tr>
29-
<td>End</td>
30-
<td>
31-
<input type="number" placeholder="YYYY" name="end_Y" size=4 max=3000 min=1970 value="%%YEAR%%">
32-
<input type="number" placeholder="mm" name="end_m" size=2 max=12 min=1 value="%%MON%%">
33-
<input type="number" placeholder="dd" name="end_d" size=2 max=31 min=1 value="%%DAY%%">
34-
&nbsp;&nbsp; &nbsp;&nbsp;
35-
<input type="number" placeholder="hh" name="end_H" size=2 max=23 min=0>
36-
<input type="number" placeholder="mm" name="end_i" size=2 max=59 min=0>
37-
</td>
38-
</tr>
39-
<tr>
40-
<td></td>
41-
<td><input type="submit" value="Add task"></td>
42-
</tr>
43-
</table>
8+
<div class="form-group row">
9+
<label for="category" class="col-sm-2 col-form-label">Category</label>
10+
<div class="col-sm-10">
11+
<input type="text" placeholder="Category" name="category" id="category" class="form-control">
12+
</div>
13+
</div>
14+
<div class="form-group row">
15+
<label for="task" class="col-sm-2 col-form-label">Task</label>
16+
<div class="col-sm-10">
17+
<input type="text" placeholder="Task" name="task" id="task" class="form-control">
18+
</div>
19+
</div>
20+
<div class="form-group row">
21+
<label class="col-sm-2 col-form-label">
22+
Begin
23+
</label>
24+
<div class="input-group col-sm-10">
25+
<input type="number" placeholder="YYYY" name="begin_Y" size=4 max=3000 min=1970 value="%%YEAR%%" class="form-control">
26+
<input type="number" placeholder="mm" name="begin_m" size=2 max=12 min=1 value="%%MON%%" class="form-control">
27+
<input type="number" placeholder="dd" name="begin_d" size=2 max=31 min=1 value="%%DAY%%" class="form-control">
28+
<button type="button" class="btn btn-light" id="beginDialog">&#x1F4C5;</button>
29+
&nbsp;&nbsp; &nbsp;&nbsp;
30+
<input type="number" placeholder="hh" name="begin_H" size=2 max=23 min=0 value="%%HOUR%%" class="form-control">
31+
<input type="number" placeholder="mm" name="begin_i" size=2 max=59 min=0 value="%%MIN%%" class="form-control">
32+
</div>
33+
</div>
34+
<div class="form-group row">
35+
<label class="col-sm-2 col-form-label">
36+
End
37+
</label>
38+
<div class="input-group col-sm-10">
39+
<input type="number" placeholder="YYYY" name="end_Y" size=4 max=3000 min=1970 value="%%YEAR%%" class="form-control">
40+
<input type="number" placeholder="mm" name="end_m" size=2 max=12 min=1 value="%%MON%%" class="form-control">
41+
<input type="number" placeholder="dd" name="end_d" size=2 max=31 min=1 value="%%DAY%%" class="form-control">
42+
<button type="button" class="btn btn-light" id="endDialog">&#x1F4C5;</button>
43+
&nbsp;&nbsp; &nbsp;&nbsp;
44+
<input type="number" placeholder="hh" name="end_H" size=2 max=23 min=0 class="form-control">
45+
<input type="number" placeholder="mm" name="end_i" size=2 max=59 min=0 class="form-control">
46+
</div>
47+
</div>
48+
<div class="form-group row">
49+
<div class="col-sm-2">&nbsp;</div>
50+
<div class="col-sm-10">
51+
<input type="submit" value="Add task" class="btn btn-secondary">
52+
</div>
53+
</div>
4454
</form>
55+
<input type="hidden" id="datepickerBegin">
56+
<input type="hidden" id="datepickerEnd">
57+
58+
<script>
59+
var usedTasksCategories = localStorage.hasOwnProperty( 'usedTasksCategories' ) ?
60+
JSON.parse( localStorage.getItem( 'usedTasksCategories' ) ) : {
61+
"categories" : [],
62+
"tasks" : []
63+
};
64+
if(sessionStorage.hasOwnProperty( 'lastServerTask' )){
65+
var values = JSON.parse( sessionStorage.getItem( 'lastServerTask' ) );
66+
$.each(values, (k,v) => {
67+
$('input[name="'+ k +'"]').val(v);
68+
});
69+
}
70+
$( "input#category" ).autocomplete({
71+
source: usedTasksCategories.categories,
72+
minLength: 1
73+
});
74+
$( "input#task" ).autocomplete({
75+
source: usedTasksCategories.tasks,
76+
minLength: 1
77+
});
78+
$("form").on("submit", () => {
79+
usedTasksCategories.categories.push($( "input#category" ).val());
80+
usedTasksCategories.tasks.push($( "input#task" ).val());
81+
localStorage.setItem( 'usedTasksCategories', JSON.stringify(usedTasksCategories) );
82+
var values = {};
83+
$("input").each((k,v) => {
84+
values[$(v).attr("name")] = $(v).val();
85+
});
86+
sessionStorage.setItem( 'lastServerTask', JSON.stringify(values));
87+
});
88+
function dateDialog(element, elements){
89+
var pos = $(elements[0]).offset();
90+
$( element ).datepicker(
91+
"dialog",
92+
$(elements[0]).val() + "-" + $(elements[1]).val() + "-" + $(elements[2]).val(),
93+
function(v,o) {
94+
$(elements[0]).val(o.selectedYear);
95+
$(elements[1]).val(o.selectedMonth+1);
96+
$(elements[2]).val(o.selectedDay);
97+
},
98+
{},
99+
[pos.left, pos.top]
100+
);
101+
}
102+
$("#beginDialog").click( (e) => {
103+
e.preventDefault();
104+
dateDialog("input#datepickerBegin", ["input[name=begin_Y]", "input[name=begin_m]", "input[name=begin_d]"]);
105+
});
106+
$("#endDialog").click( (e) => {
107+
e.preventDefault();
108+
dateDialog("input#datepickerEnd", ["input[name=end_Y]", "input[name=endn_m]", "input[name=end_d]"]);
109+
});
110+
</script>
45111

46112
<h3>Delete task</h3>
47-
<p>Delete tasks of the virtual device <code>server</code>.</p>
113+
<p>Delete tasks of the virtual device <code>Server</code>.</p>
48114

49115
<div class="%%DAYDISABLED%%">
50116
<h4>Tasks <code>%%SELCTEDDAY%%</code></h4>
@@ -62,15 +128,15 @@ <h4>Tasks <code>%%SELCTEDDAY%%</code></h4>
62128
<td>%%NAME%%</td>
63129
<td>%%BEGIN%%</td>
64130
<td>%%END%%</td>
65-
<td><a href="%%SERVERURL%%/?task=record&day=%%SELCTEDDAY%%&delete=%%ID%%" onclick="return confirm('Delete %%NAME%% starting %%BEGIN%%?');">Delete</a></td>
131+
<td><a href="%%SERVERURL%%/?task=record&day=%%SELCTEDDAY%%&delete=%%ID%%" onclick="return confirm('Delete \'%%NAME%%\' starting \'%%BEGIN%%\'?');"><button type="button" class="btn btn-danger">Delete</button></a></td>
66132
</tr>
67133
<!--MULTIPLE-Day-END-->
68134
</table>
69135
</div>
70136

71137
<h4>Days</h4>
72-
<ul>
138+
<ul class="list-group">
73139
<!--MULTIPLE-Days-BEGIN-->
74-
<li><a href="%%SERVERURL%%/?task=record&day=%%DAY%%"><code>%%DAY%%</code></a></li>
140+
<li class="list-group-item"><a href="%%SERVERURL%%/?task=record&day=%%DAY%%"><code>%%DAY%%</code></a></li>
75141
<!--MULTIPLE-Days-END-->
76142
</ul>

‎php/core/templates/home_en.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<ul>
1+
<ul class="list-group">
22
<!--MULTIPLE-Links-BEGIN-->
3-
<li><a href="%%SERVERURL%%/?task=%%PARAM%%">%%NAME%%</a></li>
3+
<li class="list-group-item"><a href="%%SERVERURL%%/?task=%%PARAM%%">%%NAME%%</a></li>
44
<!--MULTIPLE-Links-END-->
55
</ul>

0 commit comments

Comments
 (0)