Merge pull request #383 from aplbrain/accessibility

Accessibility
aplbrain · Dec 22, 2022 · ccf7ca4 · ccf7ca4
2 parents 82cf3c0 + 521e26d
commit ccf7ca4
Show file tree

Hide file tree

Showing 19 changed files with 68 additions and 32 deletions.
diff --git a/neuvue_project/templates/404.html b/neuvue_project/templates/404.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% load static %}
 
+{% block title %}404 Not Found{% endblock %}
 
 {% block content %}
 

diff --git a/neuvue_project/templates/about.html b/neuvue_project/templates/about.html
@@ -1,10 +1,12 @@
 {% extends "base.html" %}
 {% load static %}
 
+{% block title %}About Us{% endblock %}
+
 {% block content %}
 <div class="basic">
     <div class="container text-light pb-5">
-        <h2 class="pt-5 pb-3" role="heading" aria-level="1"> About Us </h2>
+        <h1 class="pt-5 pb-3" aria-level="1"> About Us </h1>
 
         <p>
             We are a team of research scientists and engineers from the Johns Hopkins Applied Physics 

diff --git a/neuvue_project/templates/admin_dashboard/dashboard-namespace-view.html b/neuvue_project/templates/admin_dashboard/dashboard-namespace-view.html
@@ -6,6 +6,7 @@
 {% block header_includes %}
 <link rel="stylesheet" href="{% static 'css/dashboard.css' %}">
 {% endblock %}
+{% block title %}Admin Dashboard: {{display_name}} in {{group}} {% endblock %}
 
 {% block content %}
 <div class="basic dashboard">

diff --git a/neuvue_project/templates/admin_dashboard/dashboard-user-view.html b/neuvue_project/templates/admin_dashboard/dashboard-user-view.html
@@ -6,6 +6,7 @@
 {% block header_includes %}
 <link rel="stylesheet" href="{% static 'css/dashboard.css' %}">
 {% endblock %}
+{% block title %}Admin Dashboard: {{username}}{% endblock %}
 
 {% block content %}
 <div class="basic dashboard">

diff --git a/neuvue_project/templates/admin_dashboard/dashboard.html b/neuvue_project/templates/admin_dashboard/dashboard.html
@@ -5,6 +5,7 @@
 {% block header_includes %}
 <link rel="stylesheet" href="{% static 'css/dashboard.css' %}">
 {% endblock %}
+{% block title %}Admin Dashboard{% endblock %}
 
 {% block content %}
 <div class="basic dashboard">

diff --git a/neuvue_project/templates/base.html b/neuvue_project/templates/base.html
@@ -2,9 +2,10 @@
 {% load socialaccount %}
 {% load in_group %}
 <!DOCTYPE html>
-<html>
+<html lang="en">
   <head>
     {% block header_includes %}{% endblock %}
+    <title>{% block title %}{% endblock %}</title>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="stylesheet" href="{% static 'css/workspace.css' %}">
@@ -26,7 +27,7 @@
     <! Navigation Bar >
     <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
       <div class="container-fluid">
-        <a class="navbar-brand" href="{% url "index" %}"> <img src="{% static 'images/axonolotl.png' %}" alt="" width="30" height="24" class="d-inline-block align-text-top"> NeuVue</a>
+        <a class="navbar-brand" href="{% url "index" %}"> <img src="{% static 'images/axonolotl.png' %}" alt="Home" width="30" height="24" class="d-inline-block align-text-top"> NeuVue</a>
         <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
           <span class="navbar-toggler-icon"></span>
         </button>
@@ -91,7 +92,7 @@
               <a class="nav-link", href="{% url "about" %}"> About</a>
             </li>
             <li class="nav-item">
-              <a class="btn btn-outline-secondary" href="{% provider_login_url 'google' %}">Sign In</a>
+              <a class="btn btn-outline-info" href="{% provider_login_url 'google' %}">Sign In</a>
             </li>
 
             {% endif %}
@@ -101,7 +102,9 @@
       </div>
     </nav>
 
-  {% block content %}{% endblock %}
+    <main>
+      {% block content %}{% endblock %}
+    </main>
 
   </body>
 </html>
diff --git a/neuvue_project/templates/getting-started.html b/neuvue_project/templates/getting-started.html
@@ -5,7 +5,7 @@
 {% block header_includes %}
 <link rel="stylesheet" href="{% static 'css/tasks.css' %}">
 {% endblock %}
-
+{% block title %}Getting Started{% endblock %}
 
 {% block content %}
 <div class="basic workspace">

diff --git a/neuvue_project/templates/index.html b/neuvue_project/templates/index.html
@@ -2,29 +2,28 @@
 {% load static %}
 {% load socialaccount %}
 
+{% block title %}Welcome to NeuVue{% endblock %}
 {% block content %}
 
-
 <div class="intro">
-  <div class="container-fluid">
-    <div class="row">
-      <div class="col-md-6">
-        <div class="index-block  d-flex justify-content-center" style="margin-top: 50%;">
+  <div class="container-fluid inherit-height">
+    <div class="row inherit-height">
+      <div class="col-md-6 d-flex justify-content-center align-items-center">
+        <div class="d-flex justify-content-center">
           <div class="title-container">
-            <div class="index-title-text ">Welcome to NeuVue</div>
+            <h1 class="index-title-text mt-4 my-1">Welcome to NeuVue</h1>
           {% if user.is_authenticated %}
             <div class="d-flex justify-content-center">
               <span class="index-title-sub-text">You are logged in as <b>{{ user.username }}. </b> </p>
             </div>
           {% else %}
-            <a class="index-title-sub-text d-flex justify-content-center" href="{% provider_login_url 'google' %}" ><img width="200"src="static/images/google.png" ></a>
+            <a class="index-title-sub-text d-flex justify-content-center" href="{% provider_login_url 'google' %}" ><img width="200"src="static/images/google.png" alt="Sign in with Google"></a>
           {% endif %}
           </div>
         </div>
       </div>
-      <div class="col-md-6">
-        <div class="row">
-          <div class="index-card-container d-flex justify-content-center">
+      <div class="col-md-6 d-flex justify-content-center align-items-center">
+          <div class="index-card-container d-flex justify-content-center align-items-center">
             <div class="card index-card" id="bootstrap-overrides">
               <div class="index-card-header card-header text-center">
                 Recent Changes
@@ -34,7 +33,7 @@
                   {% for update in recent_updates %}
                   <div class="index-card-item">
                     <div class="index-card-item-title">{{update.update_name}}</div>
-                    <div class="index-card-item-date"><i>{{update.update_date}}</i></div>
+                    <div class="index-card-item-date fst-italic">{{update.update_date}}</div>
                     <div class="index-card-item-description">{{update.update_description}}</div>
                   </div>
                   {% endfor %}
@@ -44,7 +43,6 @@
               </div>
             </div>
           </div>
-        </div>
         <div class="index-card-column">        
         </div>
       </div>

diff --git a/neuvue_project/templates/inspect.html b/neuvue_project/templates/inspect.html
@@ -2,12 +2,14 @@
 {% load static %}
 {% load socialaccount %}
 {% load inclusion_tags %}
+{% block title %}Inspect Task{% endblock %}
 {% block content %}
 
 {% if not task_id or error%}
 
 <div class="basic workspace">
   <div class="inspect-container">
+  <h3 class="text-white mb-3"> Inspect Task </h3>
     <form id="mainForm" action="" method="post" onSubmit="triggerLoadingSpinner('submit-spinner')">
       {% csrf_token %}
       <div class="form-group">

diff --git a/neuvue_project/templates/lineage.html b/neuvue_project/templates/lineage.html
@@ -1,13 +1,15 @@
 {% extends "base.html" %}
 {% load static %}
 {% load socialaccount %}
+{% block title %}Lineage Viewer{% endblock %}
 
 {% block content %}
 
 {% if not root_id or error%}
 
 <div class="basic workspace">
   <div class="inspect-container">
+    <h3 class="text-white mb-3"> Lineage Viewer </h3>
     <form id="mainForm" action="" method="post" onSubmit="triggerLoadingSpinner('submit-spinner')">
       {% csrf_token %}
       <div class="form-group">

diff --git a/neuvue_project/templates/nuclei.html b/neuvue_project/templates/nuclei.html
@@ -2,12 +2,14 @@
 {% load static %}
 {% load socialaccount %}
 
+{% block title %}Nuclei Viewer{% endblock %}
 {% block content %}
 
 {% if not given_ids or error %}
 
 <div class="basic workspace">
   <div class="inspect-container">
+    <h3 class="text-white mb-3"> Nuclei Viewer </h3>
     <form id="mainForm" action="" method="post" onSubmit="triggerLoadingSpinner('submit-spinner')">
       {% csrf_token %}
       <div class="form-group">

diff --git a/neuvue_project/templates/preferences.html b/neuvue_project/templates/preferences.html
@@ -9,6 +9,7 @@
 <script src= "https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js" integrity="sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI" crossorigin="anonymous"></script>
 <!--End Palette Dropdown-->
 {% endblock %}
+{% block title %}Preferences{% endblock %}
 {% block content %}
 <div class="basic pref">
 <div class="pref_main_container mt-0 pt-4">

diff --git a/neuvue_project/templates/report.html b/neuvue_project/templates/report.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% load static %}
 {% load socialaccount %}
+{% block title %}Reports{% endblock %}
 
 {% block content %}
 <div class="basic dashboard">

diff --git a/neuvue_project/templates/synapse.html b/neuvue_project/templates/synapse.html
@@ -1,13 +1,15 @@
 {% extends "base.html" %}
 {% load static %}
 {% load socialaccount %}
+{% block title %}Synapse Viewer{% endblock %}
 
 {% block content %}
 
 {% if not root_ids or error%}
 
 <div class="basic workspace">
   <div class="inspect-container">
+    <h3 class="text-white mb-3"> Synapse Viewer </h3>
     <form id="mainForm" action="" method="post" onSubmit="triggerLoadingSpinner('submit-spinner')">
       {% csrf_token %}
       <div class="form-group">

diff --git a/neuvue_project/templates/tasks.html b/neuvue_project/templates/tasks.html
@@ -11,6 +11,7 @@
 <script src= "https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js" integrity="sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI" crossorigin="anonymous"></script>
 <!--End Palette Dropdown-->
 {% endblock %}
+{% block title %}My Tasks{% endblock %}
 
 {% block content %}
 <div class="basic tasks">

diff --git a/neuvue_project/templates/token.html b/neuvue_project/templates/token.html
@@ -2,6 +2,7 @@
 {% load static %}
 {% load socialaccount %}
 
+{% block title %}NeuVue Queue Token{% endblock %}
 {% block content %}
 
 <div class="basic workspace">

diff --git a/neuvue_project/templates/user-namespace.html b/neuvue_project/templates/user-namespace.html
@@ -5,11 +5,13 @@
 {% block header_includes %}
 <link rel="stylesheet" href="{% static 'css/dashboard.css' %}">
 {% endblock %}
+{% block title %}User/Namespace Query{% endblock %}
 
 {% block content %}
   <div class="basic dashboard">
     {% if not filename_field %}
     <div class="inspect-container">
+      <h3 class="text-white mb-3"> User/Namespace Query </h3>
       <ul class="nav nav-pills">
         <li class="nav-item margin-right-05">
             <a class="nav-link active" href="#namespaceTab" data-bs-toggle="tab">Namespace Query</a>

diff --git a/neuvue_project/templates/workspace.html b/neuvue_project/templates/workspace.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% load static %}
 {% load inclusion_tags %}
+{% block title %}{{display_name}} Workspace{% endblock %}
 
 {% block content %}
 

diff --git a/neuvue_project/workspace/static/css/workspace.css b/neuvue_project/workspace/static/css/workspace.css
@@ -53,10 +53,24 @@ ul li {
   left:0vw;
 }
 .basic {
-  background-image: url('/static/images/neuron_background_sketch-01-min.jpg'); 
-  background-size: 70vw;
-  background-repeat: repeat;
-  min-height: 96vh;
+  background: url('/static/images/neuron_background_sketch-01-min.jpg') no-repeat center center fixed; 
+  -webkit-background-size: cover;
+  -moz-background-size: cover;
+  -o-background-size: cover;
+  background-size: cover;
+  height: calc(100vh - 52.5px);
+  overflow: auto;
+}
+
+nav {
+  max-height: 52.5px;
+}
+
+/* if navbar menu is open, height must be much larger */
+@media(max-width: 992px) {
+  nav {
+    max-height: 575px;
+  }
 }
 
 .overflow-hidden {
@@ -89,12 +103,12 @@ ul li {
 }
 
 .intro {
-  background-image: url('/static/images/xray-neuron.jpg'); 
+  background: url('/static/images/xray-neuron.jpg') no-repeat center center fixed; 
   background-size: cover;
-  background-repeat: no-repeat;
   -webkit-background-size: cover;
   -moz-background-size: cover;
   -o-background-size: cover;
+  height: calc(100vh - 52.5px);
 }
 
 
@@ -470,14 +484,9 @@ border: 2px solid var(--secondary-accent) !important;
 background-color: var(--transparent-card-background) !important;
 border-radius: 8pt !important;
 width: 86%; 
-height: 60%; 
-margin-top: 25%;
-margin-right: 7%;
+height: 50vh; 
 }
 
-.index-card-container {
-  height: 100vh;
-}
 
 .index-card-items {
   overflow:scroll;
@@ -747,13 +756,12 @@ a.fill-div {
 
 /* the entire sidebar (content  + access bar) */
 .sidemenu {
-  height: 99%;
+  height: calc(100vh - 52.5px);
   width: 25%;
   position: fixed;
   z-index: 1;
   right: 0;
   background-color: var(--transparent-background);
-  top: 4vh;
 }
 
 
@@ -1036,6 +1044,8 @@ input[type=radio]:checked + label > img {
   align-items: center;
   border-radius: 2px;
   height: calc(var(--max-width) / 2 - 6px);
+  margin-top: 2px;
+  margin-bottom: 2px;
 }
 
 .small-logo-img {
@@ -1103,3 +1113,7 @@ input[type=radio]:checked + label > img {
     text-indent: -20px;
     border: 0;
 }
+
+.inherit-height {
+  height: inherit;
+}