NottingHack · NickLocke · Aug 1, 2025 · Aug 1, 2025 · Aug 1, 2025 · Aug 21, 2025
diff --git a/resources/views/contentBlocks/index.blade.php b/resources/views/contentBlocks/index.blade.php
@@ -5,8 +5,8 @@
 @section('content')
 <div class="container">
   <p>
-    From here a limited set for page content chunks can be edited with out needing to PR changes to HMS.<br>
-    There are two types, <strong>Page</strong> & <strong>Email</strong>, this related to where this chuck is use and weather it should be written as pure HTML for display on a site page, or as markdown for email where it will be rendered to both text and HTML.
+    From here a limited set of page content chunks can be edited without needing to PR changes to HMS.<br>
+    There are two types, <strong>Page</strong> & <strong>Email</strong>, related to where the chunk is used and whether it should be written as pure HTML for display on a site page, or as markdown for email where it will be rendered to both text and HTML.
   </p>
   <div class="table-responsive no-more-tables">
     <table class="table table-bordered table-hover">

diff --git a/resources/views/emails/interestRegistered.blade.php b/resources/views/emails/interestRegistered.blade.php
@@ -12,8 +12,15 @@
 
 @content('emails.interestRegistered', 'main')  
 
+@if ($groupLink)
 Here's the URL for the public Google Group:  
-{{ $groupLink }}  
+{{ $groupLink }}
+@endif
+
+@feature('discord')
+Discord is used for members to chat online. You can join the {{ config('branding.space_type') }} Discord at:  
+{{ $discordHTML }}  
+@endfeature
 
 Here are the {{ config('branding.space_type') }} rules:  
 {{ $rulesLink }}  

diff --git a/resources/views/emails/membership/membershipComplete.blade.php b/resources/views/emails/membership/membershipComplete.blade.php
@@ -16,15 +16,17 @@
 SSID: {{ $wifiSsid }}  
 Pass: {{ $wifiPass }}  
 
-Our Google Group is where a lot of online discussion takes place:  
-{{ $groupLink }}  
+@if ($groupLink)
+Our Google Group is where a lot of online discussion takes place: 
+{{ $groupLink }}
+@endif
 
 @feature('team_slack')
-Slack is also used for team discussions. You can join NH teams slack at:  
+Slack is also used for team discussions. You can join the {{ config('branding.space_type') }} teams slack at:  
 {{ $slackHTML }}  
 @endfeature
 @feature('discord')
-Discord is also used for members to chat online. You can join the NH Discord at:  
+Discord is also used for members to chat online. You can join the {{ config('branding.space_type') }} Discord at:  
 {{ $discordHTML }}  
 @endfeature
 

diff --git a/resources/views/emails/membership/membershipReinstated.blade.php b/resources/views/emails/membership/membershipReinstated.blade.php
@@ -12,15 +12,17 @@
 SSID: {{ $wifiSsid }}  
 Pass: {{ $wifiPass }}  
 
-Our Google Group is where a lot of online discussion takes place:  
-{{ $groupLink }}  
+@if ($groupLink)
+Our Google Group is where a lot of online discussion takes place: 
+{{ $groupLink }}
+@endif
 
 @feature('team_slack')
-Slack is also used for team discussions. You can join NH teams slack at:  
+Slack is also used for team discussions. You can join {{ config('branding.space_type') }} teams slack at:  
 {{ $slackHTML }}  
 @endfeature
 @feature('discord')
-Discord is also used for members to chat online. You can join the NH Discord at:  
+Discord is also used for members to chat online. You can join the {{ config('branding.space_type') }} Discord at:  
 {{ $discordHTML }}  
 @endfeature
 

diff --git a/resources/views/emails/membership/membershipRevoked.blade.php b/resources/views/emails/membership/membershipRevoked.blade.php
@@ -5,7 +5,7 @@
 
 
 @if ($boxCount > 0)
-Our records show that you have left a members box at the space please arrange to collect it on a Wednesday evening before the tour.
+Our records show that you have left a members box at the space. Please arrange to collect it on a Wednesday evening before the tour.
 @endif
 
 @if ($snackspaceBalance < 0)

diff --git a/resources/views/emails/membership/membershipRevokedDueToUnderPayment.blade.php b/resources/views/emails/membership/membershipRevokedDueToUnderPayment.blade.php
@@ -5,7 +5,7 @@
 
 
 @if ($boxCount > 0)
-Our records show that you have left a members box at the space please arrange to collect it on a Wednesday evening before the tour.
+Our records show that you have left a members box at the space. Please arrange to collect it on a Wednesday evening before the tour.
 @endif
 
 @if ($snackspaceBalance < 0)

diff --git a/resources/views/emails/membership/rejected.blade.php b/resources/views/emails/membership/rejected.blade.php
@@ -1,7 +1,7 @@
 @component('mail::message')
 # Hello {{ $fullname }},
 
-One of the member admins have indicated that there is an issue with the contact details you entered, they have sent you the following message:
+One of the member admins has indicated that there is an issue with the contact details you entered, they have sent you the following message:
 
 @component('mail::panel')
 {{ $reason }}

diff --git a/resources/views/governance/voting/index.blade.php b/resources/views/governance/voting/index.blade.php
@@ -10,20 +10,20 @@
   <h2>Current Status</h2>
   <p>
     Your current calculated voting status is <strong>{{ $votingStatus }}</strong><br>
-    This is made up of the result (Voting / Non-Voting) and a reason (Stated, Physical, ...) for how HSM arrived at that outcome. The definitions for the reasons are explained at the bottom of this page and the wiki includes a flow chart of the HMS process.
+    This is made up of the result (Voting / Non-Voting) and a reason (Stated, Physical, ...) for how HMS arrived at that outcome. The definitions for the reasons are explained at the bottom of this page and the wiki includes a flow chart of the HMS process.
   </p>
   <hr>
   <h2>Stated Voting Preference</h2>
   <p>
-    Here you can see your current state voting preference and update it if you like.<br>
+    Here you can see your currently stated voting preference and update it if you like.<br>
     A stated preference is one of the following.
     <dl>
       <dt>Voting:</dt>
-      <dd>You wish to be counted as <strong>Voting Member</strong> of the {{ config('branding.space_type') }}</dd>
+      <dd>You wish to be counted as a <strong>Voting Member</strong> of the {{ config('branding.space_type') }}</dd>
       <dt>Non-voting:</dt>
-      <dd>You wish to be counted as <strong>Non-voting Member</strong> of the {{ config('branding.space_type') }}</dd>
+      <dd>You wish to be counted as a <strong>Non-voting Member</strong> of the {{ config('branding.space_type') }}</dd>
       <dt>Automatic:</dt>
-      <dd>Let the process decide automatically</dd>
+      <dd>You wish to let the process decide automatically</dd>
     </dl>
   </p>
   <table class="table table-borderless">
@@ -62,15 +62,15 @@
     <dt>Stated</dt>
     <dd>You have stated a preference in the last six months</dd>
     <dt>Absentee</dt>
-    <dd>You communicated you absence for an AGM or EGM in the last six months</dd>
+    <dd>You communicated your absence for an AGM or EGM in the last six months</dd>
     <dt>Attended</dt>
     <dd>You attended an AGM or EGM in the last six months</dd>
     <dt>Proxy</dt>
     <dd>You registered a proxy for an AGM or EGM in the last six months</dd>
     <dt>Physical</dt>
-    <dd>You have access the space in the last six months</dd>
+    <dd>You have accessed the space in the last six months</dd>
     <dt>Automatic</dt>
-    <dd>Having done none of the above your status was automatically calculated</dd>
+    <dd>Having done none of the above, your status was automatically calculated</dd>
   </dl>
 </div>
 @endsection
diff --git a/resources/views/statistics/laser_usage.blade.php b/resources/views/statistics/laser_usage.blade.php
@@ -4,7 +4,7 @@
 
 @section('content')
 <div class="container">
-  <p>Summary of laser cuter usage time by month.</p>
+  <p>Summary of laser cutter usage time by month.</p>
 
   <div class="table-responsive">
     <table class="table">

diff --git a/resources/views/statistics/zone_occupants.blade.php b/resources/views/statistics/zone_occupants.blade.php
@@ -4,9 +4,9 @@
 
 @section('content')
 <div class="container">
-  <p>This shows the number of current members in each area of the {{ config('branding.space_type') }}</p>
+  <p>This shows the number of current members in each area of the {{ config('branding.space_type') }}.</p>
 
-  <p>These are very rough numbers based on RFID entries and exits where available. We don't track exits at all doors and tailgating can no be account for. Every 12 hours we reset any members in a zone for over {{ $resetHours }} hours back to off-site.</p>
+  <p>These are very rough numbers based on RFID entries and exits where available. We don't track exits at all doors and tailgating cannot be accounted for. Every 12 hours we reset any members in a zone for over {{ $resetHours }} hours back to off-site.</p>
   <table class="table">
     <thead>
       <th>Zone</th>