From 3b13038712bbacd66851eaaefc8556b4d54977d0 Mon Sep 17 00:00:00 2001
From: jshjelse <jshjelse@stud.ntnu.no>
Date: Fri, 15 Sep 2023 20:07:38 +0200
Subject: [PATCH] Bedre mappestruktur og lesing av filnavn
---
style.css => css/style.css | 0
index.html | 17 ++++++++---------
javascript/openFileFromExplorer.js | 7 ++++---
3 files changed, 12 insertions(+), 12 deletions(-)
rename style.css => css/style.css (100%)
diff --git a/style.css b/css/style.css
similarity index 100%
rename from style.css
rename to css/style.css
diff --git a/index.html b/index.html
index a32619d..4f08721 100644
--- a/index.html
+++ b/index.html
@@ -3,13 +3,11 @@
<head>
<title>ProgGIS</title>
- <link rel="stylesheet" href="style.css" />
+ <link rel="stylesheet" href="css/style.css"/>
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css" integrity="sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY=" crossorigin="" />
<script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js" integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo=" crossorigin=""></script>
- <script src="https://unpkg.com/shpjs@latest/dist/shp.js"></script>
-
</head>
<body class="standard">
@@ -47,12 +45,12 @@
</svg>
</div>
- <div style="margin-top: 5px; margin-bottom: 5px;">
+ <div style="margin-left: 10px; margin-top: 5px; margin-bottom: 5px;">
<input type="file" none="dialog" id="dialog" multiple>
<button id="clickOpen" onclick="clickMe()">Click here to open new layers</button>
</div>
- <div style="margin-left: 10px; font-size: 18px; height: 60vh;">
+ <div style="margin-left: 10px; font-size: 18px; height: 50vh;">
<p id="layers"></p>
</div>
</div>
@@ -142,9 +140,10 @@
</div>
</div>
</div>
+
+ <script src="javascript/map.js"></script>
+ <script src="javascript/sidebar&boxes.js"></script>
+ <script src="javascript/openFileFromExplorer.js"></script>
+
</body>
</html>
-
-<script src="javascript/map.js"></script>
-<script src="javascript/sidebar&boxes.js"></script>
-<script src="javascript/openFileFromExplorer.js"></script>
diff --git a/javascript/openFileFromExplorer.js b/javascript/openFileFromExplorer.js
index e58a1d2..317211e 100644
--- a/javascript/openFileFromExplorer.js
+++ b/javascript/openFileFromExplorer.js
@@ -7,7 +7,8 @@ function clickMe() {
dialog.addEventListener("input", () => {
if (dialog.files.length) {
- let text = dialog.files[0].name;
- document.getElementById("layers").innerHTML = text;
+ for (i = 0; i < dialog.files.length; i++) {
+ document.getElementById("layers").innerHTML = dialog.files[i].name;
+ }
}
-});
\ No newline at end of file
+});
--
GitLab