From 68719e2645a89b5b2555252559d32af4daf602c4 Mon Sep 17 00:00:00 2001
From: INOPIAE <m.maengel@inopiae.de>
Date: Tue, 21 Feb 2017 18:07:33 +0100
Subject: [PATCH] upd: reword of rules.template and "Web of Trust"

Change-Id: I4c49316f99946e95915cc4ba27df16bdfea0b52d
---
 links.txt                                |  1 +
 src/club/wpia/gigi/Gigi.java             | 10 ++---
 src/club/wpia/gigi/pages/StaticPage.java |  4 +-
 src/club/wpia/gigi/pages/wot/Rules.templ | 48 ++++++++++++------------
 4 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/links.txt b/links.txt
index a1609201..3cac21d6 100644
--- a/links.txt
+++ b/links.txt
@@ -11,3 +11,4 @@
 /wiki/verificationHandbook
 /ttp/user
 /ttp/country
+/acceptableDocuments
diff --git a/src/club/wpia/gigi/Gigi.java b/src/club/wpia/gigi/Gigi.java
index ebd6471f..dce078fa 100644
--- a/src/club/wpia/gigi/Gigi.java
+++ b/src/club/wpia/gigi/Gigi.java
@@ -69,9 +69,9 @@ import club.wpia.gigi.pages.main.RegisterPage;
 import club.wpia.gigi.pages.orga.CreateOrgPage;
 import club.wpia.gigi.pages.orga.ViewOrgPage;
 import club.wpia.gigi.pages.statistics.StatisticsRoles;
-import club.wpia.gigi.pages.wot.VerifyPage;
 import club.wpia.gigi.pages.wot.Points;
 import club.wpia.gigi.pages.wot.RequestTTPPage;
+import club.wpia.gigi.pages.wot.VerifyPage;
 import club.wpia.gigi.ping.PingerDaemon;
 import club.wpia.gigi.util.AuthorizationContext;
 import club.wpia.gigi.util.DomainAssessment;
@@ -151,9 +151,9 @@ public final class Gigi extends HttpServlet {
             putPage(DomainOverview.PATH, new DomainOverview(), "Certificates");
             putPage(EditDomain.PATH + "*", new EditDomain(), null);
 
-            putPage(VerifyPage.PATH + "/*", new VerifyPage(), "Web of Trust");
-            putPage(Points.PATH, new Points(false), "Web of Trust");
-            putPage(RequestTTPPage.PATH, new RequestTTPPage(), "Web of Trust");
+            putPage(VerifyPage.PATH + "/*", new VerifyPage(), "Verification");
+            putPage(Points.PATH, new Points(false), "Verification");
+            putPage(RequestTTPPage.PATH, new RequestTTPPage(), "Verification");
 
             putPage(TTPAdminPage.PATH + "/*", new TTPAdminPage(), "Admin");
             putPage(CreateOrgPage.DEFAULT_PATH, new CreateOrgPage(), "Organisation Admin");
@@ -190,7 +190,7 @@ public final class Gigi extends HttpServlet {
             }
 
             try {
-                putPage("/wot/rules", new StaticPage("Web of Trust Rules", VerifyPage.class.getResourceAsStream("Rules.templ")), "Web of Trust");
+                putPage("/wot/rules", new StaticPage("Verification Rules", VerifyPage.class.getResourceAsStream("Rules.templ")), "Verification");
             } catch (UnsupportedEncodingException e) {
                 throw new ServletException(e);
             }
diff --git a/src/club/wpia/gigi/pages/StaticPage.java b/src/club/wpia/gigi/pages/StaticPage.java
index b07004af..25fd43e6 100644
--- a/src/club/wpia/gigi/pages/StaticPage.java
+++ b/src/club/wpia/gigi/pages/StaticPage.java
@@ -4,7 +4,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
-import java.util.HashMap;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -22,8 +21,7 @@ public class StaticPage extends Page {
 
     @Override
     public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-        HashMap<String, Object> vars = new HashMap<String, Object>();
-        content.output(resp.getWriter(), getLanguage(req), vars);
+        content.output(resp.getWriter(), getLanguage(req), getDefaultVars(req));
     }
 
 }
diff --git a/src/club/wpia/gigi/pages/wot/Rules.templ b/src/club/wpia/gigi/pages/wot/Rules.templ
index e161f174..0da8c82e 100644
--- a/src/club/wpia/gigi/pages/wot/Rules.templ
+++ b/src/club/wpia/gigi/pages/wot/Rules.templ
@@ -1,30 +1,32 @@
-<h3><?=_SomeCA Web of Trust Rules?></h3>
+<h3><?=_How does verification work??></h3>
 
-<p><?=_It is essential that SomeCA RA Agents understand and follow the rules below to ensure that applicants for verifcations are suitably identified, which, in turn, maintains trust in the system.?></p>
+<p><?=_Both RA Agent and Applicant need to be aware of the procedure and understand the implications on the trust granted.?></p>
 
-<p><?=_Contact?><br>
-<br>
-* <?=_You must meet the applicant in person;?><br>
-* <?=_You must sight at least one form of government issued photo identification.  It's preferable if 2 forms of government issued photo ID are presented.;?><br>
-* <?=_Complete the verification form if the applicant has not already done so.  Ensure that all information matches.?><br>
-</p>
+<p><?=_The process is split in two parts, one done in a personal meeting between RA Agent and Applicant and one done online in this system.?></p>
 
-<p><?=_Processing?><br>
-<?=_After the meeting, visit the SomeCA Web site's verification page and:?><br>
-<br>
-* <?=_Enter the applicant's email address and Date of Birth;?><br>
-* <?=_Compare the online information to the information recorded on the paper form;?><br>
-* <?=_If, and only if, the two match completely - you may award trust points up to the maximum points you are able to allocate;?><br>
-</p>
+<h4><?=_Meeting?></h4>
+<ul>
+ <li><?=_The meeting must be in person. Online meetings are currently not acceptable.?></li>
+ <li><?=_At least one form of government issued photo identification must to be shown. It's preferable to see more than one form of government issued photo identification if available. A list of acceptable documents can be found !(/acceptableDocuments)here!'</a>'.?></li>
+ <li><?=_The verification form must be filled in completely. Preferably, use the pre-filled form provided by the system. All information on the form must match the information in the documents.?></li>
+</ul>
 
-<p><?=_Privacy?><br>
-<?=_It is imperative that you maintain the confidentiality and privacy of the applicant, and never disclose the information obtained without the applicant's consent.?></p>
+<h4><?=_Online work?></h4>
+<p><?=_Should be done after the meeting, preferably at home.?></p>
+<ul>
+ <li><?=_Enter the Applicant's email address and date of birth on the verification page.?></li>
+ <li><?=_Compare the recorded information on the online form with the paper form.?></li>
+ <li><?=_Only if both match completely - you may award trust points.?></li>
+</ul>
 
-<p><?=_Fees?><br>
-<?=_You may charge a fee for your expenses if the applicant has been advised of the amount prior to the meeting.?></p>
+<h4><?=_Privacy?></h4>
+<p><?=_Privacy and confidentiality of the Applicant are very important. Therefore the information about the Applicant is never disclosed, except in the rare cases given in our !(/policies)policies!'</a>'. All paper forms need to be kept secure and must be destroyed in a secure manner after 3 years following the year of the meeting (when they are no longer required).?></p>
 
-<p><?=_Liability?><br>
-<?=_A SomeCA RA Agent who knowingly, or reasonably ought to have known, verifies the identity of an applicant contrary to this policy may be held liable.?></p>
+<h4><?=_Fees?></h4>
+<p><?=_You may charge a fee for your expenses if the Applicant has been informed of such costs beforehand.?></p>
 
-<p><?=_Verification Points?><br>
-<?=_SomeCA may, from time to time, alter the amount of Verification Points that a class of RA Agents may assign as is necessary to effect a policy or rule change.  We may also alter the amount of Verification Points available to an individual, or new class of RA Agents, should another policy of SomeCA require this.?></p>
+<p><?=_Liability?></h4>
+<?=_A SomeCA RA Agent who knowingly, or reasonably ought to have known, verifies the identity of an Applicant contrary to the underlying policy may be held liable.?></p>
+
+<h4><?=_Verification Points?></h4>
+<p><?=_SomeCA may, from time to time, alter the amount of Verification Points that a group of RA Agents may assign as is necessary to effect a policy or rule change. We may also alter the amount of Verification Points available to an individual, or new group of RA Agents, should another policy of SomeCA require this.?></p>
-- 
2.39.2