Commit 418c800d authored by Manuel Faux's avatar Manuel Faux

UX: added missing and unified existing tooltips of buttons

  * Added missing tooltips for existing buttons for list management (add line,
    remove line, move line, clone line)
  * Shortened existing tooltip texts to a minimum
  * Fixed incorrect tooltip texts
  * Changed order of buttons to 1. move item, 2. delete item, 3. add item, 4.
    clone item
  * Changed tooltips "click to toggle enable/disable rule" to "disable rule" and
    "enable rule" corresponding to the current state, respectively.
parent fa142b55
...@@ -303,7 +303,7 @@ $( document ).ready(function() { ...@@ -303,7 +303,7 @@ $( document ).ready(function() {
<?php endif; ?> <?php endif; ?>
</td> </td>
<td> <td>
<a href="#" class="act_toggle" id="toggle_<?=$nnats;?>" data-toggle="tooltip" data-placement="left" title="<?=gettext("click to toggle enabled/disabled status");?>"> <a href="#" class="act_toggle" id="toggle_<?=$nnats;?>" data-toggle="tooltip" data-placement="left" title="<?=(!isset($natent['disabled'])) ? gettext("disable rule") : gettext("enable rule");?>">
<?php if (!empty($natent['associated-rule-id'])): ?> <?php if (!empty($natent['associated-rule-id'])): ?>
<?php if(isset($natent['disabled'])):?> <?php if(isset($natent['disabled'])):?>
<span class="glyphicon glyphicon-resize-horizontal text-muted"></span> <span class="glyphicon glyphicon-resize-horizontal text-muted"></span>
...@@ -374,13 +374,13 @@ $( document ).ready(function() { ...@@ -374,13 +374,13 @@ $( document ).ready(function() {
<a type="submit" id="move_<?=$nnats;?>" name="move_<?=$nnats;?>_x" data-toggle="tooltip" data-placement="left" title="<?=gettext("move selected rules before this rule");?>" class="act_move btn btn-default btn-xs"> <a type="submit" id="move_<?=$nnats;?>" name="move_<?=$nnats;?>_x" data-toggle="tooltip" data-placement="left" title="<?=gettext("move selected rules before this rule");?>" class="act_move btn btn-default btn-xs">
<span class="glyphicon glyphicon-arrow-left"></span> <span class="glyphicon glyphicon-arrow-left"></span>
</a> </a>
<a href="firewall_nat_edit.php?id=<?=$nnats;?>" data-toggle="tooltip" data-placement="left" title="<?=gettext("edit this rule");?>" class="btn btn-default btn-xs"> <a href="firewall_nat_edit.php?id=<?=$nnats;?>" data-toggle="tooltip" data-placement="left" title="<?=gettext("edit rule");?>" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-pencil"></span> <span class="glyphicon glyphicon-pencil"></span>
</a> </a>
<a id="del_<?=$nnats;?>" title="<?=gettext("delete this rule"); ?>" data-toggle="tooltip" class="act_delete btn btn-default btn-xs"> <a id="del_<?=$nnats;?>" title="<?=gettext("delete rule"); ?>" data-toggle="tooltip" class="act_delete btn btn-default btn-xs">
<span class="glyphicon glyphicon-remove"></span> <span class="glyphicon glyphicon-remove"></span>
</a> </a>
<a href="firewall_nat_edit.php?dup=<?=$nnats;?>" class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="left" title="<?=gettext("add new rule based on this one");?>"> <a href="firewall_nat_edit.php?dup=<?=$nnats;?>" class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="left" title="<?=gettext("clone rule");?>">
<span class="fa fa-clone text-muted"></span> <span class="fa fa-clone text-muted"></span>
</a> </a>
</td> </td>
......
...@@ -135,7 +135,7 @@ $main_buttons = array( ...@@ -135,7 +135,7 @@ $main_buttons = array(
BootstrapDialog.show({ BootstrapDialog.show({
type:BootstrapDialog.TYPE_DANGER, type:BootstrapDialog.TYPE_DANGER,
title: "<?= gettext("1:1");?>", title: "<?= gettext("1:1");?>",
message: "<?=gettext("Do you really want to delete the selected mappings?");?>", message: "<?=gettext("Do you really want to delete the selected rules?");?>",
buttons: [{ buttons: [{
label: "<?= gettext("No");?>", label: "<?= gettext("No");?>",
action: function(dialogRef) { action: function(dialogRef) {
...@@ -213,7 +213,12 @@ $main_buttons = array( ...@@ -213,7 +213,12 @@ $main_buttons = array(
<input type="checkbox" name="rule[]" value="<?=$i;?>" /> <input type="checkbox" name="rule[]" value="<?=$i;?>" />
</td> </td>
<td> <td>
<a href="#" type="submit" id="toggle_<?=$i;?>" data-toggle="tooltip" data-placement="left" title="<?=gettext("click to toggle enabled/disabled status");?>" class="act_toggle glyphicon glyphicon glyphicon-play <?=isset($natent['disabled']) ? "text-muted" : "text-success";?>"> <a href="#" type="submit" id="toggle_<?=$i;?>" data-toggle="tooltip" data-placement="left" title="<?=(!isset($natent['disabled'])) ? gettext("disable rule") : gettext("enable rule");?>" class="act_toggle">
<?php if(isset($natent['disabled'])):?>
<span class="glyphicon glyphicon-play text-muted"></span>
<?php else:?>
<span class="glyphicon glyphicon-play text-success"></span>
<?php endif; ?>
</a> </a>
</td> </td>
<td> <td>
...@@ -241,16 +246,16 @@ $main_buttons = array( ...@@ -241,16 +246,16 @@ $main_buttons = array(
<?=$natent['descr'];?> &nbsp; <?=$natent['descr'];?> &nbsp;
</td> </td>
<td> <td>
<a type="submit" id="move_<?=$i;?>" name="move_<?=$i;?>_x" data-toggle="tooltip" data-placement="left" title="<?=gettext("move selected mapping before this rule");?>" class="act_move btn btn-default btn-xs"> <a type="submit" id="move_<?=$i;?>" name="move_<?=$i;?>_x" data-toggle="tooltip" data-placement="left" title="<?=gettext("move selected rules before this rule");?>" class="act_move btn btn-default btn-xs">
<span class="glyphicon glyphicon-arrow-left"></span> <span class="glyphicon glyphicon-arrow-left"></span>
</a> </a>
<a href="firewall_nat_1to1_edit.php?id=<?=$i;?>" class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="left" title="<?=gettext("edit this mapping");?>"> <a href="firewall_nat_1to1_edit.php?id=<?=$i;?>" class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="left" title="<?=gettext("edit rule ");?>">
<span class="glyphicon glyphicon-pencil"></span> <span class="glyphicon glyphicon-pencil"></span>
</a> </a>
<a id="del_<?=$i;?>" title="<?=gettext("delete this mapping"); ?>" data-toggle="tooltip" class="act_delete btn btn-default btn-xs"> <a id="del_<?=$i;?>" title="<?=gettext("delete rule"); ?>" data-toggle="tooltip" class="act_delete btn btn-default btn-xs">
<span class="glyphicon glyphicon-remove"></span> <span class="glyphicon glyphicon-remove"></span>
</a> </a>
<a href="firewall_nat_1to1_edit.php?dup=<?=$i;?>" data-toggle="tooltip" data-placement="left" title="<?=gettext("add new mapping based on this one");?>" class="btn btn-default btn-xs"> <a href="firewall_nat_1to1_edit.php?dup=<?=$i;?>" data-toggle="tooltip" data-placement="left" title="<?=gettext("clone rule");?>" class="btn btn-default btn-xs">
<span class="fa fa-clone text-muted"></span> <span class="fa fa-clone text-muted"></span>
</a> </a>
</td> </td>
...@@ -264,30 +269,30 @@ $main_buttons = array( ...@@ -264,30 +269,30 @@ $main_buttons = array(
<td> <td>
<?php if ($i == 0): <?php if ($i == 0):
?> ?>
<span title="<?=gettext("move selected mappings to end");?>" class="btn btn-default btn-xs"> <span title="<?=gettext("move selected rules to end");?>" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-arrow-left"> <span class="glyphicon glyphicon-arrow-left">
</span> </span>
</span> </span>
<?php else: <?php else:
?> ?>
<a type="submit" id="move_<?=$i;?>" name="move_<?=$i;?>_x" data-toggle="tooltip" data-placement="left" title="<?=gettext("move selected mappings to end");?>" class="act_move btn btn-default btn-xs"> <a type="submit" id="move_<?=$i;?>" name="move_<?=$i;?>_x" data-toggle="tooltip" data-placement="left" title="<?=gettext("move selected rules to end");?>" class="act_move btn btn-default btn-xs">
<span class="glyphicon glyphicon-arrow-left"></span> <span class="glyphicon glyphicon-arrow-left"></span>
</a> </a>
<?php endif; <?php endif;
?> ?>
<?php if ($i == 0): <?php if ($i == 0):
?> ?>
<span title="<?=gettext("delete selected mappings"); ?>" data-toggle="tooltip" class="btn btn-default btn-xs"> <span title="<?=gettext("delete selected rules"); ?>" data-toggle="tooltip" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-remove"></span> <span class="glyphicon glyphicon-remove"></span>
</span> </span>
<?php else: <?php else:
?> ?>
<a id="del_x" title="<?=gettext("delete selected mappings"); ?>" data-toggle="tooltip" class="act_delete btn btn-default btn-xs"> <a id="del_x" title="<?=gettext("delete selected rules"); ?>" data-toggle="tooltip" class="act_delete btn btn-default btn-xs">
<span class="glyphicon glyphicon-remove"></span> <span class="glyphicon glyphicon-remove"></span>
</a> </a>
<?php endif; <?php endif;
?> ?>
<a href="firewall_nat_1to1_edit.php" data-toggle="tooltip" data-placement="left" title="<?=gettext("add new mapping");?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-plus"></span></a> <a href="firewall_nat_1to1_edit.php" data-toggle="tooltip" data-placement="left" title="<?=gettext("add new rule");?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-plus"></span></a>
</td> </td>
</tr> </tr>
</tbody> </tbody>
......
...@@ -211,7 +211,7 @@ $main_buttons = array( ...@@ -211,7 +211,7 @@ $main_buttons = array(
<input type="checkbox" name="rule[]" value="<?=$i;?>" /> <input type="checkbox" name="rule[]" value="<?=$i;?>" />
</td> </td>
<td> <td>
<a href="#" class="act_toggle" id="toggle_<?=$i;?>" data-toggle="tooltip" data-placement="left" title="<?=gettext("click to toggle enabled/disabled status");?>"> <a href="#" class="act_toggle" id="toggle_<?=$i;?>" data-toggle="tooltip" data-placement="left" title="<?=(!isset($natent['disabled'])) ? gettext("disable rule") : gettext("enable rule");?>">
<?php if(isset($natent['disabled'])):?> <?php if(isset($natent['disabled'])):?>
<span class="glyphicon glyphicon-play text-muted"></span> <span class="glyphicon glyphicon-play text-muted"></span>
<?php else:?> <?php else:?>
...@@ -235,13 +235,13 @@ $main_buttons = array( ...@@ -235,13 +235,13 @@ $main_buttons = array(
<a type="submit" id="move_<?=$i;?>" name="move_<?=$i;?>_x" data-toggle="tooltip" data-placement="left" title="<?=gettext("move selected rules before this rule");?>" class="act_move btn btn-default btn-xs"> <a type="submit" id="move_<?=$i;?>" name="move_<?=$i;?>_x" data-toggle="tooltip" data-placement="left" title="<?=gettext("move selected rules before this rule");?>" class="act_move btn btn-default btn-xs">
<span class="glyphicon glyphicon-arrow-left"></span> <span class="glyphicon glyphicon-arrow-left"></span>
</a> </a>
<a href="firewall_nat_npt_edit.php?id=<?=$i;?>" data-toggle="tooltip" data-placement="left" title="<?=gettext("edit this rule");?>" class="btn btn-default btn-xs"> <a href="firewall_nat_npt_edit.php?id=<?=$i;?>" data-toggle="tooltip" data-placement="left" title="<?=gettext("edit rule");?>" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-pencil"></span> <span class="glyphicon glyphicon-pencil"></span>
</a> </a>
<a id="del_<?=$i;?>" title="<?=gettext("delete this rule"); ?>" data-toggle="tooltip" class="act_delete btn btn-default btn-xs"> <a id="del_<?=$i;?>" title="<?=gettext("delete rule"); ?>" data-toggle="tooltip" class="act_delete btn btn-default btn-xs">
<span class="glyphicon glyphicon-remove"></span> <span class="glyphicon glyphicon-remove"></span>
</a> </a>
<a href="firewall_nat_npt_edit.php?dup=<?=$i;?>" class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="left" title="<?=gettext("add new rule based on this one");?>"> <a href="firewall_nat_npt_edit.php?dup=<?=$i;?>" class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="left" title="<?=gettext("clone rule");?>">
<span class="fa fa-clone text-muted"></span> <span class="fa fa-clone text-muted"></span>
</a> </a>
</td> </td>
......
...@@ -319,7 +319,7 @@ include("head.inc"); ...@@ -319,7 +319,7 @@ include("head.inc");
<div class="table-responsive content-box "> <div class="table-responsive content-box ">
<table class="table table-striped table-sort"> <table class="table table-striped table-sort">
<thead> <thead>
<tr><th colspan="12"><?=gettext("Mappings:"); ?></th></tr> <tr><th colspan="12"><?=gettext("Manual rules:"); ?></th></tr>
<tr> <tr>
<th>&nbsp;</th> <th>&nbsp;</th>
<th>&nbsp;</th> <th>&nbsp;</th>
...@@ -348,11 +348,11 @@ include("head.inc"); ...@@ -348,11 +348,11 @@ include("head.inc");
<?php <?php
if ($mode == "disabled" || $mode == "automatic"): if ($mode == "disabled" || $mode == "automatic"):
?> ?>
<span data-toggle="tooltip" title="<?=gettext("This rule is being ignored");?>" class="glyphicon glyphicon-play <?=$mode == "disabled" || $mode == "automatic" || isset($natent['disabled']) ? "text-muted" : "text-success";?>"></span> <span data-toggle="tooltip" title="<?=gettext("All manual rules are being ignored");?>" class="glyphicon glyphicon-play <?=$mode == "disabled" || $mode == "automatic" || isset($natent['disabled']) ? "text-muted" : "text-success";?>"></span>
<?php <?php
else: else:
?> ?>
<a href="#" class="act_toggle" id="toggle_<?=$i;?>" data-toggle="tooltip" title="<?=gettext("click to toggle enabled/disabled status");?>" class="btn btn-default btn-xs <?=isset($natent['disabled']) ? "text-muted" : "text-success";?>"> <a href="#" class="act_toggle" id="toggle_<?=$i;?>" data-toggle="tooltip" title="<?=(!isset($natent['disabled'])) ? gettext("disable rule") : gettext("enable rule");?>" class="btn btn-default btn-xs <?=isset($natent['disabled']) ? "text-muted" : "text-success";?>">
<span class="glyphicon glyphicon-play <?=isset($natent['disabled']) ? "text-muted" : "text-success";?> "></span> <span class="glyphicon glyphicon-play <?=isset($natent['disabled']) ? "text-muted" : "text-success";?> "></span>
</a> </a>
<?php <?php
...@@ -413,13 +413,13 @@ include("head.inc"); ...@@ -413,13 +413,13 @@ include("head.inc");
<a type="submit" id="move_<?=$i;?>" name="move_<?=$i;?>_x" data-toggle="tooltip" data-placement="left" title="<?=gettext("move selected rules before this rule");?>" class="act_move btn btn-default btn-xs"> <a type="submit" id="move_<?=$i;?>" name="move_<?=$i;?>_x" data-toggle="tooltip" data-placement="left" title="<?=gettext("move selected rules before this rule");?>" class="act_move btn btn-default btn-xs">
<span class="glyphicon glyphicon-arrow-left"></span> <span class="glyphicon glyphicon-arrow-left"></span>
</a> </a>
<a href="firewall_nat_out_edit.php?id=<?=$i;?>" data-toggle="tooltip" data-placement="left" title="<?=gettext("edit mapping");?>" class="btn btn-default btn-xs"> <a href="firewall_nat_out_edit.php?id=<?=$i;?>" data-toggle="tooltip" data-placement="left" title="<?=gettext("edit rule");?>" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-pencil"></span> <span class="glyphicon glyphicon-pencil"></span>
</a> </a>
<a id="del_<?=$i;?>" title="<?=gettext("delete this rule"); ?>" data-toggle="tooltip" class="act_delete btn btn-default btn-xs"> <a id="del_<?=$i;?>" title="<?=gettext("delete rule"); ?>" data-toggle="tooltip" class="act_delete btn btn-default btn-xs">
<span class="glyphicon glyphicon-remove"></span> <span class="glyphicon glyphicon-remove"></span>
</a> </a>
<a href="firewall_nat_out_edit.php?dup=<?=$i;?>" class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="left" title="<?=gettext("add a new NAT based on this one");?>"> <a href="firewall_nat_out_edit.php?dup=<?=$i;?>" class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="left" title="<?=gettext("clone rule");?>">
<span class="fa fa-clone text-muted"></span> <span class="fa fa-clone text-muted"></span>
</a> </a>
</td> </td>
...@@ -459,7 +459,7 @@ include("head.inc"); ...@@ -459,7 +459,7 @@ include("head.inc");
<?php <?php
endif; endif;
?> ?>
<a href="firewall_nat_out_edit.php" title="<?=gettext("add new mapping");?>" alt="add" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-plus"></span></a> <a href="firewall_nat_out_edit.php" title="<?=gettext("add new rule");?>" alt="add" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-plus"></span></a>
</td> </td>
</tr> </tr>
</tbody> </tbody>
......
...@@ -290,7 +290,7 @@ $( document ).ready(function() { ...@@ -290,7 +290,7 @@ $( document ).ready(function() {
<td class="hidden-xs hidden-sm">&nbsp;</td> <td class="hidden-xs hidden-sm">&nbsp;</td>
<td><?=gettext("Block all IPv6 traffic");?></td> <td><?=gettext("Block all IPv6 traffic");?></td>
<td> <td>
<a href="system_advanced_network.php" title="<?=gettext("edit rule");?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a> <a href="system_advanced_network.php" data-toggle="tooltip" data-placement="left" title="<?=gettext("change configuration");?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a>
</td> </td>
</tr> </tr>
<?php <?php
...@@ -314,7 +314,7 @@ $( document ).ready(function() { ...@@ -314,7 +314,7 @@ $( document ).ready(function() {
<td class="hidden-xs hidden-sm">&nbsp;</td> <td class="hidden-xs hidden-sm">&nbsp;</td>
<td><?=gettext("Anti-Lockout Rule");?></td> <td><?=gettext("Anti-Lockout Rule");?></td>
<td> <td>
<a href="system_advanced_admin.php" title="<?=gettext("edit rule");?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a> <a href="system_advanced_admin.php" data-toggle="tooltip" data-placement="left" title="<?=gettext("change configuration");?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a>
</td> </td>
</tr> </tr>
<?php <?php
...@@ -340,7 +340,7 @@ $( document ).ready(function() { ...@@ -340,7 +340,7 @@ $( document ).ready(function() {
<td class="hidden-xs hidden-sm">&nbsp;</td> <td class="hidden-xs hidden-sm">&nbsp;</td>
<td class="hidden-xs hidden-sm"><?=gettext("Block private networks");?></td> <td class="hidden-xs hidden-sm"><?=gettext("Block private networks");?></td>
<td valign="middle" class="list nowrap"> <td valign="middle" class="list nowrap">
<a href="interfaces.php?if=<?=$selected_if?>#rfc1918" title="<?=gettext("edit rule");?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a> <a href="interfaces.php?if=<?=$selected_if?>#rfc1918" data-toggle="tooltip" data-placement="left" title="<?=gettext("change configuration");?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a>
</td> </td>
</tr> </tr>
<?php <?php
...@@ -365,7 +365,7 @@ $( document ).ready(function() { ...@@ -365,7 +365,7 @@ $( document ).ready(function() {
<td class="hidden-xs hidden-sm">&nbsp;</td> <td class="hidden-xs hidden-sm">&nbsp;</td>
<td><?=gettext("Block bogon networks");?></td> <td><?=gettext("Block bogon networks");?></td>
<td> <td>
<a href="interfaces.php?if=<?=htmlspecialchars($if)?>#rfc1918" title="<?=gettext("edit rule");?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a> <a href="interfaces.php?if=<?=htmlspecialchars($if)?>#rfc1918" data-toggle="tooltip" data-placement="left" title="<?=gettext("change configuration");?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a>
</td> </td>
</tr> </tr>
<?php <?php
...@@ -424,9 +424,7 @@ $( document ).ready(function() { ...@@ -424,9 +424,7 @@ $( document ).ready(function() {
<input type="checkbox" name="rule[]" value="<?=$i;?>" /> <input type="checkbox" name="rule[]" value="<?=$i;?>" />
</td> </td>
<td> <td>
<a href="#" class="act_toggle" id="toggle_<?=$i;?>" data-toggle="tooltip" data-placement="left" title="<?=gettext("click to toggle enabled/disabled status");?>"> <a href="#" class="act_toggle" id="toggle_<?=$i;?>" data-toggle="tooltip" data-placement="left" title="<?=(empty($filterent['disabled'])) ? gettext("disable rule") : gettext("enable rule");?>"><span class="glyphicon <?=$iconfn;?>"></span></a>
<span class="glyphicon <?=$iconfn;?>"></span>
</a>
<?php <?php
if (!empty($filterent['direction']) && $filterent['direction'] == "in"):?> if (!empty($filterent['direction']) && $filterent['direction'] == "in"):?>
<i class="fa fa-long-arrow-right" data-toggle="tooltip" data-placement="left" title="<?=gettext("in");?>"></i> <i class="fa fa-long-arrow-right" data-toggle="tooltip" data-placement="left" title="<?=gettext("in");?>"></i>
...@@ -525,13 +523,13 @@ $( document ).ready(function() { ...@@ -525,13 +523,13 @@ $( document ).ready(function() {
<a id="move_<?=$i;?>" name="move_<?=$i;?>_x" data-toggle="tooltip" data-placement="left" title="<?=gettext("move selected rules before this rule");?>" class="act_move btn btn-default btn-xs"> <a id="move_<?=$i;?>" name="move_<?=$i;?>_x" data-toggle="tooltip" data-placement="left" title="<?=gettext("move selected rules before this rule");?>" class="act_move btn btn-default btn-xs">
<span class="glyphicon glyphicon-arrow-left"></span> <span class="glyphicon glyphicon-arrow-left"></span>
</a> </a>
<a href="firewall_rules_edit.php?id=<?=$i;?>" data-toggle="tooltip" data-placement="left" title="<?=gettext("edit this rule");?>" class="btn btn-default btn-xs"> <a href="firewall_rules_edit.php?id=<?=$i;?>" data-toggle="tooltip" data-placement="left" title="<?=gettext("edit rule");?>" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-pencil"></span> <span class="glyphicon glyphicon-pencil"></span>
</a> </a>
<a id="del_<?=$i;?>" title="<?=gettext("delete this rule"); ?>" data-toggle="tooltip" class="act_delete btn btn-default btn-xs"> <a id="del_<?=$i;?>" title="<?=gettext("delete rule"); ?>" data-toggle="tooltip" class="act_delete btn btn-default btn-xs">
<span class="glyphicon glyphicon-remove"></span> <span class="glyphicon glyphicon-remove"></span>
</a> </a>
<a href="firewall_rules_edit.php?dup=<?=$i;?>" class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="left" title="<?=gettext("add new rule based on this one");?>"> <a href="firewall_rules_edit.php?dup=<?=$i;?>" class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="left" title="<?=gettext("clone rule");?>">
<span class="fa fa-clone text-muted"></span> <span class="fa fa-clone text-muted"></span>
</a> </a>
</td> </td>
......
...@@ -232,13 +232,13 @@ $main_buttons = array( ...@@ -232,13 +232,13 @@ $main_buttons = array(
<?=$schedule['descr'];?> <?=$schedule['descr'];?>
</td> </td>
<td> <td>
<a href="firewall_schedule_edit.php?id=<?=$i;?>" data-toggle="tooltip" data-placement="left" title="<?=gettext("edit this schedule");?>" class="btn btn-default btn-xs"> <a href="firewall_schedule_edit.php?id=<?=$i;?>" data-toggle="tooltip" data-placement="left" title="<?=gettext("edit schedule");?>" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-pencil"></span> <span class="glyphicon glyphicon-pencil"></span>
</a> </a>
<a id="del_<?=$i;?>" title="<?=gettext("delete this schedule"); ?>" data-toggle="tooltip" class="act_delete btn btn-default btn-xs"> <a id="del_<?=$i;?>" title="<?=gettext("delete schedule"); ?>" data-toggle="tooltip" class="act_delete btn btn-default btn-xs">
<span class="glyphicon glyphicon-remove"></span> <span class="glyphicon glyphicon-remove"></span>
</a> </a>
<a href="firewall_schedule.php?dup=<?=$i;?>" class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="left" title="<?=gettext("add new schedule based on this one");?>"> <a href="firewall_schedule.php?dup=<?=$i;?>" class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="left" title="<?=gettext("clone schedule");?>">
<span class="fa fa-clone text-muted"></span> <span class="fa fa-clone text-muted"></span>
</a> </a>
</td> </td>
......
...@@ -306,16 +306,16 @@ $main_buttons = array( ...@@ -306,16 +306,16 @@ $main_buttons = array(
<?=htmlspecialchars($vipent['descr']);?> <?=htmlspecialchars($vipent['descr']);?>
</td> </td>
<td> <td>
<a id="move_<?=$i;?>" name="move_<?=$i;?>_x" data-toggle="tooltip" data-placement="left" title="<?=gettext("move selected virtual ip before this rule");?>" class="act_move btn btn-default btn-xs"> <a id="move_<?=$i;?>" name="move_<?=$i;?>_x" data-toggle="tooltip" data-placement="left" title="<?=gettext("move selected virtual IPs before this entry");?>" class="act_move btn btn-default btn-xs">
<span class="glyphicon glyphicon-arrow-left"></span> <span class="glyphicon glyphicon-arrow-left"></span>
</a> </a>
<a href="firewall_virtual_ip_edit.php?id=<?=$i;?>" data-toggle="tooltip" data-placement="left" title="<?=gettext("edit this virtual ip");?>" class="btn btn-default btn-xs"> <a href="firewall_virtual_ip_edit.php?id=<?=$i;?>" data-toggle="tooltip" data-placement="left" title="<?=gettext("edit virtual IP");?>" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-pencil"></span> <span class="glyphicon glyphicon-pencil"></span>
</a> </a>
<a id="del_<?=$i;?>" title="<?=gettext("delete this virtual ip"); ?>" data-toggle="tooltip" class="act_delete btn btn-default btn-xs"> <a id="del_<?=$i;?>" title="<?=gettext("delete virtual IP"); ?>" data-toggle="tooltip" class="act_delete btn btn-default btn-xs">
<span class="glyphicon glyphicon-remove"></span> <span class="glyphicon glyphicon-remove"></span>
</a> </a>
<a href="firewall_virtual_ip_edit.php?dup=<?=$i;?>" class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="left" title="<?=gettext("add new rule based on this one");?>"> <a href="firewall_virtual_ip_edit.php?dup=<?=$i;?>" class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="left" title="<?=gettext("clone virtual IP");?>">
<span class="fa fa-clone text-muted"></span> <span class="fa fa-clone text-muted"></span>
</a> </a>
</td> </td>
...@@ -329,10 +329,10 @@ $main_buttons = array( ...@@ -329,10 +329,10 @@ $main_buttons = array(
<tr> <tr>
<td colspan="5"></td> <td colspan="5"></td>
<td> <td>
<a type="submit" id="move_<?=$i;?>" name="move_<?=$i;?>_x" data-toggle="tooltip" data-placement="left" title="<?=gettext("move selected rules to end");?>" class="act_move btn btn-default btn-xs"> <a type="submit" id="move_<?=$i;?>" name="move_<?=$i;?>_x" data-toggle="tooltip" data-placement="left" title="<?=gettext("move selected virtual IPs to end");?>" class="act_move btn btn-default btn-xs">
<span class="glyphicon glyphicon-arrow-left"></span> <span class="glyphicon glyphicon-arrow-left"></span>
</a> </a>
<a href="firewall_virtual_ip_edit.php" class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="left" title="<?=gettext("add new rule");?>"> <a href="firewall_virtual_ip_edit.php" class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="left" title="<?=gettext("add new virtual IP");?>">
<span class="glyphicon glyphicon-plus"></span> <span class="glyphicon glyphicon-plus"></span>
</a> </a>
</td> </td>
......
...@@ -195,12 +195,18 @@ $( document ).ready(function() { ...@@ -195,12 +195,18 @@ $( document ).ready(function() {
</td> </td>
<td><?=$gateway_group['descr'];?></td> <td><?=$gateway_group['descr'];?></td>
<td> <td>
<a href="system_gateway_groups_edit.php?id=<?=$i;?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a> <a href="system_gateway_groups_edit.php?id=<?=$i;?>" class="btn btn-default btn-xs"
title="edit group" data-toggle="tooltip" data-placement="left">
<span class="glyphicon glyphicon-pencil"></span>
</a>
<button type="button" class="btn btn-default btn-xs act-del-group" <button type="button" class="btn btn-default btn-xs act-del-group"
data-id="<?=$i?>" title="<?=gettext("delete group");?>" data-toggle="tooltip" data-id="<?=$i?>" title="<?=gettext("delete group");?>" data-toggle="tooltip"
data-placement="left" ><span class="glyphicon glyphicon-remove"></span> data-placement="left" ><span class="glyphicon glyphicon-remove"></span>
</button> </button>
<a href="system_gateway_groups_edit.php?dup=<?=$i;?>" class="btn btn-default btn-xs"><span class="fa fa-clone text-muted"></span></a> <a href="system_gateway_groups_edit.php?dup=<?=$i;?>" class="btn btn-default btn-xs"
title="clone group" data-toggle="tooltip" data-placement="left">
<span class="fa fa-clone text-muted"></span>
</a>
</td> </td>
</tr> </tr>
<?php $i++; <?php $i++;
......
...@@ -323,15 +323,15 @@ $( document ).ready(function() { ...@@ -323,15 +323,15 @@ $( document ).ready(function() {
<td> <td>
<?php <?php
if (isset($gateway['inactive'])) :?> if (isset($gateway['inactive'])) :?>
<span class="glyphicon glyphicon-remove text-muted" data-toggle="tooltip" data-placement="left" title="<?=gettext("This gateway is inactive because interface is missing");?>"></span> <span class="glyphicon glyphicon-remove text-muted" data-toggle="tooltip" data-placement="left" title="<?=gettext("Gateway is inactive because interface is missing");?>"></span>
<?php <?php
elseif (is_numeric($gateway['attribute'])) :?> elseif (is_numeric($gateway['attribute'])) :?>
<a href="#" class="act_toggle" data-id="<?=$i;?>" data-toggle="tooltip" data-placement="left" title="<?=gettext("click to toggle enabled/disabled status");?>" > <a href="#" class="act_toggle" data-id="<?=$i;?>" data-toggle="tooltip" data-placement="left" title="<?=(!isset($gateway['disabled'])) ? gettext("disable gateway") : gettext("enable gateway");?>">
<span class="glyphicon glyphicon-play <?=isset($gateway['disabled']) || isset($gateway['inactive']) ? "text-muted" : "text-success";?>"></span> <span class="glyphicon glyphicon-play <?=isset($gateway['disabled']) || isset($gateway['inactive']) ? "text-muted" : "text-success";?>"></span>
</a> </a>
<?php <?php
else :?> else :?>
<span class="glyphicon glyphicon-play <?=isset($gateway['disabled']) || isset($gateway['inactive']) ? "text-muted" : "text-success";?>" data-toggle="tooltip" data-placement="left" title="<?=gettext("click to toggle enabled/disabled status");?>"></span> <span class="glyphicon glyphicon-play <?=isset($gateway['disabled']) || isset($gateway['inactive']) ? "text-muted" : "text-success";?>" data-toggle="tooltip" data-placement="left" title="<?=(!isset($filterent['disabled'])) ? gettext("disable gateway") : gettext("enable gateway");?>"></span>
<?php <?php
endif;?> endif;?>
</td> </td>
...@@ -353,19 +353,19 @@ $( document ).ready(function() { ...@@ -353,19 +353,19 @@ $( document ).ready(function() {
</td> </td>
<td> <td>
<a href="system_gateways_edit.php?id=<?=$i;?>" class="btn btn-default btn-xs" <a href="system_gateways_edit.php?id=<?=$i;?>" class="btn btn-default btn-xs"
data-toggle="tooltip" data-placement="left" title="<?=gettext("Edit Gateway");?>"> data-toggle="tooltip" data-placement="left" title="<?=gettext("edit gateway");?>">
<span class="glyphicon glyphicon-pencil"></span> <span class="glyphicon glyphicon-pencil"></span>
</a> </a>
<?php <?php
if (is_numeric($gateway['attribute'])) :?> if (is_numeric($gateway['attribute'])) :?>
<button data-id="<?=$i;?>" title="<?=gettext("Delete Gateway"); ?>" data-toggle="tooltip" <button data-id="<?=$i;?>" title="<?=gettext("delete gateway"); ?>" data-toggle="tooltip"
class="act_delete btn btn-default btn-xs"> class="act_delete btn btn-default btn-xs">
<span class="glyphicon glyphicon-remove"></span> <span class="glyphicon glyphicon-remove"></span>
</button> </button>
<?php <?php
endif;?> endif;?>
<a href="system_gateways_edit.php?dup=<?=$i;?>" class="btn btn-default btn-xs" <a href="system_gateways_edit.php?dup=<?=$i;?>" class="btn btn-default btn-xs"
data-toggle="tooltip" data-placement="left" title="<?=gettext("Add Gateway based on this one");?>"> data-toggle="tooltip" data-placement="left" title="<?=gettext("clone gateway");?>">
<span class="fa fa-clone text-muted"></span> <span class="fa fa-clone text-muted"></span>
</a> </a>
</td> </td>
......
...@@ -254,8 +254,8 @@ endif; ?> ...@@ -254,8 +254,8 @@ endif; ?>
</td> </td>
<td> <td>
<a href="#" class="act_toggle" data-id="<?=$i;?>"> <a href="#" class="act_toggle" data-id="<?=$i;?>">
<span class="glyphicon glyphicon-play <?=isset($route['disabled']) ? "text-muted" : "text-success" ;?>" <span class="glyphicon glyphicon-play <?=isset($route['disabled']) ? "text-muted" : "text-success" ;?>" data-toggle="tooltip" data-placement="left"
title="<?=gettext("click to toggle enabled/disabled status");?>" alt="icon"> title="<?=(!isset($route['disabled'])) ? gettext("disable route") : gettext("enable route");?>" alt="icon">
</span> </span>
</a> </a>
</td> </td>
...@@ -272,18 +272,20 @@ endif; ?> ...@@ -272,18 +272,20 @@ endif; ?>
<?=$route['descr'];?> <?=$route['descr'];?>
</td> </td>
<td> <td>
<a data-id="<?=$i;?>" data-toggle="tooltip" data-placement="left" title="<?=gettext("move selected rules before this rule");?>" class="act_move btn btn-default btn-xs"> <a data-id="<?=$i;?>" data-toggle="tooltip" data-placement="left" title="<?=gettext("move selected routes before this route");?>" class="act_move btn btn-default btn-xs">
<span class="glyphicon glyphicon-arrow-left"></span> <span class="glyphicon glyphicon-arrow-left"></span>
</a> </a>
<a class="btn btn-default btn-xs" href="system_routes_edit.php?id=<?=$i;?>"> <a class="btn btn-default btn-xs" href="system_routes_edit.php?id=<?=$i;?>"
<span class="glyphicon glyphicon-pencil" title="<?=gettext("edit rule");?>" alt="edit"></span> title="<?=gettext("edit route");?>" data-toggle="tooltip" data-placement="left">
<span class="glyphicon glyphicon-pencil" alt="edit" ></span>
</a> </a>
<button type="button" class="btn btn-default btn-xs act-del-route" <button type="button" class="btn btn-default btn-xs act-del-route"
data-id="<?=$i?>" title="<?=gettext("delete route");?>" data-toggle="tooltip" data-id="<?=$i?>" title="<?=gettext("delete route");?>" data-toggle="tooltip"
data-placement="left" ><span class="glyphicon glyphicon-remove"></span> data-placement="left" ><span class="glyphicon glyphicon-remove"></span>
</button> </button>
<a class="btn btn-default btn-xs" href="system_routes_edit.php?dup=<?=$i;?>"> <a class="btn btn-default btn-xs" href="system_routes_edit.php?dup=<?=$i;?>"
<span class="fa fa-clone text-muted" title="<?=gettext("add a new rule based on this one");?>" alt="duplicate"></span> title="<?=gettext("clone route");?>" data-toggle="tooltip" data-placement="left">
<span class="fa fa-clone text-muted" alt="duplicate"></span>
</a> </a>
</td> </td>
</tr> </tr>
...@@ -300,12 +302,11 @@ endif; ?> ...@@ -300,12 +302,11 @@ endif; ?>
title="<?=gettext("move selected routes to end");?>" alt="move" /> title="<?=gettext("move selected routes to end");?>" alt="move" />
<?php <?php
else :?> else :?>
<button type="submit" data-id="<?=$i;?>" data-toggle="tooltip" data-placement="left" title="<?=gettext("move selected rules to end");?>" class="act_move btn btn-default btn-xs"> <button type="submit" data-id="<?=$i;?>" data-toggle="tooltip" data-placement="left" title="<?=gettext("move selected routes to end");?>" class="act_move btn btn-default btn-xs">
<span class="glyphicon glyphicon-arrow-left"></span> <span class="glyphicon glyphicon-arrow-left"></span>
</button> </button>
<?php <?php
endif;?> endif;?>
<a href="system_routes_edit.php" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-plus"></span></a>
<?php <?php
if ($i == 0) :?> if ($i == 0) :?>
<span class="btn btn-default btn-xs"> <span class="btn btn-default btn-xs">
...@@ -314,9 +315,12 @@ endif; ?> ...@@ -314,9 +315,12 @@ endif; ?>
<?php <?php
else :?> else :?>
<button id="del_x" title="<?=gettext("delete selected routes");?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-remove"></span></button> <button id="del_x" title="<?=gettext("delete selected routes");?>" class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="left"><span class="glyphicon glyphicon-remove"></span></button>
<?php <?php
endif;?> endif;?>
<a href="system_routes_edit.php" class="btn btn-default btn-xs" title="<?=gettext("add route");?>" data-toggle="tooltip" data-placement="left">
<span class="glyphicon glyphicon-plus"></span>
</a>
</td> </td>
</tr> </tr>
<tr> <tr>
......
...@@ -298,8 +298,8 @@ foreach ($pconfig['phase1'] as $ph1ent) : ...@@ -298,8 +298,8 @@ foreach ($pconfig['phase1'] as $ph1ent) :
<input type="checkbox" name="p1entry[]" value="<?=$i;?>"/> <input type="checkbox" name="p1entry[]" value="<?=$i;?>"/>
</td> </td>
<td> <td>
<button name="toggle_<?=$i; <button name="toggle_<?=$i; ?>_x" type="submit" class="btn btn-<?= isset($ph1ent['disabled'])? "default":"success"?> btn-xs"
?>_x" title="<?=gettext("click to toggle enabled/disabled status");?>" type="submit" class="btn btn-<?= isset($ph1ent['disabled'])? "default":"success"?> btn-xs"> title="<?=(isset($ph1ent['disabled'])) ? gettext("enable phase 1 entry") : gettext("disable phase 1 entry");?>" data-toggle="tooltip">
<span class="glyphicon glyphicon-play"></span> <span class="glyphicon glyphicon-play"></span>
</button> </button>
</td> </td>
...@@ -362,16 +362,16 @@ if (!empty($ph1ent['encryption-algorithm']['keylen'])) { ...@@ -362,16 +362,16 @@ if (!empty($ph1ent['encryption-algorithm']['keylen'])) {
<?=$ph1ent['descr'];?>&nbsp; <?=$ph1ent['descr'];?>&nbsp;
</td> </td>
<td> <td>
<button name="move_<?=$i; <button name="move_<?=$i; ?>_x" type="submit" class="btn btn-default btn-xs"
?>_x" title="<?=gettext("move selected entries before this");?>" type="submit" class="btn btn-default btn-xs"> title="<?=gettext("move selected entries before this");?>" data-toggle="tooltip" data-placement="left">
<span class="glyphicon glyphicon-arrow-left"></span> <span class="glyphicon glyphicon-arrow-left"></span>
</button> </button>
<a href="vpn_ipsec_phase1.php?p1index=<?=$i; <a href="vpn_ipsec_phase1.php?p1index=<?=$i; ?>" class="btn btn-default btn-xs" alt="edit"
?>" title="<?=gettext("edit phase1 entry"); ?>" class="btn btn-default btn-xs" alt="edit"> title="<?=gettext("edit phase1 entry"); ?>" data-toggle="tooltip" data-placement="left">
<span class="glyphicon glyphicon-pencil"></span> <span class="glyphicon glyphicon-pencil"></span>
</a><br/> </a><br/>
<button name="del_<?=$i;?>_x" <button name="del_<?=$i;?>_x"
title="<?=gettext("delete phase1 entry");?>" title="<?=gettext("delete phase1 entry");?>" data-toggle="tooltip" data-placement="left"
type="submit" type="submit"
onclick="return confirm('<?=gettext("Do you really want to delete this phase1 and all associated phase2 entries?"); ?>')" onclick="return confirm('<?=gettext("Do you really want to delete this phase1 and all associated phase2 entries?"); ?>')"
class="btn btn-default btn-xs"> class="btn btn-default btn-xs">
...@@ -379,8 +379,8 @@ if (!empty($ph1ent['encryption-algorithm']['keylen'])) { ...@@ -379,8 +379,8 @@ if (!empty($ph1ent['encryption-algorithm']['keylen'])) {
</button> </button>
<?php if (!isset($ph1ent['mobile'])) : <?php if (!isset($ph1ent['mobile'])) :
?> ?>
<a href="vpn_ipsec_phase1.php?dup=<?=$i; <a href="vpn_ipsec_phase1.php?dup=<?=$i; ?>" class="btn btn-default btn-xs" alt="add"
?>" title="<?=gettext("copy phase1 entry"); ?>" class="btn btn-default btn-xs" alt="add"> title="<?=gettext("clone phase1 entry"); ?>" data-toggle="tooltip" data-placement="left">
<span class="fa fa-clone text-muted"></span> <span class="fa fa-clone text-muted"></span>
</a> </a>
<?php endif; <?php endif;
...@@ -434,9 +434,9 @@ foreach ($pconfig['phase2'] as $ph2index => $ph2ent) : ...@@ -434,9 +434,9 @@ foreach ($pconfig['phase2'] as $ph2index => $ph2ent) :
<input type="checkbox" name="p2entry[]" value="<?=$ph2index;?>"/> <input type="checkbox" name="p2entry[]" value="<?=$ph2index;?>"/>
</td> </td>
<td> <td>
<button name="togglep2_<?=$ph2index; <button name="togglep2_<?=$ph2index; ?>_x"
?>_x" title="<?=gettext("click to toggle enabled/disabled status"); title="<?=(isset($ph2ent['disabled'])) ? gettext("enable phase 2 entry") : gettext("disable phase 2 entry"); ?>" data-toggle="tooltip"
?>" type="submit" class="btn btn-<?= isset($ph2ent['disabled'])?"default":"success";?> btn-xs"> type="submit" class="btn btn-<?= isset($ph2ent['disabled'])?"default":"success";?> btn-xs">
<span class="glyphicon glyphicon-play"></span> <span class="glyphicon glyphicon-play"></span>
</button> </button>
</td> </td>
...@@ -488,24 +488,26 @@ if (!empty($ph2ent['hash-algorithm-option']) && is_array($ph2ent['hash-algorithm ...@@ -488,24 +488,26 @@ if (!empty($ph2ent['hash-algorithm-option']) && is_array($ph2ent['hash-algorithm
</td> </td>
<td> <td>
<button name="movep2_<?=$j;?>_x" <button name="movep2_<?=$j;?>_x"
title="<?=gettext("move selected entries before this");?>" title="<?=gettext("move selected entries before this");?>" data-toggle="tooltip" data-placement="left"
type="submit" type="submit"
class="btn btn-default btn-xs"> class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-arrow-left"></span> <span class="glyphicon glyphicon-arrow-left"></span>
</button> </button>
<a href="vpn_ipsec_phase2.php?p2index=<?=$ph2ent['uniqid']; <a href="vpn_ipsec_phase2.php?p2index=<?=$ph2ent['uniqid']; ?>"
?>" title="<?=gettext("edit phase2 entry"); ?>" alt="edit" class="btn btn-default btn-xs"> title="<?=gettext("edit phase 2 entry"); ?>" data-toggle="tooltip" data-placement="left"
alt="edit" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-pencil"></span> <span class="glyphicon glyphicon-pencil"></span>
</a> </a>
<button name="delp2_<?=$ph2index; <button name="delp2_<?=$ph2index; ?>_x"
?>_x" title="<?=gettext("delete phase2 entry");?>" title="<?=gettext("delete phase 2 entry");?>" data-toggle="tooltip" data-placement="left"
type="submit" type="submit"
onclick="return confirm('<?=gettext("Do you really want to delete this phase2 entry?"); ?>')" onclick="return confirm('<?=gettext("Do you really want to delete this phase2 entry?"); ?>')"
class="btn btn-default btn-xs"> class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-remove"><span> <span class="glyphicon glyphicon-remove"><span>
</button> </button>
<a href="vpn_ipsec_phase2.php?dup=<?=$ph2ent['uniqid']; <a href="vpn_ipsec_phase2.php?dup=<?=$ph2ent['uniqid']; ?>"
?>" title="<?=gettext("add a new Phase 2 based on this one"); ?>" alt="add" class="btn btn-default btn-xs"> title="<?=gettext("clone phase 2 entry"); ?>" data-toggle="tooltip" data-placement="left"
alt="add" class="btn btn-default btn-xs">
<span class="fa fa-clone text-muted"></span> <span class="fa fa-clone text-muted"></span>
</a> </a>
</td> </td>
...@@ -521,25 +523,25 @@ endforeach; ...@@ -521,25 +523,25 @@ endforeach;
?> ?>
<button name="movep2_<?=$j;?>_x" type="submit" <button name="movep2_<?=$j;?>_x" type="submit"
title="<?=gettext("move selected phase2 entries to end");?>" title="<?=gettext("move selected phase 2 entries to end");?>" data-toggle="tooltip" data-placement="left"
class="btn btn-default btn-xs"> class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-arrow-down"></span> <span class="glyphicon glyphicon-arrow-down"></span>
</button> </button>
<?php endif; <?php endif;
?> ?>
<a href="vpn_ipsec_phase2.php?ikeid=<?=$ph1ent['ikeid'];
?><?= isset($ph1ent['mobile'])?"&amp;mobile=true":"";?>" class="btn btn-default btn-xs">
<span title="<?=gettext("add phase2 entry"); ?>" alt="add" class="glyphicon glyphicon-plus"></span>
</a>
<?php if ($j > 0) : <?php if ($j > 0) :
?> ?>
<button name="delp2_x" type="submit" title="<?=gettext("delete selected phase2 entries");?>" <button name="delp2_x" type="submit" title="<?=gettext("delete selected phase 2 entries");?>" data-toggle="tooltip" data-placement="left"
onclick="return confirm('<?=gettext("Do you really want to delete the selected phase2 entries?");?>')" onclick="return confirm('<?=gettext("Do you really want to delete the selected phase2 entries?");?>')"
class="btn btn-default btn-xs"> class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-remove"></span> <span class="glyphicon glyphicon-remove"></span>
</button> </button>
<?php endif; <?php endif;
?> ?>
<a href="vpn_ipsec_phase2.php?ikeid=<?=$ph1ent['ikeid']; ?><?= isset($ph1ent['mobile'])?"&amp;mobile=true":"";?>" class="btn btn-default btn-xs"
title="<?=gettext("add phase 2 entry"); ?>" data-toggle="tooltip" data-placement="left">
<span alt="add" class="glyphicon glyphicon-plus"></span>
</a>
</td> </td>
</tr> </tr>
</tbody> </tbody>
...@@ -556,21 +558,24 @@ endforeach; // $a_phase1 as $ph1ent ...@@ -556,21 +558,24 @@ endforeach; // $a_phase1 as $ph1ent
<td> <td>
<button name="move_<?=$i;?>_x" <button name="move_<?=$i;?>_x"
type="submit" type="submit"
title="<?=gettext("move selected phase1 entries to end");?>" title="<?=gettext("move selected phase 1 entries to end");?>"
data-toggle="tooltip" data-placement="left"
class="btn btn-default btn-xs"> class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-arrow-down"></span> <span class="glyphicon glyphicon-arrow-down"></span>
</button> </button>
<a href="vpn_ipsec_phase1.php" title="<?=gettext("add new phase1");?>" alt="add" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-plus"></span>
</a>
<button <button
name="del_x" name="del_x"
type="submit" type="submit"
title="<?=gettext("delete selected phase1 entries");?>" title="<?=gettext("delete selected phase 1 entries");?>"
data-toggle="tooltip" data-placement="left"
onclick="return confirm('<?=gettext("Do you really want to delete the selected phase1 entries?");?>')" onclick="return confirm('<?=gettext("Do you really want to delete the selected phase1 entries?");?>')"
class="btn btn-default btn-xs"> class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-remove"></span> <span class="glyphicon glyphicon-remove"></span>
</button> </button>
<a href="vpn_ipsec_phase1.php" title="<?=gettext("add new phase 1 entry");?>" data-toggle="tooltip" data-placement="left"
alt="add" class="btn btn-default btn-xs">
<span class="glyphicon glyphicon-plus"></span>
</a>
</td> </td>
</tr> </tr>
<tr> <tr>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment