Streamline registration templates

i-lateral · Feb 22, 2018 · debec2f · debec2f
1 parent d60cd34
commit debec2f
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 61 deletions.
diff --git a/code/control/Users_Register_Controller.php b/code/control/Users_Register_Controller.php
@@ -120,9 +120,8 @@ public function RelativeLink($action = null)
     public function index(SS_HTTPRequest $request)
     {
         $this->customise(array(
-            'Title'     => "Register",
-            'ClassName' => 'RegisterPage',
-            'Content'   => '',
+            'Title'     => _t('Users.Register', 'Register'),
+            'MetaTitle' => _t('Users.Register', 'Register'),
             'Form'      => $this->RegisterForm(),
         ));
 
@@ -145,6 +144,11 @@ public function index(SS_HTTPRequest $request)
      */
     public function sendverification(SS_HTTPRequest $request)
     {
+        // If we don't allow verification emails, return an error
+        if (!Users::config()->send_verification_email) {
+            return $this->httpError(400);
+        }
+
         $sent = false;
 
         if (Member::currentUserID()) {
@@ -153,17 +157,22 @@ public function sendverification(SS_HTTPRequest $request)
             $member = Member::get()->byID($this->getRequest()->param("ID"));
         }
 
-        if ($member && !$member->isVerified() && Users::config()->send_verification_email) {
+        if ($member && !$member->isVerified()) {
             $sent = $this->send_verification_email($member);
-        } else {
-            $sent = false;
         }
 
         $this->customise(array(
-            "ClassName" => "RegisterPage",
+            "Title" => _t('Users.AccountVerification','Account Verification'),
+            "MetaTitle" => _t('Users.AccountVerification','Account Verification'),
+            "Content" => $this->renderWith(
+                "UsersSendVerificationContent",
+                array("Sent" => $sent)
+            ),
             "Sent" => $sent
         ));
 
+        $this->extend("updateSendVerificationAction");
+
         return $this->renderWith(array(
             "Users_Register_sendverification",
             "Users",
@@ -180,7 +189,7 @@ public function sendverification(SS_HTTPRequest $request)
      * @return HTMLText
      */
     public function verify(SS_HTTPRequest $request)
-    {
+    {   
         $member = Member::get()->byID($this->getRequest()->param("ID"));
         $code = $this->getRequest()->param("OtherID");
         $verify = false;
@@ -201,7 +210,12 @@ public function verify(SS_HTTPRequest $request)
         }
 
         $this->customise(array(
-            "ClassName" => "RegisterPage",
+            "Title" => _t('Users.AccountVerification','Account Verification'),
+            "MetaTitle" => _t('Users.AccountVerification','Account Verification'),
+            "Content" => $this->renderWith(
+                "UsersVerifyContent",
+                array("Verify" => $verify)
+            ),
             "Verify" => $verify
         ));
 

diff --git a/templates/Includes/UsersSendVerificationContent.ss b/templates/Includes/UsersSendVerificationContent.ss
@@ -0,0 +1,14 @@
+<% if $Sent %>
+    <p><% _t('Users.VerificationSent','A verification has been sent to your registered email address.') %></p>
+    <p><% _t('Users.NextSteps','You will receive an email with a verification link. Clicking the link will verify your account.') %></p>
+<% else %>
+    <p><% _t('Users.NotVerificationSent','Unable to send verification.') %></p>
+<% end_if %>
+
+<% if $CurrentMember %>
+    <p>
+        <a class="btn" href="{$BaseHref}users/account">
+            <% _t("Users.BackToAccount", "Back to your account") %>
+        </a>
+    </p>
+<% end_if %>
diff --git a/templates/Includes/UsersVerifyContent.ss b/templates/Includes/UsersVerifyContent.ss
@@ -0,0 +1,13 @@
+<% if $Verify %>
+    <p><% _t('Users.VerifiedMessage','Your account has been now been verified.') %></p>
+<% else %>
+    <p><% _t('Users.NotVerifiedMessage','Your account could not be verified.') %></p>
+<% end_if %>
+
+<% if $CurrentMember %>
+    <p>
+        <a class="btn" href="{$BaseHref}users/account">
+            <% _t("Users.BackToAccount", "Back to your account") %>
+        </a>
+    </p>
+<% end_if %>
diff --git a/templates/Layout/Users_Register.ss b/templates/Layout/Users_Register.ss
diff --git a/templates/Layout/Users_Register_sendverification.ss b/templates/Layout/Users_Register_sendverification.ss
diff --git a/templates/Layout/Users_Register_verify.ss b/templates/Layout/Users_Register_verify.ss