3 files changed, 111 insertions, 48 deletions
diff --git a/uploader/templates/index2.html b/uploader/templates/index2.html
deleted file mode 100644
index 72fea2f..0000000
--- a/uploader/templates/index2.html
+++ /dev/null
@@ -1,48 +0,0 @@
-{%extends "base2.html"%}
-{%from "flash_messages.html" import flash_all_messages%}
-
-{%block title%}Home{%endblock%}
-
-{%block pagetitle%}Home{%endblock%}
-
-{%block extra_breadcrumbs%}{%endblock%}
-
-{%block contents%}
-
-<div class="row">{{flash_all_messages()}}</div>
-
-{%if user_logged_in()%}
-<div class="row">
-  <p>Select from:</p>
-  <ul>
-    <li>Species</li>
-    <li>Publications</li>
-  </ul>
-</div>
-{%else%}
-<div class="row">
-  <p>
-    <a href="{{authserver_authorise_uri()}}"
-       title="Sign in to the system"
-       class="btn btn-primary">Sign in</a>
-    to continue.</p>
-</div>
-{%endif%}
-
-{%endblock%}
-
-
-
-{%block sidebarcontents%}
-<div class="row">
-  <form id="frm-quick-navigation">
-    <legend>Quick Navigation</legend>
-    <div class="form-group">
-      <label for="fqn-species-id">Species</label>
-      <select name="species_id">
-        <option value="">Select species</option>
-      </select>
-    </div>
-  </form>
-</div>
-{%endblock%}
diff --git a/uploader/templates/base2.html b/uploader/templates/sui-base.html
index 4c5d613..4c5d613 100644
--- a/uploader/templates/base2.html
+++ b/uploader/templates/sui-base.html
diff --git a/uploader/templates/sui-index.html b/uploader/templates/sui-index.html
new file mode 100644
index 0000000..a589148
--- /dev/null
+++ b/uploader/templates/sui-index.html
@@ -0,0 +1,111 @@
+{%extends "sui-base.html"%}
+{%from "flash_messages.html" import flash_all_messages%}
+{%from "macro-step-indicator.html" import step_indicator%}
+
+{%block title%}Home{%endblock%}
+
+{%block pagetitle%}Home{%endblock%}
+
+{%block extra_breadcrumbs%}{%endblock%}
+
+{%block contents%}
+
+<div class="row">{{flash_all_messages()}}</div>
+
+{%if user_logged_in()%}
+
+<div class="row">
+  <div class="row">
+    <h2>{{step_indicator("1 - a")}} Select the Species</h2>
+
+    <p>The data in Genenetwork is related to one species or another. To get
+      started, please select the species you want to work with.</p>
+  </div>
+</div>
+
+<div class="row">
+  <form method="GET" action="{{url_for('base.index')}}" class="form-horizontal">
+    <input type="hidden" name="streamlined_ui", value="{{streamlined_ui}}" />
+
+    {%if species | length != 0%}
+    <div style="margin-top:3em;">
+      <table id="tbl-select-species" class="table compact stripe"
+             data-species-list='{{species | tojson}}'>
+        <thead>
+          <tr>
+            <th></th>
+            <th>Species Name</th>
+          </tr>
+        </thead>
+
+        <tbody></tbody>
+      </table>
+    </div>
+
+    {%else%}
+
+    <label class="control-label" for="rdo-cant-find-species">
+      <input id="rdo-cant-find-species" type="radio" name="species_id"
+             value="CREATE-SPECIES" />
+      There are no species to select from. Create the first one.</label>
+
+    <div class="col-sm-offset-10 col-sm-2">
+      <input type="submit"
+             class="btn btn-primary col-sm-offset-1"
+             value="continue" />
+    </div>
+
+    {%endif%}
+
+    <div class="row form-buttons">
+      <div class="col">
+        <input type="submit"
+               class="btn btn-primary"
+               value="continue with selected" />
+      </div>
+      <div class="col"><strong>OR</strong></div>
+      <div class="col">
+        <a href="{{url_for('species.create_species', return_to='base.index')}}"
+           title="Create a new species.">Create a new Species</a>
+      </div>
+    </div>
+
+  </form>
+</div>
+
+{%else%}
+
+<div class="row">
+  <p>The Genenetwork Uploader (<em>gn-uploader</em>) enables upload of new data
+    into the Genenetwork System. It provides Quality Control over data, and
+    guidance in case you data does not meet the standards for acceptance.</p>
+  <p>
+    <a href="{{authserver_authorise_uri()}}"
+       title="Sign in to the system"
+       class="btn btn-primary">Sign in</a>
+    to get started.</p>
+</div>
+{%endif%}
+
+{%endblock%}
+
+
+
+{%block sidebarcontents%}
+<div class="row">
+  <form id="frm-quick-navigation">
+    <legend>Quick Navigation</legend>
+    <div class="form-group">
+      <label for="fqn-species-id">Species</label>
+      <select name="species_id">
+        <option value="">Select species</option>
+      </select>
+    </div>
+  </form>
+</div>
+{%endblock%}
+
+
+{%block javascript%}
+<script type="text/javascript" src="/static/js/species.js"></script>
+{%endblock%}