From e437f6235b3c06de31719d52cf506103e969ebce Mon Sep 17 00:00:00 2001 From: Zachary Sloan Date: Mon, 22 Sep 2014 18:46:07 +0000 Subject: Adding the port as a parameter to runserver; this should just be temporary until I figure out how to get it to read the port from the config file instead Using runserver.py instead of secure_server.py because of an error with the latter that I haven't figured out how to fix yet Improved the appearance of several of the tables --- wqflask/cfg/default_settings.py | 2 - wqflask/runserver.py | 1 + .../packages/DataTables/css/jquery.dataTables.css | 1 + wqflask/wqflask/templates/marker_regression.html | 251 ++++++++++----------- wqflask/wqflask/templates/search_result_page.html | 15 +- .../wqflask/templates/show_trait_edit_data.html | 2 + 6 files changed, 138 insertions(+), 134 deletions(-) diff --git a/wqflask/cfg/default_settings.py b/wqflask/cfg/default_settings.py index c9d2a934..8fca3d77 100755 --- a/wqflask/cfg/default_settings.py +++ b/wqflask/cfg/default_settings.py @@ -1,7 +1,5 @@ LOGFILE = """/tmp/flask_gn_log""" -SERVER_PORT = 5002 - #This is needed because Flask turns key errors into a #400 bad request response with no exception/log TRAP_BAD_REQUEST_ERRORS = True diff --git a/wqflask/runserver.py b/wqflask/runserver.py index 1cf38f8e..8ab88580 100755 --- a/wqflask/runserver.py +++ b/wqflask/runserver.py @@ -28,6 +28,7 @@ import logging_tree logging_tree.printout() app.run(host='0.0.0.0', + port=5002, use_debugger=False, threaded=True, use_reloader=True) diff --git a/wqflask/wqflask/static/new/packages/DataTables/css/jquery.dataTables.css b/wqflask/wqflask/static/new/packages/DataTables/css/jquery.dataTables.css index 68d5e4fa..7a674d3a 100755 --- a/wqflask/wqflask/static/new/packages/DataTables/css/jquery.dataTables.css +++ b/wqflask/wqflask/static/new/packages/DataTables/css/jquery.dataTables.css @@ -50,6 +50,7 @@ table.dataTable tr.outlier td{ background-color: #FFFF00; } .dataTables_wrapper { position: relative; clear: both; + float: left; *zoom: 1; } diff --git a/wqflask/wqflask/templates/marker_regression.html b/wqflask/wqflask/templates/marker_regression.html index 2c8f42a1..6aed69d5 100755 --- a/wqflask/wqflask/templates/marker_regression.html +++ b/wqflask/wqflask/templates/marker_regression.html @@ -1,127 +1,126 @@ -{% extends "base.html" %} -{% block title %}Interval Mapping{% endblock %} -{% block css %} - - - - - - -{% endblock %} -{% block content %} - - {{ header("Mapping", - '{}: {}'.format(this_trait.name, this_trait.description_fmt)) }} - -
-
-

- Whole Genome Mapping -

-
- - - -
-
- - - -
- -
-
-
- -
-
-
-

- Results -

-
- - - - - - - - - - - - {% for marker in filtered_markers %} - {% if marker.lod_score > lod_cutoff %} - - - - - - - - {% endif %} - {% endfor %} - -
IndexLOD ScoreChrMbLocus
{{loop.index}}{{marker.lod_score}}{{marker.chr}}{{marker.Mb}}{{marker.name}}
- -
- - - -{% endblock %} - -{% block js %} - - - - - - - - - - - - - - - - - - - - +{% extends "base.html" %} +{% block title %}Interval Mapping{% endblock %} +{% block css %} + + + + + + +{% endblock %} +{% block content %} + + {{ header("Mapping", + '{}: {}'.format(this_trait.name, this_trait.description_fmt)) }} + +
+
+

+ Whole Genome Mapping +

+
+ + + +
+
+ + + +
+ +
+
+
+ +
+
+
+

+ Results +

+ + + + + + + + + + + + {% for marker in filtered_markers %} + {% if marker.lod_score > lod_cutoff %} + + + + + + + + {% endif %} + {% endfor %} + +
IndexLOD ScoreChrMbLocus
{{loop.index}}{{marker.lod_score}}{{marker.chr}}{{marker.Mb}}{{marker.name}}
+
+
+ + + +{% endblock %} + +{% block js %} + + + + + + + + + + + + + + + + + + + + {% endblock %} \ No newline at end of file diff --git a/wqflask/wqflask/templates/search_result_page.html b/wqflask/wqflask/templates/search_result_page.html index 0baac2d3..286ead6c 100755 --- a/wqflask/wqflask/templates/search_result_page.html +++ b/wqflask/wqflask/templates/search_result_page.html @@ -84,12 +84,15 @@

- - - - - - +
+ +
+ + + + + +
diff --git a/wqflask/wqflask/templates/show_trait_edit_data.html b/wqflask/wqflask/templates/show_trait_edit_data.html index e7df3b13..5d6346ca 100755 --- a/wqflask/wqflask/templates/show_trait_edit_data.html +++ b/wqflask/wqflask/templates/show_trait_edit_data.html @@ -119,6 +119,7 @@ {# Todo: Add IDs #}