diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2015-12-03 09:33:02 -0500 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2015-12-03 14:22:56 -0500 |
commit | af28e23103b915061d60e94f6416ad47fd0ed1cd (patch) | |
tree | 6a457d55877eca829df8ee93cb221ea8e059e517 /src/usr/local | |
parent | 20b36ca794d618db969b17a688a73866f6cd677a (diff) | |
download | pfsense-af28e23103b915061d60e94f6416ad47fd0ed1cd.zip pfsense-af28e23103b915061d60e94f6416ad47fd0ed1cd.tar.gz |
Fix updating of CSR by correcting button name
Cosmetic fixes to ldapacpicker to make it usable in 2.3
Diffstat (limited to 'src/usr/local')
-rw-r--r-- | src/usr/local/www/system_certmanager.php | 6 | ||||
-rw-r--r-- | src/usr/local/www/system_usermanager_settings_ldapacpicker.php | 41 |
2 files changed, 25 insertions, 22 deletions
diff --git a/src/usr/local/www/system_certmanager.php b/src/usr/local/www/system_certmanager.php index 5ee2c25..df670a4 100644 --- a/src/usr/local/www/system_certmanager.php +++ b/src/usr/local/www/system_certmanager.php @@ -953,7 +953,7 @@ print $form; } else if ($act == "csr" || (($_POST['save'] == gettext("Update")) && $input_errors)) { $form = new Form(new Form_Button( - 'submit', + 'save', 'Update' )); @@ -964,13 +964,15 @@ print $form; 'Signing request data', $pconfig['csr'] ))->setReadonly() + ->setWidth(7) ->setHelp('Copy the certificate signing data from here and forward it to your certificate authority for signing.'); $section->addInput(new Form_Textarea( 'cert', 'Final certificate data', $pconfig['cert'] - ))->setHelp('Paste the certificate received from your certificate authority here.'); + ))->setWidth(7) + ->setHelp('Paste the certificate received from your certificate authority here.'); if (isset($id) && $a_cert[$id]) { $section->addInput(new Form_Input( diff --git a/src/usr/local/www/system_usermanager_settings_ldapacpicker.php b/src/usr/local/www/system_usermanager_settings_ldapacpicker.php index d400b10..31770f3 100644 --- a/src/usr/local/www/system_usermanager_settings_ldapacpicker.php +++ b/src/usr/local/www/system_usermanager_settings_ldapacpicker.php @@ -86,6 +86,8 @@ if ($_GET) { ?> <html> <head> + <link rel="stylesheet" href="/bootstrap/css/pfSense.css" /> + <STYLE type="text/css"> TABLE { border-width: 1px 1px 1px 1px; @@ -126,18 +128,17 @@ function post_choices() { //]]> </script> -<body link="#0000CC" vlink="#0000CC" alink="#0000CC" > -<form method="post" action="system_usermanager_settings_ldapacpicker.php"> + <body> + <form method="post" action="system_usermanager_settings_ldapacpicker.php"> <?php if (empty($ous)): ?> - <p><?=gettext("Could not connect to the LDAP server. Please check your LDAP configuration.");?></p> - <input type='button' value='<?=gettext("Close"); ?>' onClick="window.close();"> + <p><?=gettext("Could not connect to the LDAP server. Please check your LDAP configuration.");?></p> + <input type='button' class="btn btn-sm btn-default" value='<?=gettext("Close"); ?>' onClick="window.close();"> <?php else: ?> - <b><?=gettext("Please select which containers to Authenticate against:");?></b> - <p/> - <table width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td class="tabnavtbl"> - <table width="100%"> + <b><?=gettext("Please select which containers to Authenticate against:");?></b> + <p/> + <div class="table-responsive"> + <table class="table table-hover table-striped"> + <tbody> <?php if (is_array($ous)) { foreach ($ous as $ou) { @@ -146,19 +147,19 @@ function post_choices() { } else { $CHECKED=""; } - echo " <tr><td><input type='checkbox' value='{$ou}' id='ou' name='ou[]'{$CHECKED}> {$ou}<br /></td></tr>\n"; + echo " <tr><td><div class='checkbox'><input type='checkbox' value='{$ou}' id='ou' name='ou[]'{$CHECKED}> {$ou}<br /></div></td></tr>\n"; } } ?> - </table> - </td> - </tr> - </table> - <p/> - - <input type='button' value='<?=gettext("Save");?>' onClick="post_choices();"> + </tbody> + </table> + </div> + <p/> + + <input type='button' class="btn btn-sm btn-primary" value='<?=gettext("Save");?>' onClick="post_choices();"> <?php endif; ?> -</form> -</body> + </form> + </body> + <script src="/bootstrap/js/bootstrap.min.js"></script> </html> |