Merge branch 'master' of github.com:okfocus/vvalls

4 files changed, 23 insertions, 8 deletions

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 7b7eab5..5d67f50 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -2703,6 +2703,9 @@ a[data-role="forgot-password"] {
 
 /* EMBED CODE GENERATOR */
 
+.embedView {
+  font-weight: 300;
+}
 .embedView textarea {
   border: 1px solid black;
   width: 100%;
@@ -2720,9 +2723,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 ]]