Skip to content

Commit 2123a40

Browse files
author
Kristan Kenney
committed
Merge branch 'bugfix-ui' into develop
2 parents 7a0b661 + d7d2c3b commit 2123a40

File tree

6 files changed

+21
-19
lines changed

6 files changed

+21
-19
lines changed

‎web/css/styles.min.css‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1857,6 +1857,14 @@ div.l-content > div.l-separator:nth-of-type(4) {
18571857

18581858
.l-unit__stats {
18591859
margin-bottom: 10px;
1860+
margin-left: 12%;
1861+
}
1862+
1863+
.l-unit__stats:hover {
1864+
border-left: 1px solid transparent !important;
1865+
border-right: 1px solid transparent !important;
1866+
box-shadow: none !important;
1867+
background: none !important;
18601868
}
18611869

18621870
.l-unit__stats table {

‎web/templates/admin/add_package.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@
298298
<img name="unlim-bandwidth" class="unlim-trigger" src="/images/unlim.png" />
299299
</td>
300300
</tr>
301+
<?php if ((isset($_SESSION['DNS_SYSTEM'])) && (!empty($_SESSION['DNS_SYSTEM']))) {?>
301302
<tr>
302303
<td class="vst-text input-label">
303304
<?php print __('Name servers');?>
@@ -368,6 +369,7 @@
368369
<span class="add-ns-button additional-control add"><?=__('Add one more Name Server')?></span>
369370
</td>
370371
</tr>
372+
<?php } ?>
371373
</table>
372374
<table class="data-col2">
373375
</table>

‎web/templates/admin/edit_package.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@
295295
<img name="unlim-bandwidth" class="unlim-trigger" src="/images/unlim.png" />
296296
</td>
297297
</tr>
298+
<?php if ((isset($_SESSION['DNS_SYSTEM'])) && (!empty($_SESSION['DNS_SYSTEM']))) {?>
298299
<tr>
299300
<td class="vst-text input-label">
300301
<?php print __('Name Servers');?>
@@ -367,7 +368,7 @@
367368
<span class="add-ns-button additional-control add"><?=__('Add one more Name Server')?></span>
368369
</td>
369370
</tr>
370-
371+
<?php } ?>
371372
</table>
372373
<table class="data-col2">
373374
</table>

‎web/templates/admin/edit_user.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@
178178
</select>
179179
</td>
180180
</tr>
181+
<?php if ((isset($_SESSION['DNS_SYSTEM'])) && (!empty($_SESSION['DNS_SYSTEM']))) {?>
181182
<tr>
182183
<td class="vst-text input-label">
183184
<?php print __('Default Name Servers');?>
@@ -249,8 +250,7 @@
249250
<span class="add-ns-button additional-control add"><?=__('Add one more Name Server')?></span>
250251
</td>
251252
</tr>
252-
253-
253+
<?php } ?>
254254
</table>
255255
<table class="data-col2">
256256
</table>

‎web/templates/admin/list_rrd.html‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,24 +48,15 @@
4848
foreach ($data as $key => $value) {
4949
?>
5050

51-
<div class="l-unit">
52-
<div class="l-unit-toolbar clearfix">
53-
<div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
54-
<div class="actions-panel clearfix">
55-
<div class="actions-panel__col actions-panel__edit actions-panel__download">
56-
<a href="/list/rrd/image.php?/rrd/<?php echo $data[$key]['TYPE']."/".$period."-".$data[$key]['RRD'].".png"?>" target="_blank"><?=__('download')?> <i></i></a>
57-
</div>
58-
</div>
59-
</div>
60-
</div>
51+
<div class="l-unit l-unit__stats">
6152

6253
<div class="l-unit__col l-unit__col--right">
6354
<div class="l-unit__name separate">
6455
<?= __($data[$key]['TITLE'])?>
6556
</div>
6657

67-
<div class="l-unit__stats">
68-
<img src="/list/rrd/image.php?/rrd/<?=$data[$key]['TYPE']."/".$period."-".$data[$key]['RRD'].".png"?>">
58+
<div>
59+
<a href="/list/rrd/image.php?/rrd/<?php echo $data[$key]['TYPE']."/".$period."-".$data[$key]['RRD'].".png"?>" target="_blank"><img src="/list/rrd/image.php?/rrd/<?=$data[$key]['TYPE']."/".$period."-".$data[$key]['RRD'].".png"?>"></a>
6960
</div>
7061

7162
</div>

‎web/templates/admin/list_server_info.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
<div class="l-menu__item <?php if(isset($_GET['mem'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?mem"><i class="fas fa-memory"></i>&nbsp;&nbsp;&nbsp;<?=__('RAM')?></a></div>
2929
<div class="l-menu__item <?php if(isset($_GET['disk'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?disk"><i class="fas fa-hdd"></i>&nbsp;&nbsp;&nbsp;<?=__('Disk')?></a></div>
3030
<div class="l-menu__item <?php if(isset($_GET['net'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?net"><i class="fas fa-ethernet"></i>&nbsp;&nbsp;&nbsp;<?=__('Network')?></a></div>
31-
<div class="l-menu__item <?php if(isset($_GET['web'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?web"><i class="fas fa-globe-europe"></i>&nbsp;&nbsp;&nbsp;<?=__('Web')?></a></div>
32-
<div class="l-menu__item <?php if(isset($_GET['dns'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?dns"><i class="fas fa-at"></i>&nbsp;&nbsp;&nbsp;<?=__('DNS')?></a></div>
33-
<div class="l-menu__item <?php if(isset($_GET['mail'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?mail"><i class="fas fa-mail-bulk"></i>&nbsp;&nbsp;&nbsp;<?=__('Mail')?></a></div>
34-
<div class="l-menu__item <?php if(isset($_GET['db'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?db"><i class="fas fa-database"></i>&nbsp;&nbsp;&nbsp;<?=__('DB')?></a></div>
31+
<?php if ((isset($_SESSION['WEB_SYSTEM'])) && (!empty($_SESSION['WEB_SYSTEM']))) {?><div class="l-menu__item <?php if(isset($_GET['web'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?web"><i class="fas fa-globe-europe"></i>&nbsp;&nbsp;&nbsp;<?=__('Web')?></a></div><?php }?>
32+
<?php if ((isset($_SESSION['DNS_SYSTEM'])) && (!empty($_SESSION['DNS_SYSTEM']))) {?><div class="l-menu__item <?php if(isset($_GET['dns'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?dns"><i class="fas fa-at"></i>&nbsp;&nbsp;&nbsp;<?=__('DNS')?></a></div><?php }?>
33+
<?php if ((isset($_SESSION['MAIL_SYSTEM'])) && (!empty($_SESSION['MAIL_SYSTEM']))) {?><div class="l-menu__item <?php if(isset($_GET['mail'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?mail"><i class="fas fa-mail-bulk"></i>&nbsp;&nbsp;&nbsp;<?=__('Mail')?></a></div><?php }?>
34+
<?php if ((isset($_SESSION['DB_SYSTEM'])) && (!empty($_SESSION['DB_SYSTEM']))) {?><div class="l-menu__item <?php if(isset($_GET['db'])) echo 'l-menu__item--active' ?>"><a href="/list/server/?db"><i class="fas fa-database"></i>&nbsp;&nbsp;&nbsp;<?=__('DB')?></a></div><?php }?>
3535

3636
</div>
3737
<!-- /.l-menu -->

0 commit comments

Comments
 (0)