Buttons converted to new deisgn

'X' button suppressed in info text box

6 files changed, 57 insertions, 35 deletions

diff --git a/src/usr/local/www/jquery/pfSenseHelpers.js b/src/usr/local/www/jquery/pfSenseHelpers.js
index 6c6e3fa..8ffca5c 100644
--- a/src/usr/local/www/jquery/pfSenseHelpers.js
+++ b/src/usr/local/www/jquery/pfSenseHelpers.js
@@ -370,6 +370,9 @@ $('[id^=delete]').click(function(event) {
 // If there is an infoblock, automatically add an info icon that toggles its display
 if($('#infoblock').length != 0) {
 	$('#infoblock').before('<i class="fa fa-info-circle icon-pointer" style="color: #337AB7;; font-size:20px; margin-left: 10px; margin-bottom: 10px;" id="showinfo" title="More information"></i>');
+
+	// and remove the 'X' button from the text box
+	$('.close').remove();
 }
 
 // Hide information on page load
diff --git a/src/usr/local/www/services_dhcp.php b/src/usr/local/www/services_dhcp.php
index b935f0f..cccb201 100644
--- a/src/usr/local/www/services_dhcp.php
+++ b/src/usr/local/www/services_dhcp.php
@@ -1324,12 +1324,14 @@ if (!is_numeric($pool) && !($act == "newpool")) {
 ?>
 		<table>
 	</div>
-
-	<nav class="action-buttons">
-		<br />
-		<a href="services_dhcp_edit.php?if=<?=htmlspecialchars($if)?>" class="btn btn-sm btn-success"><?=gettext("Add")?></a>
-	</nav>
 </div>
+
+<nav class="action-buttons" style="margin-top: 10px;">
+	<a href="services_dhcp_edit.php?if=<?=htmlspecialchars($if)?>" class="btn btn-sm btn-success">
+		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<?=gettext("Add")?>
+	</a>
+</nav>
 <?php
 }
 ?>
diff --git a/src/usr/local/www/services_dhcpv6.php b/src/usr/local/www/services_dhcpv6.php
index c140989..70b7036 100644
--- a/src/usr/local/www/services_dhcpv6.php
+++ b/src/usr/local/www/services_dhcpv6.php
@@ -940,8 +940,11 @@ endif;
 	</div>
 </div>
 
-<nav class="action-buttons">
-	<a href="services_dhcpv6_edit.php?if=<?=$if?>" class="btn btn-sm btn-success"/>Add</a>
+<nav class="action-buttons" style="margin-top: 10px;">
+	<a href="services_dhcpv6_edit.php?if=<?=$if?>" class="btn btn-sm btn-success"/>
+		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<?=gettext("Add")?>
+	</a>
 </nav>
 
 <script>
diff --git a/src/usr/local/www/services_dnsmasq.php b/src/usr/local/www/services_dnsmasq.php
index 821f286..fc5e5e6 100644
--- a/src/usr/local/www/services_dnsmasq.php
+++ b/src/usr/local/www/services_dnsmasq.php
@@ -322,11 +322,11 @@ print_info_box(sprintf("If the DNS forwarder is enabled, the DHCP".
 	" is checked. If you don't use that option (or if you use".
 	" a static IP address on WAN), you must manually specify at".
 	" least one DNS server on the %sSystem:".
-	"General setup%s page.",'<a href="system.php">','</a>','<a href="system.php">','</a>'));
+	"General setup%s page.",'<a href="system.php">','</a>','<a href="system.php">','</a>'), info);
 ?>
 
 <div class="panel panel-default">
-	<div class="panel-heading"><h2><?=gettext("Host Overrides")?></h2></div>
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext("Host Overrides")?></h2></div>
 	<div class="panel-body table-responsive">
 		<table class="table table-striped table-hover table-condensed">
 			<thead>
@@ -392,17 +392,20 @@ endforeach;
 	</div>
 </div>
 
-<nav class="action-buttons">
-	<a href="services_dnsmasq_edit.php" class="btn btn-sm btn-success"><?=gettext('Add')?></a>
+<nav class="action-buttons" style="margin-top: 10px;">
+	<a href="services_dnsmasq_edit.php" class="btn btn-sm btn-success btn-sm">
+		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<?=gettext('Add')?>
+	</a>
 </nav>
 
 <?php
 print_info_box(gettext("Entries in this section override individual results from the forwarders.") .
-				gettext("Use these for changing DNS results or for adding custom DNS records."));
+				gettext("Use these for changing DNS results or for adding custom DNS records."), info);
 ?>
 
 <div class="panel panel-default">
-	<div class="panel-heading"><h2><?=gettext("Domain Overrides")?></h2></div>
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext("Domain Overrides")?></h2></div>
 	<div class="panel-body table-responsive">
 		<table class="table table-striped table-hover table-condensed">
 			<thead>
@@ -441,12 +444,15 @@ endforeach;
 	</div>
 </div>
 
-<nav class="action-buttons">
-	<a href="services_dnsmasq_domainoverride_edit.php" class="btn btn-sm btn-success"><?=gettext('Add')?></a>
+<nav class="action-buttons" style="margin-top: 10px;">
+	<a href="services_dnsmasq_domainoverride_edit.php" class="btn btn-sm btn-success btn-sm">
+		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<?=gettext('Add')?>
+	</a>
 </nav>
 
 <?php
 print_info_box(gettext("Entries in this area override an entire domain, and subdomains, by specifying an".
-						" authoritative DNS server to be queried for that domain."));
+						" authoritative DNS server to be queried for that domain."), info);
 
 include("foot.inc");
diff --git a/src/usr/local/www/services_dyndns.php b/src/usr/local/www/services_dyndns.php
index 3f5f442..544dbcf 100644
--- a/src/usr/local/www/services_dyndns.php
+++ b/src/usr/local/www/services_dyndns.php
@@ -93,7 +93,7 @@ else if ($_GET['act'] == "toggle") {
 		}
 		write_config();
 		services_dyndns_configure();
-		
+
 		header("Location: services_dyndns.php");
 		exit;
 	}
@@ -119,7 +119,7 @@ display_top_tabs($tab_array);
 					<th><?=gettext("Hostname")?></th>
 					<th><?=gettext("Cached IP")?></th>
 					<th><?=gettext("Description")?></th>
-					<th></th>
+					<th><?=gettext("Actions")?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -207,14 +207,14 @@ foreach ($a_dyndns as $dyndns):
 					</td>
 					<td>
 						<a class="fa fa-pencil"			title="<?=gettext('Edit service')?>" href="services_dyndns_edit.php?id=<?=$i?>"></a>
-				<?php if (isset($dyndns['enable'])) {
-				?>	
+<?php if (isset($dyndns['enable'])) {
+?>
 						<a class="fa fa-ban"			title="<?=gettext('Disable service')?>" href="?act=toggle&amp;id=<?=$i?>"></a>
-				<?php } else {
-				?>
+<?php } else {
+?>
 						<a class="fa fa-check-square-o"	title="<?=gettext('Enable service')?>" href="?act=toggle&amp;id=<?=$i?>" ></a>
-				<?php }
-				?>	
+<?php }
+?>
 						<a class="fa fa-trash"			title="<?=gettext('Delete service')?>"	href="services_dyndns.php?act=del&amp;id=<?=$i?>" onclick="return confirm('<?=gettext("Are you sure you want to delete this service?")?>')"></a>
 					</td>
 				</tr>
@@ -228,7 +228,10 @@ foreach ($a_dyndns as $dyndns):
 </form>
 
 <nav class="action-buttons">
-	<a href="services_dyndns_edit.php" class="btn btn-sm btn-success"><i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i><?=gettext('Add')?></a>
+	<a href="services_dyndns_edit.php" class="btn btn-sm btn-success btn-sm">
+		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<?=gettext('Add')?>
+	</a>
 </nav>
 
 <div>
diff --git a/src/usr/local/www/services_igmpproxy.php b/src/usr/local/www/services_igmpproxy.php
index 606e7c7..5bc0bfe 100644
--- a/src/usr/local/www/services_igmpproxy.php
+++ b/src/usr/local/www/services_igmpproxy.php
@@ -160,17 +160,22 @@ endforeach;
 			</tbody>
 		</table>
 	</div>
-
-	<nav class="action-buttons">
-		<input id="submit" name="submit" type="submit" class="btn btn-primary" value="<?=gettext("Save")?>" />
-		<a href="services_igmpproxy_edit.php" class="btn btn-success"><?=gettext('Add')?></a>
-	</nav>
-
 </form>
 
+<nav class="action-buttons" style="margin-top: 10px;">
+	<button id="submit" name="submit" type="submit" class="btn btn-primary btn-sm" value="<?=gettext("Save")?>">
+		<i class="fa fa-save" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<?=gettext("Save")?>
+	</button>
+	<a href="services_igmpproxy_edit.php" class="btn btn-success btn-sm">
+		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<?=gettext('Add')?>
+	</a>
+</nav>
+
+<div id="infoblock">
+<?=print_info_box(gettext('Please add the interface for upstream, the allowed subnets, and the downstream interfaces you would like the proxy to allow. ' .
+					   'Only one "upstream" interface can be configured.'), info)?>
+</div>
 <?php
-
-print_info_box(gettext('Please add the interface for upstream, the allowed subnets, and the downstream interfaces you would like the proxy to allow. ' .
-					   'Only one "upstream" interface can be configured.'));
-
 include("foot.inc");