Skip to content

Commit bb93fce

Browse files
author
Kristan Kenney
committed
Table view code cleanup
1 parent 6ce3b0f commit bb93fce

21 files changed

+489
-940
lines changed

‎web/css/styles.min.css‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1565,6 +1565,8 @@ div.l-content > div.l-separator:nth-of-type(4) {
15651565
overflow: hidden;
15661566
font-size: 0.8rem;
15671567
border-radius: 0;
1568+
border-left: 1px solid transparent;
1569+
border-right: 1px solid transparent;
15681570
}
15691571

15701572
.table-header {

‎web/templates/admin/generate_ssl.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
</div>
1717

1818
<div class="l-separator"></div>
19-
<!-- /.l-separator -->
2019

2120
<div class="l-center animated fadeIn">
2221
<?php

‎web/templates/admin/list_backup.html‎

Lines changed: 21 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,9 @@
2929
</table>
3030
</div>
3131
</div>
32-
<!-- /.l-sort -->
3332
</div>
3433

3534
<div class="l-separator"></div>
36-
<!-- /.l-separator -->
3735

3836
<div class="l-center units animated fadeIn">
3937
<div class="header table-header">
@@ -71,61 +69,42 @@
7169
?>
7270

7371
<div class="l-unit<? if($status == 'suspended') echo ' l-unit--outdated';?>">
74-
<div class="l-unit-toolbar clearfix">
75-
</div>
76-
<!-- /.l-unit-toolbar -->
77-
7872
<div class="l-unit__col l-unit__col--right">
7973
<div>
8074
<div class="clearfix l-unit__stat-col--left super-compact">
81-
<input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="backup[]" value="<?php echo $key ?>">
82-
83-
</div>
75+
<input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="backup[]" value="<?php echo $key ?>">
76+
</div>
8477
<div class="clearfix l-unit__stat-col--left wide-3"><b><a href="/list/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>"><?=$key?></a></b></div>
85-
<div class="clearfix l-unit__stat-col--left compact-4 text-right"><b>
86-
<!-- START QUICK ACTION TOOLBAR AREA -->
87-
88-
<!-- l-unit-toolbar__col -->
89-
<div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
90-
<div class="actions-panel clearfix">
91-
<div class="actions-panel__col actions-panel__download shortcut-d" key-action="href"><a href="/download/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>"><i class="fas fa-file-download status-icon-lightblue status-icon-dim"></i></a></div>
92-
93-
<div class="actions-panel__col actions-panel__list shortcut-d" key-action="href"><a href="/list/backup/?backup=<?=$key?>"><i class="fas fa-undo status-icon-green status-icon-dim"></i></a></div>
94-
95-
<div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
96-
<a id="delete_link_<?=$i?>" class="data-controls do_delete">
97-
<i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
98-
<input type="hidden" name="delete_url" value="/delete/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>" />
99-
<div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
100-
<p class="confirmation"><?=__('DELETE_BACKUP_CONFIRMATION',$key)?></p>
101-
</div>
102-
</a>
103-
</div>
104-
78+
<!-- START QUICK ACTION TOOLBAR AREA -->
79+
<div class="clearfix l-unit__stat-col--left compact-4 text-right">
80+
<div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
81+
<div class="actions-panel clearfix">
82+
<div class="actions-panel__col actions-panel__download shortcut-d" key-action="href"><a href="/download/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>"><i class="fas fa-file-download status-icon-lightblue status-icon-dim"></i></a></div>
83+
<div class="actions-panel__col actions-panel__list shortcut-d" key-action="href"><a href="/list/backup/?backup=<?=$key?>"><i class="fas fa-undo status-icon-green status-icon-dim"></i></a></div>
84+
<div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
85+
<a id="delete_link_<?=$i?>" class="data-controls do_delete">
86+
<i class="fas fa-trash status-icon-red status-icon-dim do_delete"></i>
87+
<input type="hidden" name="delete_url" value="/delete/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>" />
88+
<div id="delete_dialog_<?=$i?>" class="confirmation-text-delete hidden" title="<?=__('Confirmation')?>">
89+
<p class="confirmation"><?=__('DELETE_BACKUP_CONFIRMATION',$key)?></p>
10590
</div>
106-
<!-- /.actiona-panel -->
107-
</div>
108-
<!-- END QUICK ACTION TOOLBAR AREA -->
109-
</b></div>
91+
</a>
92+
</div>
93+
</div>
94+
</div>
95+
</div>
96+
<!-- END QUICK ACTION TOOLBAR AREA -->
11097
<div class="clearfix l-unit__stat-col--left text-center wide"><b><?=translate_date($data[$key]['DATE'])?></b></div>
11198
<div class="clearfix l-unit__stat-col--left text-center"><b><?=humanize_usage_size($data[$key]['SIZE'])?></b> <span class="text-small"><?=humanize_usage_measure($data[$key]['SIZE'])?></span></div>
11299
<div class="clearfix l-unit__stat-col--left text-center"><?=$data[$key]['TYPE']?></div>
113100
<div class="clearfix l-unit__stat-col--left text-center"><?=humanize_time($data[$key]['RUNTIME'])?></div>
114101
</div>
115102
</div>
116-
<!-- /.l-unit__col -->
103+
117104
</div>
118-
<!-- /.l-unit -->
119-
<!--div class="l-separator"></div-->
120-
<!-- /.l-separator -->
121105
<?}?>
122106
</div>
123107

124-
125-
126-
127-
128-
129108
<div id="vstobjects">
130109
<div class="l-separator"></div>
131110
<div class="l-center">

‎web/templates/admin/list_backup_detail.html‎

Lines changed: 4 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,9 @@
3434
</table>
3535
</div>
3636
</div>
37-
<!-- /.l-sort -->
3837
</div>
3938

4039
<div class="l-separator"></div>
41-
<!-- /.l-separator -->
42-
4340

4441
<div class="l-center units animated fadeIn">
4542
<div class="l-unit header">
@@ -60,22 +57,13 @@
6057
<input id="check<?=$i?>" class="ch-toggle" type="checkbox" name="web[]" value="<?=$key?>">
6158
<label for="check<?=$i++?>" class="check-label"></label>
6259
</div>
63-
<!-- l-unit-toolbar__col -->
6460
<div class="l-unit-toolbar__col l-unit-toolbar__col--right">
6561
<div class="actions-panel__col actions-panel__update shortcut-r" key-action="href"><a href="/schedule/restore/?backup=<?=$backup?>&type=web&object=<?=$key?>&token=<?=$_SESSION['token']?>"><?=__('restore')?> <i></i></a><span class="shortcut">&nbsp;R</span></div>
66-
<!-- /.actiona-panel -->
6762
</div>
68-
<!-- l-unit-toolbar__col -->
6963
</div>
70-
<!-- /.l-unit-toolbar -->
7164

7265
<div class="l-unit__col l-unit__col--left clearfix"></div>
73-
<!-- /.l-unit__col -->
7466
<div class="l-unit__col l-unit__col--right">
75-
<!-- div class="l-unit__name separate">
76-
<?=$key?>
77-
</div -->
78-
7967
<div class="l-unit__stats">
8068
<table>
8169
<tr>
@@ -88,16 +76,10 @@
8876
</tr>
8977
</table>
9078
</div>
91-
<!-- /.l-unit__stats -->
9279
</div>
93-
<!-- /.l-unit__col -->
9480
</div>
95-
<!-- /.l-unit -->
96-
<!--div class="l-separator"></div-->
97-
<!-- /.l-separator -->
98-
<? }} ?>
99-
10081

82+
<? }} ?>
10183

10284
<?
10385
$mail = explode(',',$data[$backup]['MAIL']);
@@ -111,17 +93,12 @@
11193
<input id="check2<?=$i?>" type="checkbox" name="mail[]" value="<?=$key?>">
11294
<label for="check2<?=$i++?>" class="check-label"></label>
11395
</div>
114-
<!-- l-unit-toolbar__col -->
11596
<div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
11697
<div class="actions-panel__col actions-panel__update shortcut-r" key-action="href"><a href="/schedule/restore/?backup=<?=$backup?>&type=mail&object=<?=$key?>"><?=__('restore')?> <i></i></a><span class="shortcut">&nbsp;R</span></div>
117-
<!-- /.actiona-panel -->
11898
</div>
119-
<!-- l-unit-toolbar__col -->
12099
</div>
121-
<!-- /.l-unit-toolbar -->
122100

123101
<div class="l-unit__col l-unit__col--left clearfix"></div>
124-
<!-- /.l-unit__col -->
125102
<div class="l-unit__col l-unit__col--right">
126103
<div class="l-unit__stats">
127104
<table>
@@ -135,17 +112,10 @@
135112
</tr>
136113
</table>
137114
</div>
138-
<!-- /.l-unit__stats -->
139115
</div>
140-
<!-- /.l-unit__col -->
141116
</div>
142-
<!-- /.l-unit -->
143-
<!--div class="l-separator"></div-->
144-
<!-- /.l-separator -->
145-
<? }} ?>
146-
147-
148117

118+
<? }} ?>
149119

150120
<?
151121
$dns = explode(',',$data[$backup]['DNS']);
@@ -159,17 +129,12 @@
159129
<input id="check3<?=$i?>" type="checkbox" name="dns[]" value="<?=$key?>">
160130
<label for="check3<?=$i++?>" class="check-label"></label>
161131
</div>
162-
<!-- l-unit-toolbar__col -->
163132
<div class="l-unit-toolbar__col l-unit-toolbar__col--right">
164133
<div class="actions-panel__col actions-panel__update shortcut-r" key-action="href"><a href="/schedule/restore/?backup=<?=$backup?>&type=dns&object=<?=$key?>"><?=__('restore')?> <i></i></a><span class="shortcut">&nbsp;R</span></div>
165-
<!-- /.actiona-panel -->
166134
</div>
167-
<!-- l-unit-toolbar__col -->
168135
</div>
169-
<!-- /.l-unit-toolbar -->
170136

171137
<div class="l-unit__col l-unit__col--left clearfix"></div>
172-
<!-- /.l-unit__col -->
173138
<div class="l-unit__col l-unit__col--right">
174139
<div class="l-unit__stats">
175140
<table>
@@ -183,16 +148,10 @@
183148
</tr>
184149
</table>
185150
</div>
186-
<!-- /.l-unit__stats -->
187151
</div>
188-
<!-- /.l-unit__col -->
189152
</div>
190-
<!-- /.l-unit -->
191-
<!--div class="l-separator"></div-->
192-
<!-- /.l-separator -->
193-
<? }} ?>
194-
195153

154+
<? }} ?>
196155

197156
<?
198157
$db = explode(',',$data[$backup]['DB']);
@@ -206,17 +165,11 @@
206165
<input id="check4<?=$i?>" type="checkbox" name="db[]" value="<?=$key?>">
207166
<label for="check4<?=$i++?>" class="check-label"></label>
208167
</div>
209-
<!-- l-unit-toolbar__col -->
210168
<div class="l-unit-toolbar__col l-unit-toolbar__col--right">
211169
<div class="actions-panel__col actions-panel__update shortcut-r" key-action="href"><a href="/schedule/restore/?backup=<?=$backup?>&type=db&object=<?=$key?>"><?=__('restore')?> <i></i></a><span class="shortcut">&nbsp;R</span></div>
212-
<!-- /.actiona-panel -->
213170
</div>
214-
<!-- l-unit-toolbar__col -->
215171
</div>
216-
<!-- /.l-unit-toolbar -->
217-
218172
<div class="l-unit__col l-unit__col--left clearfix"></div>
219-
<!-- /.l-unit__col -->
220173
<div class="l-unit__col l-unit__col--right">
221174
<div class="l-unit__stats">
222175
<table>
@@ -230,17 +183,10 @@
230183
</tr>
231184
</table>
232185
</div>
233-
<!-- /.l-unit__stats -->
234186
</div>
235-
<!-- /.l-unit__col -->
236187
</div>
237-
<!-- /.l-unit -->
238-
<!--div class="l-separator"></div-->
239-
<!-- /.l-separator -->
240-
<? }} ?>
241-
242-
243188

189+
<? }} ?>
244190

245191
<?
246192
$backup = $_GET['backup'];
@@ -254,17 +200,12 @@
254200
<input id="check5<?=$i?>" type="checkbox" name="check" value="<?=$key?>">
255201
<label for="check5<?=$i++?>" class="check-label"></label>
256202
</div>
257-
<!-- l-unit-toolbar__col -->
258203
<div class="l-unit-toolbar__col l-unit-toolbar__col--right">
259204
<div class="actions-panel__col actions-panel__update shortcut-r" key-action="href"><a href="/schedule/restore/?backup=<?=$backup?>&type=cron&object=records"><?=__('restore')?> <i></i></a><span class="shortcut">&nbsp;R</span></div>
260-
<!-- /.actiona-panel -->
261205
</div>
262-
<!-- l-unit-toolbar__col -->
263206
</div>
264-
<!-- /.l-unit-toolbar -->
265207

266208
<div class="l-unit__col l-unit__col--left clearfix"></div>
267-
<!-- /.l-unit__col -->
268209
<div class="l-unit__col l-unit__col--right">
269210
<div class="l-unit__stats">
270211
<table>
@@ -278,18 +219,10 @@
278219
</tr>
279220
</table>
280221
</div>
281-
<!-- /.l-unit__stats -->
282222
</div>
283-
<!-- /.l-unit__col -->
284223
</div>
285-
<!-- /.l-unit -->
286-
<!--div class="l-separator"></div-->
287-
<!-- /.l-separator -->
288224
<? }} ?>
289225

290-
291-
292-
293226
<?
294227
$udir = explode(',',$data[$backup]['UDIR']);
295228
foreach ($udir as $key) {
@@ -302,17 +235,12 @@
302235
<input id="check6<?=$i?>" type="checkbox" name="udir[]" value="<?=$key?>">
303236
<label for="check6<?=$i++?>" class="check-label"></label>
304237
</div>
305-
<!-- l-unit-toolbar__col -->
306238
<div class="l-unit-toolbar__col l-unit-toolbar__col--right">
307239
<div class="actions-panel__col actions-panel__update shortcut-r" key-action="href"><a href="/schedule/restore/?backup=<?=$backup?>&type=udir&object=<?=$key?>"><?=__('restore')?> <i></i></a><span class="shortcut">&nbsp;R</span></div>
308-
<!-- /.actiona-panel -->
309240
</div>
310-
<!-- l-unit-toolbar__col -->
311241
</div>
312-
<!-- /.l-unit-toolbar -->
313242

314243
<div class="l-unit__col l-unit__col--left clearfix"></div>
315-
<!-- /.l-unit__col -->
316244
<div class="l-unit__col l-unit__col--right">
317245
<div class="l-unit__stats">
318246
<table>
@@ -326,13 +254,8 @@
326254
</tr>
327255
</table>
328256
</div>
329-
<!-- /.l-unit__stats -->
330257
</div>
331-
<!-- /.l-unit__col -->
332258
</div>
333-
<!-- /.l-unit -->
334-
<!-- div class="l-separator"></div-->
335-
<!-- /.l-separator -->
336259
<? }} ?>
337260

338261
<div class="l-unit">
@@ -341,17 +264,12 @@
341264
<input id="check7<?=$i?>" type="checkbox" name="cron" value="<?=$i?>">
342265
<label for="check7<?=$i++?>" class="check-label"></label>
343266
</div>
344-
<!-- l-unit-toolbar__col -->
345267
<div class="l-unit-toolbar__col l-unit-toolbar__col--right">
346268
<div class="actions-panel__col actions-panel__update shortcut-r" key-action="href"><a href="/schedule/restore/?backup=<?=$backup?>&type=cron"><?=__('restore')?> <i></i></a><span class="shortcut">&nbsp;R</span></div>
347-
<!-- /.actiona-panel -->
348269
</div>
349-
<!-- l-unit-toolbar__col -->
350270
</div>
351-
<!-- /.l-unit-toolbar -->
352271

353272
<div class="l-unit__col l-unit__col--left clearfix"></div>
354-
<!-- /.l-unit__col -->
355273
<div class="l-unit__col l-unit__col--right">
356274
<div class="l-unit__stats">
357275
<table>
@@ -365,17 +283,10 @@
365283
</tr>
366284
</table>
367285
</div>
368-
<!-- /.l-unit__stats -->
369286
</div>
370-
<!-- /.l-unit__col -->
371287
</div>
372-
<!-- /.l-unit -->
373-
<!-- div class="l-separator"></div-->
374-
<!-- /.l-separator -->
375288
</div>
376289

377-
378-
379290
<div id="vstobjects">
380291
<div class="l-separator"></div>
381292
<div class="l-center">

0 commit comments

Comments
 (0)