Added creator for work

This commit is contained in:
Kenneth Jao 2016-09-10 13:39:46 -04:00
parent 2908c46452
commit 725a72f21a
3 changed files with 31 additions and 10 deletions

View File

@ -476,6 +476,10 @@ input, textarea {
width: 17vw; width: 17vw;
} }
#workDatea {
width: 17vw;
}
#editWorkCont { #editWorkCont {
width: 100%; width: 100%;
height: 100%; height: 100%;
@ -560,13 +564,13 @@ input, textarea {
} }
#workInfoContainer { #workInfoContainer {
width: 70%; width: 28vw;
margin-right: 3%; margin-right: 3%;
float: left; float: left;
} }
#workToggle { #workToggle {
width: 27%; width: 10.8vw;
float: right; float: right;
vertical-align: top; vertical-align: top;
} }
@ -1034,9 +1038,9 @@ input, textarea {
} }
.doneUser img { .doneUser img {
height: 4vh; height: 2vw;
width: 4vh; width: 2vw;
margin-right: 5%; margin-right: 0.5vw;
-moz-border-radius: 50%; -moz-border-radius: 50%;
-webkit-border-radius: 50%; -webkit-border-radius: 50%;
@ -1046,6 +1050,7 @@ input, textarea {
.doneUser span { .doneUser span {
position: absolute; position: absolute;
top: 32%; top: 32%;
width: 7.5vw;
} }
#toggleButtons { #toggleButtons {
@ -1090,6 +1095,12 @@ input, textarea {
box-shadow: inset 0 0 0 99999px rgba(0,0,0,0.15); 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 { #userTab {
width: 0; width: 0;
height: 0; height: 0;

View File

@ -187,6 +187,10 @@
<i class="fa fa-thumbs-down" aria-hidden="true"></i> <i class="fa fa-thumbs-down" aria-hidden="true"></i>
<p>{{work 'reports'}}</p> <p>{{work 'reports'}}</p>
</div> </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>
</div> </div>
{{/unless}} {{/unless}}

View File

@ -614,7 +614,6 @@ Template.main.events({
if (event.target.id !== "workDate") input.value = ele.childNodes[0].nodeValue; if (event.target.id !== "workDate") input.value = ele.childNodes[0].nodeValue;
input.className = "changeInput"; input.className = "changeInput";
input.style.padding = "0.1%"; input.style.padding = "0.1%";
input.id = ele.id + "a"; input.id = ele.id + "a";
ele.parentNode.appendChild(input); ele.parentNode.appendChild(input);
@ -645,10 +644,10 @@ Template.main.events({
_id: Session.get("currentWork")["class"] _id: Session.get("currentWork")["class"]
}); });
if (!(Meteor.userId() === Session.get("currentWork").creator || if (!(Meteor.userId() === Session.get("currentWork").creator ||
Roles.userIsInRole(Meteor.userId(), ['superadmin', 'admin']) || Roles.userIsInRole(Meteor.userId(), ['superadmin', 'admin']) ||
currClass.moderators.indexOf(Meteor.userId()) !== -1 || currClass.moderators.indexOf(Meteor.userId()) !== -1 ||
currClass.banned.indexOf(Meteor.userId()) !== -1 currClass.banned.indexOf(Meteor.userId()) !== -1
)) return; )) return;
} }
var op = event.target; var op = event.target;
@ -989,8 +988,15 @@ function formReadable(input) { // Makes work information readable by users.
input.userReport = ""; input.userReport = "";
} }
var thisUser = Meteor.users.findOne({
_id: input.creator
});
input.confirmations = input.confirmations.length; input.confirmations = input.confirmations.length;
input.reports = input.reports.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 comments = input.comments;
var resort = []; var resort = [];