From fb3a67e52d85652614c96d0f5f9bae387f14109c Mon Sep 17 00:00:00 2001 From: NickLocke Date: Fri, 1 Aug 2025 19:49:41 +0100 Subject: [PATCH 01/15] Update laser_usage.blade.php - spelling. --- resources/views/statistics/laser_usage.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/statistics/laser_usage.blade.php b/resources/views/statistics/laser_usage.blade.php index 519205cec..e20ae40bf 100644 --- a/resources/views/statistics/laser_usage.blade.php +++ b/resources/views/statistics/laser_usage.blade.php @@ -4,7 +4,7 @@ @section('content')
-

Summary of laser cuter usage time by month.

+

Summary of laser cutter usage time by month.

From fe7e857fb67b99468dd5ad4d8dbf8976ed949d6b Mon Sep 17 00:00:00 2001 From: NickLocke Date: Fri, 1 Aug 2025 19:54:04 +0100 Subject: [PATCH 02/15] Update zone_occupants.blade.php - grammar. --- resources/views/statistics/zone_occupants.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/statistics/zone_occupants.blade.php b/resources/views/statistics/zone_occupants.blade.php index f486dc02f..7eb0280f4 100644 --- a/resources/views/statistics/zone_occupants.blade.php +++ b/resources/views/statistics/zone_occupants.blade.php @@ -4,9 +4,9 @@ @section('content')
-

This shows the number of current members in each area of the {{ config('branding.space_type') }}

+

This shows the number of current members in each area of the {{ config('branding.space_type') }}.

-

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.

+

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.

From 2e83ceb354f5da58b995c1031f7ce62bcd1f291b Mon Sep 17 00:00:00 2001 From: NickLocke Date: Fri, 1 Aug 2025 19:59:25 +0100 Subject: [PATCH 03/15] Update index.blade.php - spelling and grammar. --- resources/views/contentBlocks/index.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/contentBlocks/index.blade.php b/resources/views/contentBlocks/index.blade.php index 85950e268..7222560d4 100644 --- a/resources/views/contentBlocks/index.blade.php +++ b/resources/views/contentBlocks/index.blade.php @@ -5,8 +5,8 @@ @section('content')

- From here a limited set for page content chunks can be edited with out needing to PR changes to HMS.
- There are two types, Page & Email, 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.
+ There are two types, Page & Email, 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.

Zone
From 8a6ba4ca729efe862caca67614df40d7e8022e13 Mon Sep 17 00:00:00 2001 From: NickLocke Date: Thu, 21 Aug 2025 13:48:11 +0100 Subject: [PATCH 04/15] Update index.blade.php - fixed typos. --- .../views/governance/voting/index.blade.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/views/governance/voting/index.blade.php b/resources/views/governance/voting/index.blade.php index 730d616f6..ce76c9fb5 100644 --- a/resources/views/governance/voting/index.blade.php +++ b/resources/views/governance/voting/index.blade.php @@ -10,20 +10,20 @@

Current Status

Your current calculated voting status is {{ $votingStatus }}
- 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.

Stated Voting Preference

- Here you can see your current state voting preference and update it if you like.
+ Here you can see your currently stated voting preference and update it if you like.
A stated preference is one of the following.

Voting:
-
You wish to be counted as Voting Member of the {{ config('branding.space_type') }}
+
You wish to be counted as a Voting Member of the {{ config('branding.space_type') }}
Non-voting:
-
You wish to be counted as Non-voting Member of the {{ config('branding.space_type') }}
+
You wish to be counted as a Non-voting Member of the {{ config('branding.space_type') }}
Automatic:
-
Let the process decide automatically
+
You wish to let the process decide automatically

@@ -62,15 +62,15 @@
Stated
You have stated a preference in the last six months
Absentee
-
You communicated you absence for an AGM or EGM in the last six months
+
You communicated your absence for an AGM or EGM in the last six months
Attended
You attended an AGM or EGM in the last six months
Proxy
You registered a proxy for an AGM or EGM in the last six months
Physical
-
You have access the space in the last six months
+
You have accessed the space in the last six months
Automatic
-
Having done none of the above your status was automatically calculated
+
Having done none of the above, your status was automatically calculated
@endsection From 002b11bebb3903916ac68948c5a700a0372e0340 Mon Sep 17 00:00:00 2001 From: NickLocke Date: Sun, 31 Aug 2025 15:37:27 +0100 Subject: [PATCH 05/15] Update membershipComplete.blade.php - Removed Google Groups --- resources/views/emails/membership/membershipComplete.blade.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/resources/views/emails/membership/membershipComplete.blade.php b/resources/views/emails/membership/membershipComplete.blade.php index e8bbe7221..814396ca0 100644 --- a/resources/views/emails/membership/membershipComplete.blade.php +++ b/resources/views/emails/membership/membershipComplete.blade.php @@ -16,9 +16,6 @@ SSID: {{ $wifiSsid }} Pass: {{ $wifiPass }} -Our Google Group is where a lot of online discussion takes place: -{{ $groupLink }} - @feature('team_slack') Slack is also used for team discussions. You can join NH teams slack at: {{ $slackHTML }} From 32e9e52a5d5b67a064b4fabf2bc3300c0834aa7e Mon Sep 17 00:00:00 2001 From: NickLocke Date: Sun, 31 Aug 2025 15:38:33 +0100 Subject: [PATCH 06/15] Update rejected.blade.php - grammar (singular/plural) --- resources/views/emails/membership/rejected.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/emails/membership/rejected.blade.php b/resources/views/emails/membership/rejected.blade.php index 7aee747da..23730f2ae 100644 --- 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 }} From 1681ce30b4d82f14390ffeda766eece63b520980 Mon Sep 17 00:00:00 2001 From: NickLocke Date: Wed, 3 Sep 2025 15:57:19 +0100 Subject: [PATCH 07/15] Update membershipComplete.blade.php - selective groups --- .../views/emails/membership/membershipComplete.blade.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/resources/views/emails/membership/membershipComplete.blade.php b/resources/views/emails/membership/membershipComplete.blade.php index 814396ca0..df8243c9a 100644 --- a/resources/views/emails/membership/membershipComplete.blade.php +++ b/resources/views/emails/membership/membershipComplete.blade.php @@ -16,6 +16,11 @@ SSID: {{ $wifiSsid }} Pass: {{ $wifiPass }} +@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: {{ $slackHTML }} From 8dac2177ded7d0dc8411e68b2a1e0d5091a4fe6f Mon Sep 17 00:00:00 2001 From: NickLocke Date: Wed, 3 Sep 2025 17:39:53 +0100 Subject: [PATCH 08/15] Update membershipComplete.blade.php - remove hardcoded NH and make Google Groups conditional. --- .../views/emails/membership/membershipComplete.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/emails/membership/membershipComplete.blade.php b/resources/views/emails/membership/membershipComplete.blade.php index df8243c9a..572b9404c 100644 --- a/resources/views/emails/membership/membershipComplete.blade.php +++ b/resources/views/emails/membership/membershipComplete.blade.php @@ -22,11 +22,11 @@ @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 From 8e59072debe6d4526be789d161c4386bf31788fe Mon Sep 17 00:00:00 2001 From: NickLocke Date: Fri, 5 Sep 2025 11:35:41 +0100 Subject: [PATCH 09/15] Update membershipReinstated.blade.php - Made Google Group conditional and fixed a couple of hardcoded NH references. --- .../emails/membership/membershipReinstated.blade.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/resources/views/emails/membership/membershipReinstated.blade.php b/resources/views/emails/membership/membershipReinstated.blade.php index f7aa2679d..95704b7af 100644 --- 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 From d2af7eab4125cd39606c3c3af4794862ee8064fc Mon Sep 17 00:00:00 2001 From: NickLocke Date: Fri, 5 Sep 2025 11:36:45 +0100 Subject: [PATCH 10/15] Update membershipRevoked.blade.php - grammar tweak --- resources/views/emails/membership/membershipRevoked.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/emails/membership/membershipRevoked.blade.php b/resources/views/emails/membership/membershipRevoked.blade.php index 80c78c6bf..8b6f32bf2 100644 --- 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) From 29388b8492996fc28cb8cafb40b47936a535bbc1 Mon Sep 17 00:00:00 2001 From: NickLocke Date: Fri, 5 Sep 2025 11:37:23 +0100 Subject: [PATCH 11/15] Update membershipRevokedDueToUnderPayment.blade.php - grammar tweak --- .../membership/membershipRevokedDueToUnderPayment.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/emails/membership/membershipRevokedDueToUnderPayment.blade.php b/resources/views/emails/membership/membershipRevokedDueToUnderPayment.blade.php index c25020bcc..a24295384 100644 --- 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) From d8b458dbd6dcb4ae3e22d1fa7254a4167cb922c7 Mon Sep 17 00:00:00 2001 From: NickLocke Date: Fri, 5 Sep 2025 11:45:28 +0100 Subject: [PATCH 12/15] Update interestRegistered.blade.php - Google and Discord [see extended description] Made Google Groups conditional and added Discord. **Please check that the Discord bit had been done properly, and doesn't need changes elsewhere [I need to learn about Features]** This one will address JonW's original concern about Discord not being mentioned in the Interest Registered email. --- resources/views/emails/interestRegistered.blade.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/resources/views/emails/interestRegistered.blade.php b/resources/views/emails/interestRegistered.blade.php index e63a7ce0b..c5c60c545 100644 --- 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 }} From 638678e7c9b0ac980a39bda3f75c3a02a00de884 Mon Sep 17 00:00:00 2001 From: NickLocke Date: Mon, 1 Dec 2025 13:15:54 +0000 Subject: [PATCH 13/15] Added discordHTML --- app/Mail/InterestRegistered.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/Mail/InterestRegistered.php b/app/Mail/InterestRegistered.php index 744e4f671..f3d2e3a0e 100644 --- a/app/Mail/InterestRegistered.php +++ b/app/Mail/InterestRegistered.php @@ -40,6 +40,11 @@ class InterestRegistered extends Mailable implements ShouldQueue */ public $rulesLink; + /** + * @var string + */ + public $discordHTML; + /** * Create a new message instance. * @@ -57,6 +62,7 @@ public function __construct( $this->trusteesEmail = $roleRepository->findOneByName(Role::TEAM_TRUSTEES)->getEmail(); $this->groupLink = $metaRepository->get('google_group_html'); $this->rulesLink = $metaRepository->get('rules_html'); + $this->discordHTML = $metaRepository->get('discord_html'); } /** From 126a5ca282bcce23516382c73ee49645b51a5563 Mon Sep 17 00:00:00 2001 From: NickLocke Date: Mon, 1 Dec 2025 13:41:01 +0000 Subject: [PATCH 14/15] Use if rather than feature for Discord as suggested by Matt. Updated Discord feature display logic in email template. --- resources/views/emails/interestRegistered.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/emails/interestRegistered.blade.php b/resources/views/emails/interestRegistered.blade.php index c5c60c545..5c9d79973 100644 --- a/resources/views/emails/interestRegistered.blade.php +++ b/resources/views/emails/interestRegistered.blade.php @@ -17,10 +17,10 @@ {{ $groupLink }} @endif -@feature('discord') +@if ($discordHTML) Discord is used for members to chat online. You can join the {{ config('branding.space_type') }} Discord at: {{ $discordHTML }} -@endfeature +@endif Here are the {{ config('branding.space_type') }} rules: {{ $rulesLink }} From cdef06ddf17b0a61fd78fe94a61e267226ddad22 Mon Sep 17 00:00:00 2001 From: NickLocke Date: Thu, 4 Dec 2025 15:27:21 +0000 Subject: [PATCH 15/15] Added more detail to the Discord message As the Discord message now appears in the general Membership channel, rather than the private team channel, it makes sense to have a bit of descriptive text to make it clearer. --- app/Notifications/Banking/AuditResult.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/Notifications/Banking/AuditResult.php b/app/Notifications/Banking/AuditResult.php index 9e1cb96a4..3d86e8330 100644 --- a/app/Notifications/Banking/AuditResult.php +++ b/app/Notifications/Banking/AuditResult.php @@ -191,22 +191,24 @@ public function toDiscord($notifiable) $embed = [ 'title' => 'Membership Audit Results', + 'description' => 'Each day, HMS produces an update of changes in the membership. This is a summary.', 'fields' => [ [ + // Adding text to the value rather than the name, because Discord always renders the name in bold and that would look horrible. 'name' => 'New Members', - 'value' => $approveCount, + 'value' => "We have seen a payment from $approveCount new members.", // Has to be double quotes for interpolation ], [ 'name' => 'Notified Members', - 'value' => $warnCount, + 'value' => "We have not seen a payment from $warnCount members recently, so they may soon have their membership revoked.", ], [ 'name' => 'Revoked Members', - 'value' => $revokeCount, + 'value' => "The last payment from $revokeCount members was too long ago, so their membership has been revoked.", ], [ 'name' => 'Reinstated Members', - 'value' => $reinstateCount, + 'value' => "$reinstateCount members have started paying again, so their membership has been reinstated.", ], ], ];