From a0d277001e04d6184d656c8aaa91718964b29130 Mon Sep 17 00:00:00 2001 From: Kenneth Jao Date: Thu, 1 Sep 2016 00:23:22 -0400 Subject: [PATCH] Fixed issue #77 --- hourglass/client/login/login.css | 4 +--- hourglass/client/main/main.js | 4 +++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hourglass/client/login/login.css b/hourglass/client/login/login.css index d18e05d..aa20031 100644 --- a/hourglass/client/login/login.css +++ b/hourglass/client/login/login.css @@ -123,9 +123,7 @@ p.text { bottom: 0; } -.login-button { - display: none !important; -} + #github { font-size: 150%; diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js index 3053617..7099cf1 100644 --- a/hourglass/client/main/main.js +++ b/hourglass/client/main/main.js @@ -164,6 +164,7 @@ Template.registerHelper('pref', (val) => { // Obtains all user preferences. Template.main.helpers({ schoolName() { // Finds the name of the user's school. + if(Meteor.user().profile.school === undefined) return; return " - " + Meteor.user().profile.school; }, iconColor(icon) { // Sidebar status color @@ -279,6 +280,7 @@ Template.main.helpers({ if(jsEvent.target.className.includes("fc-past")) return; calCreWork = true; calWorkDate = date.format(); + Session.set("newWork", true); 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. 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' ); } else if(funcName === "toggleWork") { var workId = Session.get("currentWork")._id;