From bd3c5e1096e67a7cc3b85b61ec9a0fddc21aec7b Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Mon, 29 Jan 2018 04:55:21 +0100 Subject: [PATCH] chg: adjust wording and target for static links fixes issues #146 Change-Id: If116abe20d4ad61a2bebbd6d74f9bf9186ba2ef1 --- links.txt | 18 +++++++++--------- src/club/wpia/gigi/Gigi.templ | 2 +- src/club/wpia/gigi/pages/LoginPage.templ | 2 +- .../wpia/gigi/pages/MainPageNotLogin.templ | 2 +- .../wpia/gigi/pages/PasswordResetForm.templ | 2 +- .../pages/account/ChangePasswordForm.templ | 2 +- .../account/certs/CertificateDisplay.templ | 3 +-- .../account/certs/RequestCertificate.templ | 2 +- .../wpia/gigi/pages/main/RegisterPage.templ | 2 +- src/club/wpia/gigi/pages/main/Signup.java | 4 ++-- src/club/wpia/gigi/pages/main/Signup.templ | 2 +- src/club/wpia/gigi/pages/wot/Rules.templ | 2 +- .../wpia/gigi/pages/wot/VerificationForm.templ | 2 +- .../gigi/util/PasswordStrengthChecker.java | 2 +- 14 files changed, 23 insertions(+), 24 deletions(-) diff --git a/links.txt b/links.txt index 51d8ab6c..e68f4e90 100644 --- a/links.txt +++ b/links.txt @@ -1,17 +1,17 @@ /policy +/policy/dataPrivacy /policy/ToS /policy/CPS /policy/verification -/wiki/agentQualifyingChallenge -/wiki/gigi -/wiki/CSR -/wiki/names -/wiki/lostPassword -/wiki/goodPassword -/wiki/verificationHandbook +/kb/acceptableDocuments +/kb/agentQualifyingChallenge +/kb/gigi +/kb/CSR +/kb/names +/kb/lostPassword +/kb/goodPassword +/kb/verificationHandbook /ttp/user /ttp/country -/acceptableDocuments /blog /imprint -/dataPrivacy diff --git a/src/club/wpia/gigi/Gigi.templ b/src/club/wpia/gigi/Gigi.templ index 1c68829f..42772dbf 100644 --- a/src/club/wpia/gigi/Gigi.templ +++ b/src/club/wpia/gigi/Gigi.templ @@ -54,7 +54,7 @@ Page info | ©2016- WPIA (World Privacy and Identity Association) | '?> | - '?> + '?> diff --git a/src/club/wpia/gigi/pages/LoginPage.templ b/src/club/wpia/gigi/pages/LoginPage.templ index ad3060c5..621d9f85 100644 --- a/src/club/wpia/gigi/pages/LoginPage.templ +++ b/src/club/wpia/gigi/pages/LoginPage.templ @@ -4,5 +4,5 @@



-

' for more information?>

+

' for more information?>

diff --git a/src/club/wpia/gigi/pages/MainPageNotLogin.templ b/src/club/wpia/gigi/pages/MainPageNotLogin.templ index 2bca0b05..2e3ef1a3 100644 --- a/src/club/wpia/gigi/pages/MainPageNotLogin.templ +++ b/src/club/wpia/gigi/pages/MainPageNotLogin.templ @@ -12,5 +12,5 @@ On the other hand, server certificates can be used to establish secure internet
-

'.?> +

'.?> '.?>

\ No newline at end of file diff --git a/src/club/wpia/gigi/pages/PasswordResetForm.templ b/src/club/wpia/gigi/pages/PasswordResetForm.templ index 9663547b..650f07ea 100644 --- a/src/club/wpia/gigi/pages/PasswordResetForm.templ +++ b/src/club/wpia/gigi/pages/PasswordResetForm.templ @@ -18,7 +18,7 @@ - *'.?> + *'.?> diff --git a/src/club/wpia/gigi/pages/account/ChangePasswordForm.templ b/src/club/wpia/gigi/pages/account/ChangePasswordForm.templ index 1e9136ea..4c350c56 100644 --- a/src/club/wpia/gigi/pages/account/ChangePasswordForm.templ +++ b/src/club/wpia/gigi/pages/account/ChangePasswordForm.templ @@ -18,7 +18,7 @@ - *'.?> + *'.?> diff --git a/src/club/wpia/gigi/pages/account/certs/CertificateDisplay.templ b/src/club/wpia/gigi/pages/account/certs/CertificateDisplay.templ index 55086650..031ac848 100644 --- a/src/club/wpia/gigi/pages/account/certs/CertificateDisplay.templ +++ b/src/club/wpia/gigi/pages/account/certs/CertificateDisplay.templ @@ -49,8 +49,7 @@

. *

- * '!?> - + * '!?> diff --git a/src/club/wpia/gigi/pages/account/certs/RequestCertificate.templ b/src/club/wpia/gigi/pages/account/certs/RequestCertificate.templ index 7995d6a9..89abb8df 100644 --- a/src/club/wpia/gigi/pages/account/certs/RequestCertificate.templ +++ b/src/club/wpia/gigi/pages/account/certs/RequestCertificate.templ @@ -1,5 +1,5 @@

- '.?> + '.?>

diff --git a/src/club/wpia/gigi/pages/main/RegisterPage.templ b/src/club/wpia/gigi/pages/main/RegisterPage.templ index 29c8219e..c2b15ed7 100644 --- a/src/club/wpia/gigi/pages/main/RegisterPage.templ +++ b/src/club/wpia/gigi/pages/main/RegisterPage.templ @@ -6,5 +6,5 @@

-'.?> +'.?>

diff --git a/src/club/wpia/gigi/pages/main/Signup.java b/src/club/wpia/gigi/pages/main/Signup.java index d9b2cc1f..5c68c38e 100644 --- a/src/club/wpia/gigi/pages/main/Signup.java +++ b/src/club/wpia/gigi/pages/main/Signup.java @@ -53,7 +53,7 @@ public class Signup extends Form { vars.put("name", ni); vars.put("dob", myDoB); vars.put("email", HTMLEncoder.encodeHTML(email)); - vars.put("helpOnNames", new SprintfCommand("Help on Names {0}in the wiki{1}", Arrays.asList("!(/wiki/names", "!'"))); + vars.put("helpOnNames", new SprintfCommand("Help on Names {0}in the knowledge base{1}", Arrays.asList("!(/kb/names", "!'"))); vars.put("csrf", getCSRFToken()); vars.put("dobmin", User.MINIMUM_AGE + ""); vars.put("countryCode", cs); @@ -129,7 +129,7 @@ public class Signup extends Form { } int pwpoints = PasswordStrengthChecker.checkpw(pw1, ni.getNamePartsPlain(), email); if (pwpoints < 3) { - ga.mergeInto(new GigiApiException(new SprintfCommand("The Password you submitted failed to contain enough differing characters and/or contained words from your name and/or email address. For the current requirements and to learn more, visit our {0}FAQ{1}.", Arrays.asList("!(/wiki/goodPassword", "!''")))); + ga.mergeInto(new GigiApiException(new SprintfCommand("The Password you submitted failed to contain enough differing characters and/or contained words from your name and/or email address. For the current requirements and to learn more, visit our {0}FAQ{1}.", Arrays.asList("!(/kb/goodPassword", "!''")))); } if ( !ga.isEmpty()) { throw ga; diff --git a/src/club/wpia/gigi/pages/main/Signup.templ b/src/club/wpia/gigi/pages/main/Signup.templ index bc602e78..d8d28adf 100644 --- a/src/club/wpia/gigi/pages/main/Signup.templ +++ b/src/club/wpia/gigi/pages/main/Signup.templ @@ -43,7 +43,7 @@ - + diff --git a/src/club/wpia/gigi/pages/wot/Rules.templ b/src/club/wpia/gigi/pages/wot/Rules.templ index 6b874b87..4d370973 100644 --- a/src/club/wpia/gigi/pages/wot/Rules.templ +++ b/src/club/wpia/gigi/pages/wot/Rules.templ @@ -7,7 +7,7 @@

diff --git a/src/club/wpia/gigi/pages/wot/VerificationForm.templ b/src/club/wpia/gigi/pages/wot/VerificationForm.templ index be834f2a..6f60eba6 100644 --- a/src/club/wpia/gigi/pages/wot/VerificationForm.templ +++ b/src/club/wpia/gigi/pages/wot/VerificationForm.templ @@ -46,7 +46,7 @@ diff --git a/src/club/wpia/gigi/util/PasswordStrengthChecker.java b/src/club/wpia/gigi/util/PasswordStrengthChecker.java index 112f7128..6d5280af 100644 --- a/src/club/wpia/gigi/util/PasswordStrengthChecker.java +++ b/src/club/wpia/gigi/util/PasswordStrengthChecker.java @@ -80,7 +80,7 @@ public class PasswordStrengthChecker { } } if (checkpw(pw, parts.toArray(new String[parts.size()]), email) < 3) { - throw (new GigiApiException(new SprintfCommand("The Password you submitted failed to contain enough differing characters and/or contained words from your name and/or email address. For the current requirements and to learn more, visit our {0}FAQ{1}.", Arrays.asList("!(/wiki/goodPassword", "!''")))); + throw (new GigiApiException(new SprintfCommand("The Password you submitted failed to contain enough differing characters and/or contained words from your name and/or email address. For the current requirements and to learn more, visit our {0}FAQ{1}.", Arrays.asList("!(/kb/goodPassword", "!''")))); } } -- 2.39.2
*'.?>*'.?>
'?> - '?> - - '?> + - '?>