kjao/archive
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ksjdragon/hourglass

Browse Source
This commit is contained in:
Kenneth Jao 2016-10-20 21:54:55 -04:00
commit fb073243d9
2 changed files with 116 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hourglass/client/main/main.html
View File

@ -180,7 +180,7 @@
</div> </div>
<div id="toggleButtons"> <div id="toggleButtons">
<div id="markDone" style="background-color:{{work 'doneCol'}}"> <div id="markDone" style="background-color:{{work 'doneCol'}}">
<i class="fa fa-check-square-o" aria-hidden="true"></i> <i class="fa {{work 'doneIcon'}}" aria-hidden="true"></i>
<p>{{work 'doneText'}}</p> <p>{{work 'doneText'}}</p>
</div> </div>
<div id="markConfirm" style="color:{{work 'userConfirm'}}"> <div id="markConfirm" style="color:{{work 'userConfirm'}}">
@ -188,7 +188,7 @@
<p>{{work 'confirmations'}}</p> <p>{{work 'confirmations'}}</p>
</div> </div>
<div id="markReport" style="color:{{work 'userReport'}}"> <div id="markReport" style="color:{{work 'userReport'}}">
<i class="fa fa-thumbs-down" aria-hidden="true"></i> <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
<p>{{work 'reports'}}</p> <p>{{work 'reports'}}</p>
</div> </div>
<div class="workCreator doneUser" onclick="window.location='/user/{{work 'email'}}'"> <div class="workCreator doneUser" onclick="window.location='/user/{{work 'email'}}'">
@ -302,7 +302,7 @@
<div style="color:{{doneRatio}}"> <div style="color:{{doneRatio}}">
<i class="fa fa-thumbs-up" aria-hidden="true"></i> <i class="fa fa-thumbs-up" aria-hidden="true"></i>
<span>{{confirmationLength}}</span> <span>{{confirmationLength}}</span>
<i class="fa fa-thumbs-down" aria-hidden="true"></i> <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
<span>{{reportLength}}</span> <span>{{reportLength}}</span>
</div> </div>
</div> </div>

4
hourglass/client/main/main.js
View File

@ -1084,6 +1084,10 @@ function formReadable(input, val) { // Makes work information readable by users.
if (Session.get("newWork")) return ""; if (Session.get("newWork")) return "";
if (!_.contains(input.done, Meteor.userId())) return "Mark done"; if (!_.contains(input.done, Meteor.userId())) return "Mark done";
return "Done!"; return "Done!";
case "doneIcon":
if (Session.get("newWork")) return "";
if (!_.contains(input.done, Meteor.userId())) return "fa-square-o";
return "fa-check-square-o";
case "userConfirm": case "userConfirm":
if (!_.contains(input.confirmations, Meteor.userId())) return ""; if (!_.contains(input.confirmations, Meteor.userId())) return "";
return "#27A127"; return "#27A127";