From e02adf45c48e36d71c3885066811f72b2cb6cec8 Mon Sep 17 00:00:00 2001
From: Rajit Sarkar <rsar@loc.gov>
Date: Fri, 3 Nov 2023 08:09:44 -0400
Subject: [PATCH] CONCD-564 some additional tweaking

---
 concordia/templates/account/profile.html | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/concordia/templates/account/profile.html b/concordia/templates/account/profile.html
index 3efd511f3..aa684382f 100644
--- a/concordia/templates/account/profile.html
+++ b/concordia/templates/account/profile.html
@@ -36,19 +36,15 @@ <h2>Account Settings</h2>
                         <div class="mb-2">
                             <span class="font-weight-bold">Username</span>: {{ user.username }}
                         </div>
-                        <div class="mb-2">Optional: If you want a name to appear on your service letter, enter first and last name and click "Save" To remove name data click "Save" without entering any text.</div>
-                        {% if user.first_name %}
-                            <div class="mb-2">
-                                <span class="font-weight-bold">First Name</span>: {{ user.first_name }}
-                            </div>
-                        {% endif %}
-                        {% if user.last_name %}
-                            <div class="mb-2">
-                                <span class="font-weight-bold">Last Name</span>: {{ user.last_name }}
-                            </div>
-                        {% endif %}
                     </div>
                     <div class="col-12 col-md-10 py-3 change-options">
+                        <div class="mb-2">
+                            <span class="font-weight-bold">First Name</span>: {{ user.first_name }}
+                        </div>
+                        <div class="mb-2">
+                            <span class="font-weight-bold">Last Name</span>: {{ user.last_name }}
+                        </div>
+                        <div class="mb-2">Optional: If you want a name to appear on your service letter, enter first and last name and click "Save" To remove name data click "Save" without entering any text.</div>
                         <form class="form" action="{% url 'user-profile' %}" method="POST" enctype="multipart/form-data">
                             {% csrf_token %}
                             <div class="mb-3 user-fields">
@@ -66,7 +62,7 @@ <h2>Account Settings</h2>
                             </div>
                         </form>
                     </div>
-                    <div class="col-12 col-md-10">
+                    <div class="col-12 col-md-10 py-3 mt-5 change-options">
                         <div class="mt-1 mb-3">
                             <span class="font-weight-bold">Email address</span>: {{ user.email }}
                         </div>
@@ -75,8 +71,6 @@ <h2>Account Settings</h2>
                                 <span class="font-weight-bold">Unconfirmed email address</span>: {{ unconfirmed_email }}
                             </div>
                         {% endif %}
-                    </div>
-                    <div class="col-12 col-md-10 py-3 change-options">
                         <form class="form needs-validation" action="{% url 'user-profile' %}" method="POST" enctype="multipart/form-data" novalidate>
                             {% csrf_token %}
 
@@ -95,6 +89,8 @@ <h2>Account Settings</h2>
                                 {% endif %}
                             </div>
                         </form>
+                    </div>
+                    <div class="col-12 col-md-10 py-3 mt-5 change-options">
                         <div class="row justify-content-start">
                             <div class="btn-row col-md-10">
                                 <a class="btn btn-primary rounded-0" href="{% url 'password_change' %}">Change Password</a>