From 211da757666a6f9ee89160472e363bcf4732d1c9 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 10 Oct 2014 16:48:26 -0400
Subject: show max 6 projects at a time

---
 views/home.ejs                   | 2 --
 views/profile.ejs                | 2 --
 views/projects/list-projects.ejs | 7 ++++++-
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'views')

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/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..eb66449 100644
--- a/views/projects/list-projects.ejs
+++ b/views/projects/list-projects.ejs
@@ -3,7 +3,7 @@
 	<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">
       [[ } else { ]]
@@ -30,6 +30,11 @@
 
       </a>
 		[[ }) ]]
+
+    [[ if (projects.length > 6) { ]]
+      <a href="#" class="viewMore btn">view more</a>
+    [[ } ]]
+
 	</div>
 
 [[ } ]]
-- 
cgit v1.2.3-70-g09d2


From 433f56b6da8b9d5d42ebca566b22191e834eda66 Mon Sep 17 00:00:00 2001
From: ryderr <r@okfoc.us>
Date: Fri, 10 Oct 2014 17:07:36 -0400
Subject: default patterns

---
 public/assets/img/offbeatrepeat.jpg | Bin 0 -> 33207 bytes
 public/assets/img/plainpattern.png  | Bin 0 -> 39676 bytes
 public/assets/img/plainpattern2.png | Bin 0 -> 4898 bytes
 public/assets/img/plainpattern3.png | Bin 0 -> 27441 bytes
 views/controls/editor/wallpaper.ejs |   8 ++++----
 5 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 public/assets/img/offbeatrepeat.jpg
 create mode 100644 public/assets/img/plainpattern.png
 create mode 100644 public/assets/img/plainpattern2.png
 create mode 100644 public/assets/img/plainpattern3.png

(limited to 'views')

diff --git a/public/assets/img/offbeatrepeat.jpg b/public/assets/img/offbeatrepeat.jpg
new file mode 100644
index 0000000..4fa90c7
Binary files /dev/null and b/public/assets/img/offbeatrepeat.jpg differ
diff --git a/public/assets/img/plainpattern.png b/public/assets/img/plainpattern.png
new file mode 100644
index 0000000..1c4f12c
Binary files /dev/null and b/public/assets/img/plainpattern.png differ
diff --git a/public/assets/img/plainpattern2.png b/public/assets/img/plainpattern2.png
new file mode 100644
index 0000000..10d57a5
Binary files /dev/null and b/public/assets/img/plainpattern2.png differ
diff --git a/public/assets/img/plainpattern3.png b/public/assets/img/plainpattern3.png
new file mode 100644
index 0000000..3048665
Binary files /dev/null and b/public/assets/img/plainpattern3.png differ
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">
-- 
cgit v1.2.3-70-g09d2


From ee322b213e68800e2f322fb527cc1b18cec01da3 Mon Sep 17 00:00:00 2001
From: ryderr <r@okfoc.us>
Date: Fri, 10 Oct 2014 18:07:51 -0400
Subject: icon

---
 public/assets/stylesheets/app.css |  2 +-
 views/controls/editor/toolbar.ejs | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'views')

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 6248af7..047a559 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -331,7 +331,7 @@ iframe.embed {
 }
 
 
-.projectList a {
+.projectList .projectItem {
 	margin: 4%;
 	display: inline-block;
 }
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
index c914970..85800f8 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,13 @@
 		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>
+			
+
 	<span
 		data-role='toggle-project-settings'
 		data-info="room settings"
-- 
cgit v1.2.3-70-g09d2


From be603d871e7a0117698177405f98cd07be7d12ed Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 10 Oct 2014 18:50:32 -0400
Subject: load more

---
 public/assets/javascripts/ui/lib/Router.js       |   1 +
 public/assets/javascripts/ui/site/ProjectList.js |  28 +++++-
 server/index.js                                  |   1 +
 server/lib/views/index.js                        | 123 +++++++++++++++--------
 views/projects/list-projects.ejs                 |   6 +-
 5 files changed, 112 insertions(+), 47 deletions(-)

(limited to 'views')

diff --git a/public/assets/javascripts/ui/lib/Router.js b/public/assets/javascripts/ui/lib/Router.js
index 0b6385c..28905b2 100644
--- a/public/assets/javascripts/ui/lib/Router.js
+++ b/public/assets/javascripts/ui/lib/Router.js
@@ -16,6 +16,7 @@ var Router = View.extend({
 		
 		if (pathname in routes) {	
 			this[this.routes[pathname]](null)
+			return
 		}
 		
 		if (path[path.length-1] == null) {
diff --git a/public/assets/javascripts/ui/site/ProjectList.js b/public/assets/javascripts/ui/site/ProjectList.js
index ebb0a96..27c8aca 100644
--- a/public/assets/javascripts/ui/site/ProjectList.js
+++ b/public/assets/javascripts/ui/site/ProjectList.js
@@ -1,14 +1,17 @@
 var projectListTimeout = null
+window.fuck = 'suck'
 var ProjectList = View.extend({
 
 	el: ".projectList",
 
 	events: {
+	  "click .viewMore": 'viewMore',
 		"mouseenter .room": 'enter',
 		"mouseleave .room": 'leave',
 	},
 	
 	initialize: function(){
+	  this.$viewMore = this.$(".viewMore")
 	  this.$(".images").each(function(){
 	    $divs = $(this).children("div")
 	    $divs.hide()
@@ -41,7 +44,30 @@ var ProjectList = View.extend({
     $divs.eq(index).hide()
     $divs.eq(nextIndex).show()
     $images.data("index", nextIndex)
-	}
+	},
+	
+	viewMore: function(e){
+	  e.preventDefault()
+	  var criteria = {}
+	  criteria.offset = this.$(".projectItem").length
+	  if (window.location.pathname == "/" || window.location.pathname.match("/home")) {
+	    criteria.home = 1
+	  }
+	  else {
+	    criteria.user_id = this.$(".projectItem").first().data("userid")
+	  }
+    
+	  $.get("/api/project/paginate", criteria, function(data){
+	    var offset = this.$viewMore.offset()
+	    var $data = $(data)
+      var $els = $data.find(".projectItem")
+      $els.insertBefore( this.$viewMore )
+      if (! $data.find(".viewMore").length) {
+        this.$viewMore.hide()
+      }
+      $("body,html").animate({ scrollTop: offset.top - 80 }, 300)
+	  }.bind(this))
+	},
 	
 /*
 	spinOn: function(e){
diff --git a/server/index.js b/server/index.js
index f6636dd..8f66418 100644
--- a/server/index.js
+++ b/server/index.js
@@ -133,6 +133,7 @@ site.route = function () {
 	app.delete('/api/layout/destroy', middleware.ensureAuthenticated, middleware.ensureIsStaff, api.layouts.destroy)
 
 	app.get('/api/project', middleware.ensureAuthenticated, api.projects.index)
+	app.get('/api/project/paginate', views.projectsPaginate)
 	app.get('/api/project/:slug', api.projects.show)
 	app.get('/api/rooms/:slug', api.rooms.show)
 	app.post('/api/project/new', middleware.ensureAuthenticated, api.projects.create)
diff --git a/server/lib/views/index.js b/server/lib/views/index.js
index 5b1a72e..eacff1f 100644
--- a/server/lib/views/index.js
+++ b/server/lib/views/index.js
@@ -78,27 +78,16 @@ var views = module.exports = {
 	},
 
 	home: function (req, res) {
-		if (req.user) {
-			Project.find({ featured: true })
-				.sort('-created_at')
-				.limit(6)
-				.exec(function(err, projects){
-					projects = projects.map(function(project){
-						project = project.toObject()
-						project.date = moment(project.updated_at).format("M/DD/YYYY")
-						if (! project.colors || project.colors.wall && project.colors.wall[0] == project.colors.wall[1] && project.colors.wall[1] == project.colors.wall[2] && project.colors.wall[2] > 238) {
-							project.color = [238,238,238]
-						} else {
-							project.color = project.colors.wall
-						}
-						return project
-					})
-					res.render('home', { projects: projects || [] })
-				})
-		}
-		else {
-			res.send("<html></html>")
+	  // while in development, blank homepage if not logged in
+		if (! req.user) {
+		  res.send("<html></html>")
+		  return
 		}
+    views_middleware.fetchProjects({ featured: true }, null, null, function(err, projects){
+      res.render('home', {
+        projects: projects || []
+      })
+    })
 	},
 
 	docs: function (req, res){
@@ -131,45 +120,93 @@ var views = module.exports = {
 
 	profile: function (req, res) {
 		var username = req.params.username || (req.user && req.user.username)
+		var user, isOwnProfile = false
 		if (username) {
-			User.findOne({ username: username }, function (err, user) {
-				user ? next(user) : done(err, {}, [])
+			User.findOne({ username: username }, function (err, profileUser) {
+				if (profileUser) {
+				  user = profileUser
+				  isOwnProfile = (String(user._id) == (req.user && String(req.user._id)))
+				  next()
+				}
+				else {
+				  done(err, [])
+				}
 			})
 		}
 		else {
 			done()
 		}
 
-		function next(user){
+		function next(){
 			var criteria = { user_id: user._id }
-			if ( ! (req.user && req.user._id && req.user._id == user._id) ) {
+			if ( ! isOwnProfile ) {
 				criteria.privacy = false
 			}
-			Project.find(criteria)
-				.sort('-created_at')
-				.exec(function(err, projects){
-					projects = projects.map(function(project){
-						project = project.toObject()
-						project.date = moment(project.updated_at).format("M/DD/YYYY")
-						if (! project.colors || project.colors.wall && project.colors.wall[0] == project.colors.wall[1] && project.colors.wall[1] == project.colors.wall[2] && project.colors.wall[2] > 238) {
-							project.color = [238,238,238]
-						} else {
-							project.color = project.colors.wall
-						}
-						return project
-					})
-					done(err, user, projects)
-				})
+			views_middleware.fetchProjects(criteria, null, null, done)
 		}
 
-		function done(err, user, projects){
+		function done(err, projects){
 			if (! user) { return res.redirect('/') }
 			res.render('profile', {
-			  isOwnProfile: String(user._id) == (req.user && String(req.user._id)),
+			  isOwnProfile: isOwnProfile,
 				profile: user,
 				projects: projects || [],
 			})
 		}
-	}
+	},
+	
+	projectsPaginate: function(req, res) {
+    var criteria = {}
+    var offset = Number(req.query.offset || 0)
+    var user_id, isOwnProfile
+
+	  if (req.query.home) {
+	    criteria.featured = true
+	    criteria.privacy = false
+	  }
+	  else if (req.query.user_id) {
+      user_id = req.query.user_id
+      isOwnProfile = (String(user_id) == (req.user && String(req.user._id)))
+
+      criteria.user_id = user_id
+      if ( ! isOwnProfile ) {
+        criteria.privacy = false
+      }
+    }
+    else {
+      res.end("")
+      return
+    }
+
+    views_middleware.fetchProjects(criteria, null, offset, function(err, projects){
+			res.render('projects/list-projects', {
+				projects: projects || []
+			})
+    })
+	},
 
-}
\ No newline at end of file
+}
+
+var views_middleware = {
+  fetchProjects: function (criteria, limit, offset, next) {
+    limit = limit || 7
+    offset = offset || 0
+    Project.find(criteria)
+      .sort('-created_at')
+      .skip(offset)
+      .limit(limit)
+      .exec(function(err, projects){
+        projects = projects.map(function(project){
+          project = project.toObject()
+          project.date = moment(project.updated_at).format("M/D/YYYY")
+          if (! project.colors || project.colors.wall && project.colors.wall[0] == project.colors.wall[1] && project.colors.wall[1] == project.colors.wall[2] && project.colors.wall[2] > 238) {
+            project.color = [238,238,238]
+          } else {
+            project.color = project.colors.wall
+          }
+          return project
+        })
+        next(err, projects)
+      })
+  }
+}
diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs
index eb66449..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 ]]);">
-- 
cgit v1.2.3-70-g09d2


From 763950e94505cb4db48b0d093673ddd919b2f788 Mon Sep 17 00:00:00 2001
From: ryderr <r@okfoc.us>
Date: Fri, 10 Oct 2014 19:06:17 -0400
Subject: presets

---
 public/assets/stylesheets/app.css       |  4 ++--
 views/controls/editor/light-control.ejs | 16 ----------------
 views/editor.ejs                        |  1 +
 3 files changed, 3 insertions(+), 18 deletions(-)

(limited to 'views')

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 93de396..a40c131 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1430,7 +1430,7 @@ border-left: 1px solid black;
 
 /* WALLPAPER PICKER */
 
-.wallpaper {
+.wallpaper, .presets {
   right: 80px;
   margin-top: 77px;
   width: 172px;
@@ -1440,7 +1440,7 @@ border-left: 1px solid black;
   transform: translateX(400px);
 	padding: 5px 5px 9px 5px;
 }
-.wallpaper.active {
+.wallpaper.active, .presets:active {
   display:inline-block;
   -webkit-transform: translateX(0px);
   transform: translateX(0px);
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/editor.ejs b/views/editor.ejs
index 24f617c..330e69b 100755
--- a/views/editor.ejs
+++ b/views/editor.ejs
@@ -20,6 +20,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">
-- 
cgit v1.2.3-70-g09d2


From 2c8025db7d22dfeedba256c9ed6dde1a0116baee Mon Sep 17 00:00:00 2001
From: ryderr <r@okfoc.us>
Date: Fri, 10 Oct 2014 19:06:25 -0400
Subject: adding

---
 views/controls/editor/presets.ejs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 views/controls/editor/presets.ejs

(limited to 'views')

diff --git a/views/controls/editor/presets.ejs b/views/controls/editor/presets.ejs
new file mode 100644
index 0000000..2ea4995
--- /dev/null
+++ b/views/controls/editor/presets.ejs
@@ -0,0 +1,17 @@
+<div class="vvbox 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>
-- 
cgit v1.2.3-70-g09d2


From c777456e398fc0f7aed955596505720e0f13e1a8 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 10 Oct 2014 19:30:19 -0400
Subject: Presets

---
 .../assets/javascripts/ui/editor/EditorToolbar.js  | 42 +++++++--------
 public/assets/javascripts/ui/editor/EditorView.js  |  1 +
 .../assets/javascripts/ui/editor/LightControl.js   | 34 -------------
 public/assets/javascripts/ui/editor/Presets.js     | 59 ++++++++++++++++++++++
 public/assets/stylesheets/app.css                  |  6 +--
 views/controls/editor/presets.ejs                  |  2 +-
 views/partials/scripts.ejs                         |  1 +
 7 files changed, 83 insertions(+), 62 deletions(-)
 create mode 100644 public/assets/javascripts/ui/editor/Presets.js

(limited to 'views')

diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index 49decc2..4f12a7b 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -7,8 +7,8 @@ var EditorToolbar = View.extend({
 		"click [data-role='toggle-map-view']": 'toggleMap',
 		"click [data-role='toggle-project-settings']": 'toggleSettings',
 		"click [data-role='open-media-viewer']": 'openMediaViewer',
-// 		"click [data-role='resize-media']": 'resizeMedia',
-		"click [data-role='destroy-media']": 'destroyMedia',
+    "click [data-role='toggle-presets']": 'togglePresets',
+// 		"click [data-role='destroy-media']": 'destroyMedia',
 		"click [data-role='toggle-wallpaper-panel']": 'toggleWallpaper',
 		"click [data-role='toggle-light-control']": 'toggleLightControl',
 		"click [data-role='toggle-text-editor']": 'toggleTextEditor',
@@ -26,6 +26,7 @@ var EditorToolbar = View.extend({
 	toggleSettings: function(){
 // 	  this.resetMode()
     this.parent.textEditor.hide()
+		this.parent.presets.hide()
 		this.parent.lightControl.hide()
 		this.parent.wallpaperPicker.hide()
 		this.parent.mediaEditor.hide()
@@ -52,6 +53,7 @@ var EditorToolbar = View.extend({
 	  $(".inuse").removeClass("inuse")
     this.parent.textEditor.hide()
 		this.parent.wallpaperPicker.hide()
+		this.parent.presets.hide()
 		this.parent.lightControl.hide()
 		this.parent.settings.hide()
 	},
@@ -62,28 +64,6 @@ var EditorToolbar = View.extend({
     editor.permissions.add("resize")
     editor.permissions.remove("destroy")
 	},
-
-// 	resizeMedia: function(e, state){
-// 		this.resetControls()
-// 		if (! state && typeof e == "boolean") {
-// 			state = e
-// 			editor.permissions.assign("resize", state)
-// 		}
-// 		else {
-// 			state = editor.permissions.toggle("resize")
-// 		}
-// 		! state && editor.permissions.assign("move", true)
-// 		$(".inuse").removeClass("inuse")
-// 		$("[data-role='resize-media']").toggleClass("inuse", state)
-// 		if (state) {
-// 			if (this.parent.mediaEditor.scenery) {
-//         Scenery.resize.show( this.parent.mediaEditor.scenery )
-//       }
-// 		}
-// 		else {
-// 			Scenery.resize.hide()
-// 		}
-// 	},
 	
 	destroyMedia: function(e, state){
 		this.resetControls()
@@ -113,6 +93,7 @@ var EditorToolbar = View.extend({
 		this.parent.lightControl.hide()
     this.parent.textEditor.hide()
 		this.parent.settings.hide()
+		this.parent.presets.hide()
 		this.parent.wallpaperPicker.toggle(state)
 	},
 	
@@ -124,6 +105,7 @@ var EditorToolbar = View.extend({
 		this.parent.wallpaperPicker.hide()
     this.parent.textEditor.hide()
 		this.parent.settings.hide()
+		this.parent.presets.hide()
 		this.parent.lightControl.toggle(state)
 	},
 	
@@ -135,9 +117,21 @@ var EditorToolbar = View.extend({
 		this.parent.wallpaperPicker.hide()
 		this.parent.lightControl.hide()
 		this.parent.settings.hide()
+		this.parent.presets.hide()
 		this.parent.textEditor.toggle(state)
   },
 
+	togglePresets: function(){
+		var state = ! $("[data-role='toggle-presets']").hasClass("inuse")
+		this.resetMode()
+		$("[data-role='toggle-presets']").toggleClass("inuse", state)
+		this.parent.mediaEditor.hide()
+		this.parent.wallpaperPicker.hide()
+    this.parent.textEditor.hide()
+		this.parent.settings.hide()
+		this.parent.lightControl.hide()
+		this.parent.presets.toggle(state)
+	},
 })
 
 var editor = new function(){
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index f60b149..b35c872 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -18,6 +18,7 @@ var EditorView = View.extend({
 		this.lightControl = new LightControl ({ parent: this })
 		this.textEditor = new TextEditor ({ parent: this })
 		this.collaborators = new Collaborators ({ parent: this })
+		this.presets = new Presets ({ parent: this })
 	},
 
 	load: function(name){
diff --git a/public/assets/javascripts/ui/editor/LightControl.js b/public/assets/javascripts/ui/editor/LightControl.js
index 6100762..3eb2861 100644
--- a/public/assets/javascripts/ui/editor/LightControl.js
+++ b/public/assets/javascripts/ui/editor/LightControl.js
@@ -10,7 +10,6 @@ var LightControl = View.extend({
     "input #brightness-control": "updateBrightness",
     "input #outline-hue": "updateShadow",
     "input #wall-hue": "updateShadow",
-    "click .presets span": "selectPreset",
   },
   
   initialize: function(){
@@ -115,39 +114,6 @@ var LightControl = View.extend({
     this.setMode(mode)
   },
   
-  presets: {
-    wireframe: {
-      wall: [255,255,255],
-      outline: [0,0,0],
-      floor: [246,246,246],
-      ceiling: [255,255,255],
-    },
-    shaded: {
-      wall: [205,205,204],
-      outline: [0,0,0],
-      floor: [109,116,106],
-      ceiling: [159,163,157],
-    },
-    pfunk: {
-      wall: [255,63,78],
-      outline: [255,246,0],
-      floor: [255,255,0],
-      ceiling: [225,118,252],
-    },
-    inverse: {
-      wall: [0,0,0],
-      outline: [255,255,255],
-      floor: [0,0,0],
-      ceiling: [0,0,0],
-    },
-  },
-  selectPreset: function(e){
-    var preset = $(e.currentTarget).data('preset')
-    if (! this.presets[preset]) return
-    this.load(this.presets[preset])
-    $(e.currentTarget).addClass('active')
-  },
-  
   beginBrightness: function(){
     this.begin()
     $(window).one("mouseup", this.finalize.bind(this))
diff --git a/public/assets/javascripts/ui/editor/Presets.js b/public/assets/javascripts/ui/editor/Presets.js
new file mode 100644
index 0000000..a7e92b6
--- /dev/null
+++ b/public/assets/javascripts/ui/editor/Presets.js
@@ -0,0 +1,59 @@
+var Presets = View.extend({
+	el: "#presets",
+	
+	events: {
+    "click .presets span": "selectPreset",
+	},
+
+  presets: {
+    wireframe: {
+      wall: [255,255,255],
+      outline: [0,0,0],
+      floor: [246,246,246],
+      ceiling: [255,255,255],
+    },
+    shaded: {
+      wall: [205,205,204],
+      outline: [0,0,0],
+      floor: [109,116,106],
+      ceiling: [159,163,157],
+    },
+    pfunk: {
+      wall: [255,63,78],
+      outline: [255,246,0],
+      floor: [255,255,0],
+      ceiling: [225,118,252],
+    },
+    inverse: {
+      wall: [0,0,0],
+      outline: [255,255,255],
+      floor: [0,0,0],
+      ceiling: [0,0,0],
+    },
+  },
+  
+  initialize: function(opt){
+    this.parent = opt.parent
+  },
+
+  toggle: function(state){
+    this.$el.toggleClass("active", state);
+  },
+  
+  show: function(){
+    this.toggle(true)
+  },
+  
+  hide: function(){
+    this.toggle(false)
+  },
+
+  selectPreset: function(e){
+    var preset = $(e.currentTarget).data('preset')
+    if (! this.presets[preset]) return
+    this.parent.lightControl.load(this.presets[preset])
+    this.$(".active").removeClass('active')
+    $(e.currentTarget).addClass('active')
+  },
+  
+})
\ No newline at end of file
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index a40c131..4bae1de 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1430,7 +1430,7 @@ border-left: 1px solid black;
 
 /* WALLPAPER PICKER */
 
-.wallpaper, .presets {
+.wallpaper, #presets {
   right: 80px;
   margin-top: 77px;
   width: 172px;
@@ -1440,7 +1440,7 @@ border-left: 1px solid black;
   transform: translateX(400px);
 	padding: 5px 5px 9px 5px;
 }
-.wallpaper.active, .presets:active {
+.wallpaper.active, #presets.active {
   display:inline-block;
   -webkit-transform: translateX(0px);
   transform: translateX(0px);
@@ -1629,10 +1629,10 @@ input[type="range"]::-webkit-slider-thumb {
 .color-swatches {
   margin-top: 10px;
 }
+
 .presets {
 	margin-top: 10px;
 }
-
 .presets span {
 	font-size:12px;
 	font-weight:500;
diff --git a/views/controls/editor/presets.ejs b/views/controls/editor/presets.ejs
index 2ea4995..a41c527 100644
--- a/views/controls/editor/presets.ejs
+++ b/views/controls/editor/presets.ejs
@@ -1,4 +1,4 @@
-<div class="vvbox presets">
+<div class="vvbox" id="presets">
   <h4>Preset Styles</h4>
   <div class="presets">
     <span data-preset="wireframe">
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>
 
-- 
cgit v1.2.3-70-g09d2


From 86153d1221e38615d0a7dea8a8029a184fb25ece Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 10 Oct 2014 20:32:31 -0400
Subject: rooms editor in builder

---
 .../javascripts/mx/extensions/mx.movements.js      |  2 +-
 .../rectangles/engine/map/ui_minimap.js            |  2 --
 .../assets/javascripts/rectangles/models/wall.js   |  2 ++
 .../assets/javascripts/ui/editor/EditorToolbar.js  |  8 ++++++--
 public/assets/javascripts/ui/editor/EditorView.js  |  6 ++++++
 public/assets/javascripts/ui/site/LayoutsModal.js  |  5 +++++
 views/controls/builder/info.ejs                    |  2 +-
 views/controls/editor/toolbar.ejs                  | 23 +++++++++++-----------
 views/editor.ejs                                   |  1 +
 9 files changed, 34 insertions(+), 17 deletions(-)

(limited to 'views')

diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index 065c93b..0ce03db 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -113,7 +113,7 @@ MX.Movements = function (cam) {
 						  app.controller.mediaViewer.hide()
 						}
 						else {
-              map && map.toggle && map.toggle()
+              app.controller.toolbar.toggleMap()
 						}
 						break
 				}
diff --git a/public/assets/javascripts/rectangles/engine/map/ui_minimap.js b/public/assets/javascripts/rectangles/engine/map/ui_minimap.js
index d7280b9..fabbdb9 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui_minimap.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui_minimap.js
@@ -7,7 +7,6 @@ Map.UI.Minimap = function(map){
 
 	base.creating = base.dragging = base.resizing = false
 
-/*
 	base.mouse = new mouse({
 		el: map.el,
 		down: down,
@@ -16,7 +15,6 @@ Map.UI.Minimap = function(map){
 		up: up,
 		rightclick: rightclick,
 	})
-*/
 
 	base.wheel = new wheel({
 		el: map.el,
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index fcb2f5e..7ff9015 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -114,6 +114,8 @@
 
             // TODO: watch individual scenery object here
             Minotaur.watch( app.router.editorView.settings )
+
+						app.controller.pickWall(base, pos)
           }
 					else {
 						app.controller.pickWall(base, pos)
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index 4f12a7b..8a707ec 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -19,8 +19,12 @@ var EditorToolbar = View.extend({
 	},
 
 	toggleMap: function(){
-		map.toggle()
-		// $("#minimap").toggleClass("hide");
+		var state = ! $("[data-role='toggle-map-view']").hasClass("inuse")
+		this.resetControls()
+    $("[data-role='toggle-map-view']").toggleClass("inuse", state)
+		map.toggle(state)
+		$("#minimap").toggleClass("hide", state)
+		this.parent.info.toggle(state)
 	},
 	
 	toggleSettings: function(){
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index b35c872..6aff601 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -11,6 +11,7 @@ var EditorView = View.extend({
 	initialize: function(){
 		this.toolbar = new EditorToolbar ({ parent: this })
 		this.settings = new EditorSettings ({ parent: this })
+		this.info = new BuilderInfo ({ parent: this })
 		this.mediaViewer = new MediaViewer ({ parent: this })
 		this.mediaUpload = new MediaUpload ({ parent: this })
 		this.mediaEditor = new MediaEditor ({ parent: this })
@@ -27,6 +28,11 @@ var EditorView = View.extend({
 	},
 	
 	loadLayout: function(layout){
+	  if (layout == "empty") {
+	    this.readyLayout({})
+	    this.toolbar.toggleMap()
+      return
+	  }
 		layout = sanitize(layout)
 		$.get(this.layoutAction + layout, this.readyLayout.bind(this))
 	},
diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js
index 99db2a3..73c63e8 100644
--- a/public/assets/javascripts/ui/site/LayoutsModal.js
+++ b/public/assets/javascripts/ui/site/LayoutsModal.js
@@ -48,6 +48,7 @@ var ProjectsModal = ModalView.extend(LayoutsIndex.prototype).extend({
 
 	events: {
 		"click .templates span": 'toggleActive',
+		"click [data-role='create-new-layout']": 'createNewLayout',
 		"submit form": 'newProject',
 	},
 	
@@ -70,6 +71,10 @@ var ProjectsModal = ModalView.extend(LayoutsIndex.prototype).extend({
 		window.location.pathname = "/project/" + $layout.data("slug") + "/edit"
 	},
 	
+	createNewLayout: function(){
+	  window.location.pathname = "/layout/new"
+	},
+	
 	newProject: function(e){
 		e && e.preventDefault()
 		window.location.pathname = "/project/new"
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/toolbar.ejs b/views/controls/editor/toolbar.ejs
index 85800f8..47d7c3c 100644
--- a/views/controls/editor/toolbar.ejs
+++ b/views/controls/editor/toolbar.ejs
@@ -4,10 +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='toggle-presets'
+    data-info="preset styles"
+    class="ion-ios7-briefcase-outline"></span>
 <!-- 
 	<span
 		data-role='resize-media'
@@ -26,13 +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>
+	<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/editor.ejs b/views/editor.ejs
index 330e69b..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 ]]
-- 
cgit v1.2.3-70-g09d2