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

wip

Browse source
This commit is contained in:
David Kennedy 2024-05-22 13:11:00 -04:00
parent 993095bada
commit 2d26ae222c
No known key found for this signature in database
GPG key ID: 6528A5386E66B96B
3 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/registrar/assets/js/get-gov.js
View file

@ -836,6 +836,29 @@ function hideDeletedForms() {
})();
function initializeTooltips() {
function checkTooltip() {
//console.log('Checking for tooltip...');
if (window.tooltip && typeof window.tooltip.init === 'function') {
console.log('Tooltip is available, initializing...');
window.tooltip.init();
} else {
console.log('Tooltip not available, retrying...');
// Retry after a short delay
setTimeout(checkTooltip, 100);
}
}
checkTooltip();
}
function initializeModals() {
window.modal.on();
}
function unloadModals() {
window.modal.off();
}
document.addEventListener('DOMContentLoaded', function() {
let currentPage = 1;
let currentSortBy = 'id';
@ -885,13 +908,13 @@ document.addEventListener('DOMContentLoaded', function() {
aria-label="Status Information"
role="tooltip"
>
<use aria-hidden="true" xlink:href="{% static 'img/sprite.svg' %}#info_outline"></use>
<use aria-hidden="true" xlink:href="/public/img/sprite.svg#info_outline"></use>
</svg>
</td>
<td>
<a href="/domain/${domain.id}">
<svg class="usa-icon" aria-hidden="true" focusable="false" role="img" width="24">
<use xlink:href="{% static 'img/sprite.svg' %}#${domain.state === 'deleted' || domain.state === 'on hold' ? 'visibility' : 'settings'}"></use>
<use xlink:href="/public/img/sprite.svg#${domain.state === 'deleted' || domain.state === 'on hold' ? 'visibility' : 'settings'}"></use>
</svg>
${domain.state === 'deleted' || domain.state === 'on hold' ? 'View' : 'Manage'} <span class="usa-sr-only">${domain.name}</span>
</a>
@ -899,6 +922,7 @@ document.addEventListener('DOMContentLoaded', function() {
`;
domainList.appendChild(row);
});
initializeTooltips();
updatePagination(data.page, data.num_pages, data.has_previous, data.has_next);
currentPage = page;
@ -908,6 +932,7 @@ document.addEventListener('DOMContentLoaded', function() {
.catch(error => console.error('Error fetching domains:', error));
}
function updatePagination(currentPage, numPages, hasPrevious, hasNext) {
const paginationContainer = document.querySelector('#domains-pagination .usa-pagination__list');
paginationContainer.innerHTML = '';
@ -918,7 +943,7 @@ document.addEventListener('DOMContentLoaded', function() {
prevPageItem.innerHTML = `
<a href="javascript:void(0);" class="usa-pagination__link usa-pagination__previous-page" aria-label="Previous page">
<svg class="usa-icon" aria-hidden="true" role="img">
<use xlink:href="{% static 'img/sprite.svg' %}#navigate_before"></use>
<use xlink:href="/public/img/sprite.svg#navigate_before"></use>
</svg>
<span class="usa-pagination__link-text">Previous</span>
</a>
@ -948,7 +973,7 @@ document.addEventListener('DOMContentLoaded', function() {
<a href="javascript:void(0);" class="usa-pagination__link usa-pagination__next-page" aria-label="Next page">
<span class="usa-pagination__link-text">Next</span>
<svg class="usa-icon" aria-hidden="true" role="img">
<use xlink:href="{% static 'img/sprite.svg' %}#navigate_next"></use>
<use xlink:href="/public/img/sprite.svg#navigate_next"></use>
</svg>
</a>
`;
@ -997,8 +1022,9 @@ document.addEventListener('DOMContentLoaded', function() {
const tbody = document.querySelector('.dotgov-table__domain-requests tbody');
tbody.innerHTML = '';
unloadModals();
data.domain_requests.forEach(request => {
const domainName = request.requested_domain ? request.requested_domain.name : `New domain request (${new Date(request.created_at).toLocaleString()} UTC)`;
const domainName = request.requested_domain ? request.requested_domain : `New domain request (${new Date(request.created_at).toLocaleString()} UTC)`;
const submissionDate = request.submission_date ? new Date(request.submission_date).toLocaleDateString() : 'Not submitted';
const actionUrl = (request.status === 'Started' || request.status === 'Withdrawn') ? `/domain-request/${request.id}/edit` : `/domain-request/${request.id}`;
const actionLabel = (request.status === 'Started' || request.status === 'Withdrawn') ? 'Edit' : 'Manage';
@ -1012,7 +1038,7 @@ document.addEventListener('DOMContentLoaded', function() {
data-open-modal
>
<svg class="usa-icon" aria-hidden="true" focusable="false" role="img" width="24">
<use xlink:href="/static/img/sprite.svg#delete"></use>
<use xlink:href="/public/img/sprite.svg#delete"></use>
</svg> Delete <span class="usa-sr-only">${domainName}</span>
</a>` : '';
@ -1034,13 +1060,13 @@ document.addEventListener('DOMContentLoaded', function() {
aria-label="Status Information"
role="tooltip"
>
<use aria-hidden="true" xlink:href="/static/img/sprite.svg#info_outline"></use>
<use aria-hidden="true" xlink:href="/public/img/sprite.svg#info_outline"></use>
</svg>
</td>
<td>
<a href="${actionUrl}">
<svg class="usa-icon" aria-hidden="true" focusable="false" role="img" width="24">
<use xlink:href="/static/img/sprite.svg#${request.state === 'deleted' || request.state === 'on hold' ? 'visibility' : 'settings'}"></use>
<use xlink:href="/public/img/sprite.svg#${request.state === 'deleted' || request.state === 'on hold' ? 'visibility' : 'settings'}"></use>
</svg>
${actionLabel} <span class="usa-sr-only">${request.requested_domain ? request.requested_domain.name : 'New domain request'}</span>
</a>
@ -1049,6 +1075,8 @@ document.addEventListener('DOMContentLoaded', function() {
`;
tbody.appendChild(row);
});
initializeTooltips();
initializeModals();
updateDomainRequestsPagination(data.page, data.num_pages, data.has_previous, data.has_next);
currentPage = page;
@ -1073,7 +1101,7 @@ document.addEventListener('DOMContentLoaded', function() {
prevPageItem.innerHTML = `
<a href="javascript:void(0);" class="usa-pagination__link usa-pagination__previous-page" aria-label="Previous page">
<svg class="usa-icon" aria-hidden="true" role="img">
<use xlink:href="/static/img/sprite.svg#navigate_before"></use>
<use xlink:href="/public/img/sprite.svg#navigate_before"></use>
</svg>
<span class="usa-pagination__link-text">Previous</span>
</a>
@ -1103,7 +1131,7 @@ document.addEventListener('DOMContentLoaded', function() {
<a href="javascript:void(0);" class="usa-pagination__link usa-pagination__next-page" aria-label="Next page">
<span class="usa-pagination__link-text">Next</span>
<svg class="usa-icon" aria-hidden="true" role="img">
<use xlink:href="/static/img/sprite.svg#navigate_next"></use>
<use xlink:href="/public/img/sprite.svg#navigate_next"></use>
</svg>
</a>
`;

34
src/registrar/assets/js/uswds-edited.js
View file

@ -5336,36 +5336,6 @@ modal = {
item.addEventListener("click", toggleModal);
});
});
// Check for the presence of the testerPixel element
const intervalId = setInterval(() => {
console.log('testing');
const testerPixel = document.querySelector('.testerPixel');
if (testerPixel) {
clearInterval(intervalId);
console.log('found it');
document.querySelectorAll('.late-loading-modal-trigger').forEach(item => {
// Turn anchor links into buttons because of
// VoiceOver on Safari
if (item.nodeName === "A") {
item.setAttribute("role", "button");
item.addEventListener("click", e => e.preventDefault());
}
// Can uncomment when aria-haspopup="dialog" is supported
// https://a11ysupport.io/tech/aria/aria-haspopup_attribute
// Most screen readers support aria-haspopup, but might announce
// as opening a menu if "dialog" is not supported.
// item.setAttribute("aria-haspopup", "dialog");
item.addEventListener("click", toggleModal);
});
}
}, 100); // Check every 100ms
},
teardown(root) {
selectOrMatches(MODAL, root).forEach(modalWindow => {
@ -5384,6 +5354,7 @@ modal = {
}
};
module.exports = modal;
window.modal = modal;
},{"../../uswds-core/src/js/config":35,"../../uswds-core/src/js/utils/focus-trap":47,"../../uswds-core/src/js/utils/scrollbar-width":51,"../../uswds-core/src/js/utils/select-or-matches":52}],29:[function(require,module,exports){
"use strict";
@ -5854,7 +5825,7 @@ const {
prefix: PREFIX
} = require("../../uswds-core/src/js/config");
const isElementInViewport = require("../../uswds-core/src/js/utils/is-in-viewport");
const TOOLTIP = `.${PREFIX}-tooltip`;
const TOOLTIP = `svg.${PREFIX}-tooltip`;
const TOOLTIP_TRIGGER = `.${PREFIX}-tooltip__trigger`;
const TOOLTIP_TRIGGER_CLASS = `${PREFIX}-tooltip__trigger`;
const TOOLTIP_CLASS = `${PREFIX}-tooltip`;
@ -6188,6 +6159,7 @@ const tooltip = behavior({
hide: hideToolTip
});
module.exports = tooltip;
window.tooltip = tooltip;
},{"../../uswds-core/src/js/config":35,"../../uswds-core/src/js/utils/behavior":45,"../../uswds-core/src/js/utils/is-in-viewport":48,"../../uswds-core/src/js/utils/select-or-matches":52}],34:[function(require,module,exports){
"use strict";

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

@ -45,6 +45,7 @@
{% block css %}
<link rel="stylesheet" href="{% static 'css/styles.css' %}">
<script src="{% static 'js/uswds-init.min.js' %}" defer></script>
<script src="{% static 'js/uswds-edited.js' %}" defer></script>
<script src="{% static 'js/get-gov.js' %}" defer></script>
{% endblock %}
@ -67,7 +68,6 @@
</head>
<body id="{% block body_id %}default{% endblock %}" class="{% block body_class %}section_front{% endblock %}">
<script src="{% static 'js/uswds-edited.js' %}" defer></script>
<a class="usa-skipnav" href="#main-content">Skip to main content</a>
{% if not IS_PRODUCTION %}