Re-org css, use CDN

Smithsonian · Aug 22, 2024 · 36ca32f · 36ca32f
1 parent 840d2c9
commit 36ca32f
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 79 deletions.
diff --git a/web_app/app.py b/web_app/app.py
@@ -3247,7 +3247,7 @@ def data_reports(project_alias=None, report_id=None):
                            )
 
 
-# @cache.memoize()
+@cache.memoize()
 @app.route('/preview_image/<file_id>/', methods=['GET', 'POST'], provide_automatic_options=False)
 def get_preview(file_id=None, max=None, sensitive=None):
     """Return image previews"""

diff --git a/web_app/static/css/osprey_custom.css b/web_app/static/css/osprey_custom.css
@@ -0,0 +1,69 @@
+html {
+    position: relative;
+    min-height: 100%;
+    padding-bottom: 20px;
+    padding-top: 0px;
+  }
+  body {
+    margin-bottom: 160px;
+    font-family: "Basier-Circle",Helvetica,Arial,sans-serif;
+  }
+  footer {
+      position: absolute;
+      bottom: 0;
+      width: 100%;
+      font-family: "minion-pro",Helvetica,Arial,sans-serif;
+  }
+  .chart {
+      width: 100%;
+  }
+
+  .skipnav { text-align: left; }
+    .skipnav a { position: absolute; left: -10000px; width: 1px; height: 1px; overflow: hidden; }
+    .skipnav a:focus, .skipnav a:active { position: static; left: 0; width: auto; height: auto; overflow: visible; text-decoration: underline; 
+      background-color: #fff;
+border: 2px solid #000;
+color: #000;}
+
+  .screen-reader-only {
+      position: absolute;
+      width: 1px;
+      height: 1px;
+      padding: 0;
+      margin: -1px;
+      overflow: hidden;
+      clip: rect(0, 0, 0, 0);
+      white-space: nowrap;
+      border-width: 0;
+  }
+
+  .navtitle{
+      font-family: "minion-pro",Helvetica,Arial,sans-serif;
+      color: #FFFFFF;
+      font-size: 1.6rem;
+      font-weight: 500;
+      letter-spacing: 1px;
+      padding: 0.8rem 1rem;
+      text-decoration: none;
+  }
+
+  .navitems {
+      color: #FFFFFF;
+      text-decoration: none;
+      padding-left: 1rem;
+      font-family: "minion-pro",Helvetica,Arial,sans-serif;
+  }
+
+  .btn, .badge, .dataTables_info {
+      font-family: "Basier-Circle",Helvetica,Arial,sans-serif;
+      font-size: 1em;
+      font-weight: 200;
+  }
+
+  p, small, strong, li, th, td {
+      font-family: "Basier-Circle",Helvetica,Arial,sans-serif;
+  }
+
+  .footer-text {
+      font-family: "minion-pro",Helvetica,Arial,sans-serif;
+  }
diff --git a/web_app/static/css/osprey_custom.min.css b/web_app/static/css/osprey_custom.min.css
diff --git a/web_app/templates/base.html b/web_app/templates/base.html
@@ -19,86 +19,17 @@
             />
 
     <!-- Bootstrap CSS -->
-    <link
+    <!-- <link
             href="{{ url_for('static', filename='css/bootstrap.min.css') }}"
             rel="stylesheet"
-            />
+            /> -->
+    <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
 
     <!-- Font Awesome -->
     <link href="{{ url_for('static', filename='css/all.min.css') }}" rel="stylesheet" />
 
-    <style>
-        html {
-          position: relative;
-          min-height: 100%;
-          padding-bottom: 20px;
-          padding-top: 0px;
-        }
-        body {
-          margin-bottom: 160px;
-          font-family: "Basier-Circle",Helvetica,Arial,sans-serif;
-        }
-        footer {
-            position: absolute;
-            bottom: 0;
-            width: 100%;
-            font-family: "minion-pro",Helvetica,Arial,sans-serif;
-        }
-        .chart {
-            width: 100%;
-        }
-
-        .skipnav { text-align: left; }
-          .skipnav a { position: absolute; left: -10000px; width: 1px; height: 1px; overflow: hidden; }
-          .skipnav a:focus, .skipnav a:active { position: static; left: 0; width: auto; height: auto; overflow: visible; text-decoration: underline; 
-            background-color: #fff;
-    border: 2px solid #000;
-    color: #000;}
-
-        .screen-reader-only {
-            position: absolute;
-            width: 1px;
-            height: 1px;
-            padding: 0;
-            margin: -1px;
-            overflow: hidden;
-            clip: rect(0, 0, 0, 0);
-            white-space: nowrap;
-            border-width: 0;
-        }
-
-        .navtitle{
-            font-family: "minion-pro",Helvetica,Arial,sans-serif;
-            color: #FFFFFF;
-            font-size: 1.6rem;
-            font-weight: 500;
-            letter-spacing: 1px;
-            padding: 0.8rem 1rem;
-            text-decoration: none;
-        }
-
-        .navitems {
-            color: #FFFFFF;
-            text-decoration: none;
-            padding-left: 1rem;
-            font-family: "minion-pro",Helvetica,Arial,sans-serif;
-        }
-
-        .btn, .badge, .dataTables_info {
-            font-family: "Basier-Circle",Helvetica,Arial,sans-serif;
-            font-size: 1em;
-            font-weight: 200;
-        }
-
-        p, small, strong, li, th, td {
-            font-family: "Basier-Circle",Helvetica,Arial,sans-serif;
-        }
-
-        .footer-text {
-            font-family: "minion-pro",Helvetica,Arial,sans-serif;
-        }
-
-    </style>
+    <!-- Osprey-specific CSS -->
+    <link href="{{ url_for('static', filename='css/osprey_custom.min.css') }}" rel="stylesheet" />
 
     {% block head_blocks %}
     {% endblock %}
@@ -243,16 +174,18 @@ <h1 class="modal-title" id="loginModalLabel">Log In to the System</h1>
 <!-- Footer -->
 
     <!-- JQuery -->
-    <script
+    <!-- <script
             type="text/javascript"
             src="{{ url_for('static', filename='js/jquery-3.7.1.min.js') }}"
-    ></script>
+    ></script> -->
+    <script src="https://code.jquery.com/jquery-3.7.1.min.js" integrity="sha256-/JqT3SQfawRcv/BIHPThkBvs0OEvtFFmqPF/lYI/Cxo=" crossorigin="anonymous"></script>
 
     <!-- Bootstrap -->
-    <script
+    <!-- <script
             type="text/javascript"
             src="{{ url_for('static', filename='js/bootstrap.min.js') }}"
-    ></script>
+    ></script> -->
+    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
 
     <!-- Datatables -->
     <script