From 4ac33c212277a38d6d917ecb7a7ba7d7dfa84ecc Mon Sep 17 00:00:00 2001 From: munnsmunns Date: Thu, 20 Jun 2024 10:49:00 -0400 Subject: [PATCH 1/7] Replace and with bs4 tags where applicable --- .../animal/_animal_group_list_tbl.html | 17 +++++---------- .../templates/assessment/_dataset_list.html | 14 ++----------- .../assessment/assessment_log_list.html | 18 ++-------------- .../assessment/assessmentvalue_detail.html | 5 +---- .../templates/assessment/content_types.html | 14 ++----------- .../templates/assessment/dataset_detail.html | 21 +++---------------- .../templates/assessment/log_detail.html | 5 +---- .../templates/assessment/log_object_list.html | 19 +++-------------- .../bmd/assessmentsettings_detail.html | 5 +---- hawc/apps/bmd/templates/bmd/session_list.html | 10 +-------- .../eco/fragments/_design_table.html | 5 +---- .../epiv2/fragments/_design_table.html | 5 +---- .../templates/lit/_pubmedqueries_list.html | 9 +------- hawc/apps/lit/templates/lit/_search_list.html | 18 ++-------------- .../apps/lit/templates/lit/search_detail.html | 5 +---- .../templates/myuser/userprofile_detail.html | 5 +---- .../study/templates/study/study_detail.html | 5 +---- .../templates/summary/summarytable_list.html | 21 ++++++------------- 18 files changed, 35 insertions(+), 166 deletions(-) diff --git a/hawc/apps/animal/templates/animal/_animal_group_list_tbl.html b/hawc/apps/animal/templates/animal/_animal_group_list_tbl.html index e8f5950f4a..6c3a1897a1 100644 --- a/hawc/apps/animal/templates/animal/_animal_group_list_tbl.html +++ b/hawc/apps/animal/templates/animal/_animal_group_list_tbl.html @@ -1,17 +1,10 @@ {% if object_list %} - - - {%if with_experiment %} - - {% endif %} - - - - - - - + {% if with_experiment %} + {% bs4_thead 'Experiment,Name,Species,Strain,Sex,Siblings' %} + {% else %} + {% bs4_thead 'Name,Species,Strain,Sex,Siblings' %} + {% endif %} {% for object in object_list %} diff --git a/hawc/apps/assessment/templates/assessment/_dataset_list.html b/hawc/apps/assessment/templates/assessment/_dataset_list.html index 01d8080207..f1f97d93db 100644 --- a/hawc/apps/assessment/templates/assessment/_dataset_list.html +++ b/hawc/apps/assessment/templates/assessment/_dataset_list.html @@ -1,18 +1,8 @@ {% if object_list.count > 0 %}

Datasets

ExperimentNameSpeciesStrainSexSiblings
- - - - - - - - - - - - + {% bs4_colgroup '30,60,10' %} + {% bs4_thead 'Dataset,Description,Download' %} {% for object in object_list %} diff --git a/hawc/apps/assessment/templates/assessment/assessment_log_list.html b/hawc/apps/assessment/templates/assessment/assessment_log_list.html index fe8fb7b061..29791e5ce7 100644 --- a/hawc/apps/assessment/templates/assessment/assessment_log_list.html +++ b/hawc/apps/assessment/templates/assessment/assessment_log_list.html @@ -17,22 +17,8 @@

{{assessment}} Logs

{% url_replace page=None as params%}
DatasetDescriptionDownload
- - - - - - - - - - - - - - - - + {% bs4_colgroup '5,25,40,15,15' %} + {% bs4_thead 'Log,Item,Message,User,Timestamp' %} {% for log in object_list %} diff --git a/hawc/apps/assessment/templates/assessment/assessmentvalue_detail.html b/hawc/apps/assessment/templates/assessment/assessmentvalue_detail.html index e388d405ad..e91644a94e 100644 --- a/hawc/apps/assessment/templates/assessment/assessmentvalue_detail.html +++ b/hawc/apps/assessment/templates/assessment/assessmentvalue_detail.html @@ -13,10 +13,7 @@

Assessment Value for {{object.assessment}}

{% endif %}
LogItemMessageUserTimestamp
- - - - + {% bs4_colgroup '30,70' %} {% optional_table_row "Evaluation type" object.get_evaluation_type_display %} {% optional_table_row "System or health effect basis" object.system %} diff --git a/hawc/apps/assessment/templates/assessment/content_types.html b/hawc/apps/assessment/templates/assessment/content_types.html index 109ef93858..d8bc052e06 100644 --- a/hawc/apps/assessment/templates/assessment/content_types.html +++ b/hawc/apps/assessment/templates/assessment/content_types.html @@ -10,18 +10,8 @@

Content Types

Selected values for key data in HAWC are shown below:

- - - - - - - - - - - - + {% bs4_colgroup '40,40,20' %} + {% bs4_thead 'Domain,Dataset,ID' %} {% for ct in content_types %} diff --git a/hawc/apps/assessment/templates/assessment/dataset_detail.html b/hawc/apps/assessment/templates/assessment/dataset_detail.html index a4cda07a6a..63d568a938 100644 --- a/hawc/apps/assessment/templates/assessment/dataset_detail.html +++ b/hawc/apps/assessment/templates/assessment/dataset_detail.html @@ -13,10 +13,7 @@

{{object}}

DomainDatasetID
- - - - + {% bs4_colgroup '20,80' %} @@ -63,20 +60,8 @@

{{object}}

{% if crud == "Read" and obj_perms.edit and object.revisions.count > 0 %}

Dataset revisions

Description
- - - - - - - - - - - - - - + {% bs4_colgroup '10,50,15,25' %} + {% bs4_thead 'Version,Metadata,Download,Created/Last updated' %} {% for revision in object.revisions.all %} diff --git a/hawc/apps/assessment/templates/assessment/log_detail.html b/hawc/apps/assessment/templates/assessment/log_detail.html index 33d82c77cb..1cbb2c82f9 100644 --- a/hawc/apps/assessment/templates/assessment/log_detail.html +++ b/hawc/apps/assessment/templates/assessment/log_detail.html @@ -13,10 +13,7 @@

{{object}}

VersionMetadataDownloadCreated/Last updated
- - - - + {% bs4_colgroup '30,70' %} diff --git a/hawc/apps/assessment/templates/assessment/log_object_list.html b/hawc/apps/assessment/templates/assessment/log_object_list.html index 58ca1ba73d..4a6343bb3f 100644 --- a/hawc/apps/assessment/templates/assessment/log_object_list.html +++ b/hawc/apps/assessment/templates/assessment/log_object_list.html @@ -5,10 +5,7 @@

{{first_log}}s

- - - - + {% bs4_colgroup '30,70' %} @@ -40,18 +37,8 @@

{{first_log}}s

Logs

- - - - - - - - - - - - + {% bs4_colgroup '20,20,60' %} + {% bs4_thead 'Timestamp,User,Message' %} {% for event in object_list %} diff --git a/hawc/apps/bmd/templates/bmd/assessmentsettings_detail.html b/hawc/apps/bmd/templates/bmd/assessmentsettings_detail.html index 388018e8c4..764b163cbd 100644 --- a/hawc/apps/bmd/templates/bmd/assessmentsettings_detail.html +++ b/hawc/apps/bmd/templates/bmd/assessmentsettings_detail.html @@ -13,10 +13,7 @@

{{object}}

BMD assessment-settings can only be modified by project managers.

TimestampUserMessage
- - - - + {% bs4_colgroup '30,70' %} diff --git a/hawc/apps/bmd/templates/bmd/session_list.html b/hawc/apps/bmd/templates/bmd/session_list.html index d180087fae..3afeec0353 100644 --- a/hawc/apps/bmd/templates/bmd/session_list.html +++ b/hawc/apps/bmd/templates/bmd/session_list.html @@ -17,15 +17,7 @@

BMD sessions

{% endif %}
Benchmark dose modeling
software (BMDS) version		{{object.get_version_display}}
Last updated{{object.last_updated}}
- - - - - - - - - + {% bs4_thead 'Session,BMDS version,Dose units,Created,Last updated' %} {% for o in object_list %} diff --git a/hawc/apps/eco/templates/eco/fragments/_design_table.html b/hawc/apps/eco/templates/eco/fragments/_design_table.html index e7e81ea337..6b70e1e2e7 100644 --- a/hawc/apps/eco/templates/eco/fragments/_design_table.html +++ b/hawc/apps/eco/templates/eco/fragments/_design_table.html @@ -1,8 +1,5 @@
SessionBMDS versionDose unitsCreatedLast updated
- - - - + {% bs4_colgroup '20,80' %} {% optional_table_row "Name" object.name %} {% optional_table_row "Design" object.get_design_display %} diff --git a/hawc/apps/epiv2/templates/epiv2/fragments/_design_table.html b/hawc/apps/epiv2/templates/epiv2/fragments/_design_table.html index b2d8e2e5f6..1bf6ed3431 100644 --- a/hawc/apps/epiv2/templates/epiv2/fragments/_design_table.html +++ b/hawc/apps/epiv2/templates/epiv2/fragments/_design_table.html @@ -1,8 +1,5 @@
- - - - + {% bs4_colgroup '20,80' %} {% optional_table_row "Study design" object.get_study_design_display %} {% optional_table_row "Study population N" object.participant_n %} diff --git a/hawc/apps/lit/templates/lit/_pubmedqueries_list.html b/hawc/apps/lit/templates/lit/_pubmedqueries_list.html index 99e6fb493c..41a0db0edd 100644 --- a/hawc/apps/lit/templates/lit/_pubmedqueries_list.html +++ b/hawc/apps/lit/templates/lit/_pubmedqueries_list.html @@ -4,14 +4,7 @@

Results from queries

{% if queries %}
- - - - - - - - + {% bs4_thead 'Date last executed,Total references found,References added,References removed' %} {% for query in queries %} diff --git a/hawc/apps/lit/templates/lit/_search_list.html b/hawc/apps/lit/templates/lit/_search_list.html index 404d4f669a..10018983c2 100644 --- a/hawc/apps/lit/templates/lit/_search_list.html +++ b/hawc/apps/lit/templates/lit/_search_list.html @@ -1,21 +1,7 @@ {% if object_list %}
Date last executedTotal references foundReferences addedReferences removed
- - - - - - - - - - - - - - - - + {% bs4_colgroup '50,16,10,12,12' %} + {% bs4_thead 'Title and description,Source,References,Created,Last Updated' %} {% for object in object_list %} diff --git a/hawc/apps/lit/templates/lit/search_detail.html b/hawc/apps/lit/templates/lit/search_detail.html index 7bd67ea9dd..aade7f49a7 100644 --- a/hawc/apps/lit/templates/lit/search_detail.html +++ b/hawc/apps/lit/templates/lit/search_detail.html @@ -16,10 +16,7 @@

{{object}}

{% endif %}
Title and descriptionSourceReferencesCreatedLast Updated
- - - - + {% bs4_colgroup '20,80' %} {% if object.description %} diff --git a/hawc/apps/myuser/templates/myuser/userprofile_detail.html b/hawc/apps/myuser/templates/myuser/userprofile_detail.html index 826fa930ce..fbe714eeed 100644 --- a/hawc/apps/myuser/templates/myuser/userprofile_detail.html +++ b/hawc/apps/myuser/templates/myuser/userprofile_detail.html @@ -11,10 +11,7 @@

User Profile

{% endactions %}
Description{{object.description|safe}}
- - - - + {% bs4_colgroup '34,66' %} {% optional_table_row "Name" user.get_full_name %} {% optional_table_row "Email" user.email %} diff --git a/hawc/apps/study/templates/study/study_detail.html b/hawc/apps/study/templates/study/study_detail.html index 12493efdae..126b8f25b8 100644 --- a/hawc/apps/study/templates/study/study_detail.html +++ b/hawc/apps/study/templates/study/study_detail.html @@ -74,10 +74,7 @@

{{object}}

{% if obj_perms.edit and internal_communications|hastext %}
- - - - + {% bs4_colgroup '30,70' %} diff --git a/hawc/apps/summary/templates/summary/summarytable_list.html b/hawc/apps/summary/templates/summary/summarytable_list.html index b6881f9626..01c3c8a9e2 100644 --- a/hawc/apps/summary/templates/summary/summarytable_list.html +++ b/hawc/apps/summary/templates/summary/summarytable_list.html @@ -19,21 +19,12 @@

Available tables

{% if object_list.exists %}
Internal communications*
- - - - - - - - - - - {% if show_published %}{% endif %} - - - - + {% bs4_colgroup '40,20,20,20' %} + {% if show_published %} + {% bs4_thead 'Title,Table type,Published,Created,Modified' %} + {% else %} + {% bs4_thead 'Title,Table type,Created,Modified' %} + {% endif %} {% for object in object_list %} From 3a1b1932f18ab09f08bf6d3eb64b612e51cdd66d Mon Sep 17 00:00:00 2001 From: munnsmunns Date: Thu, 20 Jun 2024 12:53:56 -0400 Subject: [PATCH 2/7] replace alerts without extra css classes with bs4 tag --- .../templates/animal/animalgroup_confirm_delete.html | 2 +- .../apps/animal/templates/animal/animalgroup_form.html | 2 +- .../animal/templates/animal/dosingregime_form.html | 2 +- hawc/apps/animal/templates/animal/endpoint_form.html | 2 +- .../bmd/templates/bmd/_read_only_session_alert.html | 4 ++-- hawc/apps/bmd/templates/bmd/session_list.html | 4 ++-- hawc/apps/common/templates/common/widgets/error.html | 2 +- .../apps/lit/templates/lit/reference_extract_list.html | 8 ++++---- hawc/apps/lit/templates/lit/reference_user_tags.html | 4 ++-- .../lit/templates/lit/ris_export_instructions.html | 10 +++++----- hawc/apps/lit/templates/lit/tags_copy.html | 4 ++-- .../riskofbias/templates/riskofbias/arob_copy.html | 4 ++-- .../templates/riskofbias/arob_load_approach.html | 4 ++-- hawc/templates/includes/unsupported_browser.html | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/hawc/apps/animal/templates/animal/animalgroup_confirm_delete.html b/hawc/apps/animal/templates/animal/animalgroup_confirm_delete.html index c6fc8bdd30..3d3dbdde5d 100644 --- a/hawc/apps/animal/templates/animal/animalgroup_confirm_delete.html +++ b/hawc/apps/animal/templates/animal/animalgroup_confirm_delete.html @@ -6,6 +6,6 @@ {% if object.can_delete %} {% include "hawc/_delete_block.html" with name="animal-group" notes="This will remove all data associated with the animal-group, including dose-regimes, endpoints, and BMD modeling runs." %} {% else %} - + {% alert danger %}Cannot be deleted. The dosing regime is associated with at least one more animal group; please delete associated animal groups before continuing.{% endalert %} {% endif %} {% endblock content %} diff --git a/hawc/apps/animal/templates/animal/animalgroup_form.html b/hawc/apps/animal/templates/animal/animalgroup_form.html index 42dec29099..ad8521624d 100644 --- a/hawc/apps/animal/templates/animal/animalgroup_form.html +++ b/hawc/apps/animal/templates/animal/animalgroup_form.html @@ -19,7 +19,7 @@ {% if dose_groups_errors %} -
{{dose_groups_errors|safe}}
+ {% alert danger %}{{dose_groups_errors|safe}}{% endalert %} {% endif %}
TitleTable typePublishedCreatedModified
diff --git a/hawc/apps/animal/templates/animal/dosingregime_form.html b/hawc/apps/animal/templates/animal/dosingregime_form.html index ce18d5e5c8..76e077ef0d 100644 --- a/hawc/apps/animal/templates/animal/dosingregime_form.html +++ b/hawc/apps/animal/templates/animal/dosingregime_form.html @@ -12,7 +12,7 @@ + - {% if dose_groups_errors %}
{{dose_groups_errors|safe}}
{% endif %} + {% if dose_groups_errors %}{% alert danger %}{{dose_groups_errors|safe}}{% endalert %}
diff --git a/hawc/apps/animal/templates/animal/endpoint_form.html b/hawc/apps/animal/templates/animal/endpoint_form.html index 7ed7387968..859f446865 100644 --- a/hawc/apps/animal/templates/animal/endpoint_form.html +++ b/hawc/apps/animal/templates/animal/endpoint_form.html @@ -4,7 +4,7 @@ {% if animal_group.dosing_regime %} {% crispy form %} {% else %} - + {% alert danger %}Cannot create or modify an endpoint. The animal group has no dose regime. Please update the animal group to add a dosing regime before continuing.{% endalert %} {% endif %} {# extra stuff that JS will move to correct location #} diff --git a/hawc/apps/bmd/templates/bmd/_read_only_session_alert.html b/hawc/apps/bmd/templates/bmd/_read_only_session_alert.html index 76106a2d40..657d3d819d 100644 --- a/hawc/apps/bmd/templates/bmd/_read_only_session_alert.html +++ b/hawc/apps/bmd/templates/bmd/_read_only_session_alert.html @@ -1,5 +1,5 @@ - +{% endalert %} diff --git a/hawc/apps/bmd/templates/bmd/session_list.html b/hawc/apps/bmd/templates/bmd/session_list.html index 3afeec0353..d17fc73a95 100644 --- a/hawc/apps/bmd/templates/bmd/session_list.html +++ b/hawc/apps/bmd/templates/bmd/session_list.html @@ -11,10 +11,10 @@

BMD sessions

{% endif %} {% if not assessment.bmd_settings.can_create_sessions %} - + {% endalert %} {% endif %} {% bs4_thead 'Session,BMDS version,Dose units,Created,Last updated' %} diff --git a/hawc/apps/common/templates/common/widgets/error.html b/hawc/apps/common/templates/common/widgets/error.html index ec0aa74bb7..57a30c10be 100644 --- a/hawc/apps/common/templates/common/widgets/error.html +++ b/hawc/apps/common/templates/common/widgets/error.html @@ -1 +1 @@ -{% if message %}
{{message}}
{% endif %} +{% if message %}{% alert danger %}{{message}}{% endalert %}{% endif %} diff --git a/hawc/apps/lit/templates/lit/reference_extract_list.html b/hawc/apps/lit/templates/lit/reference_extract_list.html index 745e0463ed..7fc1031c16 100644 --- a/hawc/apps/lit/templates/lit/reference_extract_list.html +++ b/hawc/apps/lit/templates/lit/reference_extract_list.html @@ -31,7 +31,7 @@

Create studies from selected references

{% if form.study_type.errors %} -
{{form.study_type.errors}}
+ {% alert danger %}{{form.study_type.errors}}{% endalert %} {% endif %}
{% for checkbox in form.study_type %} @@ -44,7 +44,7 @@

Create studies from selected references

{% csrf_token %} {% if form.references.errors %} -
{{form.references.errors}}
+ {% alert danger %}{{form.references.errors}}{% endalert %} {% endif %}
@@ -52,10 +52,10 @@

Create studies from selected references

{% else %} -
+ {% alert success %} Nothing to be done!

No references have been marked for inclusion which aren't studies already.

-
+ {% endalert %} {% endif %} {% endblock %} diff --git a/hawc/apps/lit/templates/lit/reference_user_tags.html b/hawc/apps/lit/templates/lit/reference_user_tags.html index 9171623a2f..b4deb07b6e 100644 --- a/hawc/apps/lit/templates/lit/reference_user_tags.html +++ b/hawc/apps/lit/templates/lit/reference_user_tags.html @@ -10,9 +10,9 @@

Reference User Tags

{% empty %}
  • -
    + {% alert success %}  No reference user tags found. -
    + {% endalert %}
    • {% endfor %} diff --git a/hawc/apps/lit/templates/lit/ris_export_instructions.html b/hawc/apps/lit/templates/lit/ris_export_instructions.html index f186fe1c2f..7743c39604 100644 --- a/hawc/apps/lit/templates/lit/ris_export_instructions.html +++ b/hawc/apps/lit/templates/lit/ris_export_instructions.html @@ -13,11 +13,11 @@

    Preparing EndNote exports for uplo

    While HAWC can import any RIS export, additional information can be added into HAWC by structuring the RIS export in a custom format. It is recommended to do so; this will allow for hyperlinks in HAWC to be added to reference databases for access to the original reference, or the database it was found from.

    -
    + {% alert warning %}

    Caution: Currently there is no mechanism for de-duplication of reference in HAWC. This is important in two way for RIS imports:
    1. Ensure that your EndNote library has been de-duplicated prior to import into HAWC.
    2. Ensure that if you are uploading multiple RIS files into HAWC under one assessment, there is no intersection of references across libraries.

    -
    + {% endalert %}

    Help-content is divided into five different sections:

    @@ -70,7 +70,7 @@

    Copying the PMID into the Cust
  • Select: Copy
  • From field: Accession Number
  • To Field: Custom 8 (if your Custom 8 is already assigned you will need to identify a new custom field to use.)
    • -
  • Select Insert after field’s text (field should be empty)
    • +
  • Select Insert after field's text (field should be empty)
  • Click OK
    • @@ -93,7 +93,7 @@
    Adding the “Datab
    • Select: Change Fields tab
    • Select Name of Database in the fields
      • -
    • Check Insert after field’s text
      • +
    • Check Insert after field's text
    • In the text-box type “WOS”
    • Uncheck the box to Include a space before new text
    • Click OK
    @@ -191,7 +191,7 @@

    (EndNote tutori

    You may display 10 fields at a time in your library view window. You may change them in the library screen (one at a time) or go to the Preferences window to make multiple changes at once. To change which fields are showing within the library window, right-click in the header bar where you would like to add a column. A list of fields will open showing the fields in use in black text with a check, and fields not displayed grayed out.

    -

    If you don’t have 10 fields showing already, you may simply check an additional field and it will be added. (You will have to add them one at a time, as the choice list closes after each selection). If you already have 10 displayed, you will need to click one of the checked fields to remove it, then re-open the choice list to add the new field.

    +

    If you don't have 10 fields showing already, you may simply check an additional field and it will be added. (You will have to add them one at a time, as the choice list closes after each selection). If you already have 10 displayed, you will need to click one of the checked fields to remove it, then re-open the choice list to add the new field.

    If you have several fields to add or remove it may be easier to open the utility and assign the fields there. Go to Endnote in the top menu and select Preferences. In the window that pops up, choose Display Fields.

    diff --git a/hawc/apps/lit/templates/lit/tags_copy.html b/hawc/apps/lit/templates/lit/tags_copy.html index e9a767b073..f7c0f35c99 100644 --- a/hawc/apps/lit/templates/lit/tags_copy.html +++ b/hawc/apps/lit/templates/lit/tags_copy.html @@ -14,7 +14,7 @@

    From 7f76c70af094ea5f2e33e870949397df6f91096e Mon Sep 17 00:00:00 2001 From: Andy Shapiro Date: Wed, 26 Jun 2024 18:03:14 -0400 Subject: [PATCH 4/7] remove with_experiment ;never used --- .../animal/templates/animal/_animal_group_list_tbl.html | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/hawc/apps/animal/templates/animal/_animal_group_list_tbl.html b/hawc/apps/animal/templates/animal/_animal_group_list_tbl.html index 6c3a1897a1..d24a1d7f02 100644 --- a/hawc/apps/animal/templates/animal/_animal_group_list_tbl.html +++ b/hawc/apps/animal/templates/animal/_animal_group_list_tbl.html @@ -1,16 +1,9 @@ {% if object_list %} - {% if with_experiment %} - {% bs4_thead 'Experiment,Name,Species,Strain,Sex,Siblings' %} - {% else %} - {% bs4_thead 'Name,Species,Strain,Sex,Siblings' %} - {% endif %} + {% bs4_thead 'Name,Species,Strain,Sex,Siblings' %} {% for object in object_list %} - {%if with_experiment %} - - {% endif %} From 08082fa9ca7e40f88f264ede628146545ae552ad Mon Sep 17 00:00:00 2001 From: Andy Shapiro Date: Wed, 26 Jun 2024 18:03:34 -0400 Subject: [PATCH 5/7] move shared template --- .../animal/templates/animal/_doseGroupsDiv.html | 10 ++++++++++ .../templates/animal/animalgroup_form.html | 16 +--------------- .../templates/animal/dosingregime_form.html | 16 +--------------- 3 files changed, 12 insertions(+), 30 deletions(-) create mode 100644 hawc/apps/animal/templates/animal/_doseGroupsDiv.html diff --git a/hawc/apps/animal/templates/animal/_doseGroupsDiv.html b/hawc/apps/animal/templates/animal/_doseGroupsDiv.html new file mode 100644 index 0000000000..7c39340810 --- /dev/null +++ b/hawc/apps/animal/templates/animal/_doseGroupsDiv.html @@ -0,0 +1,10 @@ +
    + Dose-groups + + Add new representation + + + + {% if dose_groups_errors %}{% alert danger %}{{dose_groups_errors|safe}}{% endalert %}{% endif %} +
    {{object.experiment}}{{object}} {{object.species}} {{object.strain}}
    + + diff --git a/hawc/apps/animal/templates/animal/animalgroup_form.html b/hawc/apps/animal/templates/animal/animalgroup_form.html index ad8521624d..4992ab33a7 100644 --- a/hawc/apps/animal/templates/animal/animalgroup_form.html +++ b/hawc/apps/animal/templates/animal/animalgroup_form.html @@ -8,22 +8,8 @@ {% if crud == "Create" %}
    - {% crispy form_dosing_regime %} -
    - - Dose-groups - - Add new representation - + - - - {% if dose_groups_errors %} - {% alert danger %}{{dose_groups_errors|safe}}{% endalert %} - {% endif %} -
    - -
    + {% include 'animal/_doseGroupsDiv.html' %}
    {% endif %} diff --git a/hawc/apps/animal/templates/animal/dosingregime_form.html b/hawc/apps/animal/templates/animal/dosingregime_form.html index 48813d6fe2..4cc8e53d58 100644 --- a/hawc/apps/animal/templates/animal/dosingregime_form.html +++ b/hawc/apps/animal/templates/animal/dosingregime_form.html @@ -1,22 +1,8 @@ {% extends 'assessment-rooted.html' %} {% block content %} - {% crispy form %} - -
    - - Dose-groups - - Add new representation - + - - - {% if dose_groups_errors %}{% alert danger %}{{dose_groups_errors|safe}}
    {% endalert %}{% endif %} -
    - - - + {% include 'animal/_doseGroupsDiv.html' %} {% endblock %} {% block extrajs %} From 078756e069fd06621c85ffd01b160f759f3b1088 Mon Sep 17 00:00:00 2001 From: Andy Shapiro Date: Wed, 26 Jun 2024 18:26:34 -0400 Subject: [PATCH 6/7] make title case --- hawc/apps/bmd/templates/bmd/session_list.html | 2 +- hawc/apps/lit/templates/lit/_search_list.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hawc/apps/bmd/templates/bmd/session_list.html b/hawc/apps/bmd/templates/bmd/session_list.html index d17fc73a95..b308d23074 100644 --- a/hawc/apps/bmd/templates/bmd/session_list.html +++ b/hawc/apps/bmd/templates/bmd/session_list.html @@ -17,7 +17,7 @@

    BMD sessions

    {% endalert %} {% endif %} - {% bs4_thead 'Session,BMDS version,Dose units,Created,Last updated' %} + {% bs4_thead 'Session,BMDS Version,Dose Units,Created,Last Updated' %} {% for o in object_list %} diff --git a/hawc/apps/lit/templates/lit/_search_list.html b/hawc/apps/lit/templates/lit/_search_list.html index 10018983c2..8d47036ae7 100644 --- a/hawc/apps/lit/templates/lit/_search_list.html +++ b/hawc/apps/lit/templates/lit/_search_list.html @@ -1,7 +1,7 @@ {% if object_list %}
    {% bs4_colgroup '50,16,10,12,12' %} - {% bs4_thead 'Title and description,Source,References,Created,Last Updated' %} + {% bs4_thead 'Title,Source,References,Created,Last Updated' %} {% for object in object_list %} From 75d1fb76853bb89dffa24eff82fe489d28e77c27 Mon Sep 17 00:00:00 2001 From: Andy Shapiro Date: Wed, 26 Jun 2024 18:26:52 -0400 Subject: [PATCH 7/7] remove unused show_published template option --- hawc/apps/summary/templates/summary/summarytable_list.html | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/hawc/apps/summary/templates/summary/summarytable_list.html b/hawc/apps/summary/templates/summary/summarytable_list.html index 01c3c8a9e2..385aec9285 100644 --- a/hawc/apps/summary/templates/summary/summarytable_list.html +++ b/hawc/apps/summary/templates/summary/summarytable_list.html @@ -20,11 +20,7 @@

    Available tables

    {% if object_list.exists %}
    {% bs4_colgroup '40,20,20,20' %} - {% if show_published %} - {% bs4_thead 'Title,Table type,Published,Created,Modified' %} - {% else %} - {% bs4_thead 'Title,Table type,Created,Modified' %} - {% endif %} + {% bs4_thead 'Title,Table Type,Created,Modified' %} {% for object in object_list %} @@ -35,7 +31,6 @@

    Available tables

    {% debug_badge object.id %} - {% if show_published %}{% endif %}
    {{object.get_table_type_display}}{{object.published}}{{object.created|date:"Y-m-d" }} {{object.last_updated|date:"Y-m-d" }}