Merge pull request #128 from sn3twork/issues/126

Fixes issue #126. 

7 files changed, 5 insertions, 4 deletions

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 00000000..d992942f
--- /dev/null
+++ b/.DS_Store
diff --git a/wqflask/.DS_Store b/wqflask/.DS_Store
new file mode 100644
index 00000000..d992942f
--- /dev/null
+++ b/wqflask/.DS_Store
diff --git a/wqflask/wqflask/.DS_Store b/wqflask/wqflask/.DS_Store
new file mode 100644
index 00000000..a119e235
--- /dev/null
+++ b/wqflask/wqflask/.DS_Store
diff --git a/wqflask/wqflask/static/dbdoc/TODO.md b/wqflask/wqflask/static/dbdoc/TODO.md
new file mode 100644
index 00000000..c0a8bab7
--- /dev/null
+++ b/wqflask/wqflask/static/dbdoc/TODO.md
@@ -0,0 +1 @@
+TODO: Add all database documentation into this folder
diff --git a/wqflask/wqflask/templates/correlation_page.html b/wqflask/wqflask/templates/correlation_page.html
index b2d17b62..9dddc7ce 100755
--- a/wqflask/wqflask/templates/correlation_page.html
+++ b/wqflask/wqflask/templates/correlation_page.html
@@ -15,8 +15,8 @@
             <h1>Correlation Table</h1>
         </div>
 
-        <p>Values of record {{ this_trait.name }} in the <a href="/dbdoc/{{dataset.fullname}}">{{ dataset.fullname }}</a>
-        dataset were compared to all records in the <a href="/dbdoc/{{target_dataset.fullname}}">{{ target_dataset.fullname }}</a>
+        <p>Values of record {{ this_trait.name }} in the <a href="/static/dbdoc/{{dataset.fullname}}">{{ dataset.fullname }}</a>
+        dataset were compared to all records in the <a href="/static/dbdoc/{{target_dataset.fullname}}">{{ target_dataset.fullname }}</a>
         dataset. The top {{ return_number }} correlations ranked by the {{ formatted_corr_type }} are displayed.
         You can resort this list by clicking the headers. Select the Record ID to open the trait data
         and analysis page.
diff --git a/wqflask/wqflask/templates/search_result_page.html b/wqflask/wqflask/templates/search_result_page.html
index e304be1c..d7f67f74 100755
--- a/wqflask/wqflask/templates/search_result_page.html
+++ b/wqflask/wqflask/templates/search_result_page.html
@@ -16,7 +16,7 @@
         <input type="hidden" name="uc_id" id="uc_id" value="{{ uc_id }}">
 
         <!-- Need to customize text more for other types of searches -->
-        <p>We searched <a href="/dbdoc/{{dataset.fullname}}">{{ dataset.fullname }}</a>
+        <p>We searched <a href="/static/dbdoc/{{dataset.fullname}}">{{ dataset.fullname }}</a>
            to find all records that match
                 {% for word in search_terms %}
                     <strong>{{word.search_term[0]}}</strong> {% if not loop.last %} or {% endif %}
diff --git a/wqflask/wqflask/templates/show_trait_details.html b/wqflask/wqflask/templates/show_trait_details.html
index cdaa919e..16c5dc47 100755
--- a/wqflask/wqflask/templates/show_trait_details.html
+++ b/wqflask/wqflask/templates/show_trait_details.html
@@ -17,7 +17,7 @@
 
     <dt>Database</dt>
     <dd>
-        <a href="{{ url_for('static', filename='/dbdoc/' + dataset.fullname + '.html') }}" target="_blank">
+        <a href="{{ url_for('static', filename='dbdoc/' + dataset.fullname + '.html') }}" target="_blank">
             {{ dataset.name }}
         </a>
     </dd>