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

Merge pull request #1436 from cisagov/rh/1196-back-to-manage-domains

Browse source 
Ticket #1196: .gov registrar naming + move Back to Manage Domains places
This commit is contained in:
Rebecca H 2023-12-06 14:05:27 -08:00 • committed by GitHub
commit dbca43bcbf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/registrar/templates/base.html
View file

@ -1,5 +1,7 @@
<!doctype html>{# keep this on the first line #} <!doctype html>{# keep this on the first line #}
{% load i18n static %} {% load i18n static %}
{% load static url_helpers %}
<html class="no-js" lang="{{ LANGUAGE_CODE }}"> <html class="no-js" lang="{{ LANGUAGE_CODE }}">
<head> <head>
@ -145,9 +147,9 @@
<div class="usa-nav-container"> <div class="usa-nav-container">
<div class="usa-navbar"> <div class="usa-navbar">
{% block logo %} {% block logo %}
<div class="usa-logo" id="extended-logo"> <div class="usa-logo display-inline-block" id="extended-logo">
<strong class="usa-logo__text" > <strong class="usa-logo__text" >
<a href="{% url 'home' %}"> .gov </a> <a href="{% url 'home' %}">.gov registrar </a>
</strong> </strong>
</div> </div>
{% endblock %} {% endblock %}

20
src/registrar/templates/domain_base.html
View file

@ -5,17 +5,15 @@
{% block content %} {% block content %}
<div class="grid-container"> <div class="grid-container">
<div class="grid-row">
{% if not is_analyst_or_superuser or not analyst_action or analyst_action_location != domain.pk %} <div class="grid-row grid-gap">
<div class="tablet:grid-col-3">
<p class="font-body-md margin-top-0 margin-bottom-2 <p class="font-body-md margin-top-0 margin-bottom-2
text-primary-darker text-semibold" text-primary-darker text-semibold"
> >
<span class="usa-sr-only"> Domain name:</span> {{ domain.name }} <span class="usa-sr-only"> Domain name:</span> {{ domain.name }}
</p> </p>
{% endif %}
</div>
<div class="grid-row grid-gap">
<div class="tablet:grid-col-3">
{% if domain.domain_info %} {% if domain.domain_info %}
{% include 'domain_sidebar.html' %} {% include 'domain_sidebar.html' %}
{% endif %} {% endif %}
@ -42,16 +40,6 @@
</p> </p>
</div> </div>
</div> </div>
{% else %}
<a href="{% url 'home' %}" class="breadcrumb__back">
<svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
<use xlink:href="{% static 'img/sprite.svg' %}#arrow_back"></use>
</svg>
<p class="margin-left-05 margin-top-0 margin-bottom-0 line-height-sans-1">
Back to manage your domains
</p>
</a>
{% endif %} {% endif %}
{# messages block is under the back breadcrumb link #} {# messages block is under the back breadcrumb link #}
{% if messages %} {% if messages %}

4
src/registrar/templates/includes/footer.html
View file

@ -26,6 +26,10 @@
> >
<address class="usa-footer__address"> <address class="usa-footer__address">
<div class="usa-footer__contact-info grid-row grid-gap-md"> <div class="usa-footer__contact-info grid-row grid-gap-md">
<div class="grid-col-auto">
<a class="usa-link" rel="noopener noreferrer" href="{% url 'home' %}">Manage your domains</a>
</div>
<span class=""> | </span>
<div class="grid-col-auto"> <div class="grid-col-auto">
<a class="usa-link" rel="noopener noreferrer" target="_blank" href="{% public_site_url 'help/' %}">Help </a> <a class="usa-link" rel="noopener noreferrer" target="_blank" href="{% public_site_url 'help/' %}">Help </a>
</div> </div>

8
src/registrar/tests/test_views.py
View file

@ -1083,7 +1083,7 @@ class DomainApplicationTests(TestWithUser, WebTest):
home_page = self.app.get("/") home_page = self.app.get("/")
self.assertContains(home_page, "city.gov") self.assertContains(home_page, "city.gov")
# click the "Edit" link # click the "Edit" link
detail_page = home_page.click("Manage") detail_page = home_page.click("Manage", index=0)
self.assertContains(detail_page, "Federal: an agency of the U.S. government") self.assertContains(detail_page, "Federal: an agency of the U.S. government")
@ -2123,7 +2123,7 @@ class TestApplicationStatus(TestWithUser, WebTest):
home_page = self.app.get("/") home_page = self.app.get("/")
self.assertContains(home_page, "city.gov") self.assertContains(home_page, "city.gov")
# click the "Manage" link # click the "Manage" link
detail_page = home_page.click("Manage") detail_page = home_page.click("Manage", index=0)
self.assertContains(detail_page, "city.gov") self.assertContains(detail_page, "city.gov")
self.assertContains(detail_page, "city1.gov") self.assertContains(detail_page, "city1.gov")
self.assertContains(detail_page, "Chief Tester") self.assertContains(detail_page, "Chief Tester")
@ -2143,7 +2143,7 @@ class TestApplicationStatus(TestWithUser, WebTest):
home_page = self.app.get("/") home_page = self.app.get("/")
self.assertContains(home_page, "city.gov") self.assertContains(home_page, "city.gov")
# click the "Manage" link # click the "Manage" link
detail_page = home_page.click("Manage") detail_page = home_page.click("Manage", index=0)
self.assertContains(detail_page, "city.gov") self.assertContains(detail_page, "city.gov")
self.assertContains(detail_page, "Chief Tester") self.assertContains(detail_page, "Chief Tester")
self.assertContains(detail_page, "testy@town.com") self.assertContains(detail_page, "testy@town.com")
@ -2158,7 +2158,7 @@ class TestApplicationStatus(TestWithUser, WebTest):
home_page = self.app.get("/") home_page = self.app.get("/")
self.assertContains(home_page, "city.gov") self.assertContains(home_page, "city.gov")
# click the "Manage" link # click the "Manage" link
detail_page = home_page.click("Manage") detail_page = home_page.click("Manage", index=0)
self.assertContains(detail_page, "city.gov") self.assertContains(detail_page, "city.gov")
self.assertContains(detail_page, "city1.gov") self.assertContains(detail_page, "city1.gov")
self.assertContains(detail_page, "Chief Tester") self.assertContains(detail_page, "Chief Tester")