Merge branch 'master' into move-scope

templates/fragments/admin/add_new_portfolio_member.html

@@ -17,7 +17,7 @@
 
 {% set step_one %}
   <div class="modal__form--header">
-    <h1>Invite New Portfolio Member</h1>
+    <h1>Invite new portfolio member</h1>
   </div>
   <div class='form-row'>
     <div class='form-col form-col--half'>
@@ -48,14 +48,14 @@
         v-on:click="next()"
         v-bind:disabled="invalid"
         class='action-group__action usa-button'
-        value='Next Step'>
+        value='Next'>
     <a class='action-group__action icon-link icon-link--default' v-on:click="closeModal('{{ new_port_mem }}')">Cancel</a>
   </div>
 {% endset %}
 {% set step_two %}
   <div class="modal__form--padded">
     <div class="modal__form--header">
-      <h1>Assign Member Permissions</h1>
+      <h1>Assign member permissions</h1>
       <a class='icon-link'>
         {{ Icon('info') }}
         {{ "portfolios.admin.permissions_info" | translate }}
@@ -70,7 +70,7 @@
         type="submit"
         class='action-group__action usa-button'
         form="add-port-mem"
-        value='Invite Member'>
+        value='Invite member'>
       <a class='action-group__action icon-link icon-link--default' v-on:click="closeModal('{{ new_port_mem }}')">Cancel</a>
     </div>
   </div>

templates/fragments/admin/members_edit.html

@@ -16,5 +16,6 @@
 
     <td><button type="button" class='{{ archive_button_class }}'>{{ "portfolios.members.archive_button" | translate }}</button>
     </td>
+    {{ subform.user_id() }}
   </tr>
 {% endfor %}

templates/fragments/admin/portfolio_members.html

@@ -6,18 +6,20 @@
     {% if g.matchesPath("portfolio-members") %}
       {% include "fragments/flash.html" %}
     {% endif %}
-    <form method='POST' id="member-perms" autocomplete="off" enctype="multipart/form-data">
-      <div class='member-list-header'>
-        <div class='left'>
-          <div class='h3'>{{ "portfolios.admin.portfolio_members_title" | translate }}</div>
-          <div class='subheading'>
-            {{ "portfolios.admin.portfolio_members_subheading" | translate }}
-          </div>
+    <form method='POST' id="member-perms" action='{{ url_for("portfolios.edit_portfolio_members", portfolio_id=portfolio.id) }}' autocomplete="off" enctype="multipart/form-data">
+    {{ member_perms_form.csrf_token }}
+
+    <div class='member-list-header'>
+      <div class='left'>
+        <div class='h3'>{{ "portfolios.admin.portfolio_members_title" | translate }}</div>
+        <div class='subheading'>
+          {{ "portfolios.admin.portfolio_members_subheading" | translate }}
         </div>
-        <a class='icon-link'>
-          {{ Icon('info') }}
-          {{ "portfolios.admin.settings_info" | translate }}
-        </a>
+      </div>
+      <a class='icon-link'>
+        {{ Icon('info') }}
+        {{ "portfolios.admin.settings_info" | translate }}
+      </a>
       </div>
 
     {% if not portfolio.members %}

templates/navigation/global_sidenav.html

@@ -31,7 +31,7 @@
         </ul>
         <div class="sidenav__divider--small"></div>
         <a class="sidenav__link sidenav__link--add" href="{{ url_for("task_orders.get_started") }}" title="Fund a New Portfolio">
-          <span class="sidenav__link-label">Fund a New Portfolio</span>
+          <span class="sidenav__link-label">Fund a new portfolio</span>
           {{ Icon("plus", classes="sidenav__link-icon icon--circle") }}
         </a>
       </div>

templates/portfolios/task_orders/index.html

@@ -93,7 +93,7 @@
 <div class="portfolio-funding">
 
   <div class='portfolio-funding__header row'>
-    <a href="{{ url_for("task_orders.new", screen=1, portfolio_id=portfolio.id) }}" class="usa-button">Start a New Task Order</a>
+    <a href="{{ url_for("task_orders.new", screen=1, portfolio_id=portfolio.id) }}" class="usa-button">Start a new task order</a>
   </div>
 
   {% for task_order in pending_task_orders %}

templates/portfolios/task_orders/show.html

@@ -27,7 +27,7 @@
         {% if complete %}
           <span class="label label--success">Completed</span>
         {% else %}
-          <span class="label">Not Started</span>
+          <span class="label">Not started</span>
         {% endif %}
       </div>
       <div class="task-order-next-steps__text col col--grow">
@@ -118,7 +118,7 @@
         </dd>
       </div>
       <div class="task-order-heading__value col">
-        <dt>Task Order Value</dt>
+        <dt>Task order value</dt>
         <dd>{{ task_order.budget | dollars }}</dd>
       </div>
     </div>