Re-order and update lang to be more consistent

This commit is contained in:
Christophe Maudoux 2020-10-02 20:27:18 +02:00
parent 055ec69b92
commit bd1b153561
6 changed files with 62 additions and 104 deletions

View File

@ -6,8 +6,8 @@ Presentation
Main settings:
- **REMOTE_USER** : session attribute used for logging user access.
- **REMOTE_CUSTOM** : can be used for logging a second user attribute
- **REMOTE_USER** : session attribute used for logging user access
- **REMOTE_CUSTOM** : can be used for logging an another user attribute or a macro
(optional)
- **Hidden attributes** : session attributes never displayed or sent

View File

@ -83,9 +83,8 @@ sub tree {
},
{
title => 'passwordPolicy',
help =>
'portalcustom.html#password-policy',
form => 'simpleInputContainer',
help => 'portalcustom.html#password-policy',
form => 'simpleInputContainer',
nodes => [
'passwordPolicyActivation',
'portalDisplayPasswordPolicy',
@ -133,10 +132,7 @@ sub tree {
'start.html#authentication-users-and-password-databases',
form => 'authParams',
nodes => [
'authentication',
'userDB',
'passwordDB',
'registerDB'
'authentication', 'userDB', 'passwordDB', 'registerDB'
],
nodes_cond => [ {
title => 'adParams',
@ -148,8 +144,7 @@ sub tree {
title => 'choiceParams',
help => 'authchoice.html',
nodes => [
'authChoiceParam',
'authChoiceModules',
'authChoiceParam', 'authChoiceModules',
'authChoiceAuthBasic'
]
},
@ -236,10 +231,8 @@ sub tree {
title => 'facebookParams',
help => 'authfacebook.html',
nodes => [
'facebookAuthnLevel',
'facebookExportedVars',
'facebookAppId',
'facebookAppSecret',
'facebookAuthnLevel', 'facebookExportedVars',
'facebookAppId', 'facebookAppSecret',
'facebookUserField'
]
},
@ -248,10 +241,8 @@ sub tree {
form => 'simpleInputContainer',
help => 'authkerberos.html',
nodes => [
'krbAuthnLevel',
'krbKeytab',
'krbByJs',
'krbRemoveDomain'
'krbAuthnLevel', 'krbKeytab',
'krbByJs', 'krbRemoveDomain'
]
},
{
@ -269,7 +260,8 @@ sub tree {
'ldapVerify', 'ldapBase',
'managerDn', 'managerPassword',
'ldapTimeout', 'ldapVersion',
'ldapRaw', 'ldapCAFile', 'ldapCAPath',
'ldapRaw', 'ldapCAFile',
'ldapCAPath',
]
},
{
@ -319,12 +311,9 @@ sub tree {
help => 'authlinkedin.html',
form => 'simpleInputContainer',
nodes => [
'linkedInAuthnLevel',
'linkedInClientID',
'linkedInClientSecret',
'linkedInFields',
'linkedInUserField',
'linkedInScope'
'linkedInAuthnLevel', 'linkedInClientID',
'linkedInClientSecret', 'linkedInFields',
'linkedInUserField', 'linkedInScope'
]
},
{
@ -332,10 +321,8 @@ sub tree {
help => 'authgithub.html',
form => 'simpleInputContainer',
nodes => [
'githubAuthnLevel',
'githubClientID',
'githubClientSecret',
'githubUserField',
'githubAuthnLevel', 'githubClientID',
'githubClientSecret', 'githubUserField',
'githubScope'
]
},
@ -354,10 +341,8 @@ sub tree {
title => 'openidParams',
help => 'authopenid.html',
nodes => [
'openIdAuthnLevel',
'openIdExportedVars',
'openIdSecret',
'openIdIDPList'
'openIdAuthnLevel', 'openIdExportedVars',
'openIdSecret', 'openIdIDPList'
]
},
{
@ -381,10 +366,8 @@ sub tree {
help => 'authproxy.html',
form => 'simpleInputContainer',
nodes => [
'proxyAuthnLevel',
'proxyAuthService',
'proxySessionService',
'remoteCookieName',
'proxyAuthnLevel', 'proxyAuthService',
'proxySessionService', 'remoteCookieName',
'proxyUseSoap'
]
},
@ -399,8 +382,7 @@ sub tree {
help => 'authradius.html',
form => 'simpleInputContainer',
nodes => [
'radiusAuthnLevel',
'radiusSecret',
'radiusAuthnLevel', 'radiusSecret',
'radiusServer'
]
},
@ -409,10 +391,8 @@ sub tree {
help => 'authrest.html',
form => 'simpleInputContainer',
nodes => [
'restAuthnLevel',
'restAuthUrl',
'restUserDBUrl',
'restPwdConfirmUrl',
'restAuthnLevel', 'restAuthUrl',
'restUserDBUrl', 'restPwdConfirmUrl',
'restPwdModifyUrl'
]
},
@ -430,12 +410,9 @@ sub tree {
title => 'slaveParams',
help => 'authslave.html',
nodes => [
'slaveAuthnLevel',
'slaveUserHeader',
'slaveMasterIP',
'slaveHeaderName',
'slaveHeaderContent',
'slaveDisplayLogo',
'slaveAuthnLevel', 'slaveUserHeader',
'slaveMasterIP', 'slaveHeaderName',
'slaveHeaderContent', 'slaveDisplayLogo',
'slaveExportedVars',
]
},
@ -443,10 +420,8 @@ sub tree {
title => 'sslParams',
help => 'authssl.html',
nodes => [
'SSLAuthnLevel',
'SSLVar',
'SSLVarIf',
'sslByAjax',
'SSLAuthnLevel', 'SSLVar',
'SSLVarIf', 'sslByAjax',
'sslHost',
]
},
@ -455,10 +430,8 @@ sub tree {
help => 'authtwitter.html',
form => 'simpleInputContainer',
nodes => [
'twitterAuthnLevel',
'twitterKey',
'twitterSecret',
'twitterAppName',
'twitterAuthnLevel', 'twitterKey',
'twitterSecret', 'twitterAppName',
'twitterUserField'
]
},
@ -466,8 +439,7 @@ sub tree {
title => 'webidParams',
help => 'authwebid.html',
nodes => [
'webIDAuthnLevel',
'webIDExportedVars',
'webIDAuthnLevel', 'webIDExportedVars',
'webIDWhitelist'
]
},
@ -475,12 +447,9 @@ sub tree {
title => 'customParams',
help => 'authcustom.html',
nodes => [
'customAuth',
'customUserDB',
'customPassword',
'customRegister',
'customResetCertByMail',
'customAddParams',
'customAuth', 'customUserDB',
'customPassword', 'customRegister',
'customResetCertByMail', 'customAddParams',
]
},
],
@ -494,8 +463,7 @@ sub tree {
help => 'idpsaml.html',
form => 'simpleInputContainer',
nodes => [
'issuerDBSAMLActivation',
'issuerDBSAMLPath',
'issuerDBSAMLActivation', 'issuerDBSAMLPath',
'issuerDBSAMLRule'
]
},
@ -504,8 +472,7 @@ sub tree {
help => 'idpcas.html#enabling-cas',
form => 'simpleInputContainer',
nodes => [
'issuerDBCASActivation',
'issuerDBCASPath',
'issuerDBCASActivation', 'issuerDBCASPath',
'issuerDBCASRule',
]
},
@ -581,12 +548,9 @@ sub tree {
help => 'ssocookie.html',
form => 'simpleInputContainer',
nodes => [
'cookieName',
'*domain',
'cda',
'securedCookie',
'httpOnly',
'cookieExpiration',
'cookieName', '*domain',
'cda', 'securedCookie',
'httpOnly', 'cookieExpiration',
'sameSite',
]
},
@ -613,10 +577,8 @@ sub tree {
title => 'multipleSessions',
form => 'simpleInputContainer',
nodes => [
'singleSession',
'singleIP',
'singleUserByIP',
'notifyDeleted',
'singleSession', 'singleIP',
'singleUserByIP', 'notifyDeleted',
'notifyOther'
]
},
@ -649,16 +611,11 @@ sub tree {
help => 'portalservers.html',
form => 'simpleInputContainer',
nodes => [
'wsdlServer',
'restExportSecretKeys',
'restClockTolerance',
'restSessionServer',
'restConfigServer',
'restAuthServer',
'restPasswordServer',
'soapSessionServer',
'soapConfigServer',
'exportedAttr',
'wsdlServer', 'restExportSecretKeys',
'restClockTolerance', 'restSessionServer',
'restConfigServer', 'restAuthServer',
'restPasswordServer', 'soapSessionServer',
'soapConfigServer', 'exportedAttr',
]
},
{
@ -844,7 +801,11 @@ sub tree {
{
title => 'secondFactors',
help => 'secondfactor.html',
nodes => [ {
nodes => [
'sfManagerRule',
'sfRequired',
'sfOnlyUpgrade',
{
title => 'utotp2f',
help => 'utotp2f.html',
form => 'simpleInputContainer',
@ -962,9 +923,6 @@ sub tree {
'sfRemovedNotifMsg',
],
},
'sfOnlyUpgrade',
'sfManagerRule',
'sfRequired',
]
},
{
@ -977,7 +935,7 @@ sub tree {
{
title => 'SMTP',
help => 'smtp.html',
form => 'SMTP',
form => 'SMTP',
nodes => [
'mailSessionKey',
'SMTPServer',
@ -1070,7 +1028,8 @@ sub tree {
help => 'redirections.html#portal-redirections',
form => 'simpleInputContainer',
nodes => [
'jsRedirect', 'noAjaxHook',
'jsRedirect',
'noAjaxHook',
'skipRenewConfirmation',
'skipUpgradeConfirmation',
]

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -803,7 +803,7 @@
"remoteParams":"Paramètres Remote",
"remotePortal":"URL du portail",
"replaceByFile":"Remplacer par le fichier",
"requireToken":"Exige un jeton pour les formulaires",
"requireToken":"Exiger un jeton pour les formulaires",
"restAuthnLevel":"Niveau d'authentification",
"restAuthUrl":"URL d'authentification",
"restConfigServer":"Serveur de configurations REST",
@ -859,7 +859,7 @@
"sfaTitle":"Seconds facteurs d'authentification",
"sfExtra":"Seconds facteurs additionnels",
"sfManagerRule":"Afficher le lien du Gestionnaire",
"sfOnlyUpgrade": "Utiliser le second facteur pour augmenter le niveau d'authentification",
"sfOnlyUpgrade": "Utiliser le SF pour augmenter le niveau d'authentification",
"sfRequired":"Exiger l'enrôlement d'un SF à l'authentification",
"sfRemovedNotification":"Avertir si un SF expiré est supprimé",
"sfRemovedMsgRule":"Activation",
@ -1102,7 +1102,7 @@
"samlSPName":"Nom du fournisseur de service SAML",
"samlSPSSODescriptor":"Fournisseur de service",
"samlSPSSODescriptorAuthnRequestsSigned":"Requêtes d'authentification signées",
"samlSPSSODescriptorWantAssertionsSigned":"Exige des assertions signées",
"samlSPSSODescriptorWantAssertionsSigned":"Exiger des assertions signées",
"samlSPSSODescriptorSingleLogoutService":"Single Logout",
"samlSPSSODescriptorSingleLogoutServiceHTTPRedirect":"Redirection HTTP",
"samlSPSSODescriptorSingleLogoutServiceHTTPPost":"POST HTTP",
@ -1113,7 +1113,7 @@
"samlSPSSODescriptorArtifactResolutionService":"Résolution d'Artifact",
"samlSPSSODescriptorArtifactResolutionServiceArtifact":"Service Artifact",
"samlIDPSSODescriptor":"Fournisseur d'identité",
"samlIDPSSODescriptorWantAuthnRequestsSigned":"Exige des requêtes d'authentification signées",
"samlIDPSSODescriptorWantAuthnRequestsSigned":"Exiger des requêtes d'authentification signées",
"samlIDPSSODescriptorSingleSignOnService":"Single Sign On",
"samlIDPSSODescriptorSingleSignOnServiceHTTPRedirect":"Redirection HTTP",
"samlIDPSSODescriptorSingleSignOnServiceHTTPPost":"POST HTTP",

File diff suppressed because one or more lines are too long