13 files changed, 84 insertions, 31 deletions
diff --git a/views/app.ejs b/views/app.ejs
deleted file mode 100755
index 4a10915..0000000
--- a/views/app.ejs
+++ /dev/null
@@ -1,29 +0,0 @@
-<!doctype html>
-<html>
-<head>
-	<title>vvalls</title>
-	[[ include partials/meta ]]
-</head>
-<body class="editing loading">
-
-<div id="scene"></div>
-
-<div class="rapper">
-	<a href="/" class="logo"><img src="/assets/img/logo4.svg"></a>
-	<a href="/profile.html"><span class="icon-ios7-person-outline profile"></span></a>
-
-	[[ include controls/toolbar ]]
-	[[ include controls/video-toolbar ]]
-	[[ include controls/media-drawer ]]
-	[[ include controls/wallpaper ]]
-	[[ include controls/light-control ]]
-	[[ include controls/settings ]]
-
-	<div id="minimap" class="vvbox">
-		<span class="el"></span>
-	</div>
-</div>
-
-</body>
-[[ include partials/scripts ]]
-</html>
diff --git a/views/builder.ejs b/views/builder.ejs
new file mode 100644
index 0000000..50b2a5b
--- /dev/null
+++ b/views/builder.ejs
@@ -0,0 +1,43 @@
+<!doctype html>
+<html>
+<head>
+	<title>vvalls</title>
+	[[ include partials/meta ]]
+</head>
+<body class="editing loading">
+
+<div id="scene"></div>
+
+<div class="rapper">
+	[[ include partials/header ]]
+	[[ include controls/builder/toolbar ]]
+
+<!--
+	<div id="minimap" class="vvbox">
+		<span class="el"></span>
+	</div>
+-->
+
+	<div id="hud">
+		<div id="map" style="display: block">
+		</div>
+
+		<div id="info">
+			<select id="palette">
+				<option>colors</option>
+				<option>redblue</option>
+				<option>gray</option>
+				<option selected>bone</option>
+				<option>alpha</option>
+				<option>white</option>
+				<option>black</option>
+			</select>
+			<div id="intersects"></div>
+		</div>
+	</div>
+
+</div>
+
+</body>
+[[ include partials/scripts ]]
+</html>
diff --git a/views/controls/toolbar.ejs b/views/controls/builder/toolbar.ejs
index 1bf87eb..1bf87eb 100644
--- a/views/controls/toolbar.ejs
+++ b/views/controls/builder/toolbar.ejs
diff --git a/views/controls/light-control.ejs b/views/controls/editor/light-control.ejs
index 782c400..782c400 100644
--- a/views/controls/light-control.ejs
+++ b/views/controls/editor/light-control.ejs
diff --git a/views/controls/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index af9ea71..af9ea71 100644
--- a/views/controls/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
diff --git a/views/controls/settings.ejs b/views/controls/editor/settings.ejs
index f92d1c7..f92d1c7 100644
--- a/views/controls/settings.ejs
+++ b/views/controls/editor/settings.ejs
diff --git a/views/controls/signed-out.ejs b/views/controls/editor/signed-out.ejs
index 20e3715..20e3715 100644
--- a/views/controls/signed-out.ejs
+++ b/views/controls/editor/signed-out.ejs
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
new file mode 100644
index 0000000..1bf87eb
--- /dev/null
+++ b/views/controls/editor/toolbar.ejs
@@ -0,0 +1,9 @@
+<div class="edit menu vvbox">
+	<span class="icon-ios7-photos-outline addMedia" data-info="add media"></span>
+	<span class="icon-arrow-resize" data-info="resize media"></span>
+	<span class="icon-ios7-keypad-outline" data-info="add wallpaper"></span>
+	<span class="icon-ios7-sunny-outline" data-info="light control"></span>
+	<span class="icon-ios7-trash-outline delete-image-toggle" data-info="delete images"></span>
+	<span class="icon-ios7-compose-outline edit-text-toggle" data-info="edit wall text"></span>
+	<span class="icon-key" data-info="room settings"></span>
+</div>
diff --git a/views/controls/video-toolbar.ejs b/views/controls/editor/video-toolbar.ejs
index d4364a2..d4364a2 100644
--- a/views/controls/video-toolbar.ejs
+++ b/views/controls/editor/video-toolbar.ejs
diff --git a/views/controls/wallpaper.ejs b/views/controls/editor/wallpaper.ejs
index 82460b7..82460b7 100644
--- a/views/controls/wallpaper.ejs
+++ b/views/controls/editor/wallpaper.ejs
diff --git a/views/editor.ejs b/views/editor.ejs
new file mode 100755
index 0000000..889200c
--- /dev/null
+++ b/views/editor.ejs
@@ -0,0 +1,28 @@
+<!doctype html>
+<html>
+<head>
+	<title>vvalls</title>
+	[[ include partials/meta ]]
+</head>
+<body class="editing loading">
+
+<div id="scene"></div>
+
+<div class="rapper">
+	[[ include partials/header ]]
+
+	[[ include controls/editor/toolbar ]]
+	[[ include controls/editor/video-toolbar ]]
+	[[ include controls/editor/media-drawer ]]
+	[[ include controls/editor/wallpaper ]]
+	[[ include controls/editor/light-control ]]
+	[[ include controls/editor/settings ]]
+
+	<div id="minimap" class="vvbox">
+		<span class="el"></span>
+	</div>
+</div>
+
+</body>
+[[ include partials/scripts ]]
+</html>
diff --git a/views/partials/footer.ejs b/views/partials/footer.ejs
index 1df179a..703dab4 100644
--- a/views/partials/footer.ejs
+++ b/views/partials/footer.ejs
@@ -12,7 +12,7 @@
 	
 	<span>
 		you are signed in as &rarr;
-		<a href="/[[- user.name ]]">[[- user.displayName ]]</a>
+		<a href="/profile/[[- user.username ]]">[[- user.displayName ]]</a>
 		<a href="/logout" class="topLink">Sign Out?</a>
 	</span>
 	[[ } ]]
diff --git a/views/staff.ejs b/views/staff.ejs
index f099edb..bc07bc2 100644
--- a/views/staff.ejs
+++ b/views/staff.ejs
@@ -8,7 +8,9 @@
 <div class="rapper page">
 	[[ include partials/header ]]
 
-	[[ include staff/edit-docs ]]
+  - recent users
+  - rooms list
+  - projects list
 
 	[[ include partials/footer ]]
 </div>