From 3d96f0b3223d327b59b4e2523adb15c89a53a915 Mon Sep 17 00:00:00 2001
From: Ian Gulliver <flamingcow@gmail.com>
Date: Mon, 9 May 2016 23:13:49 +0000
Subject: [PATCH] Merge static web directories

---
 server/server.py                     |   1 +
 {www => server/static}/code-39.woff  | Bin
 {www => server/static}/systemid.html |   2 +-
 3 files changed, 2 insertions(+), 1 deletion(-)
 rename {www => server/static}/code-39.woff (100%)
 rename {www => server/static}/systemid.html (97%)

diff --git a/server/server.py b/server/server.py
index 9f8398a..27b0fd6 100755
--- a/server/server.py
+++ b/server/server.py
@@ -142,6 +142,7 @@ class HTTPRequestHandler(object):
     '.iso': 'application/octet-stream',
     '.js': 'application/javascript',
     '.json': 'application/json',
+    '.woff': 'application/font-woff',
   }
   _BLOCK_SIZE = 2 ** 16
 
diff --git a/www/code-39.woff b/server/static/code-39.woff
similarity index 100%
rename from www/code-39.woff
rename to server/static/code-39.woff
diff --git a/www/systemid.html b/server/static/systemid.html
similarity index 97%
rename from www/systemid.html
rename to server/static/systemid.html
index de0a4bc..10ff7c5 100644
--- a/www/systemid.html
+++ b/server/static/systemid.html
@@ -6,7 +6,7 @@
     <style>
 @font-face {
   font-family: 'code-39';
-  src: url('code-39.woff') format('woff');
+  src: url('/static/code-39.woff') format('woff');
   font-weight: normal;
   font-style: normal;
 }