From 5a35d057453f82aad1097f1a90e9bdd341018a17 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 7 Nov 2014 13:22:36 -0500
Subject: embed modal

---
 public/assets/javascripts/ui/reader/EmbedView.js | 50 ++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 public/assets/javascripts/ui/reader/EmbedView.js

(limited to 'public/assets/javascripts/ui/reader/EmbedView.js')

diff --git a/public/assets/javascripts/ui/reader/EmbedView.js b/public/assets/javascripts/ui/reader/EmbedView.js
new file mode 100644
index 0000000..a0b3c6f
--- /dev/null
+++ b/public/assets/javascripts/ui/reader/EmbedView.js
@@ -0,0 +1,50 @@
+var EmbedView = ModalView.extend({
+  el: ".embedView",
+  
+  events: {
+    "keydown": "stopPropagation",
+    "input [name=width]": "build",
+    "input [name=height]": "build",
+    "click [name=mute]": "build",
+    "click textarea": "selectAll",
+  },
+  
+  defaultWidth: 600,
+  defaultHeight: 450,
+
+	initialize: function(opt){
+	  this.parent = opt.parent
+    this.$embedCode = this.$("#embedCode")
+    this.$width = this.$("[name=width]")
+    this.$height = this.$("[name=height]")
+    this.$mute = this.$("[name=mute]")
+    
+    this.$width.val(this.defaultWidth)
+    this.$height.val(this.defaultHeight)
+	},
+	
+	show: function(){
+	  this.build()
+	  this.__super__.show.call(this)
+	},
+
+  build: function(){
+    var mute = this.$mute.prop('checked') ? 1 : 0
+    var width = clamp( this.$width.int(), 0, 2000) || this.defaultWidth
+    var height = clamp( this.$height.int(), 0, 2000) || this.defaultHeight
+    var link = this.parent.getLink()
+    link += "?mute=" + mute
+//    link += "&noui=1"
+    var kode = "<iframe src='" + encodeURI(link) + "' width='" + width + "' height='" + height + "'"
+             + " seamless scrolling='no' style='border: 0'"
+             + " webkitAllowFullScreen mozallowfullscreen allowfullscreen"
+             + "></iframe>"
+    
+    this.$embedCode.val( kode )
+  },
+  
+  selectAll: function(){
+    this.$embedCode[0].select()
+  },
+
+})
-- 
cgit v1.2.3-70-g09d2


From 1b2f4c77e5785073fd2b75380b521e1160070488 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 7 Nov 2014 15:31:29 -0500
Subject: non-interactive embed

---
 public/assets/javascripts/ui/reader/EmbedView.js  | 37 ++++++++++++++++++-----
 public/assets/javascripts/ui/reader/ReaderView.js | 36 +++++++++++++++++-----
 public/assets/javascripts/ui/reader/Tracker.js    |  4 +--
 views/controls/reader/about-room.ejs              |  2 +-
 views/controls/reader/embed.ejs                   |  3 +-
 5 files changed, 64 insertions(+), 18 deletions(-)

(limited to 'public/assets/javascripts/ui/reader/EmbedView.js')

diff --git a/public/assets/javascripts/ui/reader/EmbedView.js b/public/assets/javascripts/ui/reader/EmbedView.js
index a0b3c6f..21e351c 100644
--- a/public/assets/javascripts/ui/reader/EmbedView.js
+++ b/public/assets/javascripts/ui/reader/EmbedView.js
@@ -6,7 +6,9 @@ var EmbedView = ModalView.extend({
     "input [name=width]": "build",
     "input [name=height]": "build",
     "click [name=mute]": "build",
+    "click [name=interactive]": "build",
     "click textarea": "selectAll",
+    "click #test": "test",
   },
   
   defaultWidth: 600,
@@ -18,6 +20,7 @@ var EmbedView = ModalView.extend({
     this.$width = this.$("[name=width]")
     this.$height = this.$("[name=height]")
     this.$mute = this.$("[name=mute]")
+    this.$interactive = this.$("[name=interactive]")
     
     this.$width.val(this.defaultWidth)
     this.$height.val(this.defaultHeight)
@@ -29,18 +32,38 @@ var EmbedView = ModalView.extend({
 	},
 
   build: function(){
+    var kode = this.getEmbedCode()
+    this.$embedCode.val( kode )
+  },
+  
+  getEmbedCode: function(){
     var mute = this.$mute.prop('checked') ? 1 : 0
+    var interactive = this.$interactive.prop('checked') ? 1 : 0
     var width = clamp( this.$width.int(), 0, 2000) || this.defaultWidth
     var height = clamp( this.$height.int(), 0, 2000) || this.defaultHeight
     var link = this.parent.getLink()
-    link += "?mute=" + mute
-//    link += "&noui=1"
-    var kode = "<iframe src='" + encodeURI(link) + "' width='" + width + "' height='" + height + "'"
-             + " seamless scrolling='no' style='border: 0'"
-             + " webkitAllowFullScreen mozallowfullscreen allowfullscreen"
-             + "></iframe>"
+    var embed_link = link
+    embed_link += "?mute=" + mute
+    embed_link += "&embed=1"
+
+    var kode = "<iframe src='" + encodeURI(embed_link) + "' width='" + width + "' height='" + height + "'"
+    kode += " seamless scrolling='no' style='border: 0'"
+    kode += " webkitAllowFullScreen mozallowfullscreen allowfullscreen"
+    if (! interactive) {
+      kode += " style='pointer-events:none;'"
+    }
+    kode += "></iframe>"
     
-    this.$embedCode.val( kode )
+    if (! interactive) {
+      kode = "<div style='position:relative'>" + kode + "<a href='" + encodeURI(link) + "' style='display:block;position:absolute;top:0;left:0;width:" + width + "px;height:" + height + "px;'></a></div>"
+    }
+    
+    return kode
+  },
+  
+  test: function(){
+    var kode = this.getEmbedCode()
+    window.open("data:text/html," + kode, "_blank")
   },
   
   selectAll: function(){
diff --git a/public/assets/javascripts/ui/reader/ReaderView.js b/public/assets/javascripts/ui/reader/ReaderView.js
index 9e0d21e..db2ab2f 100644
--- a/public/assets/javascripts/ui/reader/ReaderView.js
+++ b/public/assets/javascripts/ui/reader/ReaderView.js
@@ -13,17 +13,39 @@ var ReaderView = View.extend({
 	},
 
 	load: function(name){
-		if (window.location.search.indexOf("noui") !== -1) {
-			$(".logo,.topLinks,#editorView").hide()
+	  var opt = this.getQS()
+	  var mode = "default"
+		var name = sanitize(name)
+
+		if (opt.noui) {
+			$(".logo, .topLinks, #editorView, #keyhint").hide()
+      mode = "noui"
 		}
-		else {
-		  this.tracker = new Tracker ()
+		if (opt.embed) {
+			$(".topLinks, .share, #edit-room-link, #keyhint").hide()
+      mode = "embed"
 		}
-		if (window.location.search.indexOf("mute") !== -1) {
+		if (opt.mute) {
 			app.muted = true
 		}
-		name = sanitize(name)
-		$.get(this.projectAction + name, this.ready.bind(this))
+
+    this.tracker = new Tracker ({ mode: mode })
+
+    $.get(this.projectAction + name, this.ready.bind(this))
+	},
+	
+	getQS: function(){
+	  var qs = {}
+	  window.location.search.replace(/^\?/,"").split("&").forEach(function(s){
+	    var pair = s.split("=")
+	    if (pair.length < 2) {
+        qs[pair[0]] = true
+	    }
+	    else {
+        qs[pair[0]] = pair[1]
+	    }
+	  })
+	  return qs
 	},
 	
 	ready: function(data){
diff --git a/public/assets/javascripts/ui/reader/Tracker.js b/public/assets/javascripts/ui/reader/Tracker.js
index beef071..bad42a8 100644
--- a/public/assets/javascripts/ui/reader/Tracker.js
+++ b/public/assets/javascripts/ui/reader/Tracker.js
@@ -13,7 +13,7 @@ var Tracker = Fiber.extend(function(base){
 		  this.events = []
 		  
 		  this.bind()
-		  this.trackPageview()
+		  this.trackPageview(opt)
 		},
 		
 		bind: function () {
@@ -29,7 +29,7 @@ var Tracker = Fiber.extend(function(base){
 		},
 		
 		trackPageview: function(opt){
-      this.pushEvent([ "view" ])
+      this.pushEvent([ "view", opt.mode ])
 		},
 
     //
diff --git a/views/controls/reader/about-room.ejs b/views/controls/reader/about-room.ejs
index eba8c98..7e02e93 100644
--- a/views/controls/reader/about-room.ejs
+++ b/views/controls/reader/about-room.ejs
@@ -17,6 +17,6 @@
 	</div>
 
 	  [[ if (canEdit) { ]]
-	   <a href="[[- editlink ]]" class="btn warn marg">Edit Room</a>
+	   <a href="[[- editlink ]]" class="btn warn marg" id="edit-room-link">Edit Room</a>
 	  [[ } ]]
 </div>
diff --git a/views/controls/reader/embed.ejs b/views/controls/reader/embed.ejs
index a897fbe..d8e3d4a 100644
--- a/views/controls/reader/embed.ejs
+++ b/views/controls/reader/embed.ejs
@@ -13,12 +13,13 @@
         
         dimensions: <input type="text" name="width">x<input type="text" name="height">
         <input type="checkbox" name="mute" id="mute" checked> <label for="mute">mute</label>
+        <input type="checkbox" name="interactive" id="interactive" checked> <label for="interactive">interactive</label>
 <!-- 
         <input type="checkbox" id=""> <label for=""></label>
         <input type="checkbox" id=""> <label for=""></label>
         <input type="checkbox" id=""> <label for=""></label>
  -->
-
+        <button id="test">test</button>
       </div>
     </div>
   </div>
-- 
cgit v1.2.3-70-g09d2


From f6b149e1909dd0507d1377b9f085123820772594 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 7 Nov 2014 15:42:14 -0500
Subject: more embed stuff

---
 public/assets/javascripts/ui/reader/EmbedView.js |  7 +++++--
 public/assets/stylesheets/app.css                | 16 ++++++++++++++--
 views/controls/reader/embed.ejs                  |  6 +++---
 views/home.ejs                                   |  2 +-
 4 files changed, 23 insertions(+), 8 deletions(-)

(limited to 'public/assets/javascripts/ui/reader/EmbedView.js')

diff --git a/public/assets/javascripts/ui/reader/EmbedView.js b/public/assets/javascripts/ui/reader/EmbedView.js
index 21e351c..7a75e00 100644
--- a/public/assets/javascripts/ui/reader/EmbedView.js
+++ b/public/assets/javascripts/ui/reader/EmbedView.js
@@ -8,7 +8,7 @@ var EmbedView = ModalView.extend({
     "click [name=mute]": "build",
     "click [name=interactive]": "build",
     "click textarea": "selectAll",
-    "click #test": "test",
+    "click #testEmbed": "test",
   },
   
   defaultWidth: 600,
@@ -45,10 +45,13 @@ var EmbedView = ModalView.extend({
     var embed_link = link
     embed_link += "?mute=" + mute
     embed_link += "&embed=1"
+    if (interactive) {
+      embed_link += "&interactive=1"
+    }
 
     var kode = "<iframe src='" + encodeURI(embed_link) + "' width='" + width + "' height='" + height + "'"
     kode += " seamless scrolling='no' style='border: 0'"
-    kode += " webkitAllowFullScreen mozallowfullscreen allowfullscreen"
+    kode += " webkitallowfullscreen mozallowfullscreen allowfullscreen"
     if (! interactive) {
       kode += " style='pointer-events:none;'"
     }
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 8b987c1..8989aef 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -2702,6 +2702,9 @@ a[data-role="forgot-password"] {
 
 /* EMBED CODE GENERATOR */
 
+.embedView {
+  font-weight: 300;
+}
 .embedView textarea {
   border: 1px solid black;
   width: 100%;
@@ -2719,9 +2722,18 @@ a[data-role="forgot-password"] {
 }
 .embedView label {
   font-size: 14px;
+  padding: 0 3px;
 }
-.embedView {
-  font-weight: 300;
+#testEmbed {
+  cursor: pointer;
+  float: right;
+  font-size: 11px;
+  margin-top: 11px;
+  font-weight: 100;
+  color: #888;
+}
+#testEmbed:hover {
+  text-decoration: underline;
 }
 
 /* MARCHING ANTS ANIMATION */
diff --git a/views/controls/reader/embed.ejs b/views/controls/reader/embed.ejs
index d8e3d4a..cc21c74 100644
--- a/views/controls/reader/embed.ejs
+++ b/views/controls/reader/embed.ejs
@@ -12,14 +12,14 @@
         <textarea id="embedCode"></textarea>
         
         dimensions: <input type="text" name="width">x<input type="text" name="height">
-        <input type="checkbox" name="mute" id="mute" checked> <label for="mute">mute</label>
-        <input type="checkbox" name="interactive" id="interactive" checked> <label for="interactive">interactive</label>
+        <input type="checkbox" name="mute" id="mute" checked><label for="mute">mute</label>
+        <input type="checkbox" name="interactive" id="interactive" checked><label for="interactive">interactive</label>
 <!-- 
         <input type="checkbox" id=""> <label for=""></label>
         <input type="checkbox" id=""> <label for=""></label>
         <input type="checkbox" id=""> <label for=""></label>
  -->
-        <button id="test">test</button>
+        <span id="testEmbed">test</span>
       </div>
     </div>
   </div>
diff --git a/views/home.ejs b/views/home.ejs
index 53d644a..76fbf3f 100755
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -71,7 +71,7 @@
 			<h3>Ready To Go Pro?</h3>
 			
 		We offer white-label licensing of the VValls platform that could be used within the context of your product offering. We can also customize the VValls platform to suit the various needs of your project. This could be include custom floor plans and numerous other features. Please inquire to start a conversation.
-		<a href="#">Contact</a>
+		<a href="mailto:info@vvalls.com?subject=VValls platform">Contact</a>
 		</span>
 	</div>
 	[[ include partials/confirm-modal ]]	
-- 
cgit v1.2.3-70-g09d2