about summary refs log tree commit diff
path: root/uploader/templates/base.html
diff options
context:
space:
mode:
Diffstat (limited to 'uploader/templates/base.html')
-rw-r--r--uploader/templates/base.html123
1 files changed, 76 insertions, 47 deletions
diff --git a/uploader/templates/base.html b/uploader/templates/base.html
index 019aa39..3c0d0d4 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%}
@@ -23,28 +23,32 @@
   </head>
 
   <body>
-    <header id="header" class="container-fluid">
-      <div class="row">
-        <span class="header col-lg-9">GeneNetwork Data Quality Control and Upload</span>
-        <nav class="header-nav col-lg-3">
-          <ul class="nav justify-content-end">
-            <li>
-              {%if user_logged_in()%}
-              <a href="{{url_for('oauth2.logout')}}"
-                 title="Log out of the system">{{user_email()}} &mdash; Log Out</a>
-              {%else%}
-              <a href="{{authserver_authorise_uri()}}"
-                 title="Log in to the system">Log In</a>
-              {%endif%}
-            </li>
-          </ul>
-        </nav>
+    <header id="header">
+      <span id="header-text">GeneNetwork</span>
+      <nav id="header-nav">
+        <ul class="nav justify-content-end">
+          <li>
+            {%if user_logged_in()%}
+            <a href="{{url_for('oauth2.logout')}}"
+               title="Log out of the system">
+              <span class="glyphicon glyphicon-user"></span>
+              {{user_email()}} Sign Out</a>
+            {%else%}
+            <a href="{{authserver_authorise_uri()}}"
+               title="Log in to the system">Sign In</a>
+            {%endif%}
+          </li>
+        </ul>
+      </nav>
     </header>
 
-    <aside id="nav-sidebar" class="container-fluid">
+    <aside id="nav-sidebar">
       <ul class="nav flex-column">
         <li {%if activemenu=="home"%}class="activemenu"{%endif%}>
           <a href="/" >Home</a></li>
+        <li {%if activemenu=="publications"%}class="activemenu"{%endif%}>
+          <a href="{{url_for('publications.index')}}"
+             title="View and manage publications.">Publications</a></li>
         <li {%if activemenu=="species"%}class="activemenu"{%endif%}>
           <a href="{{url_for('species.list_species')}}"
              title="View and manage species information.">Species</a></li>
@@ -70,9 +74,11 @@
         <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.">Expression Data</a></li>
+             title="Upload expression data."
+             class="not-implemented">Expression Data</a></li>
         <li {%if activemenu=="individuals"%}class="activemenu"{%endif%}>
           <a href="#"
              class="not-implemented"
@@ -86,47 +92,70 @@
              class="not-implemented"
              title="View and manage the backgroud jobs you have running">
             Background Jobs</a></li>
+        -->
       </ul>
     </aside>
 
-    <main id="main" class="main container-fluid">
+    <main id="main" class="main">
 
-      <div class="pagetitle row">
-        <h1>GN Uploader: {%block pagetitle%}{%endblock%}</h1>
-        <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 id="pagetitle" class="pagetitle">
+        <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 class="row">
-        <div class="container-fluid">
-          <div class="col-md-8 main-content">
-            {%block contents%}{%endblock%}
-          </div>
-          <div class="sidebar-content col-md-4">
-            {%block sidebarcontents%}{%endblock%}
-          </div>
+      <div id="all-content">
+        <div id="main-content">
+          {%block contents%}{%endblock%}
+        </div>
+        <div id="sidebar-content">
+          {%block sidebarcontents%}{%endblock%}
         </div>
       </div>
     </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>
-    <script type="text/javascript" src="/static/js/misc.js"></script>
-    {%block javascript%}{%endblock%}
 
-  </body>
+    <!--
+        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/utils.js"></script>
+    <script type="text/javascript" src="/static/js/datatables.js"></script>
+    {%block javascript%}{%endblock%}
+  </body>
 </html>