8 files changed, 19 insertions, 13 deletions
diff --git a/uploader/templates/base.html b/uploader/templates/base.html
index 3c0d0d4..d521ccb 100644
--- a/uploader/templates/base.html
+++ b/uploader/templates/base.html
@@ -45,7 +45,7 @@
     <aside id="nav-sidebar">
       <ul class="nav flex-column">
         <li {%if activemenu=="home"%}class="activemenu"{%endif%}>
-          <a href="/" >Home</a></li>
+          <a href="{{url_for('base.index')}}" >Home</a></li>
         <li {%if activemenu=="publications"%}class="activemenu"{%endif%}>
           <a href="{{url_for('publications.index')}}"
              title="View and manage publications.">Publications</a></li>
diff --git a/uploader/templates/macro-forms.html b/uploader/templates/macro-forms.html
new file mode 100644
index 0000000..0ccab32
--- /dev/null
+++ b/uploader/templates/macro-forms.html
@@ -0,0 +1,9 @@
+{%macro add_http_feature_flags()%}
+{%for flag in http_feature_flags():%}
+{%if (request.args.get(flag) or request.form.get(flag) or ""):%}
+<input type="hidden"
+       name="{{flag}}"
+       value="{{(request.args.get(flag) or request.form.get(flag))}}" />
+{%endif%}
+{%endfor%}
+{%endmacro%}
diff --git a/uploader/templates/populations/sui-base.html b/uploader/templates/populations/sui-base.html
index 88d3f54..cc01c9e 100644
--- a/uploader/templates/populations/sui-base.html
+++ b/uploader/templates/populations/sui-base.html
@@ -5,8 +5,7 @@
 <li class="breadcrumb-item">
   <a href="{{url_for('species.populations.view_population',
            species_id=species['SpeciesId'],
-           population_id=population['Id'],
-           streamlined_ui=streamlined_ui)}}">
+           population_id=population['Id'])}}">
     {{population["FullName"]}}
   </a>
 </li>
diff --git a/uploader/templates/populations/sui-view-population.html b/uploader/templates/populations/sui-view-population.html
index a9f506a..9b10ad4 100644
--- a/uploader/templates/populations/sui-view-population.html
+++ b/uploader/templates/populations/sui-view-population.html
@@ -68,8 +68,7 @@
         in your data.</p>
       <a href="{{url_for('species.populations.samples.list_samples',
                species_id=species.SpeciesId,
-               population_id=population.Id,
-               streamlined_ui=streamlined_ui)}}"
+               population_id=population.Id)}}"
          title="Upload samples for population '{{population['Name']}}'"
          class="btn btn-primary">Upload Samples</a>
     </div>
@@ -88,8 +87,7 @@
       <a href="{{url_for('species.populations.phenotypes.view_dataset',
            species_id=species.SpeciesId,
            population_id=population.Id,
-           dataset_id=dataset.Id,
-           streamlined_ui=streamlined_ui)}}"
+           dataset_id=dataset.Id)}}"
          title="Upload phenotype data for population '{{population['Name']}}'"
          class="btn btn-primary">Upload Phenotypes</a>
     </div>
@@ -102,8 +100,7 @@
         system will be added. This does not delete any existing data.</p>
       <a href="{{url_for('species.populations.genotypes.list_genotypes',
                species_id=species.SpeciesId,
-               population_id=population.Id,
-               streamlined_ui=streamlined_ui)}}"
+               population_id=population.Id)}}"
          title="Upload genotype information for the '{{population.FullName}}' population of the '{{species.FullName}}' species."
          class="btn btn-primary">upload genotypes</a>
     </div>
diff --git a/uploader/templates/species/sui-base.html b/uploader/templates/species/sui-base.html
index 5d2e6e3..f7b4fef 100644
--- a/uploader/templates/species/sui-base.html
+++ b/uploader/templates/species/sui-base.html
@@ -3,7 +3,7 @@
 {%block breadcrumbs%}
 {{super()}}
 <li class="breadcrumb-item">
-  <a href="{{url_for('species.view_species', species_id=species['SpeciesId'], streamlined_ui=streamlined_ui)}}">
+  <a href="{{url_for('species.view_species', species_id=species['SpeciesId'])}}">
     {{species["Name"]|title}}
   </a>
 </li>
diff --git a/uploader/templates/species/sui-view-species.html b/uploader/templates/species/sui-view-species.html
index 5373766..c7ac956 100644
--- a/uploader/templates/species/sui-view-species.html
+++ b/uploader/templates/species/sui-view-species.html
@@ -1,5 +1,6 @@
 {%extends "species/sui-base.html"%}
 {%from "flash_messages.html" import flash_all_messages%}
+{%from "macro-forms.html" import add_http_feature_flags%}
 {%from "macro-step-indicator.html" import step_indicator%}
 {%from "species/macro-display-species-card.html" import display_sui_species_card%}
 
diff --git a/uploader/templates/sui-base.html b/uploader/templates/sui-base.html
index 4aec354..719a646 100644
--- a/uploader/templates/sui-base.html
+++ b/uploader/templates/sui-base.html
@@ -52,7 +52,7 @@
         <ol class="breadcrumb">
           {%block breadcrumbs%}
           <li class="breadcrumb-item">
-            <a href="{{url_for('base.index', streamlined_ui='true')}}">Home</a></li>
+            <a href="{{url_for('base.index')}}">Home</a></li>
           {%endblock%}
         </ol>
       </nav>
diff --git a/uploader/templates/sui-index.html b/uploader/templates/sui-index.html
index e6873e2..260ec30 100644
--- a/uploader/templates/sui-index.html
+++ b/uploader/templates/sui-index.html
@@ -1,5 +1,6 @@
 {%extends "sui-base.html"%}
 {%from "flash_messages.html" import flash_all_messages%}
+{%from "macro-forms.html" import add_http_feature_flags%}
 {%from "macro-step-indicator.html" import step_indicator%}
 
 {%block title%}Home{%endblock%}
@@ -25,8 +26,7 @@
 
 <div class="row">
   <form method="GET" action="{{url_for('base.index')}}" class="form-horizontal">
-    <input type="hidden" name="streamlined_ui", value="{{streamlined_ui}}" />
-
+    {{add_http_feature_flags()}}
     {%if species | length != 0%}
     <div style="margin-top:3em;">
       <table id="tbl-select-species" class="table compact stripe"