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

design review tweaks

Browse source
This commit is contained in:
Rachid Mrad 2024-08-28 16:20:54 -04:00
parent 04157ce404
commit 5f21cd9ab8
No known key found for this signature in database
3 changed files with 64 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/registrar/assets/sass/_theme/_admin.scss
View file

@ -886,3 +886,7 @@ ul.add-list-reset {
.transfer-user-selector .select2-selection__placeholder { .transfer-user-selector .select2-selection__placeholder {
color: #3d4551!important; color: #3d4551!important;
} }
.dl-dja dt {
font-size: 14px;
}

114
src/registrar/templates/admin/transfer_user.html
View file

@ -48,7 +48,7 @@
</option> </option>
{% endfor %} {% endfor %}
</select> </select>
<input type="submit" value="Preview" class="usa-button usa-button--dja"> <input type="submit" value="Select and preview" class="usa-button usa-button--dja">
</form> </form>
</div> </div>
<div class="desktop:flex-align-center"> <div class="desktop:flex-align-center">
@ -61,64 +61,13 @@
</div> </div>
<div class="grid-row grid-gap-2"> <div class="grid-row grid-gap-2">
<div class="tablet:grid-col-6 margin-top-2">
<div class="module height-full">
<h2>User to receive data</h2>
<div class="padding-top-2 padding-x-2">
<dl>
<dt>Username:</dt>
<dd>{{ current_user.username }}</dd>
<dt>Created at:</dt>
<dd>{{ current_user.created_at }}</dd>
<dt>Last login:</dt>
<dd>{{ current_user.last_login }}</dd>
<dt>First name:</dt>
<dd>{{ current_user.first_name }}</dd>
<dt>Middle name:</dt>
<dd>{{ current_user.middle_name }}</dd>
<dt>Last name:</dt>
<dd>{{ current_user.last_name }}</dd>
<dt>Title:</dt>
<dd>{{ current_user.title }}</dd>
<dt>Email:</dt>
<dd>{{ current_user.email }}</dd>
<dt>Phone:</dt>
<dd>{{ current_user.phone }}</dd>
<dt>Domains:</dt>
<dd>
{% if current_user_domains %}
<ul>
{% for domain in current_user_domains %}
<li>{{ domain }}</li>
{% endfor %}
</ul>
{% else %}
None
{% endif %}
</dd>
<dt>Domain requests:</dt>
<dd>
{% if current_user_domain_requests %}
<ul>
{% for request in current_user_domain_requests %}
<li>{{ request }}</li>
{% endfor %}
</ul>
{% else %}
None
{% endif %}
</dd>
</dl>
</div>
</div>
</div>
<div class="tablet:grid-col-6 margin-top-2"> <div class="tablet:grid-col-6 margin-top-2">
<div class="module height-full"> <div class="module height-full">
<h2>User to lose data and be deleted</h2> <h2>User to transfer data from</h2>
<div class="padding-top-2 padding-x-2"> <div class="padding-top-2 padding-x-2">
{% if selected_user %} {% if selected_user %}
<dl> <dl class="dl-dja">
<dt>Username:</dt> <dt>Username:</dt>
<dd>{{ selected_user.username }}</dd> <dd>{{ selected_user.username }}</dd>
<dt>Created at:</dt> <dt>Created at:</dt>
@ -137,6 +86,7 @@
<dd>{{ selected_user.email }}</dd> <dd>{{ selected_user.email }}</dd>
<dt>Phone:</dt> <dt>Phone:</dt>
<dd>{{ selected_user.phone }}</dd> <dd>{{ selected_user.phone }}</dd>
<h3 class="font-heading-md">Data that will get transferred:</h3>
<dt>Domains:</dt> <dt>Domains:</dt>
<dd> <dd>
{% if selected_user_domains %} {% if selected_user_domains %}
@ -168,6 +118,60 @@
</div> </div>
</div> </div>
</div> </div>
<div class="tablet:grid-col-6 margin-top-2">
<div class="module height-full">
<h2>User to receive data</h2>
<div class="padding-top-2 padding-x-2">
<dl class="dl-dja">
<dt>Username:</dt>
<dd>{{ current_user.username }}</dd>
<dt>Created at:</dt>
<dd>{{ current_user.created_at }}</dd>
<dt>Last login:</dt>
<dd>{{ current_user.last_login }}</dd>
<dt>First name:</dt>
<dd>{{ current_user.first_name }}</dd>
<dt>Middle name:</dt>
<dd>{{ current_user.middle_name }}</dd>
<dt>Last name:</dt>
<dd>{{ current_user.last_name }}</dd>
<dt>Title:</dt>
<dd>{{ current_user.title }}</dd>
<dt>Email:</dt>
<dd>{{ current_user.email }}</dd>
<dt>Phone:</dt>
<dd>{{ current_user.phone }}</dd>
<h3 class="font-heading-md" aria-label="Data that will added to:">&nbsp;</h3>
<dt>Domains:</dt>
<dd>
{% if current_user_domains %}
<ul>
{% for domain in current_user_domains %}
<li>{{ domain }}</li>
{% endfor %}
</ul>
{% else %}
None
{% endif %}
</dd>
<dt>Domain requests:</dt>
<dd>
{% if current_user_domain_requests %}
<ul>
{% for request in current_user_domain_requests %}
<li>{{ request }}</li>
{% endfor %}
</ul>
{% else %}
None
{% endif %}
</dd>
</dl>
</div>
</div>
</div>
</div> </div>
</div> </div>
@ -184,7 +188,7 @@
</h2> </h2>
<div class="usa-prose"> <div class="usa-prose">
{% if selected_user != logged_in_user %} {% if selected_user != logged_in_user %}
<p>But you know what you're doing, right?</p> <p>This action cannot be undone.</p>
{% else %} {% else %}
<p>Don't do it!</p> <p>Don't do it!</p>
{% endif %} {% endif %}

2
src/registrar/tests/test_admin.py
View file

@ -2343,4 +2343,4 @@ class TestTransferUser(WebTest):
def test_transfer_user_modal(self): def test_transfer_user_modal(self):
"""Assert modal on page""" """Assert modal on page"""
user_transfer_page = self.app.get(reverse("transfer_user", args=[self.user1.pk])) user_transfer_page = self.app.get(reverse("transfer_user", args=[self.user1.pk]))
self.assertContains(user_transfer_page, "But you know what you're doing, right?") self.assertContains(user_transfer_page, "This action cannot be undone.")