Organize the ui/ subdirectory. Add static handler to serve contents from

/ui/static.
metam1nd · Oct 8, 2013 · 76ac809 · 76ac809
1 parent 2c4d441
commit 76ac809
Show file tree

Hide file tree

Showing 17 changed files with 4 additions and 3 deletions.
diff --git a/ui/app.nw → ui/nodejs-webkit/app.nw b/ui/app.nw → ui/nodejs-webkit/app.nw
diff --git a/ui/package.json → ui/nodejs-webkit/package.json b/ui/package.json → ui/nodejs-webkit/package.json
diff --git a/ui/redirect.html → ui/nodejs-webkit/redirect.html b/ui/redirect.html → ui/nodejs-webkit/redirect.html
diff --git a/ui/bootstrap/LICENSE → ui/static/bootstrap/LICENSE b/ui/bootstrap/LICENSE → ui/static/bootstrap/LICENSE
diff --git a/ui/bootstrap/css/bootstrap-theme.css → ui/static/bootstrap/css/bootstrap-theme.css b/ui/bootstrap/css/bootstrap-theme.css → ui/static/bootstrap/css/bootstrap-theme.css
diff --git a/ui/bootstrap/css/bootstrap-theme.min.css → ...tic/bootstrap/css/bootstrap-theme.min.css b/ui/bootstrap/css/bootstrap-theme.min.css → ...tic/bootstrap/css/bootstrap-theme.min.css
diff --git a/ui/bootstrap/css/bootstrap.css → ui/static/bootstrap/css/bootstrap.css b/ui/bootstrap/css/bootstrap.css → ui/static/bootstrap/css/bootstrap.css
diff --git a/ui/bootstrap/css/bootstrap.min.css → ui/static/bootstrap/css/bootstrap.min.css b/ui/bootstrap/css/bootstrap.min.css → ui/static/bootstrap/css/bootstrap.min.css
diff --git a/...ap/fonts/glyphicons-halflings-regular.eot → ...ap/fonts/glyphicons-halflings-regular.eot b/...ap/fonts/glyphicons-halflings-regular.eot → ...ap/fonts/glyphicons-halflings-regular.eot
diff --git a/...ap/fonts/glyphicons-halflings-regular.svg → ...ap/fonts/glyphicons-halflings-regular.svg b/...ap/fonts/glyphicons-halflings-regular.svg → ...ap/fonts/glyphicons-halflings-regular.svg
diff --git a/...ap/fonts/glyphicons-halflings-regular.ttf → ...ap/fonts/glyphicons-halflings-regular.ttf b/...ap/fonts/glyphicons-halflings-regular.ttf → ...ap/fonts/glyphicons-halflings-regular.ttf
diff --git a/...p/fonts/glyphicons-halflings-regular.woff → ...p/fonts/glyphicons-halflings-regular.woff b/...p/fonts/glyphicons-halflings-regular.woff → ...p/fonts/glyphicons-halflings-regular.woff
diff --git a/ui/bootstrap/js/bootstrap.js → ui/static/bootstrap/js/bootstrap.js b/ui/bootstrap/js/bootstrap.js → ui/static/bootstrap/js/bootstrap.js
diff --git a/ui/bootstrap/js/bootstrap.min.js → ui/static/bootstrap/js/bootstrap.min.js b/ui/bootstrap/js/bootstrap.min.js → ui/static/bootstrap/js/bootstrap.min.js
diff --git a/ui/index.css → ui/static/index.css b/ui/index.css → ui/static/index.css
diff --git a/ui/index.html → ui/templates/index.html b/ui/index.html → ui/templates/index.html
@@ -7,8 +7,8 @@
     <meta name="author" content="">
 
     <title>namebench (v2 alpha)</title>
-    <link href="bootstrap/dist/css/bootstrap.css" rel="stylesheet">
-    <link href="menu.css" rel="stylesheet">
+    <link href="/static/bootstrap/dist/css/bootstrap.css" rel="stylesheet">
+    <link href="/static/index.css" rel="stylesheet">
     <link href='http://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
   </head>
 

diff --git a/ui/ui.go b/ui/ui.go
@@ -26,12 +26,13 @@ const (
 )
 
 var (
-	indexTmpl = loadTemplate("ui/index.html")
+	indexTmpl = loadTemplate("ui/templates/index.html")
 )
 
 // RegisterHandler registers all known handlers.
 func RegisterHandlers() {
 	http.HandleFunc("/", Index)
+	http.Handle("/static/", http.StripPrefix("/static", http.FileServer(http.Dir("ui/static"))))
 	http.HandleFunc("/submit", Submit)
 }