fix #655 (#676)

* upgrade: use bootstrap from cdn and remove local bootstrap * revert paths to assets * remove pkg activation before installing search light adapter * Revert "remove pkg activation before installing search light adapter" This reverts commit 0363acb. * Update error-404.html * Update error-500.html * Update error-xxx.html * Update welcome.html --------- Co-authored-by: Adrian Salceanu <[email protected]>
GenieFramework · Sep 29, 2023 · 9dd1920 · 9dd1920
1 parent 672c384
commit 9dd1920
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 29 deletions.
diff --git a/files/new_app/public/css/genie/bootstrap.min.css b/files/new_app/public/css/genie/bootstrap.min.css
diff --git a/files/new_app/public/error-404.html b/files/new_app/public/error-404.html
@@ -8,7 +8,8 @@
   <title>Genie :: The highly productive Julia web framework</title>
 
   <!-- Bootstrap -->
-  <link href="/css/genie/bootstrap.min.css" rel="stylesheet">
+  <link href="https://cdn.jsdelivr.net/npm/bootstrap@5/dist/css/bootstrap-grid.min.css" rel="stylesheet"
+    crossorigin="anonymous">
   <link href="/css/genie/style.css" rel="stylesheet">
   <link href="/css/genie/prism.css" rel="stylesheet" />
 </head>
@@ -66,7 +67,8 @@ <h3>Get in touch</h3>
       <div class="col-md-6 col-sm-6">
         <p>Created by <a href="https://github.com/essenciary">Adrian Salceanu</a> and
           <a href="https://github.com/GenieFramework/Genie.jl/graphs/contributors">awesome contributors</a> |
-          <a href="https://github.com/GenieFramework/Genie.jl/blob/master/LICENSE.md">MIT licensed</a></p>
+          <a href="https://github.com/GenieFramework/Genie.jl/blob/master/LICENSE.md">MIT licensed</a>
+        </p>
       </div>
       <div class="col-md-6 col-sm-6">
         <p>
@@ -78,7 +80,9 @@ <h3>Get in touch</h3>
   <!-- End: Footer -->
 
   <script src="/js/genie/jquery.min.js"></script>
-  <script src="/js/genie/bootstrap.min.js"></script>
+  <script async defer src="https://cdn.jsdelivr.net/npm/bootstrap@5/dist/js/bootstrap.bundle.min.js"
+    integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL"
+    crossorigin="anonymous"></script>
 </body>
 
 </html>
diff --git a/files/new_app/public/error-500.html b/files/new_app/public/error-500.html
@@ -1,16 +1,19 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>Genie :: The highly productive Julia web framework</title>
 
   <!-- Bootstrap -->
-  <link href="/css/genie/bootstrap.min.css" rel="stylesheet">
+  <link href="https://cdn.jsdelivr.net/npm/bootstrap@5/dist/css/bootstrap-grid.min.css" rel="stylesheet"
+    crossorigin="anonymous">
   <link href="/css/genie/style.css" rel="stylesheet">
   <link href="/css/genie/prism.css" rel="stylesheet" />
 </head>
+
 <body id="page-top" data-spy="scroll" data-target=".side-menu">
   <div class="container-fluid">
     <!-- Start: Header -->
@@ -82,7 +85,8 @@ <h3>Get in touch</h3>
       <div class="col-md-6 col-sm-6">
         <p>Created by <a href="https://github.com/essenciary">Adrian Salceanu</a> and
           <a href="https://github.com/GenieFramework/Genie.jl/graphs/contributors">awesome contributors</a> |
-          <a href="https://github.com/GenieFramework/Genie.jl/blob/master/LICENSE.md">MIT licensed</a></p>
+          <a href="https://github.com/GenieFramework/Genie.jl/blob/master/LICENSE.md">MIT licensed</a>
+        </p>
       </div>
       <div class="col-md-6 col-sm-6">
         <p>
@@ -94,9 +98,12 @@ <h3>Get in touch</h3>
   <!-- End: Footer -->
 
   <script src="/js/genie/jquery.min.js"></script>
-  <script src="/js/genie/bootstrap.min.js"></script>
+  <script async defer src="https://cdn.jsdelivr.net/npm/bootstrap@5/dist/js/bootstrap.bundle.min.js"
+    integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL"
+    crossorigin="anonymous"></script>
   <script src="/js/genie/ansi_up.js"></script>
   <script src="/js/genie/static.js"></script>
   <script src="/js/genie/prism.js"></script>
 </body>
-</html>
+
+</html>
diff --git a/files/new_app/public/error-xxx.html b/files/new_app/public/error-xxx.html
@@ -8,7 +8,8 @@
   <title>Genie :: The highly productive Julia web framework</title>
 
   <!-- Bootstrap -->
-  <link href="/css/genie/bootstrap.min.css" rel="stylesheet">
+  <link href="https://cdn.jsdelivr.net/npm/bootstrap@5/dist/css/bootstrap-grid.min.css" rel="stylesheet"
+    crossorigin="anonymous">
   <link href="/css/genie/style.css" rel="stylesheet">
   <link href="/css/genie/prism.css" rel="stylesheet" />
 </head>
@@ -19,7 +20,7 @@
     <div class="row hero-header" id="home">
       <div class="col-md-7">
         <h1 id="main-heading">
-<error_info/>
+          <error_info />
         </h1>
         <h2>
           <code>
@@ -68,7 +69,8 @@ <h3>Get in touch</h3>
       <div class="col-md-6 col-sm-6">
         <p>Created by <a href="https://github.com/essenciary">Adrian Salceanu</a> and
           <a href="https://github.com/GenieFramework/Genie.jl/graphs/contributors">awesome contributors</a> |
-          <a href="https://github.com/GenieFramework/Genie.jl/blob/master/LICENSE.md">MIT licensed</a></p>
+          <a href="https://github.com/GenieFramework/Genie.jl/blob/master/LICENSE.md">MIT licensed</a>
+        </p>
       </div>
       <div class="col-md-6 col-sm-6">
         <p>
@@ -80,7 +82,9 @@ <h3>Get in touch</h3>
   <!-- End: Footer -->
 
   <script src="/js/genie/jquery.min.js"></script>
-  <script src="/js/genie/bootstrap.min.js"></script>
+  <script async defer src="https://cdn.jsdelivr.net/npm/bootstrap@5/dist/js/bootstrap.bundle.min.js"
+    integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL"
+    crossorigin="anonymous"></script>
 </body>
 
 </html>
diff --git a/files/new_app/public/js/genie/bootstrap.min.js b/files/new_app/public/js/genie/bootstrap.min.js
diff --git a/files/new_app/public/welcome.html b/files/new_app/public/welcome.html
@@ -8,9 +8,10 @@
   <title>Genie :: The highly productive Julia web framework</title>
 
   <!-- Bootstrap -->
-  <link href="/css/genie/bootstrap.min.css" rel="stylesheet">
-  <link href="/css/genie/style.css" rel="stylesheet">
-  <link href="/css/genie/prism.css" rel="stylesheet" />
+  <link href="https://cdn.jsdelivr.net/npm/bootstrap@5/dist/css/bootstrap-grid.min.css" rel="stylesheet"
+    crossorigin="anonymous">
+  <link href="css/genie/style.css" rel="stylesheet">
+  <link href="css/genie/prism.css" rel="stylesheet" />
 </head>
 
 <body id="page-top" data-spy="scroll" data-target=".side-menu">
@@ -60,7 +61,8 @@ <h3>Get in touch</h3>
       <div class="col-md-6 col-sm-6">
         <p>Created by <a href="https://github.com/essenciary">Adrian Salceanu</a> and
           <a href="https://github.com/GenieFramework/Genie.jl/graphs/contributors">awesome contributors</a> |
-          <a href="https://github.com/GenieFramework/Genie.jl/blob/master/LICENSE.md">MIT licensed</a></p>
+          <a href="https://github.com/GenieFramework/Genie.jl/blob/master/LICENSE.md">MIT licensed</a>
+        </p>
       </div>
       <div class="col-md-6 col-sm-6">
         <p>
@@ -72,9 +74,11 @@ <h3>Get in touch</h3>
   <!-- End: Footer -->
 
   <script src="/js/genie/jquery.min.js"></script>
-  <script src="/js/genie/bootstrap.min.js"></script>
+  <script async defer src="https://cdn.jsdelivr.net/npm/bootstrap@5/dist/js/bootstrap.bundle.min.js"
+    integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL"
+    crossorigin="anonymous"></script>
   <script async defer src="https://buttons.github.io/buttons.js"></script>
   <script src="/js/genie/prism.js"></script>
 </body>
 
-</html>
+</html>