www: missed some spots #2440

Remove static wol references, going away in 18.7 and
wol hasn't been in the default install for a while.
This commit is contained in:
Franco Fichtner 2018-06-05 19:33:47 +00:00
parent 83151f5632
commit 1d6b49090f
4 changed files with 16 additions and 35 deletions

View File

@ -1862,7 +1862,7 @@ include("head.inc");
endforeach;
endif;?>
</select>
<button type="button" class="btn btn-sm" id="btn_show_add_gateway" title="<?=gettext("Add a new one.");?>" data-toggle="tooltip"><span class="glyphicon glyphicon-plus"></span></button>
<button type="button" class="btn btn-sm" id="btn_show_add_gateway" title="<?= html_safe(gettext('Add')) ?>" data-toggle="tooltip"><i class="fa fa-plus fa-fw"></i></button>
<div class="hidden" id="addgateway">
<br/>
<table class="table table-striped table-condensed">
@ -2386,7 +2386,7 @@ include("head.inc");
endforeach;
endif;?>
</select>
<button type="button" class="btn btn-sm" id="btn_show_add_gatewayv6" title="<?=gettext("Add a new one.");?>" data-toggle="tooltip"><span class="glyphicon glyphicon-plus"></span></button>
<button type="button" class="btn btn-sm" id="btn_show_add_gatewayv6" title="<?= html_safe(gettext('Add')) ?>" data-toggle="tooltip"><i class="fa fa-plus fa-fw"></i></button>
<div class="hidden" data-for="help_for_gatewayv6">
<?=gettext("If this interface is an Internet connection, select an existing Gateway from the list or add a new one using the link above."); ?><br />
<?=gettext('On local LANs the upstream gateway should be "none".'); ?>

View File

@ -67,8 +67,6 @@ function remove_duplicate($array, $field)
$interfaces = legacy_config_get_interfaces(array('virtual' => false));
$leasesfile = services_dhcpd_leasesfile();
$wol_installed = trim(configd_run('firmware plugin wol'));
if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$awk = "/usr/bin/awk";
/* this pattern sticks comments into a single array item */
@ -365,7 +363,7 @@ include("head.inc");?>
<td class="act_sort" data-field="end"><?=gettext("End"); ?></td>
<td class="act_sort" data-field="online"><?=gettext("Status"); ?></td>
<td class="act_sort" data-field="act"><?=gettext("Lease type"); ?></td>
<td>&nbsp;</td>
<td class="text-nowrap"></td>
</tr>
</thead>
<tbody>
@ -417,17 +415,7 @@ include("head.inc");?>
<td><?=$data['int'];?></td>
<td><?=$data['ip'];?></td>
<td>
<?php
if ($wol_installed): ?>
<a href="services_wol.php?if=<?=$data['if'];?>&amp;mac=<?=$data['mac'];?>" title="<?=gettext("send Wake on LAN packet to this MAC address");?>">
<?=$data['mac'];?>
</a>
<?php
else: ?>
<?=$data['mac'];?>
<?php
endif; ?>
<br />
<?=$data['mac'];?><br />
<small><i><?=!empty($mac_man[$mac_hi]) ? $mac_man[$mac_hi] : "";?></i></small>
</td>
<td><?=$data['hostname'];?></td>
@ -436,26 +424,19 @@ include("head.inc");?>
<td><?=!empty($data['end']) ? adjust_gmt($data['end']) : "";?></td>
<td><?=$data['online'];?></td>
<td><?=$data['act'];?></td>
<td>
<td class="text-nowrap">
<?php
if ($data['type'] == "dynamic"):?>
<a class="btn btn-default btn-xs" href="services_dhcp_edit.php?if=<?=$data['if'];?>&amp;mac=<?=$data['mac'];?>&amp;hostname=<?=$data['hostname'];?>">
<span class="glyphicon glyphicon-plus" data-toggle="tooltip" title="<?=gettext("add a static mapping for this MAC address");?>" alt="add" ></span>
<i class="fa fa-plus fa-fw" data-toggle="tooltip" title="<?=gettext("add a static mapping for this MAC address");?>"></i>
</a>
<?php
endif;?>
<?php
if ($wol_installed): ?>
<a class="btn btn-default btn-xs" href="services_wol_edit.php?if=<?=$data['if'];?>&amp;mac=<?=$data['mac'];?>&amp;descr=<?=$data['hostname'];?>">
<span class="glyphicon glyphicon-flash" data-toggle="tooltip" title="<?=gettext("add a Wake on LAN mapping for this MAC address");?>" alt="add"></span>
</a>
<?php
endif;?>
<?php
if (($data['type'] == "dynamic") && ($data['online'] != "online")):?>
<a class="act_delete btn btn-default btn-xs" href="#" data-deleteip="<?=$data['ip'];?>">
<span class="fa fa-trash text-muted" title="<?=gettext("delete this DHCP lease");?>" data-toggle="tooltip" alt="delete" ></span>
<i class="fa fa-trash fa-fw" title="<?= html_safe(gettext('Delete')) ?>" data-toggle="tooltip"></i>
</a>
<?php
endif;?>

View File

@ -437,7 +437,7 @@ endif;?>
<th><?=gettext("End"); ?></th>
<th><?=gettext("Online"); ?></th>
<th><?=gettext("Lease Type"); ?></th>
<th></th>
<th class="text-nowrap"></th>
</tr>
</thead>
<tbody>
@ -479,18 +479,18 @@ endif;?>
<td><?=$data['type'] != "static" ? adjust_gmt($data['end']) : "";?></td>
<td><?=$data['online'];?></td>
<td><?=$data['act'];?></td>
<td>
<td class="text-nowrap">
<?php
if ($data['type'] == "dynamic"):?>
<a class="btn btn-default btn-xs" href="services_dhcpv6_edit.php?if=<?=$data['if'];?>&amp;duid=<?=$data['duid'];?>&amp;hostname=<?=$data['hostname'];?>">
<span class="glyphicon glyphicon-plus" alt="add" ></span>
<i class="fa fa-plus fa-fw" alt="add"></i>
</a>
<?php
endif;?>
<?php
if (($data['type'] == "dynamic") && ($data['online'] != "online")):?>
<a class="act_delete btn btn-default btn-xs" href="#" data-deleteip="<?=$data['ip'];?>">
<span class="fa fa-trash text-muted" title="<?=gettext("delete this DHCP lease");?>" data-toggle="tooltip" alt="delete" ></span>
<a class="act_delete btn btn-default btn-xs" href="#" data-deleteip="<?=$data['ip'];?>" title="<?= html_safe(gettext('Delete')) ?>" data-toggle="tooltip">
<i class="fa fa-trash fa-fw"></i>
</a>
<?php
endif;?>

View File

@ -233,8 +233,8 @@ include("head.inc");
<td><?=$service['description'];?></td>
<td>
<div data-busy-id="action_<?=$sequence;?>">
<span class="btn btn-xs btn-<?=!empty($service['status']) ?"success" : "danger";?>">
<span class="glyphicon glyphicon-<?=!empty($service['status']) ?"play" : "stop";?>"></span>
<span class="btn btn-xs btn-<?=!empty($service['status']) ? 'success' : 'danger' ?>">
<i class="fa fa-<?=!empty($service['status']) ? 'play' : 'stop' ?> fa-fw"></i>
</span>
<?php
if (!empty($service['status'])):?>
@ -244,7 +244,7 @@ include("head.inc");
data-service_name="<?=$service['name'];?>"
data-toggle="tooltip"
title="<?=sprintf(gettext('Restart %sService'), $service['name']);?>"
class="btn btn-xs btn-default xmlrpc_srv_status_act glyphicon glyphicon-refresh">
class="btn btn-xs btn-default xmlrpc_srv_status_act fa fa-refresh fa-fw">
</span>
<?php
if (empty($service['nocheck'])):?>
@ -304,7 +304,7 @@ include("head.inc");
data-service_name="all"
data-toggle="tooltip"
title="<?=gettext('Restart all services');?>"
class="btn btn-xs btn-default xmlrpc_srv_status_act glyphicon glyphicon-refresh">
class="btn btn-xs btn-default xmlrpc_srv_status_act fa fa-refresh fa-fw">
</span>
</div>
</td>