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

Merge branch 'za/1501-users-delete-domain-records' of https://github.com/cisagov/manage.get.gov into za/1501-users-delete-domain-records

Browse source
This commit is contained in:
zandercymatics 2024-01-10 16:45:06 -07:00
commit 8df2ca183e
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
4 changed files with 26 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/registrar/assets/sass/_theme/_tables.scss
View file

@ -26,16 +26,21 @@
padding-bottom: units(2px); padding-bottom: units(2px);
} }
th.action-col-custom-width { // Ticket #1510
width: 24.25%; // @include at-media('desktop') {
} // th:first-child {
// width: 220px;
// Fix margins in mobile view // }
@include at-media('tablet') { // th:nth-child(2) {
td.tablet-margin-top-2 { // width: 175px;
margin-top: 16px; // }
} // th:nth-child(3) {
} // width: 130px;
// }
// th:nth-child(5) {
// width: 130px;
// }
// }
} }
.dotgov-table { .dotgov-table {

7
src/registrar/assets/sass/_theme/_usa-modal.scss
View file

@ -1,7 +0,0 @@
@use "cisa_colors" as *;
@use "uswds-core" as *;
.usa-modal.wider-modal {
width: 40% !important;
max-width: 40% !important;
}

1
src/registrar/assets/sass/_theme/styles.scss
View file

@ -17,7 +17,6 @@
@forward "tables"; @forward "tables";
@forward "sidenav"; @forward "sidenav";
@forward "register-form"; @forward "register-form";
@forward "usa-modal";
/*-------------------------------------------------- /*--------------------------------------------------
--- Admin ---------------------------------*/ --- Admin ---------------------------------*/

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

@ -9,7 +9,7 @@
{% if user.is_authenticated %} {% if user.is_authenticated %}
{# the entire logged in page goes here #} {# the entire logged in page goes here #}
<div class="tablet:grid-offset-1 desktop:grid-offset-1"> <div class="tablet:grid-col-11 desktop:grid-col-10 tablet:grid-offset-1">
<h1>Manage your domains</h2> <h1>Manage your domains</h2>
<p class="margin-top-4"> <p class="margin-top-4">
@ -31,7 +31,7 @@
{% endif %} {% endif %}
</p> </p>
<section class="section--outlined tablet:grid-col-11 desktop:grid-col-10"> <section class="section--outlined">
<h2>Domains</h2> <h2>Domains</h2>
{% if domains %} {% if domains %}
<table class="usa-table usa-table--borderless usa-table--stacked dotgov-table dotgov-table--stacked"> <table class="usa-table usa-table--borderless usa-table--stacked dotgov-table dotgov-table--stacked">
@ -44,13 +44,14 @@
<th <th
scope="col" scope="col"
role="columnheader" role="columnheader"
{% if has_deletable_applications %} class="action-col-custom-width" {% else %} class="width-15" {% endif %}
> >
<span class="usa-sr-only">Action</span> <span class="usa-sr-only">Action</span>
</th> </th>
{% comment %}
#1510
{% if has_deletable_applications %} {% if has_deletable_applications %}
<th></th> <th></th>
{% endif %} {% endif %} {% endcomment %}
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -102,7 +103,7 @@
{% endif %} {% endif %}
</section> </section>
<section class="section--outlined tablet:grid-col-11 desktop:grid-col-10"> <section class="section--outlined">
<h2>Domain requests</h2> <h2>Domain requests</h2>
{% if domain_applications %} {% if domain_applications %}
<table class="usa-table usa-table--borderless usa-table--stacked dotgov-table dotgov-table--stacked"> <table class="usa-table usa-table--borderless usa-table--stacked dotgov-table dotgov-table--stacked">
@ -134,7 +135,7 @@
<td data-label="Status">{{ application.get_status_display }}</td> <td data-label="Status">{{ application.get_status_display }}</td>
<td> <td>
{% if application.status == "started" or application.status == "action needed" or application.status == "withdrawn" %} {% if application.status == "started" or application.status == "action needed" or application.status == "withdrawn" %}
<a href="{% url 'edit-application' application.pk %}"> <a href="{% url 'edit-application' application.pk %}" role="button">
<svg class="usa-icon" aria-hidden="true" focusable="false" role="img" width="24"> <svg class="usa-icon" aria-hidden="true" focusable="false" role="img" width="24">
<use xlink:href="{%static 'img/sprite.svg'%}#edit"></use> <use xlink:href="{%static 'img/sprite.svg'%}#edit"></use>
</svg> </svg>
@ -149,12 +150,13 @@
</a> </a>
</td> </td>
{% if has_deletable_applications %} {% if has_deletable_applications %}
<td class="tablet-margin-top-2"> <td>
{% if application.status == "started" or application.status == "withdrawn" %} {% if application.status == "started" or application.status == "withdrawn" %}
<a <a
role="button"
id="button-toggle-delete-domain-alert-{{ forloop.counter }}" id="button-toggle-delete-domain-alert-{{ forloop.counter }}"
href="#toggle-delete-domain-alert-{{ forloop.counter }}" href="#toggle-delete-domain-alert-{{ forloop.counter }}"
class="usa-button--unstyled remove-text-no-underline" class="usa-button--unstyled text-no-underline"
aria-controls="toggle-delete-domain-alert-{{ forloop.counter }}" aria-controls="toggle-delete-domain-alert-{{ forloop.counter }}"
data-open-modal data-open-modal
> >
@ -165,7 +167,7 @@
</a> </a>
<div <div
class="usa-modal wider-modal" class="usa-modal"
id="toggle-delete-domain-alert-{{ forloop.counter }}" id="toggle-delete-domain-alert-{{ forloop.counter }}"
aria-labelledby="Are you sure you want to continue?" aria-labelledby="Are you sure you want to continue?"
aria-describedby="User will be removed" aria-describedby="User will be removed"