3110 dashboard design feedback & permission changes (#3142)

* update org dashboard

* allowing org admins to access serviecs within an org

* fix test

app/templates/components/org_nav.html

@@ -4,7 +4,7 @@
     <li class="usa-sidenav__item"><a class="usa-link {{ org_navigation.is_selected('dashboard') }}" href="{{ url_for('.organization_dashboard', org_id=current_org.id) }}">Dashboard</a></li>
     {% endif %}
     <li class="usa-sidenav__item"><a class="usa-link {{ org_navigation.is_selected('usage') }}" href="{{ url_for('.organization_usage', org_id=current_org.id) }}">Usage</a></li>
-    <li class="usa-sidenav__item"><a class="usa-link {{ org_navigation.is_selected('team-members') }}" href="{{ url_for('.manage_org_users', org_id=current_org.id) }}">Team members</a></li>
+    <li class="usa-sidenav__item"><a class="usa-link {{ org_navigation.is_selected('team-members') }}" href="{{ url_for('.manage_org_users', org_id=current_org.id) }}">Org admins</a></li>
     {% if current_user.platform_admin %}
     <li class="usa-sidenav__item"><a class="usa-link {{ org_navigation.is_selected('settings') }}" href="{{ url_for('.organization_settings', org_id=current_org.id) }}">Settings</a></li>
     <li class="usa-sidenav__item"><a class="usa-link {{ org_navigation.is_selected('trial-services') }}" href="{{ url_for('.organization_trial_mode_services', org_id=current_org.id) }}">Trial mode services</a></li>

app/templates/views/organizations/organization/index.html

@@ -37,7 +37,7 @@
               <div class="text-ink font-body-2xs line-height-sans-3">
                 <span class="text-bold">{{ live_services }}</span> Live
                 <span class="margin-left-1 text-bold">{{ trial_services }}</span> Trial
-                <span class="margin-left-1 text-bold">{{ suspended_services }}</span> Suspended
+                <span class="margin-left-1 text-bold">{{ suspended_services }}</span> Archived
               </div>
             </div>
           </div>
@@ -140,6 +140,9 @@
           {% endif %}
         </div>
       </form>
+      <div class="border-top-1px border-base-lighter margin-top-3 padding-top-3">
+        <a href="{{ url_for('main.invite_user', service_id=edit_service_data.id) }}" class="usa-button usa-button--outline">Invite team member</a>
+      </div>
     </div>
 
     <div
@@ -236,7 +239,7 @@
     </h3>
     <div id="what-is-service-content" class="usa-accordion__content usa-prose" hidden>
       <p>
-        When you join Notify, you're added to a service. This is your organization's workspace for sending text messages and emails. Within your service, you can:
+        Services are your organization's workspaces for sending text messages and emails. If you have multiple teams using Notify for different purposes, it is helpful to set up a separate Service for each team, with its own managers and templates. There is no limit to the number of Services you can create, and messages sent by all of your Services contribute to your overall messaging usage. Within each Service, you can:
       </p>
       <ol class="usa-list">
         <li>Create and edit message templates</li>
@@ -244,7 +247,8 @@
         <li>View message status and history</li>
         <li>Manage team members and permissions</li>
         <li>Track usage and delivery statistics</li>
-        <li>If you work for multiple organizations, you may belong to multiple services and can switch between them.</li>
+        <li>Service members can be added to multiple services and can switch between them</li>
+        <li>Organizational administrators can always see all Services</li>
       </ol>
     </div>
   </div>
@@ -273,7 +277,7 @@
               <td><a href="{{ url_for('main.service_dashboard', service_id=service.id) }}" class="usa-link">{{ service.name }}</a></td>
               <td>
                 {% if not service.active %}
-                  Suspended
+                  Archived
                 {% elif service.restricted %}
                   Trial
                 {% else %}

app/templates/views/organizations/organization/users/index.html

@@ -5,7 +5,7 @@
 {% from "components/components/button/macro.njk" import usaButton %}
 
 {% block org_page_title %}
-  Team members
+  Organization administrators
 {% endblock %}
 
 {% block maincolumn_content %}
@@ -20,7 +20,7 @@
   {% endif %}
 
   <h1 class="font-body-2xl">
-    Team members
+    Organization administrators
   </h1>
 
   {% if show_search_box %}
@@ -66,7 +66,7 @@
   <div class="js-stick-at-bottom-when-scrolling">
     {{ usaButton({
       "element": "a",
-      "text": "Invite team member",
+      "text": "Invite an organization administrator",
       "href": url_for('.invite_org_user', org_id=current_org.id),
       "classes": "usa-button"
     }) }}

app/templates/views/organizations/organization/users/invite-org-user.html

@@ -15,7 +15,7 @@
 
 {% block maincolumn_content %}
 
-  {{ page_header("Invite a team member") }}
+  {{ page_header("Invite an organization administrator") }}
   {% call form_wrapper() %}
     {{ form.email_address(
       param_extensions={
@@ -26,11 +26,11 @@
 
     <div class="margin-bottom-3">
 		  <p class="form-label">
-		    {{ current_org.name }} team members can:
+		    {{ current_org.name }} organization administrators can:
 		  </p>
 		  <ul class="list list-bullet">
-		    <li>see usage and team members for each service</li>
-        <li>invite other team members</li>
+		    <li>access and manage all services</li>
+        <li>invite or remove other organization administrators</li>
 		  </ul>
 		</div>