From 17fabffafc8e0f9723db6e19ae2ff14012c56a63 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 10 Nov 2014 12:10:05 -0500
Subject: surface avatar

---
 public/assets/stylesheets/app.css    | 13 +++++++++++--
 server/lib/views/index.js            |  1 +
 views/controls/reader/about-room.ejs |  8 +++++++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index e6b5570..cb58ef6 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -2542,12 +2542,21 @@ a[data-role="forgot-password"] {
 .aboutRoom.vvbox .txt {
 	padding: 5px 0 3px 0;
 }
-
-.aboutRoom h1 a{
+.aboutRoom h1 a {
   text-decoration: none;
   font-style: italic;
 	font-weight:500;
 }
+.aboutRoom .profilePic {
+  width: 34px;
+  height: 34px;
+  float: none;
+  display: inline-block;
+  vertical-align: middle;
+}
+.aboutRoom .authorName {
+  vertical-align: middle;
+}
 
 .desktop .aboutRoom h1 a:hover {
   text-decoration:underline;
diff --git a/server/lib/views/index.js b/server/lib/views/index.js
index e37a01d..6e3b449 100644
--- a/server/lib/views/index.js
+++ b/server/lib/views/index.js
@@ -68,6 +68,7 @@ var views = module.exports = {
 				date: moment(req.project.updated_at).format("M/DD/YYYY"),
 				author: user.displayName,
 				authorlink: "/profile/" + user.username,
+				authorpic: user.photo,
 				canEdit: req.isOwner || req.isCollaborator,
 				editlink: "/project/" + req.project.slug + "/edit",
 				noui: !! (req.query.noui === '1'),
diff --git a/views/controls/reader/about-room.ejs b/views/controls/reader/about-room.ejs
index 2bd3f0c..974fe0f 100644
--- a/views/controls/reader/about-room.ejs
+++ b/views/controls/reader/about-room.ejs
@@ -1,6 +1,12 @@
 <div class="aboutRoom vvbox">
 	<h1>
-		<span class="roomName">[[- name ]]</span>,
+		<span class="roomName">[[- name ]]</span>
+		<br>
+    [[ if (authorpic) { ]]
+      <a href="[[- authorlink ]]" class="authorName"><div class="profilePic" style="background-image:url([[- authorpic ]])"></div></a>
+    [[ } else { ]]
+      <a href="[[- authorlink ]]" class="authorName"><span class="ion-ios7-person-outline"></span></a>
+    [[ } ]]
 		<a href="[[- authorlink ]]" class="authorName">[[- author ]]</a>
 	</h1>
 	[[ if (description) { ]]
-- 
cgit v1.2.3-70-g09d2