From f1697c4a2eabfb50837778a48711fb3028635bd8 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Sun, 15 Apr 2018 19:55:44 +0200
Subject: [PATCH] OpenVPN/server, minor visual improvements, switch dropdown
 boxes to selectpicker

---
 src/www/vpn_openvpn_server.php | 38 ++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/www/vpn_openvpn_server.php b/src/www/vpn_openvpn_server.php
index 69ab9afba..d7e6e08c1 100644
--- a/src/www/vpn_openvpn_server.php
+++ b/src/www/vpn_openvpn_server.php
@@ -476,6 +476,7 @@ $( document ).ready(function() {
               $(".opt_gwredir").hide();
           }
           $("#dev_mode").change();
+          $('.selectpicker').selectpicker('refresh');
           $(window).resize();
       });
       $("#mode").change();
@@ -498,6 +499,7 @@ $( document ).ready(function() {
               $("#serverbridge_dhcp_start").prop('disabled', false);
               $("#serverbridge_dhcp_end").prop('disabled', false);
           }
+          $('.selectpicker').selectpicker('refresh');
       });
       $("#dev_mode").change();
 
@@ -634,7 +636,7 @@ $( document ).ready(function() {
                     <tr>
                       <td><i class="fa fa-info-circle text-muted"></i> <?=gettext("Server Mode");?></td>
                         <td>
-                        <select name='mode' id="mode" class="form-control">
+                        <select name='mode' id="mode" class="selectpicker">
 <?php
                       $openvpn_server_modes = array(
                         'p2p_tls' => gettext("Peer to Peer ( SSL/TLS )"),
@@ -656,7 +658,7 @@ $( document ).ready(function() {
                     <tr class="opt_mode opt_mode_server_user opt_mode_server_tls_user" style="display:none">
                       <td><i class="fa fa-info-circle text-muted"></i> <?=gettext("Backend for authentication");?></td>
                       <td>
-                        <select name='authmode[]' id='authmode' class="form-control" multiple="multiple" size="5">
+                        <select name='authmode[]' id='authmode' class="selectpicker" multiple="multiple" size="5">
 <?php
                         if (isset($pconfig['authmode'])) {
                             $authmodes = explode(",", $pconfig['authmode']);
@@ -678,7 +680,7 @@ $( document ).ready(function() {
                     <tr class="opt_mode opt_mode_server_user opt_mode_server_tls_user" style="display:none">
                       <td><a id="help_for_local_group" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?= gettext('Enforce local group') ?></td>
                       <td>
-                        <select name='local_group' id="local_group" class="form-control">
+                        <select name='local_group' id="local_group" class="selectpicker">
                           <option value="" <?= empty($pconfig['local_group']) ? 'selected="selected"' : '' ?>>(<?= gettext('none') ?>)</option>
 <?php
                         foreach (config_read_array('system', 'group') as $group):
@@ -696,7 +698,7 @@ $( document ).ready(function() {
                     <tr>
                       <td><a id="help_for_protocol" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Protocol");?></td>
                         <td>
-                          <select name='protocol' class="form-control">
+                          <select name='protocol' class="selectpicker">
 <?php
                           foreach (openvpn_get_protocols() as $prot):
                               $selected = "";
@@ -717,7 +719,7 @@ $( document ).ready(function() {
                     <tr>
                       <td><i class="fa fa-info-circle text-muted"></i> <?=gettext("Device Mode"); ?></td>
                       <td>
-                        <select name="dev_mode" id="dev_mode" class="form-control">
+                        <select name="dev_mode" id="dev_mode" class="selectpicker">
 <?php
                         foreach (array("tun", "tap") as $device) :
                                $selected = "";
@@ -739,7 +741,7 @@ $( document ).ready(function() {
                     <tr>
                       <td><i class="fa fa-info-circle text-muted"></i> <?=gettext("Interface"); ?></td>
                       <td>
-                        <select name="interface" class="form-control">
+                        <select name="interface" class="selectpicker">
 <?php
                         $interfaces = get_configured_interface_with_descr();
                         $carplist = get_configured_carp_interface_list();
@@ -819,7 +821,7 @@ endif; ?>
                         <td>
 <?php
                         if (isset($config['ca'])) :?>
-                          <select name='caref' class="form-control">
+                          <select name='caref' class="selectpicker">
 <?php
                           foreach ($config['ca'] as $ca) :
                               $selected = "";
@@ -846,7 +848,7 @@ endif; ?>
                       <td>
 <?php
                         if (isset($config['crl'])) :?>
-                        <select name='crlref' class="form-control">
+                        <select name='crlref' class="selectpicker">
                           <option value="">None</option>
 <?php
                           foreach ($config['crl'] as $crl) :
@@ -874,7 +876,7 @@ endif; ?>
                       <td>
 <?php
                       if (isset($config['cert'])) :?>
-                        <select name='certref' class="form-control">
+                        <select name='certref' class="selectpicker">
 <?php
                         foreach ($config['cert'] as $cert) :
                             $selected = "";
@@ -914,7 +916,7 @@ endif; ?>
                     <tr class="opt_mode opt_mode_p2p_tls opt_mode_server_tls opt_mode_server_user opt_mode_server_tls_user">
                       <td><i class="fa fa-info-circle text-muted"></i> <?=gettext("DH Parameters Length"); ?></td>
                       <td>
-                        <select name="dh_length" class="form-control">
+                        <select name="dh_length" class="selectpicker">
 <?php
                         foreach (array(1024, 2048, 4096) as $length) :
                             $selected = "";
@@ -948,7 +950,7 @@ endif; ?>
                     <tr>
                       <td><i class="fa fa-info-circle text-muted"></i> <?=gettext("Encryption algorithm"); ?></td>
                       <td>
-                        <select name="crypto" class="form-control">
+                        <select name="crypto" class="selectpicker">
 <?php
                         $cipherlist = openvpn_get_cipherlist();
                         foreach ($cipherlist as $name => $desc) :
@@ -968,7 +970,7 @@ endif; ?>
                     <tr>
                       <td><a id="help_for_digest" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Auth Digest Algorithm"); ?></td>
                       <td>
-                        <select name="digest" class="form-control">
+                        <select name="digest" class="selectpicker">
 <?php
                         $digestlist = openvpn_get_digestlist();
                         foreach ($digestlist as $name => $desc) :
@@ -991,7 +993,7 @@ endif; ?>
                     <tr id="engine">
                       <td><i class="fa fa-info-circle text-muted"></i> <?=gettext("Hardware Crypto"); ?></td>
                       <td>
-                        <select name="engine" class="form-control">
+                        <select name="engine" class="selectpicker">
 <?php
                         $engines = openvpn_get_engines();
                         foreach ($engines as $name => $desc) :
@@ -1013,7 +1015,7 @@ endif; ?>
                       <td>
                         <table>
                         <tr><td>
-                        <select name="cert_depth" class="form-control">
+                        <select name="cert_depth" class="selectpicker">
                           <option value=""><?=gettext('Do Not Check') ?></option>
 <?php
                           $openvpn_cert_depths = array(
@@ -1112,7 +1114,7 @@ endif; ?>
                     <tr class="dev_mode dev_mode_tap">
                       <td style="width:22%"><a id="help_for_serverbridge_interface" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Bridge Interface"); ?></td>
                       <td>
-                        <select id="serverbridge_interface" name="serverbridge_interface" class="form-control">
+                        <select id="serverbridge_interface" name="serverbridge_interface" class="selectpicker">
 <?php
                         $serverbridge_interface['none'] = "none";
                         $serverbridge_interface = array_merge($serverbridge_interface, get_configured_interface_with_descr());
@@ -1247,7 +1249,7 @@ endif; ?>
                     <tr>
                       <td style="width:22%"><a id="help_for_compression" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Compression"); ?></td>
                       <td>
-                        <select name="compression" class="form-control">
+                        <select name="compression" class="selectpicker">
 <?php
                         foreach (openvpn_compression_modes() as $cmode => $cmodedesc):
                             $selected = "";
@@ -1443,7 +1445,7 @@ endif; ?>
                           <span>
                             <?=gettext("Node Type"); ?>:&nbsp;
                           </span>
-                          <select name='netbios_ntype' class="form-control">
+                          <select name='netbios_ntype' class="selectpicker">
 <?php
                           foreach ($netbios_nodetypes as $type => $name) :
                               $selected = "";
@@ -1544,7 +1546,7 @@ endif; ?>
                     <tr id="comboboxVerbosityLevel">
                       <td style="width:22%"><a id="help_for_verbosity_level" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Verbosity level");?></td>
                       <td>
-                        <select name="verbosity_level" class="form-control">
+                        <select name="verbosity_level" class="selectpicker">
 <?php
                         foreach (openvpn_verbosity_level() as $verb_value => $verb_desc):
                             $selected = '';