From 77b88b0b3c14440b1c4be75bfe2f5ec756de0912 Mon Sep 17 00:00:00 2001
From: Montana <montana-ctr@friends.dds.mil>
Date: Tue, 16 Oct 2018 14:44:38 -0400
Subject: [PATCH 1/3] Add a description to env roles modal

---
 atst/forms/data.py                     | 5 +++++
 atst/routes/workspaces.py              | 3 ++-
 templates/components/modal.html        | 7 ++++++-
 templates/workspaces/members/edit.html | 2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/atst/forms/data.py b/atst/forms/data.py
index 06db4ed8..7755c3a3 100644
--- a/atst/forms/data.py
+++ b/atst/forms/data.py
@@ -155,6 +155,11 @@ ENVIRONMENT_ROLES = [
     ),
 ]
 
+ENV_ROLE_MODAL_DESCRIPTION = {
+    "header": "Assign Environment Role",
+    "body": "An environment role determines the permissions a member of the workspace assumes when using the JEDI Cloud.\n\nA member may have different environment roles across different projects. A member can only have one assigned environment role in a given environment.",
+}
+
 FUNDING_TYPES = [
     ("", "- Select -"),
     ("RDTE", "Research, Development, Testing & Evaluation (RDT&E)"),
diff --git a/atst/routes/workspaces.py b/atst/routes/workspaces.py
index 583d4b65..ae0525a2 100644
--- a/atst/routes/workspaces.py
+++ b/atst/routes/workspaces.py
@@ -21,7 +21,7 @@ from atst.forms.new_project import NewProjectForm
 from atst.forms.new_member import NewMemberForm
 from atst.forms.edit_member import EditMemberForm
 from atst.forms.workspace import WorkspaceForm
-from atst.forms.data import ENVIRONMENT_ROLES
+from atst.forms.data import ENVIRONMENT_ROLES, ENV_ROLE_MODAL_DESCRIPTION
 from atst.domain.authz import Authorization
 from atst.models.permissions import Permissions
 
@@ -238,6 +238,7 @@ def view_member(workspace_id, member_id):
         projects=projects,
         form=form,
         choices=ENVIRONMENT_ROLES,
+        env_role_modal_description=ENV_ROLE_MODAL_DESCRIPTION,
         EnvironmentRoles=EnvironmentRoles,
     )
 
diff --git a/templates/components/modal.html b/templates/components/modal.html
index 8897238d..4d666e0e 100644
--- a/templates/components/modal.html
+++ b/templates/components/modal.html
@@ -1,11 +1,16 @@
 {% from "components/icon.html" import Icon %}
 
-{% macro Modal(name, dismissable=False) -%}
+{% macro Modal(name, dismissable=False, description=None) -%}
   <div v-show="activeModal === '{{name}}'" v-cloak>
     <div class='modal {% if dismissable %}modal--dismissable{% endif%}'>
       <div class='modal__container'>
         <div class='modal__dialog' role='dialog' aria-modal='true'>
           <div class='modal__body'>
+              {% if description %}
+                <h1>{{ description.header }}</h1>
+                <div>{{ description.body }}</div>
+              {% endif %}
+
               {{ caller() }}
 
               {% if dismissable %}
diff --git a/templates/workspaces/members/edit.html b/templates/workspaces/members/edit.html
index ef92399b..bfdfeaa4 100644
--- a/templates/workspaces/members/edit.html
+++ b/templates/workspaces/members/edit.html
@@ -76,7 +76,7 @@
             <div class='project-list-item__environment__actions'>
               <span v-bind:class="label_class" v-html:on=displayName></span>
               <button v-on:click="openModal('{{ env.name }}RolesModal')" type="button" class="icon-link">set role</button>
-              {% call Modal(name=env.name + 'RolesModal', dismissable=False) %}
+              {% call Modal(name=env.name + 'RolesModal', dismissable=False, description=env_role_modal_description) %}
                   <div class='block-list'>
                     <ul>
                       {% for choice in choices %}

From a50c3d92f91c7d5c28747257b551f943f90cde6c Mon Sep 17 00:00:00 2001
From: Montana <montana-ctr@friends.dds.mil>
Date: Tue, 16 Oct 2018 15:41:15 -0400
Subject: [PATCH 2/3] Style the modal description

---
 templates/components/modal.html        |  7 +------
 templates/workspaces/members/edit.html | 10 +++++++++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/templates/components/modal.html b/templates/components/modal.html
index 4d666e0e..8897238d 100644
--- a/templates/components/modal.html
+++ b/templates/components/modal.html
@@ -1,16 +1,11 @@
 {% from "components/icon.html" import Icon %}
 
-{% macro Modal(name, dismissable=False, description=None) -%}
+{% macro Modal(name, dismissable=False) -%}
   <div v-show="activeModal === '{{name}}'" v-cloak>
     <div class='modal {% if dismissable %}modal--dismissable{% endif%}'>
       <div class='modal__container'>
         <div class='modal__dialog' role='dialog' aria-modal='true'>
           <div class='modal__body'>
-              {% if description %}
-                <h1>{{ description.header }}</h1>
-                <div>{{ description.body }}</div>
-              {% endif %}
-
               {{ caller() }}
 
               {% if dismissable %}
diff --git a/templates/workspaces/members/edit.html b/templates/workspaces/members/edit.html
index bfdfeaa4..29246c45 100644
--- a/templates/workspaces/members/edit.html
+++ b/templates/workspaces/members/edit.html
@@ -76,8 +76,16 @@
             <div class='project-list-item__environment__actions'>
               <span v-bind:class="label_class" v-html:on=displayName></span>
               <button v-on:click="openModal('{{ env.name }}RolesModal')" type="button" class="icon-link">set role</button>
-              {% call Modal(name=env.name + 'RolesModal', dismissable=False, description=env_role_modal_description) %}
+              {% call Modal(name=env.name + 'RolesModal', dismissable=False) %}
                   <div class='block-list'>
+                    <div class='block-list__header'>
+                      <div>
+                      {% if env_role_modal_description %}
+                        <h1>{{ env_role_modal_description.header }}</h1>
+                        <p>{{ env_role_modal_description.body }}</p>
+                      {% endif %}
+                      </div>
+                    </div>
                     <ul>
                       {% for choice in choices %}
                       <li class='block-list__item block-list__item--selectable'>

From f9d910efd73e3279941a11fd63ddcec77c55fdb7 Mon Sep 17 00:00:00 2001
From: Montana <montana-ctr@friends.dds.mil>
Date: Tue, 16 Oct 2018 16:45:13 -0400
Subject: [PATCH 3/3] Fix new lines

---
 atst/forms/data.py                     | 2 +-
 templates/workspaces/members/edit.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/atst/forms/data.py b/atst/forms/data.py
index 7755c3a3..f5757233 100644
--- a/atst/forms/data.py
+++ b/atst/forms/data.py
@@ -157,7 +157,7 @@ ENVIRONMENT_ROLES = [
 
 ENV_ROLE_MODAL_DESCRIPTION = {
     "header": "Assign Environment Role",
-    "body": "An environment role determines the permissions a member of the workspace assumes when using the JEDI Cloud.\n\nA member may have different environment roles across different projects. A member can only have one assigned environment role in a given environment.",
+    "body": "An environment role determines the permissions a member of the workspace assumes when using the JEDI Cloud.<br/><br/>A member may have different environment roles across different projects. A member can only have one assigned environment role in a given environment.",
 }
 
 FUNDING_TYPES = [
diff --git a/templates/workspaces/members/edit.html b/templates/workspaces/members/edit.html
index 29246c45..bdcac597 100644
--- a/templates/workspaces/members/edit.html
+++ b/templates/workspaces/members/edit.html
@@ -82,7 +82,7 @@
                       <div>
                       {% if env_role_modal_description %}
                         <h1>{{ env_role_modal_description.header }}</h1>
-                        <p>{{ env_role_modal_description.body }}</p>
+                        <p>{{ env_role_modal_description.body | safe }}</p>
                       {% endif %}
                       </div>
                     </div>