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

---
 views/controls/editor/share.ejs      |  3 ---
 views/controls/reader/about-room.ejs |  1 +
 views/controls/reader/embed.ejs      | 25 +++++++++++++++++++++++++
 views/editor.ejs                     |  1 +
 views/partials/footer.ejs            |  2 +-
 views/partials/scripts.ejs           |  3 ++-
 views/reader.ejs                     |  1 +
 7 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 views/controls/reader/embed.ejs

(limited to 'views')

diff --git a/views/controls/editor/share.ejs b/views/controls/editor/share.ejs
index 97f4ceb..7e7ad3c 100644
--- a/views/controls/editor/share.ejs
+++ b/views/controls/editor/share.ejs
@@ -14,6 +14,3 @@
   </div>
 
 </div>
-
-<style>
-</style>
\ No newline at end of file
diff --git a/views/controls/reader/about-room.ejs b/views/controls/reader/about-room.ejs
index c9ad626..eba8c98 100644
--- a/views/controls/reader/about-room.ejs
+++ b/views/controls/reader/about-room.ejs
@@ -13,6 +13,7 @@
 		<h2>Share on–</h2>
 		<a id="share_facebook">Facebook</a>
 		<a id="share_twitter">Twitter</a>
+    <a id="share_embed">Embed</a>
 	</div>
 
 	  [[ if (canEdit) { ]]
diff --git a/views/controls/reader/embed.ejs b/views/controls/reader/embed.ejs
new file mode 100644
index 0000000..a897fbe
--- /dev/null
+++ b/views/controls/reader/embed.ejs
@@ -0,0 +1,25 @@
+<div class="embedView fixed mediaDrawer animate">
+	<span class="close">X</span>
+
+  <div class="rap">
+		<div class="holder">
+			<div class="inner vvbox">
+        <h2>Embed Vvalls</h2>
+
+        <p>
+          This code generates an iframe which will embed this room in your website or blog.
+        </p>
+        <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" id=""> <label for=""></label>
+        <input type="checkbox" id=""> <label for=""></label>
+        <input type="checkbox" id=""> <label for=""></label>
+ -->
+
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/views/editor.ejs b/views/editor.ejs
index b031759..efc4b9d 100755
--- a/views/editor.ejs
+++ b/views/editor.ejs
@@ -21,6 +21,7 @@
 			[[ include controls/editor/text-editor ]]
 			[[ include controls/editor/collaborators ]]
 			[[ include controls/editor/share ]]
+			[[ include controls/reader/embed ]]
 			[[ include controls/editor/settings ]]
 			[[ include controls/editor/presets ]]
 		</div>
diff --git a/views/partials/footer.ejs b/views/partials/footer.ejs
index f44b611..a94acb1 100644
--- a/views/partials/footer.ejs
+++ b/views/partials/footer.ejs
@@ -5,7 +5,7 @@
 	<a href="/about/terms">Terms</a>
 	<a href="/about/privacy">Privacy</a>
 
-	<span>©2014 VVALLS Inc.</span>
+	<span>©2014 Dot Dash 3, Inc.</span>
 
 	[[ if (logged_in) { ]]
 	<br><br>
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 3e61a5a..70c3b27 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -7,7 +7,7 @@
 <script type="text/javascript" src="/assets/javascripts/vendor/tube.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/loader.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/polyfill.js"></script>
-<!--<script type="text/javascript" src="/assets/javascripts/vendor/wow.js"></script>-->
+<!-- <script type="text/javascript" src="/assets/javascripts/vendor/wow.js"></script> -->
 <script type="text/javascript" src="/assets/javascripts/vendor/chardinjs.min.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/sha1.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/dataUriToBlob.js"></script>
@@ -115,6 +115,7 @@
 
 <script type="text/javascript" src="/assets/javascripts/ui/reader/ReaderView.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/reader/ShareView.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/reader/EmbedView.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/reader/MediaPlayer.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/reader/Tracker.js"></script>
 
diff --git a/views/reader.ejs b/views/reader.ejs
index e86bab1..b9b53d2 100644
--- a/views/reader.ejs
+++ b/views/reader.ejs
@@ -15,6 +15,7 @@
 		<div id="editorView">
 			[[ include controls/reader/about-room ]]
 			[[ include controls/reader/media-player ]]
+			[[ include controls/reader/embed ]]
 		</div>
 
 <!-- 
-- 
cgit v1.2.3-70-g09d2