diff --git a/app/Mail/InterestRegistered.php b/app/Mail/InterestRegistered.php index 744e4f67..f3d2e3a0 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'); } /** diff --git a/app/Notifications/Banking/AuditResult.php b/app/Notifications/Banking/AuditResult.php index 9e1cb96a..3d86e833 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.", ], ], ]; diff --git a/resources/views/contentBlocks/index.blade.php b/resources/views/contentBlocks/index.blade.php index 85950e26..7222560d 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.

diff --git a/resources/views/emails/interestRegistered.blade.php b/resources/views/emails/interestRegistered.blade.php index e63a7ce0..5c9d7997 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 + +@if ($discordHTML) +Discord is used for members to chat online. You can join the {{ config('branding.space_type') }} Discord at: +{{ $discordHTML }} +@endif 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 index e8bbe722..572b9404 100644 --- 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 index f7aa2679..95704b7a 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 diff --git a/resources/views/emails/membership/membershipRevoked.blade.php b/resources/views/emails/membership/membershipRevoked.blade.php index 80c78c6b..8b6f32bf 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) diff --git a/resources/views/emails/membership/membershipRevokedDueToUnderPayment.blade.php b/resources/views/emails/membership/membershipRevokedDueToUnderPayment.blade.php index c25020bc..a2429538 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) diff --git a/resources/views/emails/membership/rejected.blade.php b/resources/views/emails/membership/rejected.blade.php index 7aee747d..23730f2a 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 }} diff --git a/resources/views/governance/voting/index.blade.php b/resources/views/governance/voting/index.blade.php index 730d616f..ce76c9fb 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 diff --git a/resources/views/statistics/laser_usage.blade.php b/resources/views/statistics/laser_usage.blade.php index 519205ce..e20ae40b 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.

diff --git a/resources/views/statistics/zone_occupants.blade.php b/resources/views/statistics/zone_occupants.blade.php index f486dc02..7eb0280f 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.

Zone