[KiRi] Avoid downloading utils, now included

- Removed fontawesome, really needed? - Added copies for: - jquery (needed by bootstrap :-( - bootstrap (JS and CSS) - svg-pan-zoom
INTI-CMNB · Dec 26, 2023 · 80f44e2 · 80f44e2
1 parent cf2a0ab
commit 80f44e2
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 10 deletions.
diff --git a/kibot/out_kiri.py b/kibot/out_kiri.py
@@ -190,6 +190,7 @@ def create_kiri_files(self):
         copy2(os.path.join(src_dir, 'kiri.js'), os.path.join(web_dir, 'kiri.js'))
         copy2(os.path.join(src_dir, 'index.html'), os.path.join(web_dir, 'index.html'))
         copytree(os.path.join(src_dir, 'images'), os.path.join(web_dir, 'images'), dirs_exist_ok=True)
+        copytree(os.path.join(src_dir, 'utils'), os.path.join(web_dir, 'utils'), dirs_exist_ok=True)
         # Colors for the layers
         with open(os.path.join(web_dir, 'layer_colors.css'), 'wt') as f:
             f.write(LAYER_COLORS_HEAD)

diff --git a/kibot/resources/kiri/index.html b/kibot/resources/kiri/index.html
@@ -3,12 +3,9 @@
 	<head>
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-		<script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-		<!-- <script src="./jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script> -->
-		<!-- <script src="https://cdn.rawgit.com/ccampbell/mousetrap/825ce50c/mousetrap.min.js"></script> -->
-		<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-zCbKRCUGaJDkqS1kPbPd7TveP5iyJE0EjAuZQTgFLD2ylzuqKfdKlfG/eSrtxUkn" crossorigin="anonymous">
-		<!-- <link rel="stylesheet" href="./bootstrap.min.css" integrity="sha384-zCbKRCUGaJDkqS1kPbPd7TveP5iyJE0EjAuZQTgFLD2ylzuqKfdKlfG/eSrtxUkn" crossorigin="anonymous"> -->
-		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+		<script src="./utils/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
+		<link rel="stylesheet" href="./utils/bootstrap.min.css" integrity="sha384-zCbKRCUGaJDkqS1kPbPd7TveP5iyJE0EjAuZQTgFLD2ylzuqKfdKlfG/eSrtxUkn" crossorigin="anonymous">
+		<!-- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css"> -->
 		<link rel="icon" href="./favicon.ico" type="image/x-icon">
 		<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon">
 		<link rel="stylesheet" href="kiri.css" integrity="">
@@ -322,10 +319,8 @@ <h5>Miscellaneous</h5>
 			</div>
 		</div>
 
-		<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-fQybjgWLrvvRgtW6bFlB7jaZrFsaBXjsOMm/tB9LTS58ONXgqbR9W8oWht/amnpF" crossorigin="anonymous"></script> -->
-		<!-- <script src="./bootstrap.bundle.min.js" integrity="sha384-fQybjgWLrvvRgtW6bFlB7jaZrFsaBXjsOMm/tB9LTS58ONXgqbR9W8oWht/amnpF" crossorigin="anonymous"></script> -->
-		<!-- <script src="https://code.iconify.design/2/2.2.1/iconify.min.js" integrity=""></script> -->
-		<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/svg-pan-zoom.min.js" integrity=""></script>
+		<script src="./utils/bootstrap.bundle.min.js" integrity="sha384-fQybjgWLrvvRgtW6bFlB7jaZrFsaBXjsOMm/tB9LTS58ONXgqbR9W8oWht/amnpF" crossorigin="anonymous"></script>
+		<script src="./utils/svg-pan-zoom.min.js" integrity=""></script>
 		<script src="./kiri.js" integrity="" crossorigin="anonymous"></script>
 	</body>
 </html>
diff --git a/kibot/resources/kiri/utils/bootstrap.bundle.min.js b/kibot/resources/kiri/utils/bootstrap.bundle.min.js
diff --git a/kibot/resources/kiri/utils/bootstrap.min.css b/kibot/resources/kiri/utils/bootstrap.min.css
diff --git a/kibot/resources/kiri/utils/jquery-3.6.0.min.js b/kibot/resources/kiri/utils/jquery-3.6.0.min.js
diff --git a/kibot/resources/kiri/utils/svg-pan-zoom.min.js b/kibot/resources/kiri/utils/svg-pan-zoom.min.js