diff options
author | rbgarga <garga@FreeBSD.org> | 2013-04-08 15:00:46 -0700 |
---|---|---|
committer | rbgarga <garga@FreeBSD.org> | 2013-04-08 15:00:46 -0700 |
commit | a10b2f7516660579d890480ca791c8d61ae4b997 (patch) | |
tree | 6379ce67d03bb3a542ed748d1d921935e4dfaaf6 | |
parent | 75dda65d97506797bb570d478de18d16fc6964a9 (diff) | |
parent | 6b8588c6ad8cef9e0e3a93c5a8291b56b9798183 (diff) | |
download | pfsense-a10b2f7516660579d890480ca791c8d61ae4b997.zip pfsense-a10b2f7516660579d890480ca791c8d61ae4b997.tar.gz |
Merge pull request #539 from ExolonDX/branch_04
Tidy up "system_usermanager.php" XHTML
-rw-r--r-- | usr/local/www/system_usermanager.php | 144 |
1 files changed, 72 insertions, 72 deletions
diff --git a/usr/local/www/system_usermanager.php b/usr/local/www/system_usermanager.php index 62503ee..786e2f8 100644 --- a/usr/local/www/system_usermanager.php +++ b/usr/local/www/system_usermanager.php @@ -353,9 +353,9 @@ include("head.inc"); //Script featured on JavaScript Kit (http://www.javascriptkit.com) //For this script, visit http://www.javascriptkit.com // --> -<script language="javascript" type="text/javascript" src="javascript/datetimepicker.js"></script> -<script language="JavaScript"> -<!-- +<script type="text/javascript" src="javascript/datetimepicker.js"></script> +<script type="text/javascript"> +//<![CDATA[ function setall_selected(id) { selbox = document.getElementById(id); @@ -422,7 +422,7 @@ function sshkeyClicked(obj) { document.getElementById("sshkeychck").style.display=""; } } -//--> +//]]> </script> <?php if ($input_errors) @@ -430,7 +430,7 @@ function sshkeyClicked(obj) { if ($savemsg) print_info_box($savemsg); ?> -<table width="100%" border="0" cellpadding="0" cellspacing="0"> +<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="user manager"> <tr> <td> <?php @@ -450,29 +450,29 @@ function sshkeyClicked(obj) { <?php if ($_GET['act'] == "new" || $_GET['act'] == "edit" || $input_errors): ?> <form action="system_usermanager.php" method="post" name="iform" id="iform" onsubmit="presubmit()"> - <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <table width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area"> <?php $ro = ""; if ($pconfig['utype'] == "system") - $ro = "readonly = \"readonly\""; + $ro = "readonly=\"readonly\""; ?> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Defined by");?></td> <td width="78%" class="vtable"> <strong><?=strtoupper(htmlspecialchars($pconfig['utype']));?></strong> - <input name="utype" type="hidden" value="<?=htmlspecialchars($pconfig['utype'])?>"/> + <input name="utype" type="hidden" value="<?=htmlspecialchars($pconfig['utype'])?>" /> </td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Disabled");?></td> <td width="78%" class="vtable"> - <input name="disabled" type="checkbox" id="disabled" <?php if($pconfig['disabled']) echo "CHECKED"; ?>> + <input name="disabled" type="checkbox" id="disabled" <?php if($pconfig['disabled']) echo "checked=\"checked\""; ?> /> </td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Username");?></td> <td width="78%" class="vtable"> - <input name="usernamefld" type="text" class="formfld user" id="usernamefld" size="20" maxlength="16" value="<?=htmlspecialchars($pconfig['usernamefld']);?>" <?=$ro;?>/> + <input name="usernamefld" type="text" class="formfld user" id="usernamefld" size="20" maxlength="16" value="<?=htmlspecialchars($pconfig['usernamefld']);?>" <?=$ro;?> /> <input name="oldusername" type="hidden" id="oldusername" value="<?=htmlspecialchars($pconfig['usernamefld']);?>" /> </td> </tr> @@ -490,7 +490,7 @@ function sshkeyClicked(obj) { <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Full name");?></td> <td width="78%" class="vtable"> - <input name="descr" type="text" class="formfld unknown" id="descr" size="20" value="<?=htmlspecialchars($pconfig['descr']);?>" <?=$ro;?>/> + <input name="descr" type="text" class="formfld unknown" id="descr" size="20" value="<?=htmlspecialchars($pconfig['descr']);?>" <?=$ro;?> /> <br/> <?=gettext("User's full name, for your own information only");?> </td> @@ -498,22 +498,22 @@ function sshkeyClicked(obj) { <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Expiration date"); ?></td> <td width="78%" class="vtable"> - <input name="expires" type="text" class="formfld unknown" id="expires" size="10" value="<?=htmlspecialchars($pconfig['expires']);?>"> + <input name="expires" type="text" class="formfld unknown" id="expires" size="10" value="<?=htmlspecialchars($pconfig['expires']);?>" /> <a href="javascript:NewCal('expires','mmddyyyy')"> - <img src="/themes/<?php echo $g['theme']; ?>/images/icons/icon_cal.gif" width="16" height="16" border="0" alt="<?=gettext("Pick a date");?>"> + <img src="/themes/<?php echo $g['theme']; ?>/images/icons/icon_cal.gif" width="16" height="16" border="0" alt="<?=gettext("Pick a date");?>" /> </a> - <br> + <br/> <span class="vexpl"><?=gettext("Leave blank if the account shouldn't expire, otherwise enter the expiration date in the following format: mm/dd/yyyy"); ?></span></td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Group Memberships");?></td> <td width="78%" class="vtable" align="center"> - <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> + <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0" summary="group membership"> <tr> <td align="center" width="50%"> <strong><?=gettext("Not Member Of"); ?></strong><br/> <br/> - <select size="10" style="width: 75%" name="notgroups[]" class="formselect" id="notgroups" onChange="clear_selected('groups')" multiple> + <select size="10" style="width: 75%" name="notgroups[]" class="formselect" id="notgroups" onchange="clear_selected('groups')" multiple="multiple"> <?php foreach ($config['system']['group'] as $group): if ($group['gid'] == 1998) /* all users group */ @@ -541,7 +541,7 @@ function sshkeyClicked(obj) { <td align="center" width="50%"> <strong><?=gettext("Member Of"); ?></strong><br/> <br/> - <select size="10" style="width: 75%" name="groups[]" class="formselect" id="groups" onChange="clear_selected('nogroups')" multiple> + <select size="10" style="width: 75%" name="groups[]" class="formselect" id="groups" onchange="clear_selected('nogroups')" multiple="multiple"> <?php if (is_array($pconfig['groups'])) { foreach ($config['system']['group'] as $group): @@ -569,7 +569,7 @@ function sshkeyClicked(obj) { <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Effective Privileges");?></td> <td width="78%" class="vtable"> - <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> + <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0" summary="privileges"> <tr> <td width="20%" class="listhdrr"><?=gettext("Inherited From");?></td> <td width="30%" class="listhdrr"><?=gettext("Name");?></td> @@ -594,10 +594,10 @@ function sshkeyClicked(obj) { <td class="listbg"> <?=htmlspecialchars($priv['descr']);?> </td> - <td valign="middle" nowrap class="list"> + <td valign="middle" class="list nowrap"> <?php if (!$group): ?> - <a href="system_usermanager.php?act=delpriv&id=<?=$id?>&privid=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this privilege?");?>')"> - <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="" /> + <a href="system_usermanager.php?act=delpriv&id=<?=$id?>&privid=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this privilege?");?>')"> + <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" /> </a> <?php endif; ?> </td> @@ -613,7 +613,7 @@ function sshkeyClicked(obj) { <td class="list" colspan="3"></td> <td class="list"> <a href="system_usermanager_addprivs.php?userid=<?=$id?>"> - <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="" /> + <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /> </a> </td> </tr> @@ -623,7 +623,7 @@ function sshkeyClicked(obj) { <tr> <td width="22%" valign="top" class="vncell"><?=gettext("User Certificates");?></td> <td width="78%" class="vtable"> - <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> + <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0" summary="certificates"> <tr> <td width="45%" class="listhdrr"><?=gettext("Name");?></td> <td width="45%" class="listhdrr"><?=gettext("CA");?></td> @@ -648,14 +648,14 @@ function sshkeyClicked(obj) { <td class="listr"> <?=htmlspecialchars($ca['descr']);?> </td> - <td valign="middle" nowrap class="list"> - <a href="system_usermanager.php?act=expckey&id=<?=$id;?>&certid=<?=$i;?>"> + <td valign="middle" class="list nowrap"> + <a href="system_usermanager.php?act=expckey&id=<?=$id;?>&certid=<?=$i;?>"> <img src="/themes/<?= $g['theme'];?>/images/icons/icon_down.gif" title="<?=gettext("export private key"); ?>" alt="<?=gettext("export private key"); ?>" width="17" height="17" border="0" /> </a> - <a href="system_usermanager.php?act=expcert&id=<?=$id;?>&certid=<?=$i;?>"> + <a href="system_usermanager.php?act=expcert&id=<?=$id;?>&certid=<?=$i;?>"> <img src="/themes/<?= $g['theme'];?>/images/icons/icon_down.gif" title="<?=gettext("export cert"); ?>" alt="<?=gettext("export cert"); ?>" width="17" height="17" border="0" /> </a> - <a href="system_usermanager.php?act=delcert&id=<?=$id?>&certid=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to remove this certificate association?") .'\n'. gettext("(Certificate will not be deleted)");?>')"> + <a href="system_usermanager.php?act=delcert&id=<?=$id?>&certid=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to remove this certificate association?") .'\n'. gettext("(Certificate will not be deleted)");?>')"> <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="<?=gettext("delete cert");?>" /> </a> </td> @@ -668,8 +668,8 @@ function sshkeyClicked(obj) { <tr> <td class="list" colspan="2"></td> <td class="list"> - <a href="system_certmanager.php?act=new&userid=<?=$id?>"> - <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="" /> + <a href="system_certmanager.php?act=new&userid=<?=$id?>"> + <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="add" /> </a> </td> </tr> @@ -686,10 +686,10 @@ function sshkeyClicked(obj) { } ?> - <tr id="usercertchck" name="usercertchck" > + <tr id="usercertchck"> <td width="22%" valign="top" class="vncell"><?=gettext("Certificate");?></td> <td width="78%" class="vtable"> - <input type="checkbox" onClick="javascript:usercertClicked(this)"> <?=gettext("Click to create a user certificate."); ?> + <input type="checkbox" onclick="javascript:usercertClicked(this)" /> <?=gettext("Click to create a user certificate."); ?> </td> </tr> @@ -698,17 +698,17 @@ function sshkeyClicked(obj) { <tr id="usercert" name="usercert" style="display:none"> <td width="22%" valign="top" class="vncell"><?=gettext("Certificate");?></td> <td width="78%" class="vtable"> - <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <table width="100%" border="0" cellpadding="6" cellspacing="0" summary="certificate"> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Descriptive name");?></td> <td width="78%" class="vtable"> - <input name="name" type="text" class="formfld unknown" id="name" size="20" value="<?=htmlspecialchars($pconfig['name']);?>"/> + <input name="name" type="text" class="formfld unknown" id="name" size="20" value="<?=htmlspecialchars($pconfig['name']);?>" /> </td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Certificate authority");?></td> <td width="78%" class="vtable"> - <select name='caref' id='caref' class="formselect" onChange='internalca_change()'> + <select name='caref' id='caref' class="formselect" onchange='internalca_change()'> <?php foreach( $config['ca'] as $ca): if (!$ca['prv']) @@ -736,7 +736,7 @@ function sshkeyClicked(obj) { <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Lifetime");?></td> <td width="78%" class="vtable"> - <input name="lifetime" type="text" class="formfld unknown" id="lifetime" size="5" value="<?=htmlspecialchars($pconfig['lifetime']);?>"/>days + <input name="lifetime" type="text" class="formfld unknown" id="lifetime" size="5" value="<?=htmlspecialchars($pconfig['lifetime']);?>" />days </td> </tr> </table> @@ -746,13 +746,13 @@ function sshkeyClicked(obj) { <?php endif; endif; ?> <?php endif; ?> - <tr id="sshkeychck" name="sshkeychck" > + <tr id="sshkeychck"> <td width="22%" valign="top" class="vncell"><?=gettext("Authorized keys");?></td> <td width="78%" class="vtable"> - <input type="checkbox" onClick="javascript:sshkeyClicked(this)"> <?=gettext("Click to paste an authorized key."); ?> + <input type="checkbox" onclick="javascript:sshkeyClicked(this)" /> <?=gettext("Click to paste an authorized key."); ?> </td> </tr> - <tr id="sshkey" name="sshkey" style="display:none"> + <tr id="sshkey" style="display:none"> <td width="22%" valign="top" class="vncell"><?=gettext("Authorized keys");?></td> <td width="78%" class="vtable"> <textarea name="authorizedkeys" cols="65" rows="7" id="authorizedkeys" class="formfld_cert" wrap="off"><?=htmlspecialchars($pconfig['authorizedkeys']);?></textarea> @@ -760,10 +760,10 @@ function sshkeyClicked(obj) { <?=gettext("Paste an authorized keys file here.");?> </td> </tr> - <tr id="ipsecpskrow" name="ipsecpskrow"> + <tr id="ipsecpskrow"> <td width="22%" valign="top" class="vncell"><?=gettext("IPsec Pre-Shared Key");?></td> <td width="78%" class="vtable"> - <input name="ipsecpsk" type="text" class="formfld unknown" id="ipsecpsk" size="65" value="<?=htmlspecialchars($pconfig['ipsecpsk']);?>"> + <input name="ipsecpsk" type="text" class="formfld unknown" id="ipsecpsk" size="65" value="<?=htmlspecialchars($pconfig['ipsecpsk']);?>" /> </td> </tr> <tr> @@ -780,26 +780,49 @@ function sshkeyClicked(obj) { <?php else: ?> - <table class="sortable" width="100%" border="0" cellpadding="0" cellspacing="0"> + <table class="sortable" width="100%" border="0" cellpadding="0" cellspacing="0" summary=""> <thead> <tr> <th width="25%" class="listhdrr"><?=gettext("Username"); ?></th> <th width="25%" class="listhdrr"><?=gettext("Full name"); ?></th> <th width="5%" class="listhdrr"><?=gettext("Disabled"); ?></th> <th width="25%" class="listhdrr"><?=gettext("Groups"); ?></th> - <th width="10%" class="list"></td> + <th width="10%" class="list"></th> </tr> </thead> + <tfoot> + <tr> + <td class="list" colspan="4"></td> + <td class="list"> + <a href="system_usermanager.php?act=new"> + <img src="/themes/<?= $g['theme'];?>/images/icons/icon_plus.gif" title="<?=gettext("add user"); ?>" alt="<?=gettext("add user"); ?>" width="17" height="17" border="0" /> + </a> + </td> + </tr> + <tr> + <td colspan="4"> + <p> + <?=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> + </td> + </tr> + </tfoot> <tbody> <?php $i = 0; foreach($a_user as $userent): ?> - <tr ondblclick="document.location='system_usermanager.php?act=edit&id=<?=$i;?>'"> + <tr ondblclick="document.location='system_usermanager.php?act=edit&id=<?=$i;?>'"> <td class="listlr"> - <table border="0" cellpadding="0" cellspacing="0"> + <table border="0" cellpadding="0" cellspacing="0" summary="icons"> <tr> - <td align="left" valign="center"> + <td align="left" valign="middle"> <?php if($userent['scope'] != "user") $usrimg = "/themes/{$g['theme']}/images/icons/icon_system-user-grey.png"; @@ -820,13 +843,13 @@ function sshkeyClicked(obj) { <?=implode(",",local_user_get_groups($userent));?> </td> - <td valign="middle" nowrap class="list"> - <a href="system_usermanager.php?act=edit&id=<?=$i;?>"> + <td valign="middle" class="list nowrap"> + <a href="system_usermanager.php?act=edit&id=<?=$i;?>"> <img src="/themes/<?= $g['theme'];?>/images/icons/icon_e.gif" title="<?=gettext("edit user"); ?>" alt="<?=gettext("edit user"); ?>" width="17" height="17" border="0" /> </a> <?php if($userent['scope'] != "system"): ?> - <a href="system_usermanager.php?act=deluser&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this User?");?>')"> + <a href="system_usermanager.php?act=deluser&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this User?");?>')"> <img src="/themes/<?= $g['theme'];?>/images/icons/icon_x.gif" title="<?=gettext("delete user"); ?>" alt="<?=gettext("delete user"); ?>" width="17" height="17" border="0" /> </a> <?php endif; ?> @@ -837,29 +860,6 @@ function sshkeyClicked(obj) { endforeach; ?> </tbody> - <tfoot> - <tr> - <td class="list" colspan="4"></td> - <td class="list"> - <a href="system_usermanager.php?act=new"> - <img src="/themes/<?= $g['theme'];?>/images/icons/icon_plus.gif" title="<?=gettext("add user"); ?>" alt="<?=gettext("add user"); ?>" width="17" height="17" border="0" /> - </a> - </td> - </tr> - <tr> - <td colspan="4"> - <p> - <?=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> - </td> - </tr> - </tfoot> </table> <?php endif; ?> @@ -870,4 +870,4 @@ function sshkeyClicked(obj) { </table> <?php include("fend.inc");?> </body> -</html> +</html>
\ No newline at end of file |