diff options
| -rw-r--r-- | src/usr/local/www/system_camanager.php | 86 | ||||
| -rw-r--r-- | src/usr/local/www/system_certmanager.php | 11 | ||||
| -rw-r--r-- | src/usr/local/www/system_gateway_groups.php | 16 | ||||
| -rw-r--r-- | src/usr/local/www/system_gateways.php | 15 | ||||
| -rw-r--r-- | src/usr/local/www/system_groupmanager.php | 96 | ||||
| -rw-r--r-- | src/usr/local/www/system_routes.php | 15 |
6 files changed, 148 insertions, 91 deletions
diff --git a/src/usr/local/www/system_camanager.php b/src/usr/local/www/system_camanager.php index 30f06c7..b9520b0 100644 --- a/src/usr/local/www/system_camanager.php +++ b/src/usr/local/www/system_camanager.php @@ -1,32 +1,57 @@ <?php /* system_camanager.php - - Copyright (C) 2008 Shrew Soft Inc. - 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: certificate_manager */ @@ -342,7 +367,7 @@ if (file_exists("/etc/ca_countries")){ $dn_cc_file=file("/etc/ca_countries"); foreach($dn_cc_file as $line) { if (preg_match('/^(\S*)\s(.*)$/', $line, $matches)) { - $dn_cc[$matches[1]] = $matches[1]; + $dn_cc[$matches[1]] = $matches[1]; } } } @@ -365,7 +390,7 @@ if (!($act == "new" || $act == "edit" || $act == gettext("Save") || $input_error <th><?=gettext("Issuer")?></th> <th><?=gettext("Certificates")?></th> <th><?=gettext("Distinguished Name")?></th> - <th></th> + <th><?=gettext("Actions")?></th> </tr> </thead> <tbody> @@ -431,8 +456,11 @@ foreach ($a_ca as $i => $ca): </tbody> </table> -<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> <? include("foot.inc"); diff --git a/src/usr/local/www/system_certmanager.php b/src/usr/local/www/system_certmanager.php index 581cdd3..35b3d66 100644 --- a/src/usr/local/www/system_certmanager.php +++ b/src/usr/local/www/system_certmanager.php @@ -583,7 +583,7 @@ if (!($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors))) <th><?=gettext("Issuer")?></th> <th><?=gettext("Distinguished Name")?></th> <th><?=gettext("In Use")?></th> - <th></th> + <th><?=gettext("Actions")?></th> </tr> </thead> <tbody> @@ -682,8 +682,11 @@ foreach($a_cert as $i => $cert): </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> <? include("foot.inc"); @@ -1087,7 +1090,7 @@ events.push(function(){ } // ---------- Click checkbox handlers --------------------------------------------------------- - + $('#caref').on('change', function() { internalca_change(); }); diff --git a/src/usr/local/www/system_gateway_groups.php b/src/usr/local/www/system_gateway_groups.php index 6ee9e2f..3e54eb0 100644 --- a/src/usr/local/www/system_gateway_groups.php +++ b/src/usr/local/www/system_gateway_groups.php @@ -196,13 +196,17 @@ endforeach; </table> </div> -<nav class="action-buttons"> - <a href="system_gateway_groups_edit.php" class="btn btn-default"><?=gettext('Add')?></a> +<nav class="action-buttons" style="margin-top: 10px;"> + <a href="system_gateway_groups_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> -<?php - print_info_box(gettext('Remember to use these Gateway Groups in firewall rules in order to enable load balancing, failover, ' . +<div id="infoblock"> + <?=print_info_box(gettext('Remember to use these Gateway Groups in firewall rules in order to enable load balancing, failover, ' . 'or policy-based routing.' . '<br />' . - 'Without rules directing traffic into the Gateway Groups, they will not be used.')); - + 'Without rules directing traffic into the Gateway Groups, they will not be used.'), info)?> +</div> +<?php include("foot.inc"); diff --git a/src/usr/local/www/system_gateways.php b/src/usr/local/www/system_gateways.php index bc9f6e1..1c799d3 100644 --- a/src/usr/local/www/system_gateways.php +++ b/src/usr/local/www/system_gateways.php @@ -246,7 +246,7 @@ if ($input_errors) print_input_errors($input_errors); if ($savemsg) print_info_box($savemsg, 'success'); - + if (is_subsystem_dirty('staticroutes')) print_info_box_np(gettext("The gateway configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect.")); @@ -308,18 +308,18 @@ foreach ($a_gateways as $i => $gateway): <td> <a href="system_gateways_edit.php?id=<?=$i?>" class="fa fa-pencil" title="<?=gettext('Edit');?>"></a> <a href="system_gateways_edit.php?dup=<?=$i?>" class="fa fa-clone" title="<?=gettext('Copy')?>"></a> - + <? if (is_numeric($gateway['attribute'])): ?> <?php if (isset($gateway['disabled'])) { - ?> + ?> <a href="?act=toggle&id=<?=$i?>" class="fa fa-check-square-o" title="<?=gettext('Enable')?>"></a> <?php } else { ?> <a href="?act=toggle&id=<?=$i?>" class="fa fa-ban" title="<?=gettext('Disable')?>"></a> <?php } - ?> + ?> <a href="system_gateways.php?act=del&id=<?=$i?>" class="fa fa-trash" title="<?=gettext('Delete')?>" onclick="return confirm('<?=gettext("Are you sure you want to delete this gateway?")?>')"></a> - + <? endif?> </td> </tr> @@ -327,9 +327,10 @@ foreach ($a_gateways as $i => $gateway): </tbody> </table> -<nav class="action-buttons"> +<nav class="action-buttons" style="margin-top: 10px;"> <a href="system_gateways_edit.php" role="button" class="btn btn-success"> - <?=gettext("Add new gateway");?> + <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/system_groupmanager.php b/src/usr/local/www/system_groupmanager.php index aaeb25b..f8de594 100644 --- a/src/usr/local/www/system_groupmanager.php +++ b/src/usr/local/www/system_groupmanager.php @@ -1,42 +1,59 @@ <?php /* $Id: system_groupmanager.php - part of m0n0wall (http://m0n0.ch/wall) - part of pfSense - - Copyright (C) 2013-2015 Electric Sheep Fencing, LP - All rights reserved. - - Copyright (C) 2008 Shrew Soft Inc. - All rights reserved. - - Copyright (C) 2005 Paul Taylor <paultaylor@winn-dixie.com>. - All rights reserved. - - Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>. - 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) 2005 Paul Taylor <paultaylor@winn-dixie.com> + * Copyright (c) 2003-2005 Manuel Kasper <mk@neon1.net> + * + * 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: auth */ @@ -264,7 +281,7 @@ if (!($_GET['act'] == "new" || $_GET['act'] == "edit")) <th><?=gettext("Group name")?></th> <th><?=gettext("Description")?></th> <th><?=gettext("Member Count")?></th> - <th></th> + <th><?=gettext("Actions")?></th> </tr> </thead> <tbody> @@ -299,8 +316,11 @@ if (!($_GET['act'] == "new" || $_GET['act'] == "edit")) </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'); diff --git a/src/usr/local/www/system_routes.php b/src/usr/local/www/system_routes.php index 3e3fded..a2e62d7 100644 --- a/src/usr/local/www/system_routes.php +++ b/src/usr/local/www/system_routes.php @@ -298,17 +298,17 @@ foreach ($a_routes as $i => $route): </td> <td> <a href="system_routes_edit.php?id=<?=$i?>" class="fa fa-pencil" title="<?=gettext('Edit')?>"></a> - + <a href="system_routes_edit.php?dup=<?=$i?>" class="fa fa-clone" title="<?=gettext('Copy')?>"></a> - + <?php if (isset($route['disabled'])) { - ?> + ?> <a href="?act=toggle&id=<?=$i?>" class="fa fa-check-square-o" title="<?=gettext('Enable')?>"></a> <?php } else { ?> <a href="?act=toggle&id=<?=$i?>" class="fa fa-ban" title="<?=gettext('Disable')?>"></a> <?php } - ?> + ?> <a href="system_routes.php?act=del&id=<?=$i?>" class="fa fa-trash" title="<?=gettext('Delete')?>" onclick="return confirm('<?=gettext("Are you sure you want to delete this route?")?>')"></a> </td> @@ -316,9 +316,10 @@ foreach ($a_routes as $i => $route): </tr> </table> -<nav class="action-buttons"> - <a href="system_routes_edit.php" role="button" class="btn btn-success"> - <?=gettext("add new route")?> +<nav class="action-buttons" style="margin-top: 10px;"> + <a href="system_routes_edit.php" 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> </nav> <?php |
