Fix result rows not colored anymore.

varfish-org · May 5, 2021 · a116c5c · a116c5c
1 parent a6c66d9
commit a116c5c
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 16 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -10,11 +10,15 @@ End-User Summary
 ================
 
 - Fixing undefined variable bug.
+- Fixing result rows not colored anymore.
+- Fixing double CSS import.
 
 Full Change List
 ================
 
 - Fixing undefined variable bug.
+- Fixing result rows not colored anymore.
+- Fixing double CSS import.
 
 -------
 v0.23.4

diff --git a/cohorts/templates/cohorts/cohort_update.html b/cohorts/templates/cohorts/cohort_update.html
@@ -69,7 +69,6 @@ <h5 class="mb-0">
   </div>
 {% endblock %}
 
-
 {% block javascript %}
   {{ block.super }}
   <script>

diff --git a/svs/templates/svs/filter.html b/svs/templates/svs/filter.html
@@ -15,8 +15,6 @@
   {% endif %}
 {% endblock %}
 
-{% block projectroles %}
-
 {% block css %}
   {{ block.super }}
   <style type="text/css">
@@ -124,6 +122,8 @@
   </style>
 {% endblock %}
 
+{% block projectroles %}
+
   <div class="row sodar-pr-content-title pb-2">
     {# Project menu dropdown, only visible if browser width < X and sidebar is hidden #}
     {% include 'projectroles/_project_menu_btn.html' %}

diff --git a/variants/templates/variants/case_detail.html b/variants/templates/variants/case_detail.html
@@ -123,6 +123,10 @@ <h2 class="sodar-pr-content-title">
     </div>
   </div>
 
+{% endblock %}
+
+{% block javascript %}
+  {{ block.super }}
   <script type="text/javascript">
     // Load data after the page has loaded
     $(function() {
@@ -139,10 +143,6 @@ <h2 class="sodar-pr-content-title">
         })
     })
   </script>
-{% endblock %}
-
-{% block javascript %}
-  {{ block.super }}
   <script type="text/javascript" src="{% static 'js/qc_plots.js' %}"></script>
   <script type="text/javascript" src="{% static 'js/helpers.js' %}"></script>
   <script type="text/javascript" src="{% static 'js/variant_comments.js' %}"></script>

diff --git a/variants/templates/variants/filter.html b/variants/templates/variants/filter.html
@@ -13,10 +13,7 @@
   {%  else %}
     <li class="breadcrumb-item active">Joint Filtration</li>
   {% endif %}
-{% endblock %}
-
-{% block projectroles %}
-  {% get_app_setting 'userprofile' 'enable_project_uuid_copy' user=request.user as enable_uuid_copy %}
+{% endblock navi_sub_project_extend %}
 
 {% block css %}
   {{ block.super }}
@@ -128,18 +125,21 @@
       text-align: center;
     }
 
-    .variant-row-positive { background-color: {% get_row_bgcolor "pathogenic" %}; }
-    .variant-row-uncertain { background-color: {% get_row_bgcolor "uncertain" %}; }
-    .variant-row-negative { background-color: {% get_row_bgcolor "benign" %}; }
-    .variant-row-wip { background-color: {% get_row_bgcolor "wip" %}; }
+    .variant-row-positive { background-color: {% get_row_bgcolor "pathogenic" %} !important; }
+    .variant-row-uncertain { background-color: {% get_row_bgcolor "uncertain" %} !important; }
+    .variant-row-negative { background-color: {% get_row_bgcolor "benign" %} !important; }
+    .variant-row-wip { background-color: {% get_row_bgcolor "wip" %} !important; }
 
     .warning-conflict .hidden { display: none; }
 
     .compact-form-groups .form-group {
       margin-bottom: 0;
     }
   </style>
-{% endblock %}
+{% endblock css %}
+
+{% block projectroles %}
+  {% get_app_setting 'userprofile' 'enable_project_uuid_copy' user=request.user as enable_uuid_copy %}
 
   <div class="row sodar-pr-content-title pb-2">
     {# Project menu dropdown, only visible if browser width < X and sidebar is hidden #}