Spelling of email, move change log into button

stephenyeargin · stephenyeargin · commit 4e549b78dbbe · 2021-04-12T11:43:46.000-05:00
diff --git a/src/Controller/MemberController.php b/src/Controller/MemberController.php
@@ -183,6 +183,10 @@ public function emailSubscription(Member $member, EmailService $emailService): R
             $this->addFlash('danger', 'Email service not configured.');
             return $this->redirectToRoute('member_show', ['localIdentifier' => $member->getLocalIdentifier()]);
         }
+        if (!$member->getPrimaryEmail()) {
+            $this->addFlash('danger', 'No primary email set for Member.');
+            return $this->redirectToRoute('member_show', ['localIdentifier' => $member->getLocalIdentifier()]);
+        }
         $entityManager = $this->getDoctrine()->getManager();
         $subscriber = $emailService->getMemberSubscription($member);
         $subscriberHistory = $emailService->getMemberSubscriptionHistory($member);
diff --git a/src/Form/MemberExportType.php b/src/Form/MemberExportType.php
@@ -41,9 +41,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'help' => 'Excludes: Empty Mailing Addresses'
             ])
             ->add('emailable', CheckboxType::class, [
-                'label' => 'E-mailable',
+                'label' => 'Emailable',
                 'required' => false,
-                'help' => 'Excludes: Empty E-mail Address'
+                'help' => 'Excludes: Empty Email Address'
             ])
             ->add('columns', ChoiceType::class, [
                 'expanded' => true,
diff --git a/src/Form/MemberUpdateType.php b/src/Form/MemberUpdateType.php
@@ -32,7 +32,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label' => 'Postal Code'
             ])
             ->add('primaryEmail', null, [
-                'label' => 'Primary E-mail Address',
+                'label' => 'Primary Email Address',
                 'attr' => [
                     'placeholder' => 'user@example.com'
                 ]
diff --git a/src/Form/ProfileType.php b/src/Form/ProfileType.php
@@ -22,7 +22,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder
             ->add('name')
             ->add('email', EmailType::class, [
-                'label' => 'Login E-mail',
+                'label' => 'Login Email',
                 'constraints' => [
                     new Email([
                         'message' => 'Must be a valid email address!'
diff --git a/src/Form/UserType.php b/src/Form/UserType.php
@@ -22,7 +22,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder
             ->add('name')
             ->add('email', EmailType::class, [
-                'label' => 'Login E-mail',
+                'label' => 'Login Email',
                 'constraints' => [
                     new Email([
                         'message' => 'Must be a valid email address!'
diff --git a/src/Repository/MemberRepository.php b/src/Repository/MemberRepository.php
@@ -206,7 +206,7 @@ public function findWithExportFilters(array $filters)
         if (isset($filters['mailable']) && $filters['mailable']) {
             $qb->andWhere('m.mailingAddressLine1 != \'\' OR m.mailingAddressLine2 != \'\'');
         }
-        // Return only e-mailable records
+        // Return only emailable records
         if (isset($filters['emailable']) && $filters['emailable']) {
             $qb->andWhere('m.primaryEmail != \'\'');
         }
diff --git a/templates/directory/directory.html.twig b/templates/directory/directory.html.twig
@@ -24,7 +24,7 @@
             <th>Name</th>
             <th>Status</th>
             <th>Class</th>
-            <th>E-mail</th>
+            <th>Email</th>
             <th data-sortable="false" data-searchable="false">Social</th>
             <th>Phone Number</th>
             <th>Mailing Address</th>
diff --git a/templates/directory/email_subscription.html.twig b/templates/directory/email_subscription.html.twig
@@ -30,7 +30,7 @@
               <td>{{ subscriber.Name }}</td>
             </tr>
             <tr>
-              <th>E-mail</th>
+              <th>Email</th>
               <td>{{ subscriber.EmailAddress }}</td>
             </tr>
             <tr>
diff --git a/templates/member/_form.html.twig b/templates/member/_form.html.twig
@@ -18,7 +18,7 @@
           {{ form_row(form.middleName, {label: 'Middle Name'}) }}
           {{ form_row(form.lastName, {label: 'Last Name'}) }}
           <hr />
-          {{ form_row(form.primaryEmail, {label: 'Primary E-mail'}) }}
+          {{ form_row(form.primaryEmail, {label: 'Primary Email'}) }}
           {{ form_row(form.primaryTelephoneNumber, {label: 'Primary Telephone Number'}) }}
           <hr />
           {{ form_row(form.photoUrl, {label: 'Photo URL'}) }}
diff --git a/templates/member/_nav.html.twig b/templates/member/_nav.html.twig
@@ -1,17 +1,14 @@
 {% set current_route = app.request.get('_route') %}
 <ul class="nav nav-tabs mb-3">
   <li class="nav-item"><a class="nav-link {{ (current_route == 'member_show' or current_route == 'member_edit') ? 'active' }}" href="{{ path('member_show', {localIdentifier: member.localIdentifier}) }}"><i class="fas fa-id-badge"></i> Member Profile</a></li>
-  {% if is_granted('ROLE_ADMIN') %}
-  <li class="nav-item"><a class="nav-link {{ current_route == 'member_change_log' ? 'active' }}" href="{{ path('member_change_log', {localIdentifier: member.localIdentifier}) }}"><i class="fas fa-history"></i> Changes</a></li>
-  {% endif %}
   {% if is_email_service_configured() and member.primaryEmail %}
   {% if is_granted('ROLE_EMAIL_MANAGER') %}
-  <li class="nav-item"><a class="nav-link {{ current_route == 'member_email_subscription' ? 'active' }}" href="{{ path('member_email_subscription', {localIdentifier: member.localIdentifier}) }}"><i class="fas fa-envelope"></i> Email Subscriptions</a></li>
+  <li class="nav-item"><a class="nav-link {{ current_route == 'member_email_subscription' ? 'active' }}" href="{{ path('member_email_subscription', {localIdentifier: member.localIdentifier}) }}"><i class="fas fa-envelope"></i> Email Subscription</a></li>
   {% endif %}
   <li class="nav-item"><a class="nav-link {{ current_route == 'member_message' ? 'active' }}" href="{{ path('member_message', {localIdentifier: member.localIdentifier}) }}"><i class="fas fa-envelope-open-text"></i> Send Message</a></li>
   {% elseif is_email_service_configured() and not member.primaryEmail %}
   {% if is_granted('ROLE_EMAIL_MANAGER') %}
-  <li class="nav-item" title="No email address set." data-toggle="tooltip"><a class="nav-link disabled"><i class="fas fa-envelope"></i> Email Subscriptions</a></li>
+  <li class="nav-item" title="No email address set." data-toggle="tooltip"><a class="nav-link disabled"><i class="fas fa-envelope"></i> Email Subscription</a></li>
   {% endif %}
   <li class="nav-item" title="No email address set." data-toggle="tooltip"><a class="nav-link disabled"><i class="fas fa-envelope-open-text"></i> Send Message</a></li>
   {% endif %}
diff --git a/templates/member/_summary.html.twig b/templates/member/_summary.html.twig
@@ -22,7 +22,7 @@
   </div>
   <div class="col-lg-3">
     <dl>
-      <dt>Primary E-mail</dt>
+      <dt>Primary Email</dt>
       <dd>{{ member.primaryEmail }}</dd>
       <dt>Primary Telephone</dt>
       <dd>{{ member.primaryTelephoneNumber }}</dd>
diff --git a/templates/member/import.html.twig b/templates/member/import.html.twig
@@ -109,7 +109,7 @@
       <dd>{{ member.jobTitle }}</dd>
       <dt>Occupation/Industry</dt>
       <dd>{{ member.occupation }}</dd>
-      <dt>Primary E-mail</dt>
+      <dt>Primary Email</dt>
       <dd>{{ member.primaryEmail }}</dd>
       <dt>Primary Telephone</dt>
       <dd>{{ member.primaryTelephoneNumber }}</dd>
diff --git a/templates/member/show.html.twig b/templates/member/show.html.twig
@@ -15,6 +15,7 @@
 {% if member.status.isInactive == false and member.isDeceased == false %}
 <a role="button" href="#modalEditLink" data-toggle="modal" class="btn btn-sm btn-secondary"><i class="fas fa-link"></i></a>
 {% endif %}
+<a role="button" href="{{ path('member_change_log', {localIdentifier: member.localIdentifier}) }}" class="btn btn-sm btn-secondary"><i class="fas fa-history"></i> Changes</a></li>
 <a role="button" href="{{ path('member_edit', {localIdentifier: member.localIdentifier}) }}" class="btn btn-sm btn-primary"><i class="fas fa-edit fa-fw"></i> Edit</a>
 {% endif %}
 {% endblock %}
@@ -41,7 +42,7 @@
                 <dd class="col-sm-9 mb-3">{{ member.joinDate ? member.joinDate|date('F j, Y') : '-' }}
                 <dt class="col-sm-3 mb-3">Class Year</dt>
                 <dd class="col-sm-9 mb-3">{{ member.classYear|default('-') }}
-                <dt class="col-sm-3 mb-3">E-mail</dt>
+                <dt class="col-sm-3 mb-3">Email</dt>
                 <dd class="col-sm-9 mb-3">
                   {% if member.primaryEmail %}
                   <a href="mailto:{{ member.primaryEmail }}">{{ member.primaryEmail }}</a>
diff --git a/templates/update/email_update.html.twig b/templates/update/email_update.html.twig
@@ -49,7 +49,7 @@
           <td>{{ member.mailingPostalCode }}</td>
         </tr>
         <tr>
-          <th align="left">Primary E-mail</th>
+          <th align="left">Primary Email</th>
           <td>{{ member.primaryEmail }}</td>
         </tr>
         <tr>
diff --git a/templates/user/_macros.html.twig b/templates/user/_macros.html.twig
@@ -5,6 +5,6 @@
   {% endif %}
   <li class="list-item"><i class="fas fa-{% if 'ROLE_ADMIN' in roles or 'ROLE_USER' in roles %}check text-success{% else %}times text-danger{% endif %}"></i> Directory User</li>
   <li class="list-item"><i class="fas fa-{% if 'ROLE_ADMIN' in roles or 'ROLE_DONATION_MANAGER' in roles %}check text-success{% else %}times text-danger{% endif %}"></i> Donations Manager</li>
-  <li class="list-item"><i class="fas fa-{% if 'ROLE_ADMIN' in roles or 'ROLE_EMAIL_MANAGER' in roles %}check text-success{% else %}times text-danger{% endif %}"></i> E-mail Manager</li>
+  <li class="list-item"><i class="fas fa-{% if 'ROLE_ADMIN' in roles or 'ROLE_EMAIL_MANAGER' in roles %}check text-success{% else %}times text-danger{% endif %}"></i> Email Manager</li>
 </ul>
 {% endmacro %}
diff --git a/templates/user/index.html.twig b/templates/user/index.html.twig
@@ -20,7 +20,7 @@
       <table class="table">
         <thead>
           <tr>
-            <th>Login E-mail</th>
+            <th>Login Email</th>
             <th>Name</th>
             <th>Roles</th>
             <th>Two-Factor</th>
diff --git a/templates/user/show.html.twig b/templates/user/show.html.twig
@@ -16,7 +16,7 @@
 <div class="card mb-3 shadow">
   <div class="card-body">
     <dl>
-      <dt>Login E-mail</dt>
+      <dt>Login Email</dt>
       <dd>{{ user.email }}</dd>
       <dt>Roles</dt>
       <dd>{{ macros.user_roles(user.roles) }}</dd>

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)`
`32`	`32`	`'label' => 'Postal Code'`
`33`	`33`	`])`
`34`	`34`	`->add('primaryEmail', null, [`
`35`		`- 'label' => 'Primary E-mail Address',`
	`35`	`+ 'label' => 'Primary Email Address',`
`36`	`36`	`'attr' => [`
`37`	`37`	`'placeholder' => 'user@example.com'`
`38`	`38`	`]`
Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ public function findWithExportFilters(array $filters)`
`206`	`206`	`if (isset($filters['mailable']) && $filters['mailable']) {`
`207`	`207`	`$qb->andWhere('m.mailingAddressLine1 != \'\' OR m.mailingAddressLine2 != \'\'');`
`208`	`208`	`}`
`209`		`- // Return only e-mailable records`
	`209`	`+ // Return only emailable records`
`210`	`210`	`if (isset($filters['emailable']) && $filters['emailable']) {`
`211`	`211`	`$qb->andWhere('m.primaryEmail != \'\'');`
`212`	`212`	`}`