merge

4 files changed, 61 insertions, 41 deletions

diff --git a/views/controls/editor/collaborators.ejs b/views/controls/editor/collaborators.ejs
index b658bf6..8ad8c00 100644
--- a/views/controls/editor/collaborators.ejs
+++ b/views/controls/editor/collaborators.ejs
@@ -4,29 +4,29 @@
   <div class="rap">
 		<div class="holder">
 			<div class="inner vvbox">
-    <h2>Collaborators</h2>
+        <h2>Collaborators</h2>
 
-    <p>
-      To invite others to contribute to this project, submit their email address below. They'll receive an email with instructions to join this blog and register if they're not a Vvalls user yet.
-    </p>
+        <p>
+          To invite others to contribute to this project, submit their email address below. They'll receive an email with instructions to join this project and register if they're not a Vvalls user yet.
+        </p>
 
-    <form>
-      <input type="text" id="collaborator-email" name="email">
-      <input type="submit" id="collaborator-invite" value="Invite to this project">
-    </form>
+        <form>
+          <input type="text" id="collaborator-email" name="email">
+          <input type="submit" id="collaborator-invite" value="Invite to this project">
+        </form>
 
-    <div id="collaborator-url-rapper">
-      We've sent a link to join this project to <span id="collaborator-dummy-email"></span>.
-      You can also send this link yourself:
-      <input type="text" id="collaborator-url">
-    </div>
+        <div id="collaborator-url-rapper">
+          We've sent a link to join this project to <span id="collaborator-dummy-email"></span>.
+          You can also send this link yourself:
+          <input type="text" id="collaborator-url">
+        </div>
 
-    <ul id="collaborator-list">
-    </ul>
-  </div>
+        <ul id="collaborator-list">
+        </ul>
+      </div>
+    </div>
   </div>
 </div>
-</div>
 
 <script type="text/html" id="collaborator-template">
   <li>
@@ -38,26 +38,3 @@
     <span class="role">owner</span>
   </li>
 </script>
-
-<style>
-#collaborator-url-rapper {
-  display: none;
-  background: #fff;
-  border: 1px solid;
-  box-shadow: -3px 3px 0;
-  padding: 10px;
-  font-weight: 300;
-  font-size: 14px;
-  margin: 10px 0;
-}
-#collaborator-url {
-  font-size: 16px;
-  width: 500px;
-  border: 1px solid;
-  font-size: 14px;
-  padding: 5px;
-  font-weight: 300;
-  margin-top: 5px;
-  display: block;
-}
-</style>
diff --git a/views/controls/editor/share.ejs b/views/controls/editor/share.ejs
new file mode 100644
index 0000000..7e7ad3c
--- /dev/null
+++ b/views/controls/editor/share.ejs
@@ -0,0 +1,16 @@
+<div class="vvbox settings share">
+	<h4>Project Saved</h4>
+	
+	<div class="setting">
+	  <h2>Share on–</h2>
+    <a id="share_facebook">Facebook</a>
+    <a id="share_twitter">Twitter</a>
+    <a id="share_embed">Embed</a>
+  </div>
+  
+	<div class="setting">
+    Send people this link:
+    <input type="text" id="share_link">
+  </div>
+
+</div>
diff --git a/views/controls/reader/about-room.ejs b/views/controls/reader/about-room.ejs
index c9ad626..7e02e93 100644
--- a/views/controls/reader/about-room.ejs
+++ b/views/controls/reader/about-room.ejs
@@ -13,9 +13,10 @@
 		<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) { ]]
-	   <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
new file mode 100644
index 0000000..cc21c74
--- /dev/null
+++ b/views/controls/reader/embed.ejs
@@ -0,0 +1,26 @@
+<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" 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>
+ -->
+        <span id="testEmbed">test</span>
+      </div>
+    </div>
+  </div>
+</div>