X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Fclub%2Fwpia%2Fgigi%2Fpages%2Fmain%2FSignup.templ;h=9a5ac6a13d97376b3566102b4e7ec1b51e29b68a;hp=a6ae2b1bbda16ae3ae073adb7be7b36f5faf94b4;hb=e2a79224ab74235f539b0006fc654b078471f843;hpb=d71624703243c182beb0f946ebc582e0366a4686

diff --git a/src/club/wpia/gigi/pages/main/Signup.templ b/src/club/wpia/gigi/pages/main/Signup.templ
index a6ae2b1b..9a5ac6a1 100644
--- a/src/club/wpia/gigi/pages/main/Signup.templ
+++ b/src/club/wpia/gigi/pages/main/Signup.templ
@@ -9,7 +9,7 @@
   <tr>
     <td><?=_Name?>: </td>
     <td><?=$name?></td>
-    <td rowspan="4"><?=$!helpOnNames?></td>
+    <td><?=$!helpOnNames?></td>
   </tr>
 
   <tr>
@@ -32,39 +32,31 @@
   </tr>
 
   <tr>
-    <td><?=_Pass Phrase?><font color="red">*</font>: </td>
+    <td><?=_Password?><font color="red">*</font>: </td>
     <td><input class="form-control" type="password" name="pword1" size="30" autocomplete="off"></td>
     <td rowspan="2">&nbsp;</td>
   </tr>
 
   <tr>
-    <td><?=_Pass Phrase Again?><font color="red">*</font>: </td>
+    <td><?=_Password Again?><font color="red">*</font>: </td>
     <td><input class="form-control" type="password" name="pword2" size="30" autocomplete="off"></td>
   </tr>
 
   <tr>
-    <td colspan="3"><font color="red">*</font><?=_Your password is one of many factors to protect your account from unauthorised access. A good password is hard to guess, long, and contains a diverse set of characters. Learn more in our !(/wiki/goodPassword)FAQ!'</a>'.?></td>
+    <td colspan="3"><font color="red">*</font><?=_Your password is one of many factors to protect your account from unauthorised access. A good password is hard to guess, long, and contains a diverse set of characters. For the current requirements and to learn more, visit our !(/kb/goodPassword)FAQ!'</a>'.?></td>
   </tr>
+
   <tr>
-    <td colspan="3"><?=_It's possible to get notifications of up and coming events and even just general announcements, untick any notifications you don't wish to receive. For country, regional and radius notifications to work you must choose your location once you've verified your account and logged in.?></td>
+    <td colspan="3"><input type="checkbox" name="tos_agree" id="tos_agree" value="1"><label for="tos_agree"><?=_I agree to the Terms of Service (!(/policy/ToS)ToS!'</a>').?></label></td>
   </tr>
 
   <tr>
-    <td valign="top"><?=_Alert me if?>: </td>
-    <td align="left">
-        <input type="checkbox" name="general" value="1"<?=$!general?>><?=_General Announcements?><br>
-        <input type="checkbox" name="country" value="1"<?=$!country?>><?=_Country Announcements?><br>
-        <input type="checkbox" name="regional" value="1"<?=$!regional?>><?=_Regional Announcements?><br>
-        <input type="checkbox" name="radius" value="1"<?=$!radius?>><?=_Within 200km Announcements?></td>
-    <td>&nbsp;</td>
+    <td colspan="3"><input type="checkbox" name="dp_agree" id="dp_agree" value="1"><label for="dp_agree"><?=_I accept the (!(/policy/dataPrivacy)Data Protection Policy!'</a>').?></label></td>
   </tr>
 
   <tr>
     <td colspan="3"><?=_When you click on next, we will send a confirmation email to the email address you have entered above.?></td>
   </tr>
-  <tr>
-    <td colspan="3"><input type="checkbox" name="tos_agree" value="1"><?=_I agree to the Terms of Service (!(/policy/ToS)ToS!'</a>').?></td>
-  </tr>
 
   <tr>
     <td colspan="3"><input class="btn btn-primary" type="submit" name="process" value="<?=_Next?>"></td>