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

Commit adadea8

Browse files
kimbtechkimbtech
committed
Better Design
1 parent 9da89f1 commit adadea8

File tree

7 files changed

+44
-47
lines changed

7 files changed

+44
-47
lines changed

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
latest
2-
0.3.6
2+
0.3.7
33
0.3
44
0

‎php/core/Stats.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ private function displayContent(array $data) : void {
4848
}
4949

5050
private function arrayToTable(array $data) : string {
51-
$table = "<table class=\"table table-striped table-responsive-sm\">";
51+
$table = "<table class=\"table table-striped table-responsive-sm statstable\">";
5252
$head = false;
5353
$lastCat = '';
5454
foreach($data as $row){

‎php/core/templates/edit_en.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ <h4>Tasks <code>%%SELCTEDDAY%%</code></h4>
134134
</div>
135135

136136
<h4>Days</h4>
137-
<ul class="list-group">
137+
<div class="list-group">
138138
<!--MULTIPLE-Days-BEGIN-->
139-
<li class="list-group-item"><a href="%%SERVERURL%%/?task=record&day=%%DAY%%"><code>%%DAY%%</code></a></li>
139+
<a href="%%SERVERURL%%/?task=record&day=%%DAY%%" class="list-group-item list-group-item-action"><code>%%DAY%%</code></a>
140140
<!--MULTIPLE-Days-END-->
141-
</ul>
141+
</div>

‎php/core/templates/home_en.html‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
<center>
2-
<div class="list-group">
3-
<!--MULTIPLE-Links-BEGIN-->
4-
<a href="%%SERVERURL%%/?task=%%PARAM%%" class="list-group-item list-group-item-action %%ACTIVE%%">%%NAME%%</a>
5-
<!--MULTIPLE-Links-END-->
6-
</div>
7-
</center>
1+
<div class="list-group">
2+
<!--MULTIPLE-Links-BEGIN-->
3+
<a href="%%SERVERURL%%/?task=%%PARAM%%" class="list-group-item list-group-item-action %%ACTIVE%%">%%NAME%%</a>
4+
<!--MULTIPLE-Links-END-->
5+
</div>

‎php/core/templates/main_en.html‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,17 @@
3636
<body>
3737
<div id="main">
3838
<h1>Task&shy;Time&shy;Terminate Server</h1>
39-
<div id="logoutbox" class="%%DISPLAYLOGOUTBOX%%">
40-
Hi <span class="badge badge-success">%%GROUP%%</span>! &mdash;
41-
<a href="%%SERVERURL%%/?logout" class="btn-sm btn-warning">Logout</a>
39+
<div id="logoutbox" class="%%DISPLAYLOGOUTBOX%% popover inline-popover">
40+
<h3 class="popover-header">Hi <span class="badge badge-dark badge-pill">%%GROUP%%</span></h3>
41+
<div class="popover-body">
42+
<a href="%%SERVERURL%%/?logout" class="btn-sm btn-warning">Logout</a>
43+
</div>
4244
</div>
4345
<p>%%HOMELINK%% <button type="button" class="btn btn-light" style="visibility: hidden;">&nbsp;</button></p>
4446
<h2>%%TITLE%%</h2>
45-
47+
<div class="inner">
4648
%%INNERCONTAINER%%
47-
49+
</div>
4850
</div>
4951
<div id="footer">
5052
<center>

‎php/core/templates/stats_en.html‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,12 +133,14 @@ <h5 class="alert-heading">Client Command</h5>
133133
<p><code>%%CMD%%</code></p>
134134
</div>
135135

136+
</div> <!-- opened in main.html -->
136137
<div style="margin-bottom: 10px;">
137138
%%TABLEA%%
138139
</div>
139140
<div>
140141
%%TABLEB%%
141142
</div>
143+
<div class="inner"><!-- reopen for main.html -->
142144

143145
<h3>Graph</h3>
144146
<div class="form-inline">
@@ -152,9 +154,12 @@ <h3>Graph</h3>
152154
The selected timespan contains a huge amount of data, some graphs may not display all data!
153155
</div>
154156

155-
<div style="width: 99%;">
157+
</div> <!-- opened in main.html -->
158+
<div class="graphbox">
156159
<canvas id="maingraph"></canvas>
157160
</div>
161+
<div class="inner"><!-- reopen for main.html -->
162+
158163
<script>
159164
var combiData = %%COMBIDATA%%;
160165
var plainData = %%PLAINDATA%%;

‎php/load/main.css‎

Lines changed: 21 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,15 @@ div#main{
2929
border-radius: 4px;
3030
min-height: 300px;
3131
}
32+
div#logoutbox{
33+
float: right;
34+
}
35+
div.inner{
36+
min-width: 350px;
37+
max-width: 800px;
38+
width: 100%;
39+
margin:auto;
40+
}
3241
div#footer{
3342
color: white;
3443
}
@@ -37,40 +46,23 @@ div#footer a, div#footer a:visited, div#footer a:hover {
3746
color: white;
3847
}
3948

40-
div.achtung {
41-
border: 2px solid red;
42-
padding: 5px;
43-
border-radius: 4px;
44-
background-color: orange;
45-
margin:auto;
46-
max-width: 500px;
47-
}
48-
div.note {
49-
border: 2px solid darkblue;
50-
padding: 5px;
51-
border-radius: 4px;
52-
background-color: lightblue;
53-
margin:auto;
54-
max-width: 500px;
55-
}
56-
5749
.disable{
5850
display: none;
5951
}
52+
table.accounttable th {
53+
text-align: center;
54+
}
6055

61-
div#logoutbox{
62-
background: #ccc;
63-
border-radius: 5px;
64-
border: solid 1px black;
65-
padding: 5px;
66-
float: right;
56+
table.statstable, div.graphbox {
57+
width: calc(100%-10px);
6758
}
6859

69-
table.accounttable, .form-group, .list-group{
70-
width: 100%;
71-
min-width: 345px;
72-
max-width: 800px;
60+
div.inline-popover{
61+
position: static;
7362
}
74-
table.accounttable th {
75-
text-align: center;
63+
div.inline-popover h3{
64+
margin-top: initial;
65+
}
66+
div.inline-popover .popover-body{
67+
text-align: right;
7668
}

0 commit comments

Comments
 (0)