diff --git a/src/registrar/templates/domain_add_user.html b/src/registrar/templates/domain_add_user.html index 8ef167f98..31d2b0c6a 100644 --- a/src/registrar/templates/domain_add_user.html +++ b/src/registrar/templates/domain_add_user.html @@ -3,9 +3,6 @@ {% block title %}Add a domain manager | {% endblock %} -{% block domain_content %} - - {% include "includes/form_errors.html" with form=form %} {% block breadcrumb %} {% if portfolio %} @@ -41,6 +38,11 @@ {% endif %} {% endblock breadcrumb %} +{% block domain_content %} + + + {% include "includes/form_errors.html" with form=form %} +

Add a domain manager

{% if portfolio %}

diff --git a/src/registrar/templates/domain_base.html b/src/registrar/templates/domain_base.html index 919178577..12457240a 100644 --- a/src/registrar/templates/domain_base.html +++ b/src/registrar/templates/domain_base.html @@ -21,7 +21,13 @@ {% endif %} -

+
+ + + {% block breadcrumb %} + {% endblock breadcrumb %} + + {% if not domain.domain_info %}
@@ -62,7 +68,7 @@ {% endblock %} {# domain_content #} {% endif %} -
+
{% endblock %} {# content #} \ No newline at end of file diff --git a/src/registrar/templates/domain_detail.html b/src/registrar/templates/domain_detail.html index 9a99440de..4fa93bc4c 100644 --- a/src/registrar/templates/domain_detail.html +++ b/src/registrar/templates/domain_detail.html @@ -2,7 +2,6 @@ {% load static url_helpers %} {% load custom_filters %} -{% block domain_content %} {% block breadcrumb %} {% if portfolio %} @@ -19,6 +18,7 @@ {% endif %} {% endblock breadcrumb %} +{% block domain_content %} {{ block.super }}

{{ domain.name }}

diff --git a/src/registrar/templates/domain_dns.html b/src/registrar/templates/domain_dns.html index 80faa15f2..ecf9b2986 100644 --- a/src/registrar/templates/domain_dns.html +++ b/src/registrar/templates/domain_dns.html @@ -3,7 +3,6 @@ {% block title %}DNS | {{ domain.name }} | {% endblock %} -{% block domain_content %} {% block breadcrumb %} {% if portfolio %} @@ -23,6 +22,8 @@ {% endif %} {% endblock breadcrumb %} +{% block domain_content %} +

DNS

The Domain Name System (DNS) is the internet service that translates your domain name into an IP address. Before your .gov domain can be used, you'll need to connect it to a DNS hosting service and provide us with your name server information.

diff --git a/src/registrar/templates/domain_dnssec.html b/src/registrar/templates/domain_dnssec.html index e26c8768d..da88e96bd 100644 --- a/src/registrar/templates/domain_dnssec.html +++ b/src/registrar/templates/domain_dnssec.html @@ -3,7 +3,6 @@ {% block title %}DNSSEC | {{ domain.name }} | {% endblock %} -{% block domain_content %} {% block breadcrumb %} {% if portfolio %} @@ -26,6 +25,8 @@ {% endif %} {% endblock breadcrumb %} + + {% block domain_content %}

DNSSEC

diff --git a/src/registrar/templates/domain_dsdata.html b/src/registrar/templates/domain_dsdata.html index ceab937bc..28fd3c5a8 100644 --- a/src/registrar/templates/domain_dsdata.html +++ b/src/registrar/templates/domain_dsdata.html @@ -3,11 +3,6 @@ {% block title %}DS data | {{ domain.name }} | {% endblock %} -{% block domain_content %} - - {% for form in formset %} - {% include "includes/form_errors.html" with form=form %} - {% endfor %} {% block breadcrumb %} {% if portfolio %} @@ -34,6 +29,13 @@ {% endif %} {% endblock breadcrumb %} + {% block domain_content %} + + + {% for form in formset %} + {% include "includes/form_errors.html" with form=form %} + {% endfor %} +

DS data

diff --git a/src/registrar/templates/domain_nameservers.html b/src/registrar/templates/domain_nameservers.html index acd73cc3b..429c55fde 100644 --- a/src/registrar/templates/domain_nameservers.html +++ b/src/registrar/templates/domain_nameservers.html @@ -2,47 +2,46 @@ {% load static field_helpers%} {% block title %}DNS name servers | {{ domain.name }} | {% endblock %} + {% block breadcrumb %} + {% if portfolio %} + + + {% endif %} + {% endblock breadcrumb %} -{% block domain_content %} + {% block domain_content %} {# this is right after the messages block in the parent template. #} + + {% if formset.initial|length >= formset.max_num %} + +{% endif %} {% for form in formset %} {% include "includes/form_errors.html" with form=form %} {% endfor %} - {% if formset.initial|length >= formset.max_num %} - - {% endif %} - - {% block breadcrumb %} - {% if portfolio %} - - - {% endif %} - {% endblock breadcrumb %} -

Name servers

diff --git a/src/registrar/templates/domain_renewal.html b/src/registrar/templates/domain_renewal.html index 0ca092773..f74bbe752 100644 --- a/src/registrar/templates/domain_renewal.html +++ b/src/registrar/templates/domain_renewal.html @@ -2,20 +2,8 @@ {% load static url_helpers %} {% load custom_filters %} -{% block domain_content %} {% block breadcrumb %} - - {% if form.is_policy_acknowledged.errors %} - - {% endif %} - {% if portfolio %} + + {% block messages %} + {% include "includes/form_messages.html" %} + {% endblock messages%} + {% include "includes/form_errors.html" with form=form %} + +

Domain assignments

diff --git a/src/registrar/templates/portfolio_member_domains_edit.html b/src/registrar/templates/portfolio_member_domains_edit.html index 2a88075d7..831fa512a 100644 --- a/src/registrar/templates/portfolio_member_domains_edit.html +++ b/src/registrar/templates/portfolio_member_domains_edit.html @@ -7,11 +7,6 @@ {% block portfolio_content %}
- - {% include "includes/form_errors.html" with form=form %} - {% block messages %} - {% include "includes/form_messages.html" %} - {% endblock messages%} {% url 'members' as url %} {% if portfolio_permission %} @@ -38,6 +33,12 @@ + + {% block messages %} + {% include "includes/form_messages.html" %} + {% endblock messages%} + {% include "includes/form_errors.html" with form=form %} +

Edit domain assignments

diff --git a/src/registrar/templates/portfolio_member_permissions.html b/src/registrar/templates/portfolio_member_permissions.html index 59a8b1fd8..eb5a77049 100644 --- a/src/registrar/templates/portfolio_member_permissions.html +++ b/src/registrar/templates/portfolio_member_permissions.html @@ -11,11 +11,6 @@ {% block portfolio_content %}
- - {% include "includes/form_errors.html" with form=form %} - {% block messages %} - {% include "includes/form_messages.html" %} - {% endblock messages%} {% url 'members' as url %} @@ -38,6 +33,13 @@ + + {% block messages %} + {% include "includes/form_messages.html" %} + {% endblock messages%} + {% include "includes/form_errors.html" with form=form %} + +

Member access and permissions

diff --git a/src/registrar/templates/portfolio_members_add_new.html b/src/registrar/templates/portfolio_members_add_new.html index 7c9125b79..1e92d506a 100644 --- a/src/registrar/templates/portfolio_members_add_new.html +++ b/src/registrar/templates/portfolio_members_add_new.html @@ -11,11 +11,7 @@ {% block portfolio_content %}
- - {% include "includes/form_errors.html" with form=form %} - {% block messages %} - {% include "includes/form_messages.html" %} - {% endblock messages%} + + + {% block messages %} + {% include "includes/form_messages.html" %} + {% endblock messages%} + {% include "includes/form_errors.html" with form=form %} +

Add a new member

diff --git a/src/registrar/templates/profile.html b/src/registrar/templates/profile.html index e295a01fb..2e091e300 100644 --- a/src/registrar/templates/profile.html +++ b/src/registrar/templates/profile.html @@ -14,16 +14,6 @@ Edit your User Profile |
- {% if messages %} - {% for message in messages %} - - {% endfor %} - {% endif %} - {% include "includes/form_errors.html" with form=form %} {% if show_back_button %} @@ -35,7 +25,20 @@ Edit your User Profile |

{% endif %} - + + + {% if messages %} + {% for message in messages %} + + {% endfor %} + {% endif %} + + {% include "includes/form_errors.html" with form=form %} + {% if show_confirmation_modal %}