diff options
author | Phil Davis <phil.davis@inf.org> | 2016-03-11 22:02:25 +0545 |
---|---|---|
committer | Phil Davis <phil.davis@inf.org> | 2016-03-11 22:02:25 +0545 |
commit | 2f62ed872c59dd308c6eb5aa29028dd93274fed6 (patch) | |
tree | 3c386f61bd0c24fc0eb3cb7208cd769ada535a50 /src/usr/local/www/services_wol.php | |
parent | bc3c30ebc548c9b1b184166e940d66cc91752a28 (diff) | |
parent | b95e3de4cb39e0b3ef6a0f042b2c96b041019522 (diff) | |
download | pfsense-2f62ed872c59dd308c6eb5aa29028dd93274fed6.zip pfsense-2f62ed872c59dd308c6eb5aa29028dd93274fed6.tar.gz |
Resolve conflicts with master
Diffstat (limited to 'src/usr/local/www/services_wol.php')
-rw-r--r-- | src/usr/local/www/services_wol.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/usr/local/www/services_wol.php b/src/usr/local/www/services_wol.php index 82f243e..4b9585a 100644 --- a/src/usr/local/www/services_wol.php +++ b/src/usr/local/www/services_wol.php @@ -182,14 +182,15 @@ $section->addInput(new Form_Input( $mac ))->setHelp(gettext('Enter a MAC address in the following format: xx:xx:xx:xx:xx:xx')); -$section->addInput(new Form_Button( +$form->add($section); + +$form->addGlobal(new Form_Button( 'Submit', gettext('Send'), null, 'fa-power-off' ))->addClass('btn-primary'); -$form->add($section); print $form; ?> @@ -223,8 +224,9 @@ print $form; <?=htmlspecialchars($wolent['descr']);?> </td> <td> - <a class="fa fa-pencil" title="<?=gettext('Edit device')?>" href="services_wol_edit.php?id=<?=$i?>"></a> - <a class="fa fa-trash" title="<?=gettext('Delete device')?>" href="services_wol.php?act=del&id=<?=$i?>"></a> + <a class="fa fa-pencil" title="<?=gettext('Edit Device')?>" href="services_wol_edit.php?id=<?=$i?>"></a> + <a class="fa fa-trash" title="<?=gettext('Delete Device')?>" href="services_wol.php?act=del&id=<?=$i?>"></a> + <a class="fa fa-power-off" title="<?=gettext('Wake Device')?>" href="?mac=<?=$wolent['mac'];?>&if=<?=$wolent['interface'];?>"></a> </td> </tr> <?php endforeach?> @@ -240,7 +242,7 @@ print $form; <a href="services_wol.php?wakeall=true" role="button" class="btn btn-primary"> <i class="fa fa-power-off icon-embed-btn"></i> - <?=gettext("Wake all devices")?> + <?=gettext("Wake All Devices")?> </a> </div> </div> |