From f9be43e4cce6b57f41a4e2242f019e969b081d37 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 1 Dec 2014 12:43:28 -0500
Subject: view project button in settings

---
 views/controls/editor/settings.ejs | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'views')

diff --git a/views/controls/editor/settings.ejs b/views/controls/editor/settings.ejs
index cd17382..cd915c5 100644
--- a/views/controls/editor/settings.ejs
+++ b/views/controls/editor/settings.ejs
@@ -27,6 +27,12 @@
       <span class="ion-map"></span>
       Edit map
     </a>
+
+	  <a href="#" class="modalLink" data-role='view-project' style="margin-left: 40px;">
+      <span class="ion-ios7-search-strong"></span>
+      View project
+    </a>
+
 	</div>
 	
 	<div class="setting">
-- 
cgit v1.2.3-70-g09d2


From 64f99d71c9ff0d419fad080751ba02afe9f6f3df Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 1 Dec 2014 16:27:39 -0500
Subject: move tumblr load stuff into own modal; example tumblrs

---
 Gruntfile.js                                       |  1 +
 .../assets/javascripts/ui/editor/EditorToolbar.js  |  1 -
 public/assets/javascripts/ui/editor/EditorView.js  |  1 +
 public/assets/javascripts/ui/editor/MediaTumblr.js | 53 ++++++++++++++++++++++
 public/assets/javascripts/ui/editor/MediaUpload.js |  2 +-
 public/assets/javascripts/ui/editor/MediaViewer.js | 40 ++++++++--------
 public/assets/javascripts/ui/lib/ModalView.js      |  6 +--
 public/assets/stylesheets/app.css                  | 11 ++++-
 views/controls/editor/media-drawer.ejs             | 15 +++++-
 views/partials/scripts.ejs                         |  1 +
 10 files changed, 104 insertions(+), 27 deletions(-)
 create mode 100644 public/assets/javascripts/ui/editor/MediaTumblr.js

(limited to 'views')

diff --git a/Gruntfile.js b/Gruntfile.js
index 68828e0..21bbfb0 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -117,6 +117,7 @@ module.exports = function(grunt) {
           "public/assets/javascripts/ui/editor/ColorControl.js",
           "public/assets/javascripts/ui/editor/Collaborators.js",
           "public/assets/javascripts/ui/editor/MediaEditor.js",
+          "public/assets/javascripts/ui/editor/MediaTumblr.js",
           "public/assets/javascripts/ui/editor/MediaUpload.js",
           "public/assets/javascripts/ui/editor/MediaViewer.js",
           "public/assets/javascripts/ui/editor/Presets.js",
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index 277718a..a5ad2dd 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -59,7 +59,6 @@ var EditorToolbar = View.extend({
 		this.resetControls()
 		this.toggleMap(false)
 		this.parent.mediaViewer.show()
-		this.parent.mediaUpload.show()
 	},
 
 	resetMode: function(){
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index 4a2f712..50d3650 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -15,6 +15,7 @@ var EditorView = View.extend({
 		this.info = new BuilderInfo ({ parent: this })
 		this.mediaViewer = new MediaViewer ({ parent: this })
 		this.mediaUpload = new MediaUpload ({ parent: this })
+		this.mediaTumblr = new MediaTumblr ({ parent: this })
 		this.mediaEditor = new MediaEditor ({ parent: this })
 		this.wallpaperPicker = new WallpaperPicker ({ parent: this })
 		this.colorControl = new ColorControl ({ parent: this })
diff --git a/public/assets/javascripts/ui/editor/MediaTumblr.js b/public/assets/javascripts/ui/editor/MediaTumblr.js
new file mode 100644
index 0000000..47419ae
--- /dev/null
+++ b/public/assets/javascripts/ui/editor/MediaTumblr.js
@@ -0,0 +1,53 @@
+
+var MediaTumblr = ModalView.extend({
+	el: "#tumblrUpload",
+
+	events: {
+    'mousedown': "stopPropagation",
+		"keydown .url": "enterSubmit",
+		"click .exampleTumblr": "loadExample",
+	},
+	
+	initialize: function(opt){
+    this.__super__.initialize.call(this)
+		this.parent = opt.parent
+		this.$url = this.$(".url")
+	},
+
+	show: function(){
+		this.$el.addClass("active")
+		this.$url.val("")
+	},
+	
+	hide: function(){
+		this.$el.removeClass("active")
+	},
+	
+	enterSubmit: function(e){
+		e.stopPropagation()
+		if (e.keyCode == 13) {
+			e.preventDefault()
+      var url = this.$tumblrUrl.val()
+			this.loadTumblr(url)
+		}
+	},
+
+	loadTumblr: function(url){
+		Parser.tumblr(url, function(media_list){
+			console.log(media_list)
+			this.parent.mediaViewer.$foundMediaContainer.empty()
+			media_list.reverse().forEach(function(media){
+				this.parent.mediaViewer.add(media, this.parent.mediaViewer.$foundMediaContainer)
+			}.bind(this))
+		}.bind(this))
+	},
+	
+	loadExample: function(e){
+	  e.preventDefault()
+	  var name = $(e.currentTarget).html()
+	  var url = "http://" + name + ".tumblr.com/"
+	  this.$url.val(url)
+	  this.loadTumblr(url)
+	},
+
+})
\ No newline at end of file
diff --git a/public/assets/javascripts/ui/editor/MediaUpload.js b/public/assets/javascripts/ui/editor/MediaUpload.js
index 9ae90e3..d09e38c 100644
--- a/public/assets/javascripts/ui/editor/MediaUpload.js
+++ b/public/assets/javascripts/ui/editor/MediaUpload.js
@@ -1,6 +1,6 @@
 
 var MediaUpload = UploadView.extend({
-	el: ".fileUpload",
+	el: "#fileUpload",
 
 	createAction: "/api/media/new",
 	uploadAction: "/api/media/upload",
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index 94a9d90..2ae5104 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -38,11 +38,11 @@ var MediaViewer = ModalView.extend({
 		this.$deleteMedia = this.$("#deleteMedia")
 		this.$viewMore = this.$(".viewMore")
 		this.$noMedia = this.$(".noMedia")
-		
-		this.$tumblrUrl = this.$("#tumblr-url")
   },
 
+  mode: "user",
 	wallpaperToggle: function(){
+	  this.mode = "wallpaper"
     this.$wallpaperMedia.addClass("active")
     this.$foundMedia.addClass("inactive")
     this.$myMedia.addClass("inactive").removeClass('active')
@@ -51,19 +51,25 @@ var MediaViewer = ModalView.extend({
 	},
 	
 	foundToggle: function(){
+	  this.mode = "found"
     this.$wallpaperMedia.removeClass("active")
     this.$foundMedia.addClass("active")
     this.$myMedia.addClass("inactive").removeClass('active')
     this.$("a").removeClass("active")
     this.$foundToggle.addClass("active")
+    this.parent.mediaUpload.hide()
+    this.parent.mediaTumblr.show()
 	},
 	
 	userToggle: function(){
+	  this.mode = "user"
     this.$wallpaperMedia.removeClass("active")
     this.$foundMedia.removeClass("active")
     this.$myMedia.removeClass("inactive").addClass('active')
     this.$("a").removeClass("active")
     this.$userToggle.addClass("active")
+    this.parent.mediaUpload.show()
+    this.parent.mediaTumblr.hide()
 	},
 
 	show: function(){
@@ -72,8 +78,7 @@ var MediaViewer = ModalView.extend({
 			// this.loadTrending()
 		}
 		else {
-		  this.parent.cursor.message("media")
-			this.__super__.show.call(this)
+			this.reallyShow()
 		}
 	},
 	
@@ -81,8 +86,20 @@ var MediaViewer = ModalView.extend({
 		this.__super__.hide.call(this)
 		this.deleteArmed(false)
 		this.parent.mediaUpload.hide()
+		this.parent.mediaTumblr.hide()
 		this.parent.cursor.message('start')
 	},
+	
+	reallyShow: function(){
+    this.__super__.show.call(this)
+    if (this.mode == "user") {
+      this.userToggle()
+    }
+    else {
+      this.foundToggle()
+    }
+    this.parent.cursor.message("media")
+	},
 
 	load: function(){
 		$.get("/api/media/user", { offset: this.offset, limit: this.perPage }, this.populate.bind(this))
@@ -159,8 +176,7 @@ var MediaViewer = ModalView.extend({
 		}
 		else  {
 			this.loaded = true
-      this.parent.cursor.message("media")
-			this.__super__.show.call(this)
+			this.reallyShow()
 		}
 	},
 	
@@ -296,16 +312,4 @@ var MediaViewer = ModalView.extend({
 		_followCursor(e)
 	},
 	
-	enterTumblrUrl: function(e){
-		e.stopPropagation()
-		if (e.keyCode !== 13) { return }
-		var url = this.$tumblrUrl.val()
-		Parser.tumblr(url, function(media_list){
-			console.log(media_list)
-			this.$foundMediaContainer.empty()
-			media_list.reverse().forEach(function(media){
-				this.add(media, this.$foundMediaContainer)
-			}.bind(this))
-		}.bind(this))
-	},
 })
diff --git a/public/assets/javascripts/ui/lib/ModalView.js b/public/assets/javascripts/ui/lib/ModalView.js
index f70fbb3..6f1c729 100644
--- a/public/assets/javascripts/ui/lib/ModalView.js
+++ b/public/assets/javascripts/ui/lib/ModalView.js
@@ -14,10 +14,8 @@ var ModalView = View.extend({
   
   show: function(){
     $(".mediaDrawer").removeClass("active")
-    
-    if (! this.usesFileUpload) {
-      $(".fileUpload").removeClass("active")
-    }
+    $(".fileUpload").removeClass("active")
+
     if (this.fixedClose) {
       $("#fixed_close").addClass("active")
       $("#fixed_close").bind("click", this.hide.bind(this))
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 5d69d75..07d1bbb 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1720,7 +1720,16 @@ border-left: 1px solid black;
   padding-top: 2px;
 }
 
-
+.exampleTumblrs {
+  display: block;
+  margin-top: 10px;
+  font-weight: 300;
+  font-size: 0.8em;
+}
+.exampleTumblrs a {
+  border-bottom: 1px dotted;
+  margin-left: 5px;
+}
 
 .vvbox .colors {
   max-width: 155px;
diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index 3db71d5..f9bce61 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -23,7 +23,6 @@
 	</div>
 
 	<div class="foundMedia">
-	  <input type="text" id="tumblr-url" placeholder="Enter a Tumblr URL to add images from it!">
 	  <span class="container"></span>
  	</div>
  	
@@ -33,7 +32,7 @@
  	
 </div>
 
-<span class="fileUpload">
+<span class="fileUpload" id="fileUpload">
   <input type="hidden" name="_csrf" value="[[- token ]]">
   <form>
     <span class="ion-ios7-upload-outline upload-icon"></span><br>
@@ -43,3 +42,15 @@
   <small>~ or ~</small><br>
   <input type="text" placeholder="Enter Vimeo or YouTube or image link" class="url">
 </span>
+
+<span class="fileUpload" id="tumblrUpload">
+  <input type="hidden" name="_csrf" value="[[- token ]]">
+  <input type="text" class="url" placeholder="Enter a Tumblr URL to add images from it!">
+  <br>
+  <span class="exampleTumblrs">
+    or try one of these:
+    <a href="#" class="exampleTumblr">risingtensions</a>
+    <a href="#" class="exampleTumblr">fixoid</a>
+    <a href="#" class="exampleTumblr">nopattern</a>
+  </span>
+</span>
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 61659f7..fc94992 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -113,6 +113,7 @@
 <script type="text/javascript" src="/assets/javascripts/ui/editor/ColorControl.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/Collaborators.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/MediaEditor.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/editor/MediaTumblr.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>
-- 
cgit v1.2.3-70-g09d2


From b4de393c30ab2540ce8961b394be1915729d8df6 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 1 Dec 2014 16:30:27 -0500
Subject: about.ejs

---
 server/lib/views/index.js |  6 +++++-
 views/about/about.ejs     | 27 +++++++++++++++++++++++++++
 views/partials/footer.ejs |  3 ++-
 3 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 views/about/about.ejs

(limited to 'views')

diff --git a/server/lib/views/index.js b/server/lib/views/index.js
index 145b5ac..6ceef7e 100644
--- a/server/lib/views/index.js
+++ b/server/lib/views/index.js
@@ -111,12 +111,16 @@ var views = module.exports = {
 	},
 
 	docs: function (req, res){
-		var name = req.params.name || "howto"
+		var name = req.params.name || "about"
 
 	  if (name == "howto") {
 	    res.render('about/' + name)
 	    return
 	  }
+	  if (name == "about" || name == "index") {
+	    res.render('about/' + name)
+	    return
+	  }
 
 		if (name === "new") {
 			res.render('docs', {
diff --git a/views/about/about.ejs b/views/about/about.ejs
new file mode 100644
index 0000000..e600a3d
--- /dev/null
+++ b/views/about/about.ejs
@@ -0,0 +1,27 @@
+<!doctype html>
+<html>
+<head>
+	<title>vvalls</title>
+	[[ include ../partials/meta ]]
+</head>
+<body class="loading">
+	<div class="rapper page home">
+	[[ include ../partials/header ]]
+
+
+	<div class="hero" style="background-image:url(http://okfocus.s3.amazonaws.com/images/vvalls/construction.jpg);">
+		<div class="holder">
+	  </div>
+	</div>
+	<h1>About VValls</h1>
+
+
+	[[ 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/partials/footer.ejs b/views/partials/footer.ejs
index 7b01162..e3c572f 100644
--- a/views/partials/footer.ejs
+++ b/views/partials/footer.ejs
@@ -13,7 +13,8 @@
 
   <br><br>
   
-	<a href="/about">How To</a>
+	<a href="/about">About</a>
+	<a href="/about/howto">How To</a>
 	<a href="/about/terms">Terms</a>
 	<a href="/about/privacy">Privacy</a>
 	<a href="mailto:hello@vvalls.com">Contact</a>
-- 
cgit v1.2.3-70-g09d2


From f6fa8808adc4dc20a4decea4b2480cf0efa8d25f Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 1 Dec 2014 16:44:59 -0500
Subject: about section

---
 views/about/about.ejs | 46 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

(limited to 'views')

diff --git a/views/about/about.ejs b/views/about/about.ejs
index e600a3d..f59fe14 100644
--- a/views/about/about.ejs
+++ b/views/about/about.ejs
@@ -5,7 +5,7 @@
 	[[ include ../partials/meta ]]
 </head>
 <body class="loading">
-	<div class="rapper page home">
+	<div class="rapper page">
 	[[ include ../partials/header ]]
 
 
@@ -15,7 +15,37 @@
 	</div>
 	<h1>About VValls</h1>
 
+	<div class="projectList about aboutintro">
+	  <div class="inner">
+      VValls is a platform for creating and sharing immersive web based 3D exhibitions. With VValls users can draw floor plans, and then apply media to the surfaces of the virtual space. VValls is the ideal solution for anyone creating immersive presentations of content, curators looking to plan shows, and artists looking to visualize their work in 3D space. VValls is completely HTML5 based – mobile and desktop compatible.
+      <br><br>
+      Contact us with inquiries at <a href="mailto:hello@vvalls.com">hello@vvalls.com</a>.<br>
+      We are based in New York City.
+    </div>
 
+		<div class="item">
+			<div class="rap">
+        <span style="background-image:url(http://vvalls.s3.amazonaws.com/static/larisa.jpg)">
+        </span>
+        <span>
+          <h3>Dot Dash 3</h3>
+          <words>VValls was conceived and prototyped by Larisa Leventon, Ph.D., MBA, founder of Dot Dash 3 and an M.I.T. + Brown University-trained visualization algorithm specialist.</words>
+        </span>
+      </div>
+    </div>
+
+		<div class="item">
+			<div class="rap">
+        <span style="background-image:url(http://vvalls.s3.amazonaws.com/static/okf.jpg)">
+        </span>
+        <span>
+          <h3>OKFocus</h3>
+          <words>VValls was developed and designed by OKFocus, a forward thinking NYC based creative agency. The technology was spearheaded by Jules LaPlace, CTO, and the design by Ryder Ripps, ECD.</words>
+        </span>
+      </div>
+    </div>
+  </div>
+  
 	[[ include ../partials/confirm-modal ]]	
 	[[ include ../projects/layouts-modal ]]	
 	[[ include ../partials/sign-in ]]
@@ -25,3 +55,17 @@
 </body>
 [[ include ../partials/scripts ]]
 </html>
+<style>
+.aboutintro {
+  text-align: center;
+  line-height: 43px;
+  font-size: 24px;
+  padding: 5% 0;
+  font-weight: 300;
+}
+.aboutintro .inner {
+  max-width: 800px;
+  margin: 0 auto;
+  text-align: center;
+}
+</style>
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2