Skip to content

Commit 6a06d76

Browse files
ScIT-RaphaelScIT-Raphael
authored
Merge pull request hestiacp#407 from hestiacp/release-1.0.1-ui
User interface bug fixes
2 parents 7d62175 + 10d37bf commit 6a06d76

File tree

3 files changed

+39
-33
lines changed

3 files changed

+39
-33
lines changed

‎web/css/styles.min.css‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1109,7 +1109,7 @@ a {
11091109
position: fixed;
11101110
background-color: #fff;
11111111
z-index: 100;
1112-
padding-top: 34px;
1112+
padding-top: 36px;
11131113
overflow: hidden;
11141114
text-align: center;
11151115
display: flex;
@@ -1223,6 +1223,7 @@ div.l-content > div.l-separator:nth-of-type(4) {
12231223
background-color: #fff;
12241224
z-index: 120;
12251225
margin-top: 181px;
1226+
height: 44px;
12261227
}
12271228

12281229
.l-sort__create-btn {

‎web/js/app.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,7 +1003,7 @@ hover_menu = function() {
10031003
var st = $(window).scrollTop();
10041004

10051005
if (st <= 112) {
1006-
sep_1.css({'margin-top': 178 - st + 'px'});
1006+
sep_1.css({'margin-top': 180 - st + 'px'});
10071007
sep_2.css({'margin-top': 225 - st + 'px'});
10081008
nav_a.css({'height': 111 - st + 'px'});
10091009
nav_a.css({'min-height': 111 - st + 'px'});
@@ -1033,11 +1033,11 @@ hover_menu = function() {
10331033

10341034
if(st < 109 ){
10351035
nav_a.find('ul').css({'visibility': 'visible'});
1036-
nav_main.css({'padding-top': 34 + 'px'});
1036+
nav_main.css({'padding-top': 36 + 'px'});
10371037
}
10381038

10391039
if (st <= 112 && st > 110 ) {
1040-
nav_main.css({'padding-top': 34 - st + 109 + 'px'});
1040+
nav_main.css({'padding-top': 36 - st + 109 + 'px'});
10411041
}
10421042

10431043
lastScrollTop = st;

‎web/templates/admin/list_backup_detail.html‎

Lines changed: 34 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
<button type="submit" class="l-sort-toolbar__filter-apply" onclick="return doSearch('/search/')" value=""><i class="fas fa-search"></i></button>
1515
</form>
1616
</td>
17-
<td class="toggle-all">
18-
<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onchange="checkedAll('objects');">
19-
<label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
20-
</td>
2117
<td>
2218
<form action="/bulk/restore/" method="post" id="objects">
2319
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -39,10 +35,19 @@
3935
<div class="l-separator"></div>
4036

4137
<div class="l-center units animated fadeIn">
42-
<div class="header">
43-
<div class="subtitle"><?=__('Listing')?> <?=htmlentities($_GET['backup'])?></div>
44-
</div>
45-
38+
<div class="header table-header">
39+
<div class="l-unit__col l-unit__col--right step-top">
40+
<div>
41+
<div class="clearfix l-unit__stat-col--left super-compact">
42+
<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onchange="checkedAll('objects');">
43+
</div>
44+
<div class="clearfix l-unit__stat-col--left compact-4"><b><?php print __('Type');?></b></div>
45+
<div class="clearfix l-unit__stat-col--left wide-4"><b><?php print __('Details');?></b></div>
46+
<div class="clearfix l-unit__stat-col--left text-right compact-4"><b><?php print __('Restore');?></b></div>
47+
</div>
48+
</div>
49+
</div>
50+
4651
<?
4752
$backup = $_GET['backup'];
4853
$web = explode(',',$data[$backup]['WEB']);
@@ -58,10 +63,10 @@
5863
<label for="check<?=$i++?>" class="check-label"></label>
5964
</div>
6065

61-
<div class="clearfix l-unit__stat-col--left">
62-
<div class="l-unit__stat-col l-unit__stat-col--left uppercase"><?='WEB ' . __('domain')?></div>
66+
<div class="clearfix l-unit__stat-col--left compact-4">
67+
<div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Web domain')?></div>
6368
</div>
64-
<div class="clearfix l-unit__stat-col--left wide-3">
69+
<div class="clearfix l-unit__stat-col--left wide-4">
6570
<div class="l-unit__stat-col l-unit__stat-col--left wide-4"><b><?=$key?></b></div>
6671
</div>
6772

@@ -96,10 +101,10 @@
96101
<label for="check2<?=$i++?>" class="check-label"></label>
97102
</div>
98103

99-
<div class="clearfix l-unit__stat-col--left">
100-
<div class="l-unit__stat-col l-unit__stat-col--left uppercase"><?='MAIL ' . __('domain')?></div>
104+
<div class="clearfix l-unit__stat-col--left compact-4">
105+
<div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Mail domain')?></div>
101106
</div>
102-
<div class="clearfix l-unit__stat-col--left wide-3">
107+
<div class="clearfix l-unit__stat-col--left wide-4">
103108
<div class="l-unit__stat-col l-unit__stat-col--left wide-4"><b><?=$key?></b></div>
104109
</div>
105110

@@ -134,10 +139,10 @@
134139
<label for="check3<?=$i++?>" class="check-label"></label>
135140
</div>
136141

137-
<div class="clearfix l-unit__stat-col--left">
138-
<div class="l-unit__stat-col l-unit__stat-col--left uppercase"><?='DNS ' . __('domain')?></div>
142+
<div class="clearfix l-unit__stat-col--left compact-4">
143+
<div class="l-unit__stat-col l-unit__stat-col--left"><?=__('DNS domain')?></div>
139144
</div>
140-
<div class="clearfix l-unit__stat-col--left wide-3">
145+
<div class="clearfix l-unit__stat-col--left wide-4">
141146
<div class="l-unit__stat-col l-unit__stat-col--left wide-4"><b><?=$key?></b></div>
142147
</div>
143148

@@ -172,10 +177,10 @@
172177
<label for="check4<?=$i++?>" class="check-label"></label>
173178
</div>
174179

175-
<div class="clearfix l-unit__stat-col--left">
176-
<div class="l-unit__stat-col l-unit__stat-col--left uppercase"><?=__('database')?></div>
180+
<div class="clearfix l-unit__stat-col--left compact-4">
181+
<div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Database')?></div>
177182
</div>
178-
<div class="clearfix l-unit__stat-col--left wide-3">
183+
<div class="clearfix l-unit__stat-col--left wide-4">
179184
<div class="l-unit__stat-col l-unit__stat-col--left wide-4"><b><?=$key?></b></div>
180185
</div>
181186

@@ -210,10 +215,10 @@
210215
<label for="check5<?=$i++?>" class="check-label"></label>
211216
</div>
212217

213-
<div class="clearfix l-unit__stat-col--left">
214-
<div class="l-unit__stat-col l-unit__stat-col--left uppercase"><?=__('cron')?></div>
218+
<div class="clearfix l-unit__stat-col--left compact-4">
219+
<div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Cron Records')?></div>
215220
</div>
216-
<div class="clearfix l-unit__stat-col--left wide-3">
221+
<div class="clearfix l-unit__stat-col--left wide-4">
217222
<div class="l-unit__stat-col l-unit__stat-col--left wide-4"><b><?='cron '.__('records')?></b></div>
218223
</div>
219224

@@ -247,10 +252,10 @@
247252
<label for="check6<?=$i++?>" class="check-label"></label>
248253
</div>
249254

250-
<div class="clearfix l-unit__stat-col--left">
251-
<div class="l-unit__stat-col l-unit__stat-col--left uppercase"><?=__('user dir')?></div>
255+
<div class="clearfix l-unit__stat-col--left compact-4">
256+
<div class="l-unit__stat-col l-unit__stat-col--left"><?=__('user dir')?></div>
252257
</div>
253-
<div class="clearfix l-unit__stat-col--left wide-3">
258+
<div class="clearfix l-unit__stat-col--left wide-4">
254259
<div class="l-unit__stat-col l-unit__stat-col--left wide-4"><b><?=$key?></b></div>
255260
</div>
256261

@@ -279,10 +284,10 @@
279284
<label for="check7<?=$i++?>" class="check-label"></label>
280285
</div>
281286

282-
<div class="clearfix l-unit__stat-col--left">
283-
<div class="l-unit__stat-col l-unit__stat-col--left uppercase"><?=__('cron')?></div>
287+
<div class="clearfix l-unit__stat-col--left compact-4">
288+
<div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Cron')?></div>
284289
</div>
285-
<div class="clearfix l-unit__stat-col--left wide-3">
290+
<div class="clearfix l-unit__stat-col--left wide-4">
286291
<div class="l-unit__stat-col l-unit__stat-col--left wide-4"><b>&nbsp;</b></div>
287292
</div>
288293

0 commit comments

Comments
 (0)