merge

6 files changed, 70 insertions, 31 deletions

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 4c6c909..e3bb325 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -2254,22 +2254,33 @@ input[type="range"]::-webkit-slider-thumb {
 #randomize {
 	background: transparent;
 	display: inline-block;
-	color: black;
+	color: #999;
 	text-decoration: none;
-	text-align: center;
+	text-align: left;
 	font-size: 12px;
-	padding: 3px;
+	padding: 5px;
 	cursor: pointer;
 	position: absolute;
 	left: 10px;
 	font-weight: 500;
 	top: 0px;
-	border-bottom: 1px solid;
+	border: 1px solid #999;
+	-webkit-transition:0.2s background;
+	-moz-transition:0.2s background;
+	transition:0.2s background;
 }
 #randomize:hover {
   color: white;
   background: black;
 }
+#tumblr-url {
+	border: 1px solid #999;
+	padding: 10px 5px;
+	position: absolute;
+	top: 18px;
+	left: 145px;
+	width: 216px;
+}
 .warn {
 	background:red;
 	display: inline-block;
diff --git a/server/lib/views/index.js b/server/lib/views/index.js
index 8ca2113..145b5ac 100644
--- a/server/lib/views/index.js
+++ b/server/lib/views/index.js
@@ -111,7 +111,7 @@ var views = module.exports = {
 	},
 
 	docs: function (req, res){
-		var name = req.params.name || "index"
+		var name = req.params.name || "howto"
 
 	  if (name == "howto") {
 	    res.render('about/' + name)
diff --git a/views/about/howto.ejs b/views/about/howto.ejs
index 2e0f8ed..30497e1 100644
--- a/views/about/howto.ejs
+++ b/views/about/howto.ejs
@@ -8,8 +8,6 @@
 	<div class="rapper page">
 	[[ include ../partials/header ]]
 
-  <!-- put stuff here -->
-
 	<div class="hero" style="background-image:url(http://okfocus.s3.amazonaws.com/images/vvalls/construction.jpg);">
 		<div class="holder">
 	  </div>
@@ -73,7 +71,57 @@
 			</span>
 		</div>
 	</div>
-	
+
+	<h1 style="text-align:center;">Keyboard Shortcuts</h1>
+  
+  <div class="item">
+    <div class="rap">
+      <span style="background-image:url(http://okfocus.s3.amazonaws.com/random/keyboard.gif); background-position: 15%;"></span>
+      <span>
+      <words>
+				<h3>Getting around VValls is easier with the keyboard.</h3>
+
+        If you play video games, you should be familiar with using WASD to move -- left hand on the keyboard, right hand on the mouse.
+        We have added a few keys for pivoting and looking up and down.
+      </words>
+      </span>
+      <br clear="both">
+ 
+      <table border="0" class="keyboard first-keyboard">
+      <tr><td>W</td><td>Move forward</td></tr>
+      <tr><td>A</td><td>Strafe left</td></tr>
+      <tr><td>S</td><td>Move backward</td></tr>
+      <tr><td>D</td><td>Strafe right</td></tr>
+      <tr><td>&nbsp;</td></tr>
+      <tr><td>Q</td><td>Turn left</td></tr>
+      <tr><td>E</td><td>Turn right</td></tr>
+      <tr><td>&nbsp;</td></tr>
+      <tr><td>R</td><td>Look up</td></tr>
+      <tr><td>F</td><td>Look down</td></tr>
+      </table>
+      <table border="0" class="keyboard">
+      <tr><td>Cmd-Z</td><td>Undo</td></tr>
+      <tr><td>Shift-Cmd-Z</td><td>Redo</td></tr>
+      <tr><td>Cmd-\</td><td>Noclip mode</td></tr>
+      <tr><td>Esc</td><td>Cancel</td></tr>
+      <tr><td>Backspace</td><td>Delete currently selected media</td></tr>
+      <tr><td>&nbsp;</td></tr>
+      <tr><td>Mousewheel</td><td>Move forward/back</td></tr>
+      <tr><td>Shift-Mousewheel</td><td>Turn left/right</td></tr>
+      <tr><td>&nbsp;</td></tr>
+      <tr><td>Spacebar</td><td>Jump</td></tr>
+      </table>
+      <style>
+        .keyboard { float: left; width: 50%; }
+        .keyboard tr { margin: 0; padding: 0; }
+        .keyboard td { padding: 2px 10px; margin: 0; }
+        .keyboard.first-keyboard td:nth-child(1) { text-align: center; width: 50px; padding-left: 100px; }
+        .keyboard td:nth-child(1) { text-align: right; width: 150px; }
+        .keyboard td:nth-child(2) { font-weight: 300; }
+      </style>
+      </span>
+    </div>
+  </div>
 </div>
 
 
diff --git a/views/about/index.ejs b/views/about/index.ejs
deleted file mode 100644
index 2517225..0000000
--- a/views/about/index.ejs
+++ /dev/null
@@ -1,20 +0,0 @@
-<!doctype html>
-<html>
-<head>
-	<title>vvalls</title>
-	[[ include ../partials/meta ]]
-</head>
-<body class="loading">
-	<div class="rapper page">
-	[[ include ../partials/header ]]
-
-
-	[[ include ../partials/confirm-modal ]]	
-	[[ include ../projects/layouts-modal ]]	
-	[[ include ../partials/sign-in ]]
-	[[ include ../partials/footer ]]
-
-  </div>
-</body>
-[[ include ../partials/scripts ]]
-</html>
diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index df7910c..3db71d5 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -14,7 +14,7 @@
  -->
 	</h2><br>
 	<h3 class="editBtn warn" id="deleteMedia"></h3>
-	<h3 class="editBtn" id="randomize">Randomize</h3>
+	<h3 class="editBtn" id="randomize">Click here<br>to automatically place<br>images on walls!</h3>
 
 	<div class="myMedia">
 	  <div class="noMedia">You have no media yet.  Upload some!</div>
@@ -23,7 +23,7 @@
 	</div>
 
 	<div class="foundMedia">
-	  <input type="text" id="tumblr-url" placeholder="Enter a Tumblr url!">
+	  <input type="text" id="tumblr-url" placeholder="Enter a Tumblr URL to add images from it!">
 	  <span class="container"></span>
  	</div>
  	
diff --git a/views/home.ejs b/views/home.ejs
index cc108ba..8fc248e 100755
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -48,7 +48,7 @@
 			<span style="background-image:url(http://33.media.tumblr.com/tumblr_m0an31XPpF1qbhp9xo1_1280.jpg)">
 			</span>
 			<span>
-				<h3>Cutting Edge Presentations</h3>
+				<h3>Make Cutting Edge Presentations</h3>
 				<words>There's no cooler way than VValls for displaying your images online. Take your pix out of that drab Tumblr theme and present them in the freshest way online!</words>
 			</span>
 		</div>