Merge pull request #2015 from heper/patch-1

9 files changed, 38 insertions, 44 deletions

diff --git a/src/usr/local/www/interfaces_bridge.php b/src/usr/local/www/interfaces_bridge.php
index 6b79dee..cc7c887 100644
--- a/src/usr/local/www/interfaces_bridge.php
+++ b/src/usr/local/www/interfaces_bridge.php
@@ -172,8 +172,8 @@ foreach ($a_bridges as $bridge) {
 					<?=htmlspecialchars($bridge['descr'])?>
 				</td>
 				<td>
-					<a href="interfaces_bridge_edit.php?id=<?=$i?>" class="btn btn-default btn-xs"><?=gettext("Edit")?></a>
-					<a href="interfaces_bridge.php?act=del&amp;id=<?=$i?>" class="btn btn-danger btn-xs"><?=gettext("Delete")?></a>
+					<a class="fa fa-pencil"	title="<?=gettext('Edit interface bridge')?>"	href="interfaces_bridge_edit.php?id=<?=$i?>"></a>
+					<a class="fa fa-trash"	title="<?=gettext('Delete interface bridge')?>"	href="interfaces_bridge.php?act=del&amp;id=<?=$i?>" onclick="return confirm('<?=gettext("Are you sure you want to delete this interface bridge?")?>')"></a>
 				</td>
 			</tr>
 <?php
@@ -189,4 +189,4 @@ foreach ($a_bridges as $bridge) {
 
 </div>
 
-<?php include("foot.inc");
\ No newline at end of file
+<?php include("foot.inc");
diff --git a/src/usr/local/www/interfaces_gif.php b/src/usr/local/www/interfaces_gif.php
index 3bd4395..4d35922 100644
--- a/src/usr/local/www/interfaces_gif.php
+++ b/src/usr/local/www/interfaces_gif.php
@@ -149,8 +149,8 @@ display_top_tabs($tab_array);
 					<?=htmlspecialchars($gif['descr'])?>
 				</td>
 				<td>
-					<a href="interfaces_gif_edit.php?id=<?=$i?>" class="btn btn-default btn-xs"><?=gettext("Edit")?></a>
-					<a href="interfaces_gif.php?act=del&amp;id=<?=$i?>" class="btn btn-danger btn-xs"><?=gettext("Delete")?></a>
+					<a class="fa fa-pencil"	title="<?=gettext('Edit GIF interface')?>"	href="interfaces_gif_edit.php?id=<?=$i?>"></a>
+					<a class="fa fa-trash"	title="<?=gettext('Delete GIF interface')?>"	href="interfaces_gif.php?act=del&amp;id=<?=$i?>" onclick="return confirm('<?=gettext("Are you sure you want to delete this GIF interface?")?>')"></a>
 				</td>
 			</tr>
 <?php endforeach; ?>
@@ -164,4 +164,4 @@ display_top_tabs($tab_array);
 	</a>
 </nav>
 
-<?php include("foot.inc");
\ No newline at end of file
+<?php include("foot.inc");
diff --git a/src/usr/local/www/interfaces_gre.php b/src/usr/local/www/interfaces_gre.php
index 7d8ed9e..0ec2d13 100644
--- a/src/usr/local/www/interfaces_gre.php
+++ b/src/usr/local/www/interfaces_gre.php
@@ -148,12 +148,8 @@ display_top_tabs($tab_array);
 					<?=htmlspecialchars($gre['descr'])?>
 				</td>
 				<td>
-					<a href="interfaces_gre_edit.php?id=<?=$i?>" class="btn btn-default btn-xs">
-						<?=gettext("Edit")?>
-					</a>
-					<a href="interfaces_gre.php?act=del&amp;id=<?=$i?>" class="btn btn-danger btn-xs">
-						<?=gettext("Delete")?>
-					</a>
+					<a class="fa fa-pencil"	title="<?=gettext('Edit GRE interface')?>"	href="interfaces_gre_edit.php?id=<?=$i?>"></a>
+					<a class="fa fa-trash"	title="<?=gettext('Delete GRE interface')?>"	href="interfaces_gre.php?act=del&amp;id=<?=$i?>" onclick="return confirm('<?=gettext("Are you sure you want to delete this GRE interface?")?>')"></a>
 				</td>
 			</tr>
 <?php endforeach; ?>
@@ -167,4 +163,4 @@ display_top_tabs($tab_array);
 	</a>
 </nav>
 <?php
-include("foot.inc");
\ No newline at end of file
+include("foot.inc");
diff --git a/src/usr/local/www/interfaces_groups.php b/src/usr/local/www/interfaces_groups.php
index 2550d97..b0b9d44 100644
--- a/src/usr/local/www/interfaces_groups.php
+++ b/src/usr/local/www/interfaces_groups.php
@@ -146,12 +146,8 @@ print_info_box(gettext('Interface Groups allow you to setup rules for multiple i
 					<?=htmlspecialchars($ifgroupentry['descr']);?>
 				</td>
 				<td>
-					<a class="btn btn-default btn-sm" role="button" href="interfaces_groups_edit.php?id=<?=$i; ?>">
-						<?=gettext('Edit'); ?>
-					</a>
-					<a class="btn btn-danger btn-sm" role="button" href="interfaces_groups.php?act=del&amp;id=<?=$i; ?>">
-						<?=gettext("Delete"); ?>
-					</a>
+					<a class="fa fa-pencil"	title="<?=gettext('Edit group')?>"	href="interfaces_groups_edit.php?id=<?=$i; ?>"></a>
+					<a class="fa fa-trash"	title="<?=gettext('Delete group')?>"	href="interfaces_groups.php?act=del&amp;id=<?=$i; ?>" onclick="return confirm('<?=gettext("Are you sure you want to delete this group?")?>')"></a>
 				</td>
 			</tr>
 <?php endforeach; ?>
@@ -167,4 +163,4 @@ print_info_box(gettext('Interface Groups allow you to setup rules for multiple i
 
 <?php
 
-include("fend.inc");
\ No newline at end of file
+include("fend.inc");
diff --git a/src/usr/local/www/interfaces_lagg.php b/src/usr/local/www/interfaces_lagg.php
index 654962f..3cd0b4c 100644
--- a/src/usr/local/www/interfaces_lagg.php
+++ b/src/usr/local/www/interfaces_lagg.php
@@ -160,8 +160,8 @@ foreach ($a_laggs as $lagg) {
 					<?=htmlspecialchars($lagg['descr'])?>
 				</td>
 				<td>
-					<a href="interfaces_lagg_edit.php?id=<?=$i?>" class="btn btn-default btn-xs"><?=gettext("Edit")?></a>
-					<a href="interfaces_lagg.php?act=del&amp;id=<?=$i?>" class="btn btn-danger btn-xs"><?=gettext("Delete")?></a>
+					<a class="fa fa-pencil"	title="<?=gettext('Edit LAGG interface')?>"	href="interfaces_lagg_edit.php?id=<?=$i?>"></a>
+					<a class="fa fa-trash"	title="<?=gettext('Delete LAGG interface')?>"	href="interfaces_lagg.php?act=del&amp;id=<?=$i?>" onclick="return confirm('<?=gettext("Are you sure you want to delete this LAGG interface?")?>')"></a>
 				</td>
 			</tr>
 <?php
diff --git a/src/usr/local/www/interfaces_ppps.php b/src/usr/local/www/interfaces_ppps.php
index 3da5b38..530fb78 100644
--- a/src/usr/local/www/interfaces_ppps.php
+++ b/src/usr/local/www/interfaces_ppps.php
@@ -155,8 +155,8 @@ foreach ($a_ppps as $id => $ppp) {
 					<?=htmlspecialchars($ppp['descr'])?>
 				</td>
 				<td>
-					<a href="interfaces_ppps_edit.php?id=<?=$i?>" class="btn btn-default btn-xs"><?=gettext("Edit")?></a>
-					<a href="interfaces_ppps.php?act=del&amp;id=<?=$i?>" class="btn btn-danger btn-xs"><?=gettext("Delete")?></a>
+					<a class="fa fa-pencil"	title="<?=gettext('Edit PPP interface')?>"	href="interfaces_ppps_edit.php?id=<?=$i?>"></a>
+					<a class="fa fa-trash"	title="<?=gettext('Delete PPP interface')?>"	href="interfaces_ppps.php?act=del&amp;id=<?=$i?>" onclick="return confirm('<?=gettext("Are you sure you want to delete this PPP interface?")?>')"></a>
 				</td>
 			</tr>
 <?php
diff --git a/src/usr/local/www/interfaces_qinq.php b/src/usr/local/www/interfaces_qinq.php
index 6581c6e..f0b27bf 100644
--- a/src/usr/local/www/interfaces_qinq.php
+++ b/src/usr/local/www/interfaces_qinq.php
@@ -169,8 +169,8 @@ print_info_box(sprintf(gettext('Not all drivers/NICs support 802.1Q QinQ tagging
 					<?=htmlspecialchars($qinq['descr'])?>&nbsp;
 				</td>
 				<td>
-					<a href="interfaces_qinq_edit.php?id=<?=$i?>" class="btn btn-default btn-xs"><?=gettext("Edit")?></a>
-					<a href="interfaces_qinq.php?act=del&amp;id=<?=$i?>" class="btn btn-danger btn-xs"><?=gettext("Delete")?></a>
+					<a class="fa fa-pencil"	title="<?=gettext('Edit Q-in-Q interface')?>"	href="interfaces_qinq_edit.php?id=<?=$i?>"></a>
+					<a class="fa fa-trash"	title="<?=gettext('Delete Q-in-Q interface')?>"	href="interfaces_qinq.php?act=del&amp;id=<?=$i?>" onclick="return confirm('<?=gettext("Are you sure you want to delete this Q-in-Q interface?")?>')"></a>
 				</td>
 			</tr>
 <?php
diff --git a/src/usr/local/www/interfaces_vlan.php b/src/usr/local/www/interfaces_vlan.php
index bdd7898..81e3b4b 100644
--- a/src/usr/local/www/interfaces_vlan.php
+++ b/src/usr/local/www/interfaces_vlan.php
@@ -140,26 +140,28 @@ print_info_box(sprintf(gettext('NOTE: Not all drivers/NICs support 802.1Q '.
 
 	<div class="table-responsive">
 		<table class="table table-striped table-hover table-condensed">
-			<tr>
-				<th><?=gettext('Interface');?></th>
-				<th><?=gettext('VLAN tag');?></th>
-				<th><?=gettext('Description');?></th>
-			</tr>
+			<thead>
+				<tr>
+					<th><?=gettext('Interface');?></th>
+					<th><?=gettext('VLAN tag');?></th>
+					<th><?=gettext('Description');?></th>
+				</tr>
+			</thead>
 <?php
 	$i = 0;
 	foreach ($a_vlans as $vlan) {
 ?>
-			<tr>
-				<td><?=htmlspecialchars($vlan['if']);?></td>
-				<td><?=htmlspecialchars($vlan['tag']);?></td>
-				<td><?=htmlspecialchars($vlan['descr']);?></td>
-				<td>
-					<a class="btn btn-primary btn-xs" role="button" href="interfaces_vlan_edit.php?id=<?=$i?>"><?=gettext('Edit')?></a>
-<!--					<a class="btn btn-danger btn-xs" role="button" href="interfaces_vlan.php?act=del&amp;id=<?=$i?>"><?=gettext('Delete')?></a></td> -->
-					<a class="btn btn-danger btn-xs" role="button" id="del-<?=$i?>"><?=gettext('Delete')?></a></td>
-				</td>
-			</tr>
-		<?php
+				<tr>
+					<td><?=htmlspecialchars($vlan['if']);?></td>
+					<td><?=htmlspecialchars($vlan['tag']);?></td>
+					<td><?=htmlspecialchars($vlan['descr']);?></td>
+					<td>
+						<a class="fa fa-pencil"	title="<?=gettext('Edit VLAN')?>"	role="button" href="interfaces_vlan_edit.php?id=<?=$i?>"></a>
+<!--						<a class="btn btn-danger btn-xs" role="button" href="interfaces_vlan.php?act=del&amp;id=<?=$i?>"><?=gettext('Delete')?></a></td> -->
+						<a class="fa fa-trash"	title="<?=gettext('Delete VLAN')?>"	role="button" id="del-<?=$i?>" onclick="return confirm('<?=gettext("Are you sure you want to delete this VLAN?")?>')"></a>
+					</td>
+				</tr>
+<?php
 			$i++;
 	}
 ?>
diff --git a/src/usr/local/www/interfaces_wireless.php b/src/usr/local/www/interfaces_wireless.php
index 0c53d37..3cb4f20 100644
--- a/src/usr/local/www/interfaces_wireless.php
+++ b/src/usr/local/www/interfaces_wireless.php
@@ -156,8 +156,8 @@ foreach ($a_clones as $clone) {
 					<?=htmlspecialchars($clone['descr'])?>
 				</td>
 				<td>
-					<a href="interfaces_wireless_edit.php?id=<?=$i?>" class="btn btn-default btn-xs"><?=gettext("Edit")?></a>
-					<a href="interfaces_wireless.php?act=del&amp;id=<?=$i?>" class="btn btn-danger btn-xs"><?=gettext("Delete")?></a>
+					<a class="fa fa-pencil"	title="<?=gettext('Edit WiFi interface')?>"	href="interfaces_wireless_edit.php?id=<?=$i?>"></a>
+					<a class="fa fa-trash"	title="<?=gettext('Delete WiFi interface')?>"	href="interfaces_wireless.php?act=del&amp;id=<?=$i?>" onclick="return confirm('<?=gettext("Are you sure you want to delete this WiFi interface?")?>')"></a>
 				</td>
 			</tr>
 <?php