Skip to content

Commit

Permalink
Merge branch 'main' into show_samples_on_case_page
Browse files Browse the repository at this point in the history
  • Loading branch information
northwestwitch authored Jul 23, 2024
2 parents f746826 + 897cc80 commit a3bf705
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ About changelog [here](https://keepachangelog.com/en/1.0.0/)
### Fixed
- Sort "select default panels" dropdown menu options on case page
- Show gene panel removed status on case page
- `fa-remove` icon replaced by `fa-times` because it's no longer visible

## [4.84]
### Changed
Expand Down
2 changes: 1 addition & 1 deletion scout/server/blueprints/cases/templates/cases/case.html
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ <h6 class="mt-3 ms-3">
<a href="{{ url_for('cases.case', institute_id=grouped_case.owner, case_name=grouped_case.display_name) }}">{{ grouped_case.display_name }}</a>

<a href="{{ url_for('cases.remove_case_group', institute_id=institute._id, case_name=grouped_case.display_name, case_group=group_id) }}" class="btn btn-link btn-sm">
<span class="fa fa-remove text-dark"></span></a>
<span class="fa fa-times text-dark"></span></a>

</div>
{% endfor %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@
{% else %}
<button type="submit" name="action" value="DELETE" class="btn btn-warning btn-xs form-control">
{% endif %}
<span class="fa fa-remove"></span>
<span class="fa fa-times"></span>
{{ user.name }}
</button>
</form>
Expand Down
2 changes: 1 addition & 1 deletion scout/server/blueprints/cases/templates/cases/utils.html
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@ <h6 class="m-2">&nbsp;Variants present in a ClinVar submission, no longer pinned
name="{{ button_name if button_name }}"
value="{{ button_value if button_value }}"
type="submit">
<i class="fa fa-remove text-danger""></i>
<i class="fa fa-times text-danger"></i>
</button>
</div>
</form>
Expand Down
2 changes: 1 addition & 1 deletion scout/server/templates/utils.html
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ <h6 class="comments-title ms-3 mt-2"><i class="far fa-comments"></i> Comments ({
<span class='badge bg-secondary'>edited</span>
{% endif %}
{% if comment.user_id == current_user.email %}
<button class="btn btn-link btn-sm" type="submit" name="remove"><i class="fa fa-remove"></i></button>
<button class="btn btn-link btn-sm" type="submit" name="remove"><i class="fa fa-times"></i></button>
<button class="btn btn-link btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#editComment_{{index}}"><i class="fa fa-edit"></i></button>
{% endif %}
</small>
Expand Down

0 comments on commit a3bf705

Please sign in to comment.