From fe8a68043fabbd89029135dd7e51d3492faf23b9 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 17 Sep 2024 11:20:50 -0600
Subject: [PATCH] re-remove and fix breadcrumb

---
 .../templates/domain_request_status.html      | 24 +++++++------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/registrar/templates/domain_request_status.html b/src/registrar/templates/domain_request_status.html
index 2cdd9b03f..0a67d687a 100644
--- a/src/registrar/templates/domain_request_status.html
+++ b/src/registrar/templates/domain_request_status.html
@@ -8,8 +8,6 @@
 {% block content %}
 <main id="main-content" class="grid-container">
   <div class="grid-col desktop:grid-offset-2 desktop:grid-col-8">
-    {% comment %} 
-    TODO: Uncomment in #2596
     {% if portfolio %}
       {% url 'domain-requests' as url %}
       <nav class="usa-breadcrumb padding-top-0" aria-label="Domain request breadcrumb">
@@ -18,12 +16,15 @@
             <a href="{{ url }}" class="usa-breadcrumb__link"><span>Domain requests</span></a>
           </li>
           <li class="usa-breadcrumb__list-item usa-current" aria-current="page">
-            <span>{{ DomainRequest.requested_domain.name }}</span
-            >
+            {% if not DomainRequest.requested_domain and DomainRequest.status == DomainRequest.DomainRequestStatus.STARTED %}
+              <span>New domain request</span>
+            {% else %}
+              <span>{{ DomainRequest.requested_domain.name }}</span>
+            {% endif %}
           </li>
         </ol>
       </nav>
-    {% else %}{% endcomment %}
+    {% else %}
     {% url 'home' as url %}
     <a href="{{ url }}" class="breadcrumb__back">
       <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
@@ -34,12 +35,9 @@
         Back to manage your domains
       </p>
     </a>
-
-    {% if not DomainRequest.requested_domain and DomainRequest.status == DomainRequest.DomainRequestStatus.STARTED %}
-      <h1>New domain request</h1>
-    {% else %}
-      <h1>Domain request for {{ DomainRequest.requested_domain.name }}</h1>
     {% endif %}
+
+    <h1>Domain request for {{ DomainRequest.requested_domain.name }}</h1>
     <div
         class="usa-summary-box dotgov-status-box margin-top-3 padding-left-2" 
         role="region"
@@ -58,12 +56,6 @@
     </div>
     <br>
 
-    {% if DomainRequest.creator and DomainRequest.creator != request.user %}
-      <p class="margin-top-1 margin-bottom-1">
-        <b class="review__step__name">Created by:</b> {{DomainRequest.creator.email|default:DomainRequest.creator.get_formatted_name }}
-      </p>
-    {% endif %}
-
     {% with statuses=DomainRequest.DomainRequestStatus last_submitted=DomainRequest.last_submitted_date|date:"F j, Y" first_submitted=DomainRequest.first_submitted_date|date:"F j, Y" last_status_update=DomainRequest.last_status_update|date:"F j, Y" %}
     {% comment %} 
     These are intentionally seperated this way.