diff options
Diffstat (limited to 'src/usr/local')
-rw-r--r-- | src/usr/local/www/services_rfc2136.php | 7 | ||||
-rw-r--r-- | src/usr/local/www/services_unbound.php | 35 | ||||
-rw-r--r-- | src/usr/local/www/services_unbound_acls.php | 95 | ||||
-rw-r--r-- | src/usr/local/www/status_lb_pool.php | 22 | ||||
-rw-r--r-- | src/usr/local/www/status_upnp.php | 83 | ||||
-rw-r--r-- | src/usr/local/www/status_wireless.php | 85 | ||||
-rw-r--r-- | src/usr/local/www/system_authservers.php | 13 |
7 files changed, 224 insertions, 116 deletions
diff --git a/src/usr/local/www/services_rfc2136.php b/src/usr/local/www/services_rfc2136.php index 22069e4..4cc5bcc 100644 --- a/src/usr/local/www/services_rfc2136.php +++ b/src/usr/local/www/services_rfc2136.php @@ -191,8 +191,11 @@ endforeach; ?> </div> </form> -<nav class="action-buttons"> - <a href="services_rfc2136_edit.php" class="btn btn-sm btn-success"><?=gettext('Add')?></a> +<nav class="action-buttons" style="margin-top: 10px;"> + <a href="services_rfc2136_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 diff --git a/src/usr/local/www/services_unbound.php b/src/usr/local/www/services_unbound.php index f455f0a..00b2c97 100644 --- a/src/usr/local/www/services_unbound.php +++ b/src/usr/local/www/services_unbound.php @@ -366,17 +366,7 @@ $section->addInput(new Form_TextArea ( $form->add($section); print($form); - -print_info_box(sprintf(gettext("If the DNS Resolver is enabled, the DHCP". -" service (if enabled) will automatically serve the LAN IP". -" address as a DNS server to DHCP clients so they will use". -" the DNS Resolver. If Forwarding, is enabled, the DNS Resolver will use the DNS servers". -" entered in %sSystem: General setup%s". -" or those obtained via DHCP or PPP on WAN if the "Allow". -" DNS server list to be overridden by DHCP/PPP on WAN"". -" is checked."),'<a href="system.php">','</a>')); ?> - <script> //<![CDATA[ events.push(function(){ @@ -491,8 +481,11 @@ endforeach; </div> </div> -<nav class="action-buttons"> - <a href="services_unbound_host_edit.php" class="btn btn-sm btn-success"><?=gettext('Add')?></a> +<nav class="action-buttons" style="margin-top: 10px;"> + <a href="services_unbound_host_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> <div class="panel panel-default"> @@ -537,7 +530,21 @@ endforeach; </div> </div> -<nav class="action-buttons"> - <a href="services_unbound_domainoverride_edit.php" class="btn btn-sm btn-success"><?=gettext('Add')?></a> +<nav class="action-buttons" style="margin-top: 10px;"> + <a href="services_unbound_domainoverride_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> + +<div id="infoblock"> + <?=print_info_box(sprintf(gettext("If the DNS Resolver is enabled, the DHCP". + " service (if enabled) will automatically serve the LAN IP". + " address as a DNS server to DHCP clients so they will use". + " the DNS Resolver. If Forwarding, is enabled, the DNS Resolver will use the DNS servers". + " entered in %sSystem: General setup%s". + " or those obtained via DHCP or PPP on WAN if the "Allow". + " DNS server list to be overridden by DHCP/PPP on WAN"". + " is checked."),'<a href="system.php">','</a>'), info)?> +</div> <?php include("foot.inc"); diff --git a/src/usr/local/www/services_unbound_acls.php b/src/usr/local/www/services_unbound_acls.php index ba47a897..dcf48c0 100644 --- a/src/usr/local/www/services_unbound_acls.php +++ b/src/usr/local/www/services_unbound_acls.php @@ -2,33 +2,58 @@ /* $Id$ */ /* services_unbound_acls.php - part of pfSense (https://www.pfsense.org/) - - Copyright (C) 2011 Warren Baker <warren@decoy.co.za> - 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. + * Copyright (c) 2011 Warren Baker <warren@decoy.co.za> + * + * 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. + * + * ==================================================================== + * + */ require("guiconfig.inc"); require("unbound.inc"); @@ -287,10 +312,10 @@ else // NOT 'edit' or 'add' <table class="table table-striped table-hover table-condensed"> <thead> <tr> - <th><?=gettext("Access List Name"); ?></th> - <th><?=gettext("Action"); ?></th> - <th><?=gettext("Description"); ?></th> - <th> </th> + <th><?=gettext("Access List Name")?></th> + <th><?=gettext("Action")?></th> + <th><?=gettext("Description")?></th> + <th><?=gettext("Actions")?></th> </tr> </thead> <tbody> @@ -320,12 +345,16 @@ else // NOT 'edit' or 'add' </tbody> </table> </div> - <nav class="action-buttons"> - <a href="services_unbound_acls.php?act=new" class="btn btn-sm btn-success">Add</a> - </nav> </div> </div> +<nav class="action-buttons" style="margin-top: 10px;"> + <a href="services_unbound_acls.php?act=new" 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> //<![CDATA[ events.push(function(){ diff --git a/src/usr/local/www/status_lb_pool.php b/src/usr/local/www/status_lb_pool.php index c4407ae..2779b66 100644 --- a/src/usr/local/www/status_lb_pool.php +++ b/src/usr/local/www/status_lb_pool.php @@ -241,17 +241,25 @@ endforeach; ?> </tbody> </table> + </div> + </div> +</form> + <?php if($rowsprinted > 0) { ?> <nav class="action-buttons"> - <input name="Submit" type="submit" class="btn btn-primary" value="<?= gettext("Save"); ?>" /> - <input name="Reset" type="reset" class="btn btn-danger" value="<?= gettext("Reset"); ?>" /> + <button 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> + + <button name="Reset" type="reset" class="btn btn-danger btn-sm" value="<?= gettext("Reset"); ?>"> + <i class="fa fa-undo" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i> + <?=gettext("Reset")?> + </button> </nav> <?php } -?> - </div> - </div> -</form> -<?php include("foot.inc");
\ No newline at end of file + +include("foot.inc");
\ No newline at end of file diff --git a/src/usr/local/www/status_upnp.php b/src/usr/local/www/status_upnp.php index abf53dc..c92c2d5 100644 --- a/src/usr/local/www/status_upnp.php +++ b/src/usr/local/www/status_upnp.php @@ -3,32 +3,58 @@ /* status_upnp.php part of pfSense (https://www.pfsense.org/) - - Copyright (C) 2010 Seth Mos <seth.mos@dds.nl>. - 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. + * Copyright (c) 2010 Seth Mos <seth.mos@dds.nl> + * + * 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: /sbin/pfctl pfSense_MODULE: upnp @@ -122,8 +148,11 @@ foreach ($rdr_entries as $rdr_entry) { </table> </div> <form action="status_upnp.php" method="post"> - <nav class="action-buttons"> - <input class="btn btn-danger" type="submit" name="clear" id="clear" value="<?=gettext("Clear all sessions")?>" /> + <nav class="action-buttons" style="margin-top: 10px;"> + <button class="btn btn-danger btn-sm" type="submit" name="clear" id="clear" value="<?=gettext("Clear all sessions")?>"> + <i class="fa fa-trash" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i> + <?=gettext("Clear all sessions")?> + </button> </nav> </form> </div> diff --git a/src/usr/local/www/status_wireless.php b/src/usr/local/www/status_wireless.php index 798cc5d..6591945 100644 --- a/src/usr/local/www/status_wireless.php +++ b/src/usr/local/www/status_wireless.php @@ -1,31 +1,57 @@ <?php /* status_wireless.php - Copyright (C) 2004 Scott Ullrich - 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_MODULE: interfaces */ @@ -209,15 +235,18 @@ display_top_tabs($tab_array); <form action="status_wireless.php" method="post"> - <nav class="action-buttons"> - <input type="hidden" name="if" id="if" value="<?=htmlspecialchars($if)?>"> - <input type="submit" class="btn btn-success" name="rescanwifi" id="rescanwifi" value="Rescan"> + <nav class="action-buttons" style="margin-top: 10px;"> + <input type="hidden" name="if" id="if" value="<?=htmlspecialchars($if)?>" /> + <button type="submit" class="btn btn-success" name="rescanwifi" id="rescanwifi" value="Rescan"> + <i class="fa fa-undo" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i> + <?=gettext("Rescan")?> + </button> </nav> </form> <?php print_info_box('<b>Flags:</b> A = authorized, E = Extended Rate (802.11g), P = Power saving mode<br />' . '<b>Capabilities:</b> E = ESS (infrastructure mode), I = IBSS (ad-hoc mode), P = privacy (WEP/TKIP/AES), ' . - 'S = Short preamble, s = Short slot time'); + 'S = Short preamble, s = Short slot time', info); include("foot.inc");
\ No newline at end of file diff --git a/src/usr/local/www/system_authservers.php b/src/usr/local/www/system_authservers.php index 20165f0..9947853 100644 --- a/src/usr/local/www/system_authservers.php +++ b/src/usr/local/www/system_authservers.php @@ -407,7 +407,7 @@ if (!($act == "new" || $act == "edit" || $input_errors)) <th><?=gettext("Server Name")?></th> <th><?=gettext("Type")?></th> <th><?=gettext("Host Name")?></th> - <th></th> + <th><?=gettext("Actions")?></th> </tr> </thead> <tbody> @@ -428,8 +428,11 @@ if (!($act == "new" || $act == "edit" || $input_errors)) </table> </div> - <nav class="action-buttons"> - <a href="?act=new" class="btn btn-success">add new</a> + <nav class="action-buttons" style="margin-top: 10px;"> + <a href="?act=new" 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> <?php include("foot.inc"); @@ -824,7 +827,7 @@ events.push(function(){ } // ---------- On initial page load ------------------------------------------------------------ - + <?php if ($act != 'edit') : ?> ldap_tmplchange(); <?php endif; ?> @@ -852,7 +855,7 @@ events.push(function(){ } ?> // ---------- Click checkbox handlers --------------------------------------------------------- - + $('#ldap_tmpltype').on('change', function() { ldap_tmplchange(); }); |