From 009ebe40920d4563e62dbef6d168f0fa0ba3bc92 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 31 May 2023 17:18:56 -0500 Subject: [PATCH 1/5] fix: DES-2482 cms icons, role as none, only `i.fa` --- .../apps/accounts/js/new_institution.js | 4 +- .../apps/accounts/manage_licenses.html | 2 +- .../apps/accounts/notifications.html | 2 +- .../designsafe/apps/accounts/profile.html | 2 +- .../designsafe/apps/api/agave/preview.html | 8 +- .../apps/api/data/agave/preview.html | 2 +- .../designsafe/apps/dashboard/index.j2 | 2 +- .../templates/djangoRT/attachment.html | 2 +- .../templates/djangoRT/navigation.html | 4 +- .../djangoRT/templates/djangoRT/reply.html | 6 +- .../djangoRT/templates/djangoRT/ticket.html | 4 +- .../templates/djangoRT/ticketDetail.html | 12 +- .../templates/djangoRT/ticketList.html | 4 +- .../apps/licenses/ls-dyna_details.html | 2 +- .../apps/licenses/matlab_details.html | 2 +- .../designsafe/apps/nco/nco_index.j2 | 2 +- .../designsafe/apps/nco/ttc_grants.j2 | 2 +- .../designsafe/apps/rapid/admin.html | 8 +- .../apps/rapid/admin_create_event.html | 2 +- .../apps/rapid/admin_edit_event.html | 2 +- .../apps/rapid/admin_event_add_dataset.html | 2 +- .../apps/rapid/admin_event_datasets.html | 2 +- .../apps/rapid/admin_event_edit_dataset.html | 2 +- .../designsafe/apps/workspace/index.j2 | 2 +- .../controllers/application-edit.js | 6 +- .../html/application-add-admin.html | 2 +- .../applications/html/application-add.html | 2 +- .../applications/html/application-clone.html | 2 +- .../html/application-confirm.html | 2 +- .../html/application-details.html | 272 +++++++++--------- .../applications/html/application-edit.html | 80 +++++- .../applications/html/application-pems.html | 2 +- .../html/application-systems-details.html | 2 +- .../html/application-systems-role.html | 2 +- .../html/application-tray-delete.html | 2 +- .../applications/html/application-tray.html | 40 +-- .../dashboard/dashboard.component.html | 12 +- .../files-listing.template.html | 28 +- ...ion-advanced-search-checkbox.template.html | 10 +- .../publication-advanced-search.template.html | 4 +- .../publication-description.component.html | 4 +- .../publications-legacy-listing.template.html | 6 +- .../publications-listing.template.html | 8 +- .../data-depot-nav.component.html | 8 +- .../data-depot-new.component.html | 18 +- .../data-depot-toolbar.component.html | 20 +- .../hazmapper-maps.component.html | 4 +- .../curation-directory.component.html | 2 +- .../amend-citation.template.html | 16 +- .../amend-experimental.template.html | 10 +- .../amend-field-recon.template.html | 10 +- .../pipeline-amend/amend-other.template.html | 10 +- .../pipeline-authors.component.html | 30 +- .../pipeline-licenses.component.html | 20 +- .../pipeline-other.component.html | 16 +- .../pipeline-experiment.template.html | 18 +- .../pipeline-field-recon.template.html | 16 +- .../pipeline-hybrid.template.html | 18 +- .../pipeline-simulation.template.html | 18 +- .../pipeline-project.component.html | 16 +- .../pipeline-publish/pipeline-agreement.html | 8 +- .../pipeline-privacy-agreement.html | 10 +- .../pipeline-selection-exp.template.html | 24 +- .../pipeline-selection-field.template.html | 22 +- .../pipeline-selection-hyb-sim.template.html | 32 +-- .../pipeline-selection-other.component.html | 18 +- .../pipeline-selection-sim.template.html | 24 +- .../pipeline-start.template.html | 8 +- .../pipeline-sub-entity-exp.template.html | 22 +- .../pipeline-sub-entity-field.template.html | 16 +- .../pipeline-sub-entity-hyb-sim.template.html | 30 +- .../pipeline-sub-entity-sim.template.html | 22 +- .../pipeline-team/pipeline-team.template.html | 20 +- .../version-changes.template.html | 14 +- .../version-citation.template.html | 12 +- .../version-experiment-citation.template.html | 12 +- ...version-experiment-selection.template.html | 14 +- ...ersion-field-recon-selection.template.html | 14 +- .../version-other-citation.template.html | 8 +- .../version-other-selection.template.html | 8 +- .../project-listing.component.html | 6 +- .../project-view/project-view.component.html | 2 +- .../author-information-modal.template.html | 4 +- .../publication-popup.html | 6 +- ...ication-preview-field-recon.component.html | 6 +- ...publication-preview-hyb-sim.component.html | 16 +- .../publication-preview-other.component.html | 4 +- .../publication-preview-sim.component.html | 8 +- .../publication-preview.component.html | 8 +- .../data-depot/components/published/fmt.html | 8 +- .../published/published.component.html | 28 +- .../components/published/published.html | 2 +- .../data-depot/templates/view-project.html | 8 +- designsafe/static/scripts/geo/html/help.html | 8 +- designsafe/static/scripts/geo/html/index.html | 8 +- designsafe/static/scripts/geo/html/map.html | 32 +-- .../nco-scheduler-filters.template.html | 8 +- .../nco-scheduler/nco-scheduler.template.html | 2 +- .../nco-ttc-grants.template.html | 2 +- .../image-preview.template.html | 12 +- ...ata-browser-service-preview.component.html | 16 +- .../data-browser-service-upload.template.html | 14 +- .../prj-pub-preview-metadata-template.html | 4 +- .../scripts/notifications/html/badge.html | 2 +- .../notifications/html/notification_list.html | 2 +- .../amend-entity.template.html | 2 +- .../confirm-message.template.html | 4 +- .../file-categories.template.html | 2 +- .../file-category-selector.template.html | 2 +- .../leave-feedback-modal.template.html | 6 +- .../manage-authors.template.html | 10 +- .../manage-categories.component.html | 8 +- .../manage-experiments.template.html | 12 +- ...age-field-recon-collections.component.html | 4 +- ...manage-field-recon-documents.template.html | 10 +- .../manage-field-recon-missions.template.html | 10 +- .../manage-hybrid-simulations.template.html | 10 +- .../manage-project-type.template.html | 54 ++-- .../amend-project.template.html | 10 +- .../manage-project.template.html | 22 +- .../manage-simulations.template.html | 10 +- .../project-tree/project-tree.template.html | 8 +- .../publication-citation.template.html | 2 +- .../publication-download.template.html | 6 +- .../entity-metrics.template.html | 8 +- .../publication-metrics.template.html | 10 +- .../published-data-modal.template.html | 4 +- .../static/scripts/rapid/html/index.html | 8 +- .../scripts/rapid/html/rapid-admin-users.html | 2 +- .../components/search/search.component.html | 10 +- .../application-tray.component.html | 2 +- ...ce-data-browser-file-listing.template.html | 4 +- ...ce-data-browser-nees-listing.template.html | 6 +- ...data-browser-project-listing.template.html | 6 +- ...-browser-publication-listing.template.html | 6 +- .../workspace-data-browser.template.html | 2 +- .../workspace/html/application-form.html | 6 +- .../scripts/workspace/html/jobs-status.html | 6 +- .../js-custom-select/js/customSelect.js | 2 +- .../templates/includes/ef_navigation.html | 4 +- designsafe/templates/includes/header.html | 2 +- designsafe/templates/includes/navigation.html | 2 +- 142 files changed, 866 insertions(+), 788 deletions(-) diff --git a/designsafe/apps/accounts/static/designsafe/apps/accounts/js/new_institution.js b/designsafe/apps/accounts/static/designsafe/apps/accounts/js/new_institution.js index 35489023c..10052ea8f 100644 --- a/designsafe/apps/accounts/static/designsafe/apps/accounts/js/new_institution.js +++ b/designsafe/apps/accounts/static/designsafe/apps/accounts/js/new_institution.js @@ -13,11 +13,11 @@ jQuery(function($) { updateNewInstitutionFieldStatus(); $('#id_institutionId').children().last().wrap(''); - $('#id_institutionId').parent().after('

My Institution is not listed

') + $('#id_institutionId').parent().after('

My Institution is not listed

') $('#id_institutionNotListed').on('click', function(e) { e.preventDefault(); $('#id_institutionId').val(-1).trigger('change'); }); -}); \ No newline at end of file +}); diff --git a/designsafe/apps/accounts/templates/designsafe/apps/accounts/manage_licenses.html b/designsafe/apps/accounts/templates/designsafe/apps/accounts/manage_licenses.html index 0f05a1a6b..6a2cc2381 100644 --- a/designsafe/apps/accounts/templates/designsafe/apps/accounts/manage_licenses.html +++ b/designsafe/apps/accounts/templates/designsafe/apps/accounts/manage_licenses.html @@ -17,7 +17,7 @@

Software Licenses

{{license.license_type}} {% if license.current_user_license %} - ACTIVE + ACTIVE {% else %} NOT ACTIVE {% endif %} diff --git a/designsafe/apps/accounts/templates/designsafe/apps/accounts/notifications.html b/designsafe/apps/accounts/templates/designsafe/apps/accounts/notifications.html index ccca6bb6d..fb5daab2d 100644 --- a/designsafe/apps/accounts/templates/designsafe/apps/accounts/notifications.html +++ b/designsafe/apps/accounts/templates/designsafe/apps/accounts/notifications.html @@ -54,7 +54,7 @@

Coming soon!

{% else %}
- +

No unread notifications.

You have no unread notifications. diff --git a/designsafe/apps/accounts/templates/designsafe/apps/accounts/profile.html b/designsafe/apps/accounts/templates/designsafe/apps/accounts/profile.html index dfd2e9900..5c0558e28 100644 --- a/designsafe/apps/accounts/templates/designsafe/apps/accounts/profile.html +++ b/designsafe/apps/accounts/templates/designsafe/apps/accounts/profile.html @@ -107,7 +107,7 @@

Research Interests


- Edit profile + Edit profile
diff --git a/designsafe/apps/api/templates/designsafe/apps/api/agave/preview.html b/designsafe/apps/api/templates/designsafe/apps/api/agave/preview.html index a40bb8748..4a43450c2 100644 --- a/designsafe/apps/api/templates/designsafe/apps/api/agave/preview.html +++ b/designsafe/apps/api/templates/designsafe/apps/api/agave/preview.html @@ -31,7 +31,7 @@ {% if image_preview %}
- +
+ {% elif object_preview %} - +