From df4957e48441d63d7f0d17dfcf56397023718627 Mon Sep 17 00:00:00 2001
From: Stephen Beaver <sbeaver@netgate.com>
Date: Wed, 4 Nov 2015 09:14:51 -0500
Subject: Revised button style on firewall_aliases.php as a model for all other
 table-based pages

---
 src/usr/local/www/firewall_aliases.php     | 34 +++++++-----
 src/usr/local/www/jquery/pfSenseHelpers.js |  9 ++++
 src/usr/local/www/services_dyndns.php      | 86 +++++++++++++++++++-----------
 3 files changed, 86 insertions(+), 43 deletions(-)

(limited to 'src')

diff --git a/src/usr/local/www/firewall_aliases.php b/src/usr/local/www/firewall_aliases.php
index 8fae094..5461708 100644
--- a/src/usr/local/www/firewall_aliases.php
+++ b/src/usr/local/www/firewall_aliases.php
@@ -269,28 +269,36 @@ display_top_tabs($tab_array);
 			<td>
 				<a class="fa fa-pencil" title="<?=gettext("Edit alias"); ?>" href="firewall_aliases_edit.php?id=<?=$i?>"></a>
 				<a class="fa fa-trash"	title="<?=gettext("Delete alias")?>" href="?act=del&amp;tab=<?=$tab?>&amp;id=<?=$i?>" onclick="return confirm('<?=gettext("Are you sure you want to delete this alias?")?>')"></a>
-				</td>
-			</tr>
+			</td>
+		</tr>
 <?php endif?>
 <?php endforeach?>
 	</tbody>
 </table>
 </div>
 
-<nav class="action-buttons">
-	<a href="firewall_aliases_edit.php?tab=<?=$tab?>" role="button" class="btn btn-success">
-		<?=gettext("add new alias");?>
+<nav class="action-buttons" style="margin-top: 10px;">
+	<a href="firewall_aliases_edit.php?tab=<?=$tab?>" role="button" 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>
-	<a href="firewall_aliases_import.php" role="button" class="btn btn-default">
-		<?=gettext("bulk import");?>
+	<a href="firewall_aliases_import.php" role="button" class="btn btn-default btn-sm">
+		<i class="fa fa-download" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<?=gettext("Import");?>
 	</a>
 </nav>
 
-<?php
-
-print_info_box(gettext('Aliases act as placeholders for real hosts, networks or ports. They can be used to minimize the number ' .
-			   'of changes that have to be made if a host, network or port changes.' . '<br />' .
-			   'You can enter the name of an alias instead of the host, network or port where indicated. The alias will be resolved according to the list above.' . '<br />' .
-			   'If an alias cannot be resolved (e.g. because you deleted it), the corresponding element (e.g. filter/NAT/shaper rule) will be considered invalid and skipped.'));
+<!-- Information section. Icon ID must be "showinfo" and the information <div> ID must be "infoblock".
+	 That way jQuery (in pfenseHelpers.js) will automatically take care of the display. -->
+<div>
+<i class="fa fa-info-circle icon-pointer" style="color: #337AB7;; font-size:20px; margin-left: 10px; margin-bottom: 10px;" id="showinfo" title="<?=gettext('More information')?>"></i>
+	<div id="infoblock">
+		<?=print_info_box(gettext( 'Aliases act as placeholders for real hosts, networks or ports. They can be used to minimize the number ' .
+			'of changes that have to be made if a host, network or port changes. <br />' .
+			'You can enter the name of an alias instead of the host, network or port where indicated. The alias will be resolved according to the list above.' . '<br />' .
+			'If an alias cannot be resolved (e.g. because you deleted it), the corresponding element (e.g. filter/NAT/shaper rule) will be considered invalid and skipped.'), info)?>
+	</div>
+</div>
 
+<?php
 include("foot.inc");
diff --git a/src/usr/local/www/jquery/pfSenseHelpers.js b/src/usr/local/www/jquery/pfSenseHelpers.js
index 1a0e2e1..0528c02 100644
--- a/src/usr/local/www/jquery/pfSenseHelpers.js
+++ b/src/usr/local/www/jquery/pfSenseHelpers.js
@@ -363,4 +363,13 @@ $('[id^=delete]').click(function(event) {
 	}
 	else
 		alert('You may not delete the last row!');
+});
+
+// "More information" handlers
+// Hide information on page load
+$('#infoblock').hide();
+
+// SHow the help on clicking the info icon
+$('#showinfo').click(function() {
+	$('#infoblock').toggle();
 });
\ No newline at end of file
diff --git a/src/usr/local/www/services_dyndns.php b/src/usr/local/www/services_dyndns.php
index aefeef5..3f5f442 100644
--- a/src/usr/local/www/services_dyndns.php
+++ b/src/usr/local/www/services_dyndns.php
@@ -2,32 +2,57 @@
 /* $Id$ */
 /*
 	services_dyndns.php
-
-	Copyright (C) 2008 Ermal Luçi
-	Copyright (C) 2013-2015 Electric Sheep Fencing, LP
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are met:
-
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-
-	2. Redistributions in binary form must reproduce the above copyright
-	   notice, this list of conditions and the following disclaimer in the
-	   documentation and/or other materials provided with the distribution.
-
-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-	POSSIBILITY OF SUCH DAMAGE.
 */
+/* ====================================================================
+ *	Copyright (c)  2004-2015  Electric Sheep Fencing, LLC. All rights reserved.
+ *
+ *	Redistribution and use in source and binary forms, with or without modification,
+ *	are permitted provided that the following conditions are met:
+ *
+ *	1. Redistributions of source code must retain the above copyright notice,
+ *		this list of conditions and the following disclaimer.
+ *
+ *	2. Redistributions in binary form must reproduce the above copyright
+ *		notice, this list of conditions and the following disclaimer in
+ *		the documentation and/or other materials provided with the
+ *		distribution.
+ *
+ *	3. All advertising materials mentioning features or use of this software
+ *		must display the following acknowledgment:
+ *		"This product includes software developed by the pfSense Project
+ *		 for use in the pfSense software distribution. (http://www.pfsense.org/).
+ *
+ *	4. The names "pfSense" and "pfSense Project" must not be used to
+ *		 endorse or promote products derived from this software without
+ *		 prior written permission. For written permission, please contact
+ *		 coreteam@pfsense.org.
+ *
+ *	5. Products derived from this software may not be called "pfSense"
+ *		nor may "pfSense" appear in their names without prior written
+ *		permission of the Electric Sheep Fencing, LLC.
+ *
+ *	6. Redistributions of any form whatsoever must retain the following
+ *		acknowledgment:
+ *
+ *	"This product includes software developed by the pfSense Project
+ *	for use in the pfSense software distribution (http://www.pfsense.org/).
+ *
+ *	THIS SOFTWARE IS PROVIDED BY THE pfSense PROJECT ``AS IS'' AND ANY
+ *	EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ *	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ *	PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE pfSense PROJECT OR
+ *	ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *	SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *	NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ *	HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ *	STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ *	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ *	OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *	====================================================================
+ *
+ */
 /*
 	pfSense_BUILDER_BINARIES:	/usr/bin/host
 	pfSense_MODULE: dyndns
@@ -203,12 +228,13 @@ foreach ($a_dyndns as $dyndns):
 </form>
 
 <nav class="action-buttons">
-	<a href="services_dyndns_edit.php" class="btn btn-sm btn-success"><?=gettext('Add')?></a>
+	<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>
 </nav>
 
-<?php
-
-print_info_box(gettext("IP addresses appearing in green are up to date with Dynamic DNS provider. " .
-			           "You can force an update for an IP address on the edit page for that service."));
+<div>
+	<?=gettext('IP addresses appearing in <span style="color: green;">green</span> are up to date with Dynamic DNS provider. ')?>
+	<?=gettext('You can force an update for an IP address on the edit page for that service.')?>
+</div>
 
+<?php
 include("foot.inc");
-- 
cgit v1.1