1 files changed, 47 insertions, 19 deletions
diff --git a/uploader/templates/base.html b/uploader/templates/base.html
index a08c3e5..09e6470 100644
--- a/uploader/templates/base.html
+++ b/uploader/templates/base.html
@@ -8,14 +8,14 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     {%block extrameta%}{%endblock%}
 
-    <title>GN Uploader: {%block title%}{%endblock%}</title>
+    <title>Data Upload and Quality Control: {%block title%}{%endblock%}</title>
 
     <link rel="stylesheet" type="text/css"
 	  href="{{url_for('base.bootstrap',
                 filename='css/bootstrap.min.css')}}" />
     <link rel="stylesheet" type="text/css"
-	  href="{{url_for('base.bootstrap',
-                filename='css/bootstrap-theme.min.css')}}" />
+          href="{{url_for('base.datatables',
+                filename='css/dataTables.bootstrap5.min.css')}}" />
     <link rel="stylesheet" type="text/css" href="/static/css/styles.css" />
 
     {%block css%}{%endblock%}
@@ -24,7 +24,7 @@
 
   <body>
     <header id="header">
-      <span id="header-text">GeneNetwork: Data Upload and Quality Control</span>
+      <span id="header-text">GeneNetwork</span>
       <nav id="header-nav">
         <ul class="nav justify-content-end">
           <li>
@@ -32,10 +32,10 @@
             <a href="{{url_for('oauth2.logout')}}"
                title="Log out of the system">
               <span class="glyphicon glyphicon-user"></span>
-              Log Out</a>
+              Sign Out</a>
             {%else%}
             <a href="{{authserver_authorise_uri()}}"
-               title="Log in to the system">Log In</a>
+               title="Log in to the system">Sign In</a>
             {%endif%}
           </li>
         </ul>
@@ -71,6 +71,7 @@
         <li {%if activemenu=="phenotypes"%}class="activemenu"{%endif%}>
           <a href="{{url_for('species.populations.phenotypes.index')}}"
              title="Upload phenotype data.">Phenotype Data</a></li>
+        <!--
         <li {%if activemenu=="expression-data"%}class="activemenu"{%endif%}>
           <a href="{{url_for('species.populations.expression-data.index')}}"
              title="Upload expression data."
@@ -88,25 +89,28 @@
              class="not-implemented"
              title="View and manage the backgroud jobs you have running">
             Background Jobs</a></li>
+        -->
       </ul>
     </aside>
 
     <main id="main" class="main">
 
       <div id="pagetitle" class="pagetitle">
-        <span class="title">GN Uploader: {%block pagetitle%}{%endblock%}</span>
-        <nav>
-          <ol class="breadcrumb">
-            <li {%if activelink is not defined or activelink=="home"%}
-                class="breadcrumb-item active"
-                {%else%}
-                class="breadcrumb-item"
-                {%endif%}>
-              <a href="{{url_for('base.index')}}">Home</a>
-            </li>
-            {%block lvl1_breadcrumbs%}{%endblock%}
-          </ol>
-        </nav>
+        <span class="title">Data Upload and Quality Control: {%block pagetitle%}{%endblock%}</span>
+        <!--
+            <nav>
+              <ol class="breadcrumb">
+                <li {%if activelink is not defined or activelink=="home"%}
+                    class="breadcrumb-item active"
+                    {%else%}
+                    class="breadcrumb-item"
+                    {%endif%}>
+                  <a href="{{url_for('base.index')}}">Home</a>
+                </li>
+                {%block lvl1_breadcrumbs%}{%endblock%}
+              </ol>
+            </nav>
+            -->
       </div>
 
       <div id="all-content">
@@ -120,11 +124,35 @@
     </main>
 
 
+    <!--
+        Core dependencies
+      -->
     <script src="{{url_for('base.jquery',
                  filename='jquery.min.js')}}"></script>
     <script src="{{url_for('base.bootstrap',
                  filename='js/bootstrap.min.js')}}"></script>
+
+    <!--
+        DataTables dependencies
+      -->
+    <script type="text/javascript"
+            src="{{url_for('base.datatables',
+                 filename='js/dataTables.min.js')}}"></script>
+    <script type="text/javascript"
+        src="{{url_for('base.datatables_extensions',
+             filename='scroller/js/dataTables.scroller.min.js')}}"></script>
+    <script type="text/javascript"
+            src="{{url_for('base.datatables_extensions',
+                 filename='buttons/js/dataTables.buttons.min.js')}}"></script>
+    <script type="text/javascript"
+            src="{{url_for('base.datatables_extensions',
+                 filename='select/js/dataTables.select.min.js')}}"></script>
+
+    <!--
+        local dependencies
+      -->
     <script type="text/javascript" src="/static/js/misc.js"></script>
+    <script type="text/javascript" src="/static/js/datatables.js"></script>
     {%block javascript%}{%endblock%}
   </body>
 </html>