merge

10 files changed, 45 insertions, 32 deletions

diff --git a/views/controls/builder/info.ejs b/views/controls/builder/info.ejs
index d92d34c..7ef0b6a 100644
--- a/views/controls/builder/info.ejs
+++ b/views/controls/builder/info.ejs
@@ -1,4 +1,4 @@
-<div class="vvbox active settings info active" id="builderInfo">
+<div class="vvbox settings info" id="builderInfo">
 	<div class="setting number">
 		<label for="room-width">width</label>
 		<input type="text" class="units" name="width" id="room-width">
diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs
index 8f42d8d..8b20464 100644
--- a/views/controls/editor/light-control.ejs
+++ b/views/controls/editor/light-control.ejs
@@ -21,20 +21,4 @@
       <div class="swatch" id="outline-color" data-mode="outline"></div><label>outlines</label>
     </span>
   </div>
-
-  <h4>Preset Styles</h4>
-  <div class="presets">
-    <span data-preset="wireframe">
-      Wireframe
-    </span>
-    <span data-preset="shaded">
-      Shaded
-    </span>
-    <span data-preset="inverse">
-      Inverse
-    </span>
-    <span data-preset="pfunk">
-      P.Funk
-    </span>
-  </div>
 </div>
diff --git a/views/controls/editor/presets.ejs b/views/controls/editor/presets.ejs
new file mode 100644
index 0000000..a41c527
--- /dev/null
+++ b/views/controls/editor/presets.ejs
@@ -0,0 +1,17 @@
+<div class="vvbox" id="presets">
+  <h4>Preset Styles</h4>
+  <div class="presets">
+    <span data-preset="wireframe">
+      Wireframe
+    </span>
+    <span data-preset="shaded">
+      Shaded
+    </span>
+    <span data-preset="inverse">
+      Inverse
+    </span>
+    <span data-preset="pfunk">
+      P.Funk
+    </span>
+  </div>
+</div>
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
index c914970..47d7c3c 100644
--- a/views/controls/editor/toolbar.ejs
+++ b/views/controls/editor/toolbar.ejs
@@ -4,6 +4,10 @@
 		data-role='open-media-viewer'
 		data-info="add media"
 		class="ion-ios7-photos-outline"></span>
+  <span
+    data-role='toggle-presets'
+    data-info="preset styles"
+    class="ion-ios7-briefcase-outline"></span>
 <!-- 
 	<span
 		data-role='resize-media'
@@ -22,10 +26,14 @@
 		data-role='toggle-light-control'
 		data-info="edit room colors"
 		class="ion-ios7-sunny-outline"></span>
+  <span
+    data-role='toggle-text-editor'
+    data-info="add text to wall"
+    class="ion-ios7-compose-outline"></span>
 	<span
-		data-role='toggle-text-editor'
-		data-info="add text to wall"
-		class="ion-ios7-compose-outline"></span>
+		data-role='toggle-map-view'
+		data-info="toggle map view"
+		class="ion-ios7-world-outline"></span>
 	<span
 		data-role='toggle-project-settings'
 		data-info="room settings"
diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs
index d54b9c1..ac025b5 100644
--- a/views/controls/editor/wallpaper.ejs
+++ b/views/controls/editor/wallpaper.ejs
@@ -4,10 +4,10 @@
 	<span class="txt" style="margin-bottom:7px">Add custom wallpaper to walls. Begin by uploading a pattern. Or try one of these -> </span>
 	
   <span class="swatches">
-  	  <span class="swatch"></span>
-			<span class="swatch"></span>
-			<span class="swatch"></span>
-			<span class="swatch"></span>
+  	  <span class="swatch" style="background-image:url(/assets/img/offbeatrepeat.jpg)"></span>
+			<span class="swatch" style="background-image:url(/assets/img/plainpattern3.png)"></span>
+			<span class="swatch" style="background-image:url(/assets/img/plainpattern.png)"></span>
+			<span class="swatch" style="background-image:url(/assets/img/plainpattern2.png)"></span>
   </span>
   
   <div class="wallpaperUpload toolButton">
diff --git a/views/editor.ejs b/views/editor.ejs
index 24f617c..c0562e9 100755
--- a/views/editor.ejs
+++ b/views/editor.ejs
@@ -13,6 +13,7 @@
 
 		<div id="editorView">
 			[[ include controls/editor/toolbar ]]
+			[[ include controls/builder/info ]]
 			[[ include controls/editor/media-drawer ]]
 			[[ include controls/editor/media-editor ]]
 			[[ include controls/editor/wallpaper ]]
@@ -20,6 +21,7 @@
 			[[ include controls/editor/text-editor ]]
 			[[ include controls/editor/collaborators ]]
 			[[ include controls/editor/settings ]]
+			[[ include controls/editor/presets ]]
 		</div>
 
 		<div id="minimap" class="vvbox" data-intro="Mini-map shows your position and orientation in a room. Navigate with WASD keys or drag here." data-position="top">
diff --git a/views/home.ejs b/views/home.ejs
index 16b00e7..8910070 100755
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -65,8 +65,6 @@
 
 	[[ include projects/list-projects ]]
 
-	<a href="#loadmore" class="viewMore btn">View More</a>
-
 	[[ include partials/confirm-modal ]]	
 	[[ include projects/layouts-modal ]]	
 	[[ include partials/sign-in ]]
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 21bed03..07ee7a5 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -107,6 +107,7 @@
 <script type="text/javascript" src="/assets/javascripts/ui/editor/MediaEditor.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/MediaUpload.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/MediaViewer.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/editor/Presets.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/TextEditor.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/WallpaperPicker.js"></script>
 
diff --git a/views/profile.ejs b/views/profile.ejs
index 2909fb8..1be0702 100644
--- a/views/profile.ejs
+++ b/views/profile.ejs
@@ -49,8 +49,6 @@
 		<h1>[[- profile.username ]] has [[- projects.length ]] project[[- projects.length != 1 ? "s" : "" ]]</h1>
 	
     [[ include projects/list-projects ]]
-
-    <a href="#" class="viewMore btn">view more</a>
   [[ } else { ]]
 	
     <h1>Welcome to VVALLS</h1>
diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs
index 9dbd7d2..5ecaec1 100644
--- a/views/projects/list-projects.ejs
+++ b/views/projects/list-projects.ejs
@@ -1,13 +1,13 @@
 [[ if (projects.length) { ]]
-		
+	
 	<div class="projectList">
 
 		[[ projects.forEach(function(project, i) { ]]
-
+		  [[ if (i > 5) { return } ]]
       [[ if (String(user._id) == String(project.user_id)) { ]]
-      <a href="/project/[[- project.slug ]]/edit" class="projectItem">
+      <a href="/project/[[- project.slug ]]/edit" class="projectItem" data-userid="[[- project.user_id ]]">
       [[ } else { ]]
-      <a href="/project/[[- project.slug ]]" class="projectItem">
+      <a href="/project/[[- project.slug ]]" class="projectItem" data-userid="[[- project.user_id ]]">
       [[ } ]]
 
 			<span class="room" style="background-color: rgb([[- project.color ]]);">
@@ -30,6 +30,11 @@
 
       </a>
 		[[ }) ]]
+
+    [[ if (projects.length > 6) { ]]
+      <a href="#" class="viewMore btn">view more</a>
+    [[ } ]]
+
 	</div>
 
 [[ } ]]