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

Fixed issue #77

Browse Source
This commit is contained in:
Kenneth Jao 2016-09-01 00:23:22 -04:00
parent 9ee9d36835
commit a0d277001e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hourglass/client/login/login.css
View File

@ -123,9 +123,7 @@ p.text {
bottom: 0; bottom: 0;
} }
.login-button {
display: none !important;
}
#github { #github {
font-size: 150%; font-size: 150%;

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

@ -164,6 +164,7 @@ Template.registerHelper('pref', (val) => { // Obtains all user preferences.
Template.main.helpers({ Template.main.helpers({
schoolName() { // Finds the name of the user's school. schoolName() { // Finds the name of the user's school.
if(Meteor.user().profile.school === undefined) return;
return " - " + Meteor.user().profile.school; return " - " + Meteor.user().profile.school;
}, },
iconColor(icon) { // Sidebar status color iconColor(icon) { // Sidebar status color
@ -279,6 +280,7 @@ Template.main.helpers({
if(jsEvent.target.className.includes("fc-past")) return; if(jsEvent.target.className.includes("fc-past")) return;
calCreWork = true; calCreWork = true;
calWorkDate = date.format(); calWorkDate = date.format();
Session.set("newWork", true);
Session.set("sidebar","menuContainer"); Session.set("sidebar","menuContainer");
} }
}; };
@ -782,7 +784,7 @@ function closeDivFade(div) {
function sendData(funcName) { // Call Meteor function, and do actions after function is completed depending on function. function sendData(funcName) { // Call Meteor function, and do actions after function is completed depending on function.
Meteor.call(funcName, serverData , function(err,result) { Meteor.call(funcName, serverData , function(err,result) {
if((funcName === "editWork" || funcName === "createWork") && Session.get("mode") === "calendar") { if((funcName === "editWork" || funcName === "createWork" || funcName === "deleteWork") && Session.get("mode") === "calendar") {
$("#fullcalendar").fullCalendar( 'refetchEvents' ); $("#fullcalendar").fullCalendar( 'refetchEvents' );
} else if(funcName === "toggleWork") { } else if(funcName === "toggleWork") {
var workId = Session.get("currentWork")._id; var workId = Session.get("currentWork")._id;