Skip to content

Commit 0cef014

Browse files
author
Kristan Kenney
committed
Merge branch 'fix/settings-ui' into main
2 parents c2cf5e5 + 96669cf commit 0cef014

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

‎web/templates/pages/edit_server.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
<div class="l-sort clearfix">
44
<div class="l-unit-toolbar__buttonstrip">
55
<a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
6+
<a href="/list/ip/" class="ui-button cancel" dir="ltr"><i class="fas fa-ethernet status-icon blue"></i><?=_('IP');?></a>
7+
<?php if ((isset($_SESSION['FIREWALL_SYSTEM'])) && (!empty($_SESSION['FIREWALL_SYSTEM']))) {?>
8+
<a href="/list/firewall/" class="ui-button cancel" dir="ltr"><i class="fas fa-shield-alt status-icon red"></i><?=_('Firewall');?></a>
9+
<?php }?>
610
</div>
711
<div class="l-unit-toolbar__buttonstrip float-right">
812
<a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>

‎web/templates/pages/list_firewall.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="l-center">
33
<div class="l-sort clearfix noselect">
44
<div class="l-unit-toolbar__buttonstrip">
5-
<a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
5+
<a class="ui-button cancel" dir="ltr" id="btn-back" href="/edit/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
66
<a href="/add/firewall/" id="btn-create" class="ui-button cancel" dir="ltr"><i class="fas fa-plus-circle status-icon green"></i><?=_('Add Rule');?></a>
77
<?php if(!empty($_SESSION['FIREWALL_EXTENSION'])): ?>
88
<a class="ui-button cancel" dir="ltr" href="/list/firewall/banlist/"><i class="fas fa-eye status-icon red"></i><?=_('list fail2ban');?></a>

‎web/templates/pages/list_ip.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="l-center">
33
<div class="l-sort clearfix noselect">
44
<div class="l-unit-toolbar__buttonstrip">
5-
<a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
5+
<a class="ui-button cancel" dir="ltr" id="btn-back" href="/edit/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
66
<a href="/add/ip/" id="btn-create" class="ui-button cancel" dir="ltr"><i class="fas fa-plus-circle status-icon green"></i><?=_('Add IP');?></a>
77
</div>
88
<ul class="context-menu sort-order animated fadeIn" style="display:none;">

‎web/templates/pages/list_services.html‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,9 @@
33
<div class="l-sort clearfix noselect">
44
<div class="l-unit-toolbar__buttonstrip">
55
<a href="/edit/server/" class="ui-button cancel" dir="ltr"><i class="fas fa-cog status-icon maroon"></i><?=_('Configure');?></a>
6-
<a href="/list/rrd/" class="ui-button cancel" dir="ltr"><i class="fas fa-chart-area status-icon green"></i><?=_('Graphs');?></a>
7-
<a href="/list/ip/" class="ui-button cancel" dir="ltr"><i class="fas fa-ethernet status-icon blue"></i><?=_('IP');?></a>
8-
<?php if ((isset($_SESSION['FIREWALL_SYSTEM'])) && (!empty($_SESSION['FIREWALL_SYSTEM']))) {?>
9-
<a href="/list/firewall/" class="ui-button cancel" dir="ltr"><i class="fas fa-shield-alt status-icon red"></i><?=_('Firewall');?></a>
10-
<?php }?>
6+
<a href="/list/rrd/" class="ui-button cancel" dir="ltr"><i class="fas fa-chart-area status-icon blue"></i><?=_('Graphs');?></a>
117
<a href="/list/updates/" class="ui-button cancel" dir="ltr"><i class="fas fa-sync status-icon green"></i><?=_('Updates');?></a>
12-
<a href="/list/log/?user=system&token=<?=$_SESSION['token']?>" class="ui-button cancel" dir="ltr"><i class="fas fa-history status-icon lightblue"></i><?=_('Logs');?></a>
8+
<a href="/list/log/?user=system&token=<?=$_SESSION['token']?>" class="ui-button cancel" dir="ltr"><i class="fas fa-binoculars status-icon orange"></i><?=_('Logs');?></a>
139
<div class="actions-panel display-inline-block" key-action="js">
1410
<a class="data-controls do_servicerestart ui-button danger cancel">
1511
<i class="do_servicerestart fas fa-undo status-icon red"></i><?=_('Restart');?>

‎web/templates/pages/list_updates.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
if($autoupdate == 'Enabled') {
88
$btn_url = '/delete/cron/autoupdate/?token='.$_SESSION['token'].'';
99
$btn_icon = 'fa-toggle-on status-icon green';
10-
$btn_label = _('Disable autoupdate');
10+
$btn_label = _('Disable automatic updates');
1111
} else {
1212
$btn_url = '/add/cron/autoupdate/?token='.$_SESSION['token'].'';
1313
$btn_icon = 'fa-toggle-off status-icon red';
14-
$btn_label = _('Enable autoupdate');
14+
$btn_label = _('Enable automatic updates');
1515
}
1616
?>
1717
<a class="ui-button cancel" dir="ltr" href="<?=$btn_url;?>"><i class="fas <?=$btn_icon;?>"></i><?=$btn_label;?></a>

0 commit comments

Comments
 (0)