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

4 files changed, 13 insertions, 17 deletions

diff --git a/views/controls/reader/about-room.ejs b/views/controls/reader/about-room.ejs
index c0ca9f7..c9ad626 100644
--- a/views/controls/reader/about-room.ejs
+++ b/views/controls/reader/about-room.ejs
@@ -1,7 +1,7 @@
 <div class="aboutRoom vvbox">
 	<h1>
-		[[- name ]],
-		<a href="[[- authorlink ]]">[[- author ]]</a>
+		<span class="roomName">[[- name ]]</span>,
+		<a href="[[- authorlink ]]" class="authorName">[[- author ]]</a>
 	</h1>
 	[[ if (description) { ]]
 	<span class="txt">[[- description ]]</span>
@@ -11,13 +11,11 @@
 
 	<div class="share">
 		<h2>Share on–</h2>
-		<a href="#">Facebook</a>
-		<a href="#">Twitter</a>
+		<a id="share_facebook">Facebook</a>
+		<a id="share_twitter">Twitter</a>
 	</div>
 
 	  [[ if (canEdit) { ]]
 	   <a href="[[- editlink ]]" class="btn warn marg">Edit Room</a>
 	  [[ } ]]
 </div>
-
-
diff --git a/views/partials/meta.ejs b/views/partials/meta.ejs
index 6ff45cb..c50fc01 100644
--- a/views/partials/meta.ejs
+++ b/views/partials/meta.ejs
@@ -18,16 +18,14 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
 	<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-	<meta name="keywords" content=""/>
-	<meta name="description" content="" />
-	<meta name="author" content="" />
-	<link rel="shortcut icon" href="/favicon.ico"/>
-	<meta property="og:title" content=""/>
-	<meta property="og:type" content="website"/>
-	<meta property="og:image" content="" />
-	<link rel="image_src" href=""/>
-	<meta property="og:url" content=""/>
-	<meta property="og:site_name" content="" />
+	<meta name="description" content="[[- ogDescription ]]" />
+	<meta name="author" content="[[- ogAuthor ]]" />
+	<link rel="shortcut icon" href="/favicon.ico" />
+	<meta property="og:title" content="[[- ogTitle ]]" />
+	<meta property="og:type" content="website" />
+	<meta property="og:image" content="[[- ogImage ]]" />
+	<meta property="og:url" content="[[- ogUrl ]]" />
+	<meta property="og:site_name" content="Vvalls" />
 	<link rel="icon" href="/favicon.ico" type="image/x-icon">
 	<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
 	<link href='/assets/stylesheets/ionicons.css' rel='stylesheet' type='text/css'>
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 0373a3e..af16099 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -114,6 +114,7 @@
 <script type="text/javascript" src="/assets/javascripts/ui/editor/WallpaperPicker.js"></script>
 
 <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/MediaPlayer.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/reader/Tracker.js"></script>
 
diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs
index 5ecaec1..2749b0e 100644
--- a/views/projects/list-projects.ejs
+++ b/views/projects/list-projects.ejs
@@ -9,7 +9,6 @@
       [[ } else { ]]
       <a href="/project/[[- project.slug ]]" class="projectItem" data-userid="[[- project.user_id ]]">
       [[ } ]]
-
 			<span class="room" style="background-color: rgb([[- project.color ]]);">
         <span class="mask" style="background-image: url([[- project.photo ]]);">
         </span>