Skip to content

Commit 5b06701

Browse files
serghey-rodinserghey-rodin
committed
Sort_by feature
1 parent 4ebd88b commit 5b06701

33 files changed

+397
-211
lines changed

‎web/templates/admin/list_backup.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<!-- /.l-separator -->
4545

4646

47-
<div class="l-center">
47+
<div class="l-center units">
4848
<?
4949
foreach ($data as $key => $value) {
5050
++$i;
@@ -142,7 +142,7 @@
142142
<!-- /.l-unit__col -->
143143
</div>
144144
<!-- /.l-unit -->
145-
<div class="l-separator"></div>
145+
<!-- div class="l-separator"></div -->
146146
<!-- /.l-separator -->
147147
<? } ?>
148148

@@ -154,6 +154,7 @@
154154
<div class="l-separator"></div>
155155
<div class="l-center">
156156
<div class="l-unit-ft">
157+
<table class='data'></table>
157158
<div class="l-unit__col l-unit__col--left clearfix"></div>
158159
<div class="data-count l-unit__col l-unit__col--right clearfix">
159160
<?php

‎web/templates/admin/list_backup_detail.html‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,11 @@
4242
<!-- /.l-separator -->
4343

4444

45-
<div class="l-center">
46-
47-
45+
<div class="l-center units">
4846
<div class="l-unit">
4947
<div class="subtitle"><?=__('Listing')?> <?=htmlentities($_GET['backup'])?></div>
5048
</div>
5149

52-
<div class="l-separator"></div>
53-
5450
<?
5551
$backup = $_GET['backup'];
5652
$web = explode(',',$data[$backup]['WEB']);
@@ -97,7 +93,7 @@
9793
<!-- /.l-unit__col -->
9894
</div>
9995
<!-- /.l-unit -->
100-
<div class="l-separator"></div>
96+
<!--div class="l-separator"></div-->
10197
<!-- /.l-separator -->
10298
<? }} ?>
10399

@@ -144,7 +140,7 @@
144140
<!-- /.l-unit__col -->
145141
</div>
146142
<!-- /.l-unit -->
147-
<div class="l-separator"></div>
143+
<!--div class="l-separator"></div-->
148144
<!-- /.l-separator -->
149145
<? }} ?>
150146

@@ -192,7 +188,7 @@
192188
<!-- /.l-unit__col -->
193189
</div>
194190
<!-- /.l-unit -->
195-
<div class="l-separator"></div>
191+
<!--div class="l-separator"></div-->
196192
<!-- /.l-separator -->
197193
<? }} ?>
198194

@@ -239,7 +235,7 @@
239235
<!-- /.l-unit__col -->
240236
</div>
241237
<!-- /.l-unit -->
242-
<div class="l-separator"></div>
238+
<!--div class="l-separator"></div-->
243239
<!-- /.l-separator -->
244240
<? }} ?>
245241

@@ -287,7 +283,7 @@
287283
<!-- /.l-unit__col -->
288284
</div>
289285
<!-- /.l-unit -->
290-
<div class="l-separator"></div>
286+
<!--div class="l-separator"></div-->
291287
<!-- /.l-separator -->
292288
<? }} ?>
293289

@@ -335,7 +331,7 @@
335331
<!-- /.l-unit__col -->
336332
</div>
337333
<!-- /.l-unit -->
338-
<div class="l-separator"></div>
334+
<!-- div class="l-separator"></div-->
339335
<!-- /.l-separator -->
340336
<? }} ?>
341337
</div>

‎web/templates/admin/list_backup_exclusions.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<!-- /.l-separator -->
4242

4343

44-
<div class="l-center">
44+
<div class="l-center units">
4545
<?
4646
foreach ($data as $key => $value) {
4747
?>
@@ -101,7 +101,7 @@
101101
<!-- /.l-unit__col -->
102102
</div>
103103
<!-- /.l-unit -->
104-
<div class="l-separator"></div>
104+
<!--div class="l-separator"></div-->
105105
<!-- /.l-separator -->
106106
<? } ?>
107107

‎web/templates/admin/list_cron.html‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
<div class="l-center">
22
<div class="l-sort clearfix noselect">
33
<a href="/add/cron/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Cron Job'))?>"></a>
4+
<ul class="context-menu sort-order" style="display:none;">
5+
<li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
6+
<li entity="sort-name"><span class="name"><?=__('Command')?></span><span class="up">&nbsp;</span></li>
7+
</ul>
48
<div class="l-sort-toolbar clearfix">
59
<table>
610
<tr>
@@ -26,7 +30,7 @@
2630
<label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
2731
</td>
2832
<td class="sort-by">
29-
<?=__('sort by');?>: <span><b><?=__('DATE')?></b></span> <i class="l-icon-down-arrow media-top"></i>
33+
<?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
3034
</td>
3135
<td class="step-right">
3236
<form action="/bulk/cron/" method="post" id="objects">
@@ -59,7 +63,7 @@
5963

6064

6165

62-
<div class="l-center">
66+
<div class="l-center units">
6367
<?
6468
foreach ($data as $key => $value) {
6569
++$i;
@@ -75,7 +79,7 @@
7579
?>
7680

7781

78-
<div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended';?>">
82+
<div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_COOKIE['cron-'.sha1($key)] == 1) echo ' l-unit--starred'; ?>" uniq-id="cron-<?=sha1($key)?>" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=htmlspecialchars($data[$key]['CMD'], ENT_NOQUOTES)?>">
7983
<div class="l-unit-toolbar clearfix">
8084
<div class="l-unit-toolbar__col l-unit-toolbar__col--left">
8185
<input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="job[]" value="<?php echo $key ?>">
@@ -117,6 +121,9 @@
117121
<?=translate_date($data[$key]['DATE'])?>
118122
</div>
119123
<div class="l-unit__suspended""><?=__('suspended')?></div>
124+
<div class="text-center">
125+
<i class="l-icon-star"></i>
126+
</div>
120127
</div>
121128
<!-- /.l-unit__col -->
122129
<div class="l-unit__col l-unit__col--right">
@@ -140,7 +147,7 @@
140147
<!-- /.l-unit__col -->
141148
</div>
142149
<!-- /.l-unit -->
143-
<div class="l-separator"></div>
150+
<!--div class="l-separator"></div-->
144151
<!-- /.l-separator -->
145152
<?}?>
146153

@@ -151,6 +158,7 @@
151158
<div class="l-separator"></div>
152159
<div class="l-center">
153160
<div class="l-unit-ft">
161+
<table class='data'></table>
154162
<div class="l-unit__col l-unit__col--left clearfix"></div>
155163
<div class="data-count l-unit__col l-unit__col--right clearfix">
156164
<?php

‎web/templates/admin/list_db.html‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
<div class="l-center">
22
<div class="l-sort clearfix noselect">
33
<a href="/add/db/" class="l-sort__create-btn" title="<?=str_replace(' ', '&nbsp;', __('Add Database'))?>"></a>
4-
4+
<ul class="context-menu sort-order" style="display:none;">
5+
<li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?></span><span class="up">&nbsp;</span></li>
6+
<li entity="sort-name"><span class="name"><?=__('Database')?></span><span class="up">&nbsp;</span></li>
7+
<li entity="sort-disk" sort_as_int="1"><span class="name"><?=__('Disk')?></span><span class="up">&nbsp;</span></li>
8+
<li entity="sort-user"><span class="name"><?=__('User')?></span><span class="up">&nbsp;</span></li>
9+
<li entity="sort-server"><span class="name"><?=__('Host')?></span><span class="up">&nbsp;</span></li>
10+
</ul>
511
<div class="l-sort-toolbar clearfix">
612
<table>
713
<tr>
@@ -18,20 +24,20 @@
1824

1925
$db_admin_link = "http://".$http_host."/phpmyadmin/";
2026
if (!empty($_SESSION['DB_PMA_URL']))
21-
$db_admin_link = $_SESSION['DB_PMA_URL'];
27+
$db_myadmin_link = $_SESSION['DB_PMA_URL'];
2228
}
2329
if ($data[$key]['TYPE'] == 'pgsql'){
2430
$pgsql = 1;
2531
$db_admin_link = "http://".$http_host."/phppgadmin/";
2632
if (!empty($_SESSION['DB_PGA_URL']))
27-
$db_admin_link = $_SESSION['DB_PGA_URL'];
33+
$db_pgadmin_link = $_SESSION['DB_PGA_URL'];
2834
}
2935
}
3036
if($mysql){
31-
echo '<td class="step-right"><a class="vst" href="'.$db_admin_link.'">phpMyAdmin</td>';
37+
echo '<td class="step-right"><a class="vst" href="'.$db_myadmin_link.'" target="_blank">phpMyAdmin</td>';
3238
}
3339
if($pgsql){
34-
echo '<td class="step-right"><a class="vst" href="'.$db_admin_link.'">phpPgAdmin</td>';
40+
echo '<td class="step-right"><a class="vst" href="'.$db_pgadmin_link.'" target="_blank">phpPgAdmin</td>';
3541
}
3642
?>
3743
<td class="l-sort-toolbar__search-box step-left">
@@ -46,7 +52,7 @@
4652
<label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
4753
</td>
4854
<td class="sort-by">
49-
<?=__('sort by');?>: <span><b><?=__('DATE')?></b></span> <i class="l-icon-down-arrow media-top"></i>
55+
<?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
5056
</td>
5157
<td>
5258
<form action="/bulk/db/" method="post" id="objects">
@@ -78,7 +84,7 @@
7884

7985

8086

81-
<div class="l-center">
87+
<div class="l-center units">
8288
<?
8389
list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
8490
foreach ($data as $key => $value) {
@@ -102,7 +108,7 @@
102108
?>
103109

104110

105-
<div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended';?>">
111+
<div class="l-unit <? if($status == 'suspended') echo 'l-unit--suspended'; if($_COOKIE['db-'.sha1($key)] == 1) echo ' l-unit--starred'; ?>" uniq-id="db-<?=sha1($key)?>"" sort-date="<?=strtotime($data[$key]['DATE'].' '.$data[$key]['TIME'])?>" sort-name="<?=$key?>" sort-disk="<?=$data[$key]['U_DISK']?>" sort-user="<?=$data[$key]['DBUSER']?>" sort-server="<?=$data[$key]['HOST']?>">
106112
<div class="l-unit-toolbar clearfix">
107113
<div class="l-unit-toolbar__col l-unit-toolbar__col--left">
108114
<input id="check<?php echo $i ?>" class="ch-toggle" type="checkbox" name="database[]" value="<?php echo $key ?>">
@@ -142,6 +148,9 @@
142148
<?=translate_date($data[$key]['DATE'])?>
143149
</div>
144150
<div class="l-unit__suspended""><?=__('suspended')?></div>
151+
<div class="text-center">
152+
<i class="l-icon-star"></i>
153+
</div>
145154
</div>
146155
<!-- /.l-unit__col -->
147156
<div class="l-unit__col l-unit__col--right">
@@ -170,7 +179,7 @@
170179
<div class="l-unit__stat-cols clearfix">
171180
<div class="l-unit__stat-col l-unit__stat-col--left"><?=__('User')?>:</div>
172181
<div class="l-unit__stat-col l-unit__stat-col--right">
173-
<b><?=__($data[$key]['DBUSER'])?></b>
182+
<b><?=$data[$key]['DBUSER']?></b>
174183
</div>
175184
</div>
176185
</td>
@@ -209,7 +218,7 @@
209218
<!-- /.l-unit__col -->
210219
</div>
211220
<!-- /.l-unit -->
212-
<div class="l-separator"></div>
221+
<!-- div class="l-separator"></div-->
213222
<!-- /.l-separator -->
214223
<?}?>
215224

@@ -220,6 +229,7 @@
220229
<div class="l-separator"></div>
221230
<div class="l-center">
222231
<div class="l-unit-ft">
232+
<table class='data'></table>
223233
<div class="l-unit__col l-unit__col--left clearfix"></div>
224234
<div class="data-count l-unit__col l-unit__col--right clearfix">
225235
<?php

0 commit comments

Comments
 (0)