diff options
-rw-r--r-- | src/usr/local/www/system_usermanager.php | 48 | ||||
-rw-r--r-- | src/usr/local/www/vpn_ipsec.php | 12 | ||||
-rw-r--r-- | src/usr/local/www/vpn_ipsec_keys.php | 11 | ||||
-rw-r--r-- | src/usr/local/www/vpn_l2tp_users.php | 7 | ||||
-rw-r--r-- | src/usr/local/www/vpn_openvpn_client.php | 5 | ||||
-rw-r--r-- | src/usr/local/www/vpn_openvpn_csc.php | 12 | ||||
-rw-r--r-- | src/usr/local/www/vpn_openvpn_server.php | 7 | ||||
-rw-r--r-- | src/usr/local/www/vpn_pppoe.php | 7 |
8 files changed, 54 insertions, 55 deletions
diff --git a/src/usr/local/www/system_usermanager.php b/src/usr/local/www/system_usermanager.php index fbcd20c..e0eae0d 100644 --- a/src/usr/local/www/system_usermanager.php +++ b/src/usr/local/www/system_usermanager.php @@ -514,18 +514,23 @@ foreach($a_user as $i => $userent): </tbody> </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"> + <i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i> + <?=gettext("Add")?> + </a> </nav> -<p> - <?=gettext("Additional users can be added here. User permissions for accessing " . + +<div id="infoblock"> + <?=print_info_box(gettext("Additional users can be added here. User permissions for accessing " . "the webConfigurator can be assigned directly or inherited from group memberships. " . "An icon that appears grey indicates that it is a system defined object. " . - "Some system object properties can be modified but they cannot be deleted.")?> - <br /><br /> - <?=gettext("Accounts created here are also used for other parts of the system " . - "such as OpenVPN, IPsec, and Captive Portal.")?> -</p> + "Some system object properties can be modified but they cannot be deleted.") . + '<br /><br />' . + gettext("Accounts created here are also used for other parts of the system " . + "such as OpenVPN, IPsec, and Captive Portal."), info)?> +</div> + <?php include("foot.inc"); exit; @@ -834,32 +839,7 @@ print $form; <script> //<![CDATA[ events.push(function(){ - //---------- "Standard" show/hide functions --------------------------------------------------- - - // Hides all elements of the specified class. - function hideClass(s_class, hide) { - if(hide) - $('.' + s_class).hide(); - else - $('.' + s_class).show(); - } - - // Hides the <div> in which the specified input element lives so that the input, its label and help text are hidden - function hideInput(id, hide) { - if(hide) - $('#' + id).parent().parent('div').addClass('hidden'); - else - $('#' + id).parent().parent('div').removeClass('hidden'); - } - // Hides the <div> in which the specified checkbox lives so that the checkbox, its label and help text are hidden - function hideCheckbox(id, hide) { - if(hide) - $('#' + id).parent().parent().parent('div').addClass('hidden'); - else - $('#' + id).parent().parent().parent('div').removeClass('hidden'); - } - // Select every option in the specified multiselect function AllServers(id, selectAll) { for (i = 0; i < id.length; i++) { diff --git a/src/usr/local/www/vpn_ipsec.php b/src/usr/local/www/vpn_ipsec.php index d74a6d0..9a6dc25 100644 --- a/src/usr/local/www/vpn_ipsec.php +++ b/src/usr/local/www/vpn_ipsec.php @@ -561,7 +561,7 @@ display_top_tabs($tab_array); </div> </div> -<nav class="action-buttons"> +<nav class="action-buttons" style="margin-top: 10px;"> <?php /* if ($i !== 0): ?> @@ -569,9 +569,15 @@ display_top_tabs($tab_array); <?php endif; */ ?> - <a href="vpn_ipsec_phase1.php" class="btn btn-success"><?=gettext("Add new P1")?></a> + <a href="vpn_ipsec_phase1.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 P1")?> + </a> <?php if ($i !== 0): ?> - <input type="submit" name="del" class="btn btn-danger" value="<?=gettext("Delete selected P1s")?>" onclick="return confirm('<?=gettext("Do you really want to delete the selected phase1 entries?")?>')" /> + <button type="submit" name="del" class="btn btn-danger btn-sm" value="<?=gettext("Delete selected P1s")?>" onclick="return confirm('<?=gettext("Do you really want to delete the selected phase1 entries?")?>')"> + <i class="fa fa-trash" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i> + <?=gettext("Delete P1s")?> + </button> <?php endif; ?> </nav> </form> diff --git a/src/usr/local/www/vpn_ipsec_keys.php b/src/usr/local/www/vpn_ipsec_keys.php index 9e3c8bc..2bcd84b 100644 --- a/src/usr/local/www/vpn_ipsec_keys.php +++ b/src/usr/local/www/vpn_ipsec_keys.php @@ -188,13 +188,16 @@ if (is_subsystem_dirty('ipsec')) </table> </div> -<nav class="action-buttons"> - <a class="btn btn-success" href="vpn_ipsec_keys_edit.php"><?=gettext("add key")?></a> +<nav class="action-buttons" style="margin-top: 10px;"> + <a class="btn btn-success btn-sm" href="vpn_ipsec_keys_edit.php"> + <i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i> + <?=gettext("Add")?> + </a> </nav> <div class="alert alert-info"> - <strong><?=gettext("Note"); ?>:</strong><br /> - <?=gettext("PSK for any user can be set by using an identifier of any")?> + <strong><?=gettext("Note"); ?>:</strong> + <?=gettext(" PSK for any user can be set by using an identifier of any")?> </div> <?php include("foot.inc"); ?>
\ No newline at end of file diff --git a/src/usr/local/www/vpn_l2tp_users.php b/src/usr/local/www/vpn_l2tp_users.php index db4e28f..b0cfe2f 100644 --- a/src/usr/local/www/vpn_l2tp_users.php +++ b/src/usr/local/www/vpn_l2tp_users.php @@ -144,8 +144,11 @@ include("head.inc"); </table> </div> -<nav class="action-buttons"> - <a class="btn btn-success" href="vpn_l2tp_users_edit.php"><?=gettext("add user")?></a> +<nav class="action-buttons" style="margin-top: 10px;"> + <a class="btn btn-success btn-sm" href="vpn_l2tp_users_edit.php"> + <i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i> + <?=gettext("Add")?> + </a> </nav> diff --git a/src/usr/local/www/vpn_openvpn_client.php b/src/usr/local/www/vpn_openvpn_client.php index a04d5ce..6ffc90f 100644 --- a/src/usr/local/www/vpn_openvpn_client.php +++ b/src/usr/local/www/vpn_openvpn_client.php @@ -855,9 +855,10 @@ else: </div> </div> -<nav class="action-buttons"> +<nav class="action-buttons" style="margin-top: 10px;"> <a href="vpn_openvpn_client.php?act=new" class="btn btn-sm btn-success"> - <?=gettext("Add client")?> + <i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i> + <?=gettext("Add")?> </a> </nav> diff --git a/src/usr/local/www/vpn_openvpn_csc.php b/src/usr/local/www/vpn_openvpn_csc.php index 09b03cc..31ba7e8 100644 --- a/src/usr/local/www/vpn_openvpn_csc.php +++ b/src/usr/local/www/vpn_openvpn_csc.php @@ -647,14 +647,16 @@ else : // Not an 'add' or an 'edit'. Just the table of Override CSCs ?> </tbody> </table> - - <nav class="action-buttons"> - <a href="vpn_openvpn_csc.php?act=new" class="btn btn-success btn-sm"><?=gettext('Add CSC')?></a> - </nav> - </div> </div> +<nav class="action-buttons" style="margin-top: 10px;"> + <a href="vpn_openvpn_csc.php?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 endif; include("foot.inc");
\ No newline at end of file diff --git a/src/usr/local/www/vpn_openvpn_server.php b/src/usr/local/www/vpn_openvpn_server.php index b43bb8a..77e84f6 100644 --- a/src/usr/local/www/vpn_openvpn_server.php +++ b/src/usr/local/www/vpn_openvpn_server.php @@ -1321,9 +1321,10 @@ else: </div> </div> -<nav class="action-buttons"> - <a href="vpn_openvpn_server.php?act=new" class="btn btn-sm btn-success"> - <?=gettext("Add server")?> +<nav class="action-buttons" style="margin-top: 10px;"> + <a href="vpn_openvpn_server.php?act=new" 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> diff --git a/src/usr/local/www/vpn_pppoe.php b/src/usr/local/www/vpn_pppoe.php index 660a89a..8095bb6 100644 --- a/src/usr/local/www/vpn_pppoe.php +++ b/src/usr/local/www/vpn_pppoe.php @@ -169,8 +169,11 @@ endforeach; </table> </div> -<nav class="action-buttons"> - <a href="vpn_pppoe_edit.php" class="btn btn-success"><?=gettext("Add")?></a> +<nav class="action-buttons" style="margin-top: 10px;"> + <a href="vpn_pppoe_edit.php" class="btn btn-success"> + <i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i> + <?=gettext("Add")?> + </a> </nav> <?php |