From 0ae106ee7ac666a0afb16897b9155f5cc6090f89 Mon Sep 17 00:00:00 2001
From: Morven Lewis-Everley <morven@i-lateral.com>
Date: Thu, 21 Sep 2017 19:57:25 +0100
Subject: [PATCH] Add support for bootstrap theme

---
 templates/Layout/UserAccount.ss               | 52 ++++++++++---------
 .../Layout/UserAccount_changepassword.ss      | 34 ++++++------
 templates/Layout/UserAccount_edit.ss          | 34 ++++++------
 templates/Layout/Users_Register.ss            | 12 +++--
 .../Layout/Users_Register_sendverification.ss | 36 +++++++------
 templates/Layout/Users_Register_verify.ss     | 34 ++++++------
 6 files changed, 107 insertions(+), 95 deletions(-)

diff --git a/templates/Layout/UserAccount.ss b/templates/Layout/UserAccount.ss
index 6e1e229..2a859aa 100755
--- a/templates/Layout/UserAccount.ss
+++ b/templates/Layout/UserAccount.ss
@@ -1,31 +1,33 @@
-<div class="units-row row users-account line">
-    <% include Users_Profile_SideBar %>
+<div class="container">
+    <div class="units-row row users-account line">
+        <% include Users_Profile_SideBar %>
 
-    <div class="users-content-container typography col-xs-12 col-sm-8 unit-75 unit size3of4 lastUnit">
-        <% if $RequireVerification %>
-            <div class="message message-bad">
-                <p>
-                    <% _t("Users.NotVerified", "You have not verified your email address") %>
-                    <a href="{$BaseHref}users/register/sendverification">
-                        <% _t("Users.Send", "Send now") %>
-                    </a>
-                </p>
-            </div>
-        <% end_if %>
+        <div class="users-content-container typography col-xs-12 col-sm-8 unit-75 unit size3of4 lastUnit">
+            <% if $RequireVerification %>
+                <div class="message message-bad">
+                    <p>
+                        <% _t("Users.NotVerified", "You have not verified your email address") %>
+                        <a href="{$BaseHref}users/register/sendverification">
+                            <% _t("Users.Send", "Send now") %>
+                        </a>
+                    </p>
+                </div>
+            <% end_if %>
 
-        <h1><%t Users.ProfileSummary "Profile Summary" %></h1>
+            <h1><%t Users.ProfileSummary "Profile Summary" %></h1>
 
-        <% with $CurrentUser %>
-            <div class="users-profile-summary">
-                <p>
-                    <strong><% _t('Member.FIRSTNAME',"First Name") %></strong> $FirstName<br/>
-                    <strong><% _t('Member.SURNAME',"Surname") %></strong> $Surname<br/>
-                    <strong><% _t("Member.EMAIL","Email") %></strong> $Email<br/>
-                </p>
-            </div>
-        <% end_with %>
+            <% with $CurrentUser %>
+                <div class="users-profile-summary">
+                    <p>
+                        <strong><% _t('Member.FIRSTNAME',"First Name") %></strong> $FirstName<br/>
+                        <strong><% _t('Member.SURNAME',"Surname") %></strong> $Surname<br/>
+                        <strong><% _t("Member.EMAIL","Email") %></strong> $Email<br/>
+                    </p>
+                </div>
+            <% end_with %>
 
 
-        $Form
+            $Form
+        </div>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/templates/Layout/UserAccount_changepassword.ss b/templates/Layout/UserAccount_changepassword.ss
index 851e856..06c34d3 100644
--- a/templates/Layout/UserAccount_changepassword.ss
+++ b/templates/Layout/UserAccount_changepassword.ss
@@ -1,20 +1,22 @@
-<div class="units-row row users-account line">
-    <% include Users_Profile_SideBar %>
+<div class="container">
+    <div class="units-row row users-account line">
+        <% include Users_Profile_SideBar %>
 
-    <div class="users-content-container typography col-xs-12 col-sm-8 unit-75 unit size3of4 lastUnit">
-        <% if $RequireVerification %>
-            <div class="message message-bad">
-                <p>
-                    <% _t("Users.NotVerified", "You have not verified your email address") %>
-                    <a href="{$BaseHref}users/register/sendverification">
-                        <% _t("Users.Send", "Send now") %>
-                    </a>
-                </p>
-            </div>
-        <% end_if %>
+        <div class="users-content-container typography col-xs-12 col-sm-8 unit-75 unit size3of4 lastUnit">
+            <% if $RequireVerification %>
+                <div class="message message-bad">
+                    <p>
+                        <% _t("Users.NotVerified", "You have not verified your email address") %>
+                        <a href="{$BaseHref}users/register/sendverification">
+                            <% _t("Users.Send", "Send now") %>
+                        </a>
+                    </p>
+                </div>
+            <% end_if %>
 
-        <h1><%t Security.ChangeYourPassword "Change your password" %></h1>
+            <h1><%t Security.ChangeYourPassword "Change your password" %></h1>
 
-        $Form
+            $Form
+        </div>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/templates/Layout/UserAccount_edit.ss b/templates/Layout/UserAccount_edit.ss
index 7952db5..369db37 100644
--- a/templates/Layout/UserAccount_edit.ss
+++ b/templates/Layout/UserAccount_edit.ss
@@ -1,20 +1,22 @@
-<div class="units-row row users-account line">
-    <% include Users_Profile_SideBar %>
+<div class="container">
+    <div class="units-row row users-account line">
+        <% include Users_Profile_SideBar %>
 
-    <div class="users-content-container typography col-xs-12 col-sm-8 unit-75 unit size3of4 lastUnit">
-        <% if $RequireVerification %>
-            <div class="message message-bad">
-                <p>
-                    <% _t("Users.NotVerified", "You have not verified your email address") %>
-                    <a href="{$BaseHref}users/register/sendverification">
-                        <% _t("Users.Send", "Send now") %>
-                    </a>
-                </p>
-            </div>
-        <% end_if %>
+        <div class="users-content-container typography col-xs-12 col-sm-8 unit-75 unit size3of4 lastUnit">
+            <% if $RequireVerification %>
+                <div class="message message-bad">
+                    <p>
+                        <% _t("Users.NotVerified", "You have not verified your email address") %>
+                        <a href="{$BaseHref}users/register/sendverification">
+                            <% _t("Users.Send", "Send now") %>
+                        </a>
+                    </p>
+                </div>
+            <% end_if %>
 
-        <h1><%t Users.EditAccountDetails "Edit account details" %></h1>
+            <h1><%t Users.EditAccountDetails "Edit account details" %></h1>
 
-        $Form
+            $Form
+        </div>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/templates/Layout/Users_Register.ss b/templates/Layout/Users_Register.ss
index df9ff45..a55db65 100755
--- a/templates/Layout/Users_Register.ss
+++ b/templates/Layout/Users_Register.ss
@@ -1,7 +1,9 @@
-<div class="users-register-container typography">
-    <h1>$Title</h1>
+<div class="container">
+    <div class="users-register-container typography">
+        <h1>$Title</h1>
 
-    $Content
+        $Content
 
-    $Form
-</div>
+        $Form
+    </div>
+</div>
\ No newline at end of file
diff --git a/templates/Layout/Users_Register_sendverification.ss b/templates/Layout/Users_Register_sendverification.ss
index 2199d2e..275a10d 100644
--- a/templates/Layout/Users_Register_sendverification.ss
+++ b/templates/Layout/Users_Register_sendverification.ss
@@ -1,20 +1,22 @@
-<div class="units-row row users-verify">
-    <div class="content-container typography">
-        <h1><% _t('Users.AccountVerification','Account Verification') %></h1>
+<div class="container">
+    <div class="units-row row users-verify">
+        <div class="content-container typography">
+            <h1><% _t('Users.AccountVerification','Account Verification') %></h1>
 
-        <% 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 $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 %>
+            <% if $CurrentMember %>
+                <p>
+                    <a class="btn" href="{$BaseHref}users/account">
+                        <% _t("Users.BackToAccount", "Back to your account") %>
+                    </a>
+                </p>
+            <% end_if %>
+        </div>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/templates/Layout/Users_Register_verify.ss b/templates/Layout/Users_Register_verify.ss
index fde803c..b5e7716 100644
--- a/templates/Layout/Users_Register_verify.ss
+++ b/templates/Layout/Users_Register_verify.ss
@@ -1,19 +1,21 @@
-<div class="units-row users-verify">
-    <div class="content-container typography">
-        <h1><% _t('Users.AccountVerification','Account Verification') %></h1>
+<div class="container">
+    <div class="units-row users-verify">
+        <div class="content-container typography">
+            <h1><% _t('Users.AccountVerification','Account Verification') %></h1>
 
-        <% 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 $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 %>
+            <% if $CurrentMember %>
+                <p>
+                    <a class="btn" href="{$BaseHref}users/account">
+                        <% _t("Users.BackToAccount", "Back to your account") %>
+                    </a>
+                </p>
+            <% end_if %>
+        </div>
     </div>
-</div>
+</div>
\ No newline at end of file