fix button colors, update queue

AndersenLab · Jun 14, 2021 · ebb6e68 · ebb6e68
1 parent d4bef48
commit ebb6e68
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 16 deletions.
diff --git a/base/templates/tools/heritability_calculator.html b/base/templates/tools/heritability_calculator.html
@@ -43,13 +43,13 @@
 
 <div class="row">
   <div class="col-md-3 col-md-offset-3 col-sm-5 col-sm-offset-1 col-xs-8 col-xs-offset-2 row-margin-bottom btn-mid-row">
-    <a id='create' value="create" type='submit' href="{{ url_for('heritability.heritability_create') }}" class="btn btn-primary btn-block">
+    <a id='create' value="create" type='submit' href="{{ url_for('heritability.heritability_create') }}" class="btn nu-alt-btn btn-block">
       <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> 
       New Calculation
     </a>
   </div> {# /col-md-3 #}
   <div class="col-md-3 col-sm-5 col-sm-offset-0 col-xs-8 col-xs-offset-2 row-margin-bottom btn-mid-row">
-    <a id='create' value="create" type='submit' href="{{ url_for('heritability.heritability_result_list') }}" class="btn btn-primary btn-block">
+    <a id='create' value="create" type='submit' href="{{ url_for('heritability.heritability_result_list') }}" class="btn nu-alt-btn btn-block">
       <span class="glyphicon glyphicon-list" aria-hidden="true"></span> 
       My Reports
     </a>
@@ -66,14 +66,14 @@
 <div class="row">
 
   <div class='col-md-3 col-md-offset-6 col-sm-offset-0 col-sm-6 row-margin-top'>
-    <a id='set-example' value="set-example" type='submit' class="btn btn-primary btn-block">
+    <a id='set-example' value="set-example" type='submit' class="btn btn-nu btn-block">
       <span class="glyphicon glyphicon-import" aria-hidden="true"></span> 
       Load sample data
     </a>
   </div> {# /col-md-3 #}
 
   <div class="col-md-3 col-sm-6 row-margin-top">
-    <a id='hcalc' value="hcalc" type='submit' class="btn btn-primary btn-block">
+    <a id='hcalc' value="hcalc" type='submit' class="btn btn-nu btn-block">
       <span class="glyphicon glyphicon-flash" aria-hidden="true"></span> 
       Calculate Heritability
     </a>

diff --git a/base/templates/tools/heritability_results.html b/base/templates/tools/heritability_results.html
@@ -92,19 +92,19 @@ <h4 class="text-center">
 
 <div class="row">
   <div class='col-md-2 col-md-offset-3 col-sm-4 col-sm-offset-0 col-xs-8 col-xs-offset-2 btn-mid-row'>
-    <a class="btn btn-primary btn-block" data-toggle="collapse" href="#collapseExample" role="button" aria-expanded="false" aria-controls="collapseExample">
+    <a class="btn btn-nu btn-block" data-toggle="collapse" href="#collapseExample" role="button" aria-expanded="false" aria-controls="collapseExample">
       <span class="glyphicon glyphicon-collapse-down" aria-hidden="true"></span> 
       View Data
     </a>
   </div>
   <div class='col-md-2 col-sm-4 col-sm-offset-0 col-xs-8 col-xs-offset-2  btn-mid-row'>
-    <a class="btn btn-primary btn-block" onClick="window.open('https://storage.googleapis.com/elegansvariation.org/reports/heritability/{{ data_hash }}/data.tsv')" role="button">
+    <a class="btn btn-nu btn-block" onClick="window.open('https://storage.googleapis.com/elegansvariation.org/reports/heritability/{{ data_hash }}/data.tsv')" role="button">
       <span class="glyphicon glyphicon-download" aria-hidden="true"></span> 
       Download Data
     </a>
   </div>
   <div class='col-md-2 col-sm-4 col-sm-offset-0 col-xs-8 col-xs-offset-2 btn-mid-row'>
-    <a class="btn btn-primary btn-block"  onClick="getPDF()" role="button">
+    <a class="btn btn-nu btn-block"  onClick="getPDF()" role="button">
       <span class="glyphicon glyphicon-stats" aria-hidden="true"></span> 
       Download PDF
     </a>

diff --git a/base/templates/tools/indel_primer.html b/base/templates/tools/indel_primer.html
@@ -34,16 +34,13 @@
 
   <div class='row row-margin'>
     <div class='col-md-4 col-md-offset-4 my-results-btn'>
-      <a role="button" class="btn btn-primary btn-block" href='{{ url_for("indel_primer.indel_primer_result_list") }}' >
+      <a role="button" class="btn nu-alt-btn btn-block" href='{{ url_for("indel_primer.indel_primer_result_list") }}' >
         <span class="glyphicon glyphicon-list" aria-hidden="true"></span>
         My Indel Primer Results
       </a>
     </div> {# /col #}
   </div> {# /row #}
 
-</div>{# /container #}
-
-<div class="container">
 
 	<div class='row row-margin'>
 		<form id='form-submit' method="POST">
@@ -55,7 +52,7 @@
 			<div class='col-lg-2 col-md-2 col-sm-4 col-xs-6'>{{ render_field(form.stop, placeholder="2,029,217") }}</div>
 			<div class='col-lg-2 col-md-2 col-sm-4 col-xs-6'>
 				<label>&nbsp;</label> <br />
-				<button id='find_indels' type='submit' value="submit" class="btn btn-primary btn-block"><span class="glyphicon glyphicon-search" aria-hidden="true"></span> Find Indels</button>
+				<button id='find_indels' type='submit' value="submit" class="btn nu-alt-btn btn-block"><span class="glyphicon glyphicon-search" aria-hidden="true"></span> Find Indels</button>
 			</div>
 		</form>
 	</div>

diff --git a/base/views/tools/heritability.py b/base/views/tools/heritability.py
@@ -159,8 +159,8 @@ def heritability_result(id):
   data = data.to_dict('records')
   trait = data[0]['TraitName']
   # Get trait and set title
-  title = f"Heritability Results: {trait}"
-
+  subtitle = trait
+  
   if result:
     hr.status = 'COMPLETE'
     hr.save()

diff --git a/queue.yaml b/queue.yaml
@@ -17,6 +17,8 @@ queue:
     max_doublings: 2
 - name: nscalc
   max_concurrent_requests: 1
-  rate: 1/s
+  rate: 0.01/s
   retry_parameters:
-    task_retry_limit: 1
+    task_retry_limit: 2
+    min_backoff_seconds: 300
+    max_backoff_seconds: 3000