Merge pull request gdcc#13 from gdcc/fixity

Fixity and a11y
ErykKul · Aug 9, 2023 · de48525 · de48525
2 parents c664383 + 2679f2c
commit de48525
Show file tree

Hide file tree

Showing 3 changed files with 249 additions and 116 deletions.
diff --git a/src/css/dvwebloader.css b/src/css/dvwebloader.css
@@ -54,4 +54,16 @@ label {
 }
 #help {
     float:right;
-}
+}
+#logo {
+    display: inline-block;
+    margin: 10px 10px 10px 40px;
+    width: 240px;
+    min-height: 120px;
+    vertical-align: middle;
+}
+h1 {
+    text-align: center;
+    width: 58%;
+    display:inline-block;
+}
diff --git a/src/dvwebloader.html b/src/dvwebloader.html
@@ -1,32 +1,46 @@
-<html>
+<!DOCTYPE html>
+<html lang='en'>
     <head>
         <title>Dataverse WebLoader</title>
         <link type="text/css" rel="stylesheet" href="css/dvwebloader.css">
         <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.2/components/core.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.2/components/md5.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.0.0/core.js"></script>
         <script src="js/fileupload2.js"></script>
     </head>
     <body>
-        <div id='help'><a href='https://github.com/gdcc/dvwebloader/wiki' target='_blank'>Help/Tutorial</a></div>
-        <div id="top"><label for='files' class='button'>Select  a Directory<input type="file" id="files" name="files[]" multiple webkitdirectory style="display:none"/></label>
-            <div id='messages'></div>
-        </div>
-        <div id="filelist"></div>
-        <div id="credit"><a href='https://github.com/gdcc/dvwebloader' target='_blank'>DVWebloader v0.2</a>, development sponsored by UiT/DataverseNO</div>
-        <script>
-            var input = document.getElementById('files');
+        <main>
+            <div>
+                <img id='logo' alt='Site Logo'>
+                <h1>Folder Upload</h1>
+                <div id='help'>
+                    <a href='https://github.com/gdcc/dvwebloader/wiki' target='_blank'>Help/Tutorial</a>
+                </div>
+            </div>
+            <hr class='solid'>
+
+            <div id="top">
+                <label for='files' class='button'>Select a Directory<input type="file" id="files" name="files[]" multiple webkitdirectory style="display: none" /></label>
+                <div id='messages'></div>
+            </div>
+            <div id="filelist"></div>
+            <div id="credit">
+                <a href='https://github.com/gdcc/dvwebloader' target='_blank'>DVWebloader v0.2</a>, development sponsored by UiT/DataverseNO
+            </div>
+            <script>
+                var input = document
+                    .getElementById('files');
 
-            input.onchange = function (e) {
-                var files = e.target.files; // FileList
-                for (let i = 0; i < files.length; ++i) {
-                    let f = files[i];
-                    queueFileForDirectUpload(f);
-                    console.debug(files[i].webkitRelativePath);
-                    //              output.innerText  = output.innerText + files[i].webkitRelativePath+"\n";
-                }
-            };
-        </script>
+                input.onchange = function (e) {
+                    var files = e.target.files; // FileList
+                    for (let i = 0; i < files.length; ++i) {
+                        let f = files[i];
+                        queueFileForDirectUpload(f);
+                        console
+                            .debug(files[i].webkitRelativePath);
+                    }
+                };
+            </script>
+        </main>
     </body>
 </html>