zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-14 06:55:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/dk/1807-user-profile' into za/2047-force-new-users-profile

Browse source
This commit is contained in:
zandercymatics 2024-05-20 14:19:35 -06:00
commit 4e4d0d0f1e
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
4 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/registrar/templates/domain_detail.html
View file

@ -59,6 +59,7 @@
{% url 'domain-authorizing-official' pk=domain.id as url %}
{% include "includes/summary_item.html" with title='Authorizing official' value=domain.domain_info.authorizing_official contact='true' edit_link=url editable=domain.is_editable %}
{# Conditionally display profile #}
{% if not has_profile_feature_flag %}
{% url 'domain-your-contact-information' pk=domain.id as url %}
{% include "includes/summary_item.html" with title='Your contact information' value=request.user.contact contact='true' edit_link=url editable=domain.is_editable %}

2
src/registrar/templates/domain_sidebar.html
View file

@ -74,7 +74,7 @@
</li>
{% if not has_profile_feature_flag %}
{% comment %}Conditionally display profile link in main nav{% endcomment %}
{# Conditionally display profile link in main nav #}
<li class="usa-sidenav__item">
{% url 'domain-your-contact-information' pk=domain.id as url %}
<a href="{{ url }}"

8
src/registrar/templates/includes/input_with_errors.html
View file

@ -36,12 +36,12 @@ error messages, if necessary.
{% if sublabel_text %}
<p id="{{ widget.attrs.id }}__sublabel" class="text-base margin-top-2px margin-bottom-1">
{% comment %} If the link_text appears more than once, the first instance will be a link and the other instances will be ignored {% endcomment %}
{# If the link_text appears more than once, the first instance will be a link and the other instances will be ignored #}
{% if link_text and link_text in sublabel_text %}
{% with link_index=sublabel_text|find_index:link_text %}
{{ sublabel_text|slice:link_index }}
{% comment %} HTML will convert a new line into a space, resulting with a space before the fullstop in case link_text is at the end of sublabel_text, hence the unfortunate line below {% endcomment %}
<a {% if external_link == "true" %}rel="noopener noreferrer" class="usa-link usa-link--external" {% endif %}{% if target_blank == "true" %}target="_blank" {% endif %}href="{{ link_href }}">{{ link_text }}</a>{% with sublabel_part_after=sublabel_text|slice_after:link_text %}{{ sublabel_part_after }}{% endwith %}
{# HTML will convert a new line into a space, resulting with a space before the fullstop in case link_text is at the end of sublabel_text, hence the unfortunate line below #}
<a {% if external_link %}rel="noopener noreferrer" class="usa-link usa-link--external" {% endif %}{% if target_blank == "true" %}target="_blank" {% endif %}href="{{ link_href }}">{{ link_text }}</a>{% with sublabel_part_after=sublabel_text|slice_after:link_text %}{{ sublabel_part_after }}{% endwith %}
{% endwith %}
{% else %}
{{ sublabel_text }}
@ -85,7 +85,7 @@ error messages, if necessary.
</div>
{% endif %}
{% if widget.attrs.maxlength and do_not_show_max_chars == "false" %}
{% if widget.attrs.maxlength and not do_not_show_max_chars %}
<span
id="{{ widget.attrs.id }}__message"
class="usa-character-count__message"

8
src/registrar/templates/profile.html
View file

@ -51,11 +51,13 @@ Edit your User Profile |
{% input_with_errors form.title %}
{% public_site_url "help/account-management/#get-help-with-login.gov" as login_help_url %}
{% with link_href=login_help_url %}
{% with sublabel_text="We recommend using your work email for your .gov account. If the wrong email is displayed below, you’ll need to update your Login.gov account and log back in. Get help with your Login.gov account." %}
{% with link_text="Get help with your Login.gov account" %}
{% with link_href="http://Login.gov" %}
{% with target_blank="true" %}
{% with do_not_show_max_chars="true" %}
{% with target_blank=True %}
{% with do_not_show_max_chars=True %}
{% input_with_errors form.email %}
{% endwith %}
{% endwith %}