diff options
-rw-r--r-- | uploader/templates/base.html | 5 | ||||
-rw-r--r-- | uploader/templates/phenotypes/index.html | 8 | ||||
-rw-r--r-- | uploader/templates/phenotypes/select-population.html | 3 | ||||
-rw-r--r-- | uploader/templates/phenotypes/view-dataset.html | 7 |
4 files changed, 5 insertions, 18 deletions
diff --git a/uploader/templates/base.html b/uploader/templates/base.html index 90652bf..5eca445 100644 --- a/uploader/templates/base.html +++ b/uploader/templates/base.html @@ -17,6 +17,8 @@ href="{{url_for('base.bootstrap', filename='css/bootstrap-theme.min.css')}}" /> <link rel="stylesheet" type="text/css" href="/static/css/styles.css" /> + <link rel="stylesheet" + href="{{url_for('base.datatables', filename='css/jquery.dataTables.css')}}" /> {%block css%}{%endblock%} @@ -129,6 +131,9 @@ <script src="{{url_for('base.bootstrap', filename='js/bootstrap.min.js')}}"></script> <script type="text/javascript" src="/static/js/misc.js"></script> + <script type="text/javascript" + src="{{url_for('base.datatables', + filename='js/jquery.dataTables.js')}}"></script> {%block javascript%}{%endblock%} </body> </html> diff --git a/uploader/templates/phenotypes/index.html b/uploader/templates/phenotypes/index.html index 93159be..bffc278 100644 --- a/uploader/templates/phenotypes/index.html +++ b/uploader/templates/phenotypes/index.html @@ -6,11 +6,6 @@ {%block pagetitle%}Phenotypes{%endblock%} -{%block css%} -<link rel="stylesheet" - href="{{url_for('base.datatables', filename='css/jquery.dataTables.css')}}" /> -{%endblock%} - {%block contents%} {{flash_all_messages()}} @@ -22,9 +17,6 @@ {%block javascript%} -<script type="text/javascript" - src="{{url_for('base.datatables', - filename='js/jquery.dataTables.js')}}"></script> <script type="text/javascript" src="/static/js/species.js"></script> <script type="text/javascript"> $(function() { diff --git a/uploader/templates/phenotypes/select-population.html b/uploader/templates/phenotypes/select-population.html index d6e6aa1..cea0806 100644 --- a/uploader/templates/phenotypes/select-population.html +++ b/uploader/templates/phenotypes/select-population.html @@ -22,9 +22,6 @@ {%endblock%} {%block javascript%} -<script type="text/javascript" - src="{{url_for('base.datatables', - filename='js/jquery.dataTables.js')}}"></script> <script type="text/javascript" src="/static/js/populations.js"></script> <script type="text/javascript"> $(function() { diff --git a/uploader/templates/phenotypes/view-dataset.html b/uploader/templates/phenotypes/view-dataset.html index 4f2b79b..7507ff5 100644 --- a/uploader/templates/phenotypes/view-dataset.html +++ b/uploader/templates/phenotypes/view-dataset.html @@ -5,11 +5,6 @@ {%block title%}Phenotypes{%endblock%} -{%block css%} -<link rel="stylesheet" - href="{{url_for('base.datatables', filename='css/jquery.dataTables.css')}}" /> -{%endblock%} - {%block pagetitle%}Phenotypes{%endblock%} {%block lvl4_breadcrumbs%} @@ -81,8 +76,6 @@ {%block javascript%} -<script src="{{url_for('base.datatables', - filename='js/jquery.dataTables.js')}}"></script> <script type="text/javascript"> $(function() { $("#tbl-phenotypes-list").DataTable({ |