#130, #131, #132 Change "GeoPortal" branding language

USEPA · Mar 21, 2023 · 57998a1 · 57998a1
1 parent 85024b0
commit 57998a1
Show file tree

Hide file tree

Showing 28 changed files with 68 additions and 69 deletions.
diff --git a/AGOLAccountRequestor/urls.py b/AGOLAccountRequestor/urls.py
@@ -35,8 +35,8 @@
 router.register('agol/roles', account_views.AGOLRoleViewSet)
 router.register('notifications', account_views.PendingNotificationViewSet)
 
-admin.site.site_header = "EPA GeoPlatform Account Request Tool"
-admin.site.site_title = "GeoPlatform Account Request Tool"
+admin.site.site_header = "EPA Account Request Tool"
+admin.site.site_title = "Account Request Tool"
 admin.site.index_title = "Tool Administration"
 admin.site.site_url = f"/{settings.URL_PREFIX}"
 

diff --git a/AGOLAccountRequestor/views.py b/AGOLAccountRequestor/views.py
@@ -50,10 +50,10 @@ def email_field_coordinator_request(request):
             email_context = request.data
         if 'emergency_response_name' in email_context:
             html_msg = render_to_string('../templates/field_coord_er_request_email.html', email_context)
-            email_subject = "Response/Project Request for Review in GeoPlatform Account Request Tool"
+            email_subject = "Response/Project Request for Review in Account Request Tool"
         else:
             html_msg = render_to_string('../templates/field_coord_request_email.html', email_context)
-            email_subject = "Coordinator Request for Review in GeoPlatform Account Request Tool"
+            email_subject = "Coordinator Request for Review in Account Request Tool"
         plain_msg = strip_tags(html_msg)
         result = send_mail(
             subject=email_subject,

diff --git a/README.md b/README.md
@@ -1,3 +1,3 @@
-# GeoPlatform-Request-Tool
+# Account-Request-Tool
 
-The GeoPlatform Account Request Tool provisions EPA GeoPlatform (GPO) user accounts during emergency response events and projects. Authorized users (Team Coordinators) can rapidly set up accounts for field data collection events and provide access to specific GeoPlatform groups.
+The Account Request Tool provisions EPA GIS user accounts during emergency response events and projects. Authorized users (Team Coordinators) can rapidly set up accounts for field data collection events and provide access to specific  groups.
diff --git a/accounts/admin.py b/accounts/admin.py
@@ -293,7 +293,7 @@ def change_view(self, request, object_id, form_url='', extra_context=None):
         return response
 
     def disable_users_link(self, obj):
-        return mark_safe(f'<a target=_blank href="{obj.disable_users_link}">Relevant Response/Project GeoPlatform Accounts List</a>')
+        return mark_safe(f'<a target=_blank href="{obj.disable_users_link}">Relevant Response/Project Accounts List</a>')
 
     def get_urls(self):
         from django.urls import path
@@ -327,8 +327,8 @@ def approve_view(self, request, object_id):
             "to": ', '.join(to),
             "subject": subject,
             "email_content": message,
-            'site_header': 'EPA GeoPlatform Account Request Tool',
-            'site_title': 'GeoPlatform Account Request Tool',
+            'site_header': 'EPA Account Request Tool',
+            'site_title': 'Account Request Tool',
         })
 
     def disable_view(self, request, object_id):
@@ -353,8 +353,8 @@ def disable_view(self, request, object_id):
             "to": ', '.join(to),
             "subject": subject,
             "email_content": message,
-            'site_header': 'EPA GeoPlatform Account Request Tool',
-            'site_title': 'GeoPlatform Account Request Tool',
+            'site_header': 'EPA Account Request Tool',
+            'site_title': 'Account Request Tool',
         })
 
 

diff --git a/accounts/func.py b/accounts/func.py
@@ -93,7 +93,7 @@ def enable_account(account_request, password):
                                          context={"username": account_request.username,
                                                   "response": account_request.response.name,
                                                   "approved_by": account_request.approved_by},
-                                         subject="Your EPA Geoplatform Account has been enabled",
+                                         subject=f"Your EPA {account_request.response.portal} Account has been enabled",
                                          to=[account_request.email],
                                          content_object=account_request)
     return True
diff --git a/accounts/management/commands/create_reminder_notification.py b/accounts/management/commands/create_reminder_notification.py
@@ -15,7 +15,7 @@ def handle(self, *args, **options):
 
         for pending in pending_accounts:
             Notification.create_new_notification(
-                subject='Pending GeoPlatform Account Requests',
+                subject='Pending Account Requests',
                 context={
                     "HOST_ADDRESS": settings.HOST_ADDRESS,
                     "count": pending.total_pending

diff --git a/accounts/management/commands/notify_sponsors.py b/accounts/management/commands/notify_sponsors.py
@@ -15,14 +15,14 @@ def handle(self, *args, **options):
             to_emails = list(AGOLUserFields.objects.values_list('delegates__email', flat=True))
             to_emails.append(notification['sponsor__email'])
             results = send_mail(
-                'Pending GeoPlatform Account Requests',
-                f'{notification["total"]} GeoPlatform Account Request(s) is pending your approval in the GeoPlatform Account Request Tool.'
-                f'Please log in to the <a href="https://r9data.response.epa.gov/request/accounts/list">GeoPlatform Account Request Tool Approval List</a> to configure new GeoPlatform accounts and notify the users when configuration is complete.',
+                'Pending Account Requests',
+                f'{notification["total"]} Account Request(s) is pending your approval in the Account Request Tool.'
+                f'Please log in to the <a href="https://r9data.response.epa.gov/request/accounts/list">Account Request Tool Approval List</a> to configure new accounts and notify the users when configuration is complete.',
                 '[email protected]',
                 list(set(to_emails)),
                 fail_silently=False,
-                html_message=f'{notification["total"]} GeoPlatform Account Request(s) is pending your approval in the GeoPlatform Account Request Tool.'
-                f'Please log in to the <a href="https://r9data.response.epa.gov/request/accounts/list">GeoPlatform Account Request Tool Approval List</a> to configure new GeoPlatform accounts and notify the users when configuration is complete.',
+                html_message=f'{notification["total"]} Account Request(s) is pending your approval in the Account Request Tool.'
+                f'Please log in to the <a href="https://r9data.response.epa.gov/request/accounts/list">Account Request Tool Approval List</a> to configure new accounts and notify the users when configuration is complete.',
             )
             if results == 1:
                 AccountRequests.objects.filter(

diff --git a/accounts/models.py b/accounts/models.py
@@ -70,7 +70,7 @@ def sponsor_notified(self):
 
     def create_new_notification(self):
         Notification.create_new_notification(
-            subject='New GeoPlatform Account Request',
+            subject=f'New {self.response.portal} Account Request',
             context={"HOST_ADDRESS": settings.HOST_ADDRESS},
             template="new_account_request_email.html",
             content_object=self,
@@ -434,12 +434,12 @@ def __init__(self, *args, **kwargs):
     name = models.CharField('Name', max_length=500)
     portal = models.ForeignKey(AGOL, models.PROTECT, default=1)
     assignable_groups = models.ManyToManyField('AGOLGroup', related_name='response',
-                                               verbose_name='GeoPlatform Assignable Groups')
+                                               verbose_name='Assignable Groups')
     role = models.ForeignKey('AGOLRole', on_delete=models.PROTECT, verbose_name='GeoPlatform Role',
                              limit_choices_to={'is_available': True}, null=True, blank=True,
                              help_text='System default will be used if left blank.')
     authoritative_group = models.ForeignKey('AGOLGroup', on_delete=models.PROTECT,
-                                            verbose_name='Geoplatform Authoritative Group',
+                                            verbose_name='Authoritative Group',
                                             limit_choices_to={'is_auth_group': True})
     disabled = models.DateTimeField(null=True, blank=True)
     disabled_by = models.ForeignKey(User, models.PROTECT, 'disabled_responses', null=True, blank=True)
@@ -500,7 +500,7 @@ def save(self, *args, **kwargs):
     def generate_new_email(self):
         REQUEST_URL = f"{settings.HOST_ADDRESS}/api/admin/accounts/responseproject/{self.pk}"
         to = [x.email.lower() for x in User.objects.filter(groups__pk=settings.COORDINATOR_ADMIN_GROUP_ID)]
-        subject = 'New Response/Project Request for Review in GeoPlatform Account Request Tool'
+        subject = f'New {self.portal} Response/Project Request for Review in Account Request Tool'
         content = render_to_string('new_response_request_email.html', {"REQUEST_URL": REQUEST_URL})
         return to, subject, content
 
@@ -515,7 +515,7 @@ def generate_approval_email(self):
             recipients = self.get_email_recipients()
             request_url = f"{settings.HOST_ADDRESS}?response={self.pk}"
             approval_url = f"{settings.HOST_ADDRESS}/accounts/list"
-            email_subject = f"GeoPlatform Account Response/Project {self.name} has been approved"
+            email_subject = f"{self.portal} Account Response/Project {self.name} has been approved"
             msg = render_to_string('response_approval_email.html', {
                 "response_project": self,
                 "request_url": request_url,
@@ -532,7 +532,7 @@ def generate_approval_email(self):
     def generate_disable_email(self):
         try:
             recipients = self.get_email_recipients()
-            email_subject = f"GeoPlatform Account Response/Project {self.name} has been disabled"
+            email_subject = f"{self.portal} Account Response/Project {self.name} has been disabled"
             msg = render_to_string('response_disable_email.html', {"response_project": self})
             return recipients, email_subject, msg
 

diff --git a/accounts/templates/enabled_account_email.html b/accounts/templates/enabled_account_email.html
@@ -1,7 +1,8 @@
-Your EPA GeoPlatform acount, {{ username }}, has been enabled as part of the {{ response }} response / project.
+Your EPA {{ response_project.portal }} account, {{ username }}, has been enabled as part of the {{ response }} response / project.
 <br/><br/>
 If you no longer know your account password please go to the
-<a href="https://epa.maps.arcgis.com/home/signin.html?useLandingPage=true">EPA Geoplatform Sign In</a> page and click
+{{ base_url }}
+<a href="{{ response_project.portal_url }}/home/signin.html?useLandingPage=true">EPA {{ response_project.portal }} Sign In</a> page and click
 "Forgot password?".
 
 {% include "signature_line.html" %}
diff --git a/accounts/templates/enabled_account_email_with_password.html b/accounts/templates/enabled_account_email_with_password.html
@@ -1,4 +1,4 @@
-Your EPA GeoPlatform acount, {{ username }}, has been enabled as part of the {{ response }} response / project.
+Your EPA account, {{ username }}, has been enabled as part of the {{ response }} response / project.
 <br/><br/>
 Your password has been reset by the response / project by
 {{ approved_by.first_name }} {{ approved_by.last_name }} ({{ approved_by.email }}).

diff --git a/accounts/templates/new_account_request_email.html b/accounts/templates/new_account_request_email.html
@@ -1,5 +1,5 @@
-You have a new GeoPlatform Account Request pending your approval in the GeoPlatform Account Request Tool ({{ HOST_ADDRESS }}).
+You have a new {{ response_project.portal }} Account Request pending your approval in the Account Request Tool ({{ HOST_ADDRESS }}).
 <br/><br/>
-Please log in to the GeoPlatform Account Request Tool Approval List to review your GeoPlatform account requests.
+Please log in to the Account Request Tool Approval List to review your account requests.
 
 {% include "signature_line.html" %}
diff --git a/accounts/templates/new_response_request_email.html b/accounts/templates/new_response_request_email.html
@@ -1,4 +1,4 @@
-An Emergency Response Request or Project has been submitted to the GeoPlatform Account Request Tool (r9data.response.epa.gov/request).
+An Emergency Response Request or Project has been submitted to the Account Request Tool (r9data.response.epa.gov/request).
 
-Please log in to the GeoPlatform Account Request Tool Administration to review the pending request:
+Please log in to the Account Request Tool Administration to review the pending request:
 <a href="{{ REQUEST_URL }}">{{ REQUEST_URL }}</a>
diff --git a/accounts/templates/reminder_pending_account_request_email.html b/accounts/templates/reminder_pending_account_request_email.html
@@ -1,5 +1,5 @@
-You have {{ count }} GeoPlatform Account Request{% if count > 1 %}s{% endif %} pending your approval in the GeoPlatform Account Request Tool ({{ HOST_ADDRESS }}).
+You have {{ count }} Account Request{% if count > 1 %}s{% endif %} pending your approval in the Account Request Tool ({{ HOST_ADDRESS }}).
 <br/><br/>
-Please log in to the GeoPlatform Account Request Tool Approval List to review your GeoPlatform account requests.
+Please log in to the Account Request Tool Approval List to review your account requests.
 
 {% include "signature_line.html" %}
diff --git a/accounts/templates/response_approval_email.html b/accounts/templates/response_approval_email.html
@@ -1,4 +1,4 @@
-The GeoPlatform Account Request Tool Response/Project <b>{{ response_project.name }}</b> has been approved.
+The Account Request Tool Response/Project <b>{{ response_project.name }}</b> has been approved.
 <p>
     <ul>
         <li>You can now start accepting and approving requests.</li>

diff --git a/accounts/templates/response_disable_email.html b/accounts/templates/response_disable_email.html
@@ -1,5 +1,5 @@
-GeoPlatform Account Request Tool Response/Project <b>{{ response_project.name }}</b> has been disabled.
+Account Request Tool Response/Project <b>{{ response_project.name }}</b> has been disabled.
 <p>
-<a href="{{response_project.disable_users_link}}">Please go to the GeoPlatform to make appropriate changes to relevant accounts.</a>
+<a href="{{response_project.disable_users_link}}">Please go to {{ response_project.portal }} to make appropriate changes to relevant accounts.</a>
 </p>
 {% include "signature_line.html" %}
diff --git a/accounts/templates/signature_line.html b/accounts/templates/signature_line.html
@@ -1,28 +1,28 @@
 A few important points:<br/>
 
 <ul>
-<li>The EPA GeoPlatform is a place for <em>creating and sharing maps and map applications</em>. Depending on your access level, you may only be able to view content items, or you may be able to collaborate by creating and editing items.</li>
+<li>The EPA {{ response_project.portal }} is a place for <em>creating and sharing maps and map applications</em>. Depending on your access level, you may only be able to view content items, or you may be able to collaborate by creating and editing items.</li>
 
 <li>Multi-Factor Authentication (MFA) is now required to be enabled on all accounts per <a href="https://www.epa.gov/system/files/documents/2021-09/information_security_identification_and_authentication_procedure.pdf">security policy</a>.
 Guidance for the simple process of enabling two-factor authentication can be found in <a href="https://epa.maps.arcgis.com/sharing/rest/content/items/079ede9b32464c73815d386703d3f88b/data">this document</a>.
 You will have a short grace period following account creation to enable MFA, after which your account will be automatically disabled.
 </li>
 
-<li>If you do something with the GeoPlatform that <em>you would like to share</em> with our community, please contact us and let us know! The best contact is this email address: [email protected].</li>
+<li>If you do something with the {{ response_project.portal }} that <em>you would like to share</em> with our community, please contact us and let us know! The best contact is this email address: <a href="mailto:[email protected]">[email protected]</a>.</li>
 
-<li>Discover additional data resources by visiting the <a href="https://edg.epa.gov/">Environmental Dataset Gateway</a> or contacting [email protected]</li>
+<li>Discover additional data resources by visiting the <a href="https://edg.epa.gov/">Environmental Dataset Gateway</a> or contacting <a href="mailto:[email protected]">[email protected]</a></li>
 
-<li>We hope that you enjoy using this platform to build and enhance your mapping capabilities, but we also have one major rule to consider as you use the GeoPlatform: <br/>
+<li>We hope that you enjoy using this platform to build and enhance your mapping capabilities, but we also have one major rule to consider as you use the {{ response_project.portal }}: <br/>
 <span style='color:red'>
-<strong>No PERSONALLY IDENTIFIABLE INFORMATION (PII) or National Security Information (NSI) can be stored on the GeoPlatform.</strong>
+<strong>No PERSONALLY IDENTIFIABLE INFORMATION (PII) or National Security Information (NSI) can be stored on the {{ response_project.portal }}.</strong>
 </span><br/>
-If you need a place for storing names, social security numbers, phone numbers, home addresses and the like – PLEASE do not store them here.  PII or NSI found in the GeoPlatform, whether added inadvertently or intentionally, will be removed.
+If you need a place for storing names, social security numbers, phone numbers, home addresses and the like – PLEASE do not store them here.  PII or NSI found in the {{ response_project.portal }}, whether added inadvertently or intentionally, will be removed.
 </li>
 
 </ul>
 
-Thank you for your attention to this important information and welcome again to the GeoPlatform community.<br/><br/>
+Thank you for your attention to this important information and welcome again to the {{ response_project.portal }} community.<br/><br/>
 
-The GeoPlatform Administration<br/>
+The {{ response_project.portal }} Administration<br/>
 
 <hr>
diff --git a/templates/field_coord_er_request_email.html b/templates/field_coord_er_request_email.html
@@ -1,7 +1,7 @@
 {% block html %}
     <div>
-        An Emergency Response Request or Project has been submitted to the GeoPlatform Account Request
-        Tool (<a href="https://r9data.response.epa.gov/request">r9data.response.epa.gov/request</a>). The following
+        An Emergency Response Request or Project has been submitted to the Account Request Tool
+        (<a href="https://r9data.response.epa.gov/request">r9data.response.epa.gov/request</a>). The following
         information was submitted:
         <ul>
             <li>Response / Project Name: {{emergency_response_name}}</li>
@@ -11,7 +11,7 @@
                     <li>{{value}}</li>
                 {% endfor %}
             </ul></li>
-            <li>GeoPlatform Groups:
+            <li>{{ response_project.portal }} Groups:
             <ul>
                 {% for value in geoplatform_groups %}
                     <li>{{value.title}}</li>
@@ -21,7 +21,7 @@
             <li>Coordinator / Requester Name: {{requester}}</li>
             <li>Coordinator / Requester Phone: {{requester_phone_number}}</li>
         </ul>
-        Please log in to the <a href="https://r9data.response.epa.gov/request/api/admin/">GeoPlatform
+        Please log in to the <a href="https://r9data.response.epa.gov/request/api/admin/">{{ response_project.portal }}
         Account Request Tool Administration</a> to configure a new project or response and notify the coordinator when
         configuration is complete.
     </div>

diff --git a/templates/field_coord_request_email.html b/templates/field_coord_request_email.html
@@ -1,6 +1,6 @@
 {% block html %}
     <div>
-        A Coordinator Request has been submitted to the GeoPlatform Account Request Tool
+        A Coordinator Request has been submitted to the Account Request Tool
         (<a href="https://r9data.response.epa.gov/request">r9data.response.epa.gov/request</a>). The following
         information was submitted:
         <ul>
@@ -11,8 +11,7 @@
             <li>GeoPlatform User: {{agol_user}}</li>
             {% if emergency_response %}<li>Response / Project: {{emergency_response}}</li>{% endif %}
         </ul>
-     Please log in to the <a href="https://r9data.response.epa.gov/request/api/admin/">GeoPlatform
-        Account Request Tool Administration</a> to configure a new project or response and notify the
+     Please log in to the <a href="https://r9data.response.epa.gov/request/api/admin/">Account Request Tool Administration</a> to configure a new project or response and notify the
         coordinator when configuration is complete.
     </div>
 {% endblock %}
diff --git a/templates/invitation_email_body.html b/templates/invitation_email_body.html
@@ -1,4 +1,4 @@
-<html><body><p>{{account_request.sponsor.get_full_name}} has invited you to join an ArcGIS Online Organization,
-    EPA GeoPlatform Online, as part of {{ account_request.response.name }}</p>
+<html><body>
+<p>{{account_request.sponsor.get_full_name}} has invited you to join EPA {{ account_request.response.portal }}, as part of {{ account_request.response.name }}</p>
 
 {% include 'signature_line.html' %}
diff --git a/ui/src/app/app.component.html b/ui/src/app/app.component.html
@@ -2,7 +2,7 @@
   <mat-toolbar class="header" color="primary" style="justify-content: space-between">
     <div style="display: flex; align-items: center; cursor: pointer;" routerLink="/">
       <img src="./assets/EPA_logo.png" style="width: 60px;"/>
-      GeoPlatform Account Request Tool
+      Account Request Tool
     </div>
     <div style="padding-right: 25px;">
       <button mat-button routerLink="/accounts/list/" *ngIf="!(config | async)">Team Coordinator Login</button>