diff --git a/atst/forms/portfolio_member.py b/atst/forms/portfolio_member.py index a017539f..9fff59c1 100644 --- a/atst/forms/portfolio_member.py +++ b/atst/forms/portfolio_member.py @@ -10,24 +10,24 @@ from atst.utils.localization import translate class PermissionsForm(BaseForm): perms_app_mgmt = BooleanField( - translate("forms.new_member.app_mgmt"), + translate("forms.new_member.app_mgmt.label"), default=False, - description="Add, remove and edit applications in this Portfolio.", + description=translate("forms.new_member.app_mgmt.description"), ) perms_funding = BooleanField( - translate("forms.new_member.funding"), + translate("forms.new_member.funding.label"), default=False, - description="Add and Modify Task Orders to fund this Portfolio.", + description=translate("forms.new_member.funding.description"), ) perms_reporting = BooleanField( - translate("forms.new_member.reporting"), + translate("forms.new_member.reporting.label"), default=False, - description="View and export reports about this Portfolio's funding.", + description=translate("forms.new_member.reporting.description"), ) perms_portfolio_mgmt = BooleanField( - translate("forms.new_member.portfolio_mgmt"), + translate("forms.new_member.portfolio_mgmt.label"), default=False, - description="Edit this Portfolio's settings.", + description=translate("forms.new_member.portfolio_mgmt.description"), ) @property diff --git a/templates/components/member_form.html b/templates/components/member_form.html index 14766b6d..f68c5eed 100644 --- a/templates/components/member_form.html +++ b/templates/components/member_form.html @@ -2,7 +2,7 @@ {% macro MemberForm(title=None, next_button=None, previous=True, modal=modal) %}

- {% if title %}

{{ title }}

{% endif %} + {% if title %}

{{ title }}

{% endif %} {{ caller() }}
diff --git a/templates/portfolios/fragments/add_new_portfolio_member.html b/templates/portfolios/fragments/add_new_portfolio_member.html index 83863636..7bfccc37 100644 --- a/templates/portfolios/fragments/add_new_portfolio_member.html +++ b/templates/portfolios/fragments/add_new_portfolio_member.html @@ -4,11 +4,7 @@ {% from "components/text_input.html" import TextInput %} {% macro PermsFields(form, member_role_id=None) %} -

Assign member permissions

- - {{ Icon('info') }} - {{ "portfolios.admin.permissions_info" | translate }} - +

Set Portfolio Permissions

{% if new %} {% set app_mgmt = form.perms_app_mgmt.name %} diff --git a/translations.yaml b/translations.yaml index 925cc07e..5ec23702 100644 --- a/translations.yaml +++ b/translations.yaml @@ -161,15 +161,23 @@ forms: phone_number_label: Phone number service_branch_label: Service branch or agency new_member: - app_mgmt: App management + app_mgmt: + label: Edit Applications + description: Add, remove and edit applications in this Portfolio. dod_id_label: DoD ID email_label: Email address first_name_label: First name - funding: Funding + funding: + label: Edit Funding + description: Add and Modify Task Orders to fund this Portfolio. last_name_label: Last name phone_number_label: Phone number - portfolio_mgmt: Portfolio management - reporting: Reporting + portfolio_mgmt: + label: Edit Portfolio + description: "Edit this Portfolio's settings." + reporting: + label: Edit Reporting + description: "View and export reports about this Portfolio's funding." portfolio: name: label: Portfolio Name