From 725a72f21a6d2284e043b6c9d4e7241e0831f853 Mon Sep 17 00:00:00 2001
From: Kenneth Jao <ksjdragon@gmail.com>
Date: Sat, 10 Sep 2016 13:39:46 -0400
Subject: [PATCH] Added creator for work

---
 hourglass/client/main/main.css  | 21 ++++++++++++++++-----
 hourglass/client/main/main.html |  4 ++++
 hourglass/client/main/main.js   | 16 +++++++++++-----
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/hourglass/client/main/main.css b/hourglass/client/main/main.css
index 59bdeab..8bb506a 100644
--- a/hourglass/client/main/main.css
+++ b/hourglass/client/main/main.css
@@ -476,6 +476,10 @@ input, textarea {
 	width: 17vw;
 }
 
+#workDatea {
+	width: 17vw;
+}
+
 #editWorkCont {
 	width: 100%;
 	height: 100%;
@@ -560,13 +564,13 @@ input, textarea {
 }
 
 #workInfoContainer {
-	width: 70%;
+	width: 28vw;
 	margin-right: 3%;
 	float: left;
 }
 
 #workToggle {
-	width: 27%;
+	width: 10.8vw;
 	float: right;
 	vertical-align: top;
 }
@@ -1034,9 +1038,9 @@ input, textarea {
 }
 
 .doneUser img {
-	height: 4vh;
-	width: 4vh;
-	margin-right: 5%;
+	height: 2vw;
+	width: 2vw;
+	margin-right: 0.5vw;
 
 	-moz-border-radius: 50%;
 	-webkit-border-radius: 50%;
@@ -1046,6 +1050,7 @@ input, textarea {
 .doneUser span {
 	position: absolute;
 	top: 32%;
+	width: 7.5vw;
 }
 
 #toggleButtons {
@@ -1090,6 +1095,12 @@ input, textarea {
 	box-shadow: inset 0 0 0 99999px rgba(0,0,0,0.15);
 }
 
+.workCreator span {
+	font-weight: 400;
+	font-size: 1.2vh;
+	text-align: center;
+}
+
 #userTab {
 	width: 0; 
 	height: 0; 
diff --git a/hourglass/client/main/main.html b/hourglass/client/main/main.html
index 43d2041..aafb4f4 100644
--- a/hourglass/client/main/main.html
+++ b/hourglass/client/main/main.html
@@ -187,6 +187,10 @@
                                 <i class="fa fa-thumbs-down" aria-hidden="true"></i>
                                 <p>{{work 'reports'}}</p>
                             </div>
+                            <div class="workCreator doneUser" onclick="window.location='/user/{{work 'email'}}'">
+                                <img src="{{work 'avatar'}}">
+                                <span>Created by<br>{{work 'creator'}}</span>
+                            </div>
                         </div>
                     </div>
                 {{/unless}}
diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js
index 2e08130..9c998fc 100644
--- a/hourglass/client/main/main.js
+++ b/hourglass/client/main/main.js
@@ -614,7 +614,6 @@ Template.main.events({
         if (event.target.id !== "workDate") input.value = ele.childNodes[0].nodeValue;
         input.className = "changeInput";
 
-        
         input.style.padding = "0.1%";
         input.id = ele.id + "a";
         ele.parentNode.appendChild(input);
@@ -645,10 +644,10 @@ Template.main.events({
                 _id: Session.get("currentWork")["class"]
             });
             if (!(Meteor.userId() === Session.get("currentWork").creator ||
-                    Roles.userIsInRole(Meteor.userId(), ['superadmin', 'admin']) ||
-                    currClass.moderators.indexOf(Meteor.userId()) !== -1 ||
-                    currClass.banned.indexOf(Meteor.userId()) !== -1
-                )) return;
+                Roles.userIsInRole(Meteor.userId(), ['superadmin', 'admin']) ||
+                currClass.moderators.indexOf(Meteor.userId()) !== -1 ||
+                currClass.banned.indexOf(Meteor.userId()) !== -1
+            )) return;
         }
 
         var op = event.target;
@@ -989,8 +988,15 @@ function formReadable(input) { // Makes work information readable by users.
             input.userReport = "";
         }
 
+        var thisUser = Meteor.users.findOne({
+            _id: input.creator
+        });
+
         input.confirmations = input.confirmations.length;
         input.reports = input.reports.length;
+        input.creator = thisUser.profile.name;
+        input.avatar = thisUser.profile.avatar;
+        input.email = thisUser.services.google.email;
 
         var comments = input.comments;
         var resort = [];