Fix result rows not colored anymore.

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

Hide file tree

Showing 25 changed files with 42 additions and 39 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_confirm_delete.html b/cohorts/templates/cohorts/cohort_confirm_delete.html
@@ -11,7 +11,7 @@
   <li class="breadcrumb-item active">{{ object.name }}</li>
 {% endblock %}
 
-{% block projectroles %}
+{% block projectroles_extend %}
   <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' %}
@@ -36,4 +36,4 @@ <h2 class="sodar-pr-content-title">
       <button type="submit" class="btn btn-danger"><i class="fa fa-trash"></i> Confirm</button>
     </form>
   </div>
-{% endblock %}
+{% endblock projectroles_extend %}
diff --git a/cohorts/templates/cohorts/cohort_create.html b/cohorts/templates/cohorts/cohort_create.html
@@ -11,7 +11,7 @@
   <li class="breadcrumb-item active">{{ object.name }}</li>
 {% endblock %}
 
-{% block projectroles %}
+{% block projectroles_extend %}
   <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/cohorts/templates/cohorts/cohort_list.html b/cohorts/templates/cohorts/cohort_list.html
@@ -10,7 +10,7 @@
   <li class="breadcrumb-item active">Cohorts</li>
 {% endblock %}
 
-{% block projectroles %}
+{% block projectroles_extend %}
   <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/cohorts/templates/cohorts/cohort_update.html b/cohorts/templates/cohorts/cohort_update.html
@@ -12,7 +12,7 @@
   <li class="breadcrumb-item active">{{ object.name }}</li>
 {% endblock %}
 
-{% block projectroles %}
+{% block projectroles_extend %}
   <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' %}
@@ -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_extend %}
+
   <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/svs/templates/svs/import_job_detail.html b/svs/templates/svs/import_job_detail.html
@@ -13,7 +13,7 @@
   <li class="breadcrumb-item active">{{ object.bg_job.name }}</li>
 {% endblock %}
 
-{% block projectroles %}
+{% block projectroles_extend %}
   <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/background_job_list.html b/variants/templates/variants/background_job_list.html
@@ -13,7 +13,7 @@
   <li class="breadcrumb-item active">Jobs</li>
 {% endblock %}
 
-{% block projectroles %}
+{% block projectroles_extend %}
   {% has_perm 'bgjobs.view_data' request.user project as can_view_data %}
 
   {% has_perm 'bgjobs.clear_own_jobs' request.user project as can_clear_own_jobs %}

diff --git a/variants/templates/variants/cadd_job_detail.html b/variants/templates/variants/cadd_job_detail.html
@@ -14,7 +14,7 @@
   <li class="breadcrumb-item active">{{ object.bg_job.name }}</li>
 {% endblock %}
 
-{% block projectroles %}
+{% block projectroles_extend %}
   <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_delete_job_detail.html b/variants/templates/variants/case_delete_job_detail.html
@@ -19,7 +19,7 @@
   {% endif %}
 {% endblock %}
 
-{% block projectroles %}
+{% block projectroles_extend %}
   <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
@@ -10,7 +10,7 @@
   <li class="breadcrumb-item active">{{ object.name }}</li>
 {% endblock %}
 
-{% block projectroles %}
+{% block projectroles_extend %}
   {% get_app_setting 'variants' 'disable_pedigree_sex_check' project=project as disable_pedigree_sex_check %}
   {% get_app_setting 'userprofile' 'enable_project_uuid_copy' user=request.user as enable_uuid_copy %}
 

diff --git a/variants/templates/variants/case_list.html b/variants/templates/variants/case_list.html
@@ -11,7 +11,7 @@
   <li class="breadcrumb-item active">Cases</li>
 {% endblock %}
 
-{% block projectroles %}
+{% block projectroles_extend %}
   {% get_app_setting 'variants' 'disable_pedigree_sex_check' project=project as disable_pedigree_sex_check %}
   {% get_app_setting 'userprofile' 'enable_project_uuid_copy' user=request.user as enable_uuid_copy %}
 

diff --git a/variants/templates/variants/case_update_terms.html b/variants/templates/variants/case_update_terms.html
@@ -21,7 +21,7 @@
   <li class="breadcrumb-item active">Update</li>
 {% endblock %}
 
-{% block projectroles %}
+{% block projectroles_extend %}
   {% get_app_setting 'userprofile' 'enable_project_uuid_copy' user=request.user as enable_uuid_copy %}
 
   <div class="row sodar-subtitle-container">
@@ -149,4 +149,4 @@ <h3>Update Terms for Case {{ object.name }}</h3>
     </div>
   </div>
 
-{% endblock projectroles %}
+{% endblock projectroles_extend %}
diff --git a/variants/templates/variants/distiller_job_detail.html b/variants/templates/variants/distiller_job_detail.html
@@ -14,7 +14,7 @@
   <li class="breadcrumb-item active">{{ object.bg_job.name }}</li>
 {% endblock %}
 
-{% block projectroles %}
+{% block projectroles_extend %}
   <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/export_job_detail.html b/variants/templates/variants/export_job_detail.html
@@ -14,7 +14,7 @@
   <li class="breadcrumb-item active">{{ object.bg_job.name }}</li>
 {% endblock %}
 
-{% block projectroles %}
+{% block projectroles_extend %}
   <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/export_project_cases_job_detail.html b/variants/templates/variants/export_project_cases_job_detail.html
@@ -12,7 +12,7 @@
   <li class="breadcrumb-item active">{{ object.bg_job.name }}</li>
 {% endblock %}
 
-{% block projectroles %}
+{% block projectroles_extend %}
   <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/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_extend %}
+  {% 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 #}
@@ -200,7 +200,7 @@ <h2 class="sodar-pr-content-title">
   <div id="resultsTable" data-loaded="false">
   </div>
 
-{% endblock projectroles %}
+{% endblock projectroles_extend %}
 
 {% block javascript %}
   {{ block.super }}

diff --git a/variants/templates/variants/filter_job_detail.html b/variants/templates/variants/filter_job_detail.html
@@ -19,7 +19,7 @@
   {% endif %}
 {% endblock %}
 
-{% block projectroles %}
+{% block projectroles_extend %}
   <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/import_job_detail.html b/variants/templates/variants/import_job_detail.html
@@ -13,7 +13,7 @@
   <li class="breadcrumb-item active">{{ object.bg_job.name }}</li>
 {% endblock %}
 
-{% block projectroles %}
+{% block projectroles_extend %}
   <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/maintenance_job_detail.html b/variants/templates/variants/maintenance_job_detail.html
@@ -11,7 +11,7 @@
   Global Background Job: {{ object.bg_job.name }}
 {% endblock title %}
 
-{% block projectroles %}
+{% block projectroles_extend %}
   <div class="row sodar-pr-content-title pb-2">
     <h2 class="sodar-pr-content-title">
       Global Maintenance Job

diff --git a/variants/templates/variants/project_stats_job_create.html b/variants/templates/variants/project_stats_job_create.html
@@ -9,7 +9,7 @@
   <li class="breadcrumb-item active">Recreate Project-Wide Statistics</li>
 {% endblock %}
 
-{% block projectroles %}
+{% block projectroles_extend %}
 
   <div class="row sodar-pr-content-title pb-2">
     {# Project menu dropdown, only visible if browser width < X and sidebar is hidden #}
@@ -41,4 +41,4 @@ <h2 class="sodar-pr-content-title">
   </form>
 </div>
 
-{% endblock projectroles %}
+{% endblock projectroles_extend %}
diff --git a/variants/templates/variants/project_stats_job_detail.html b/variants/templates/variants/project_stats_job_detail.html
@@ -12,7 +12,7 @@
   <li class="breadcrumb-item active">{{ object.bg_job.name }}</li>
 {% endblock %}
 
-{% block projectroles %}
+{% block projectroles_extend %}
   <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/spanr_job_detail.html b/variants/templates/variants/spanr_job_detail.html
@@ -14,7 +14,7 @@
   <li class="breadcrumb-item active">{{ object.bg_job.name }}</li>
 {% endblock %}
 
-{% block projectroles %}
+{% block projectroles_extend %}
   <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/sync_job_create.html b/variants/templates/variants/sync_job_create.html
@@ -9,7 +9,7 @@
   <li class="breadcrumb-item active">Synchronise with Upstream</li>
 {% endblock %}
 
-{% block projectroles %}
+{% block projectroles_extend %}
 
   <div class="row sodar-pr-content-title pb-2">
     {# Project menu dropdown, only visible if browser width < X and sidebar is hidden #}
@@ -41,4 +41,4 @@ <h2 class="sodar-pr-content-title">
   </form>
 </div>
 
-{% endblock projectroles %}
+{% endblock projectroles_extend %}
diff --git a/variants/templates/variants/sync_job_detail.html b/variants/templates/variants/sync_job_detail.html
@@ -13,7 +13,7 @@
   <li class="breadcrumb-item active">{{ object.bg_job.name }}</li>
 {% endblock %}
 
-{% block projectroles %}
+{% block projectroles_extend %}
   <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' %}