From e4e6c4d2777268c500c8a3e2feddfb76ab7e99fe Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Mon, 10 Feb 2020 13:53:29 -0500 Subject: [PATCH] Add DoD ID tooltip to app member and portfolio member forms --- styles/elements/_tooltip.scss | 5 +++++ templates/applications/fragments/member_form_fields.html | 5 +++-- templates/components/tooltip.html | 2 +- templates/portfolios/fragments/member_form_fields.html | 3 ++- translations.yaml | 1 + 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/styles/elements/_tooltip.scss b/styles/elements/_tooltip.scss index 46f1146b..b86506eb 100644 --- a/styles/elements/_tooltip.scss +++ b/styles/elements/_tooltip.scss @@ -95,4 +95,9 @@ .icon { @include icon-size(16); } + + &--tight { + margin: 0; + padding: 0; + } } diff --git a/templates/applications/fragments/member_form_fields.html b/templates/applications/fragments/member_form_fields.html index dd91dd5d..cb9a5c31 100644 --- a/templates/applications/fragments/member_form_fields.html +++ b/templates/applications/fragments/member_form_fields.html @@ -1,7 +1,8 @@ {% from "components/alert.html" import Alert %} {% from "components/checkbox_input.html" import CheckboxInput %} -{% from "components/text_input.html" import TextInput %} {% from "components/phone_input.html" import PhoneInput %} +{% from "components/text_input.html" import TextInput %} +{% from "components/tooltip.html" import Tooltip %} {% macro EnvRoleInput(sub_form, member_role_id=None) %} {% set role = sub_form.role.data if not sub_form.disabled.data else "Access Suspended" %} @@ -121,6 +122,6 @@ {{ TextInput(member_form.email, validation='email', optional=False) }} {{ PhoneInput(member_form.phone_number, member_form.phone_ext)}} {{ TextInput(member_form.dod_id, validation='dodId', optional=False) }} - {{ "forms.new_member.dod_help" | translate }} + {{ "forms.new_member.dod_help" | translate }} {{ Tooltip("forms.new_member.dod_text"|translate, title="", classes="icon-tooltip--tight") }} {% endmacro %} diff --git a/templates/components/tooltip.html b/templates/components/tooltip.html index 052299f6..bec2a31a 100644 --- a/templates/components/tooltip.html +++ b/templates/components/tooltip.html @@ -2,7 +2,7 @@ {% macro Tooltip(message,title='Help', classes="") %} - diff --git a/templates/portfolios/fragments/member_form_fields.html b/templates/portfolios/fragments/member_form_fields.html index 48642d2b..7e0998c2 100644 --- a/templates/portfolios/fragments/member_form_fields.html +++ b/templates/portfolios/fragments/member_form_fields.html @@ -2,6 +2,7 @@ {% from "components/icon.html" import Icon %} {% from "components/phone_input.html" import PhoneInput %} {% from "components/text_input.html" import TextInput %} +{% from "components/tooltip.html" import Tooltip %} {% macro PermsFields(form, member_role_id=None) %}

Set Portfolio Permissions

@@ -32,6 +33,6 @@ {{ TextInput(member_form.email, validation='email', optional=False) }} {{ PhoneInput(member_form.phone_number, member_form.phone_ext)}} {{ TextInput(member_form.dod_id, validation='dodId', optional=False) }} - {{ "forms.new_member.dod_help" | translate }} + {{ "forms.new_member.dod_help" | translate }} {{ Tooltip("forms.new_member.dod_text"|translate, title="", classes="icon-tooltip--tight") }} {% endmacro %} diff --git a/translations.yaml b/translations.yaml index b80f5dca..c3d73c3a 100644 --- a/translations.yaml +++ b/translations.yaml @@ -246,6 +246,7 @@ forms: description: Add, remove and edit applications in this Portfolio. dod_id_label: DoD ID dod_help: How do I find out the DoD ID? + dod_text: "An individual's DOD ID (formerly known as EDIPI) number can be found on the back of their CAC. Access to this system requires a valid CAC and DOD ID." email_label: Email address first_name_label: First name funding: