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

Minor changes, small fixes

Browse Source
This commit is contained in:
Kenneth Jao 2016-11-02 19:18:36 -04:00
parent 88beb191c9
commit 043a453b2d
2 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,7 @@
</div> </div>
</div> </div>
<div id="divCenter"> <div id="divCenter">
<header id="mainHeader" style="background-color:{{divColor 'mainColor'}}{{textColor}}{{defaultMode}}{{refetchEvents}}"> <header id="mainHeader" style="background-color:{{divColor 'mainColor'}}{{refetchEvents}}">
<h1>Hourglass</h1><h2>{{schoolName}}</h2> <h1>Hourglass</h1><h2>{{schoolName}}</h2>
<div id="dropdown"> <div id="dropdown">
<img src="{{avatar}}"> <img src="{{avatar}}">

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

@ -39,6 +39,10 @@ Template.login.rendered = function() {
Accounts._loginButtonsSession.set('dropdownVisible', true); Accounts._loginButtonsSession.set('dropdownVisible', true);
}; };
Template.main.created = function() {
Session.set("mode", Session.get("user").preferences.mode);
}
Template.main.rendered = function() { Template.main.rendered = function() {
Accounts._loginButtonsSession.set('dropdownVisible', true); Accounts._loginButtonsSession.set('dropdownVisible', true);
setTimeout(startDragula, 300); setTimeout(startDragula, 300);
@ -50,10 +54,12 @@ Template.main.rendered = function() {
railColor: '#222', railColor: '#222',
railOpacity: 0.1, railOpacity: 0.1,
});*/ });*/
document.getElementsByTagName("body")[0].style.color = Session.get("user").preferences.theme.textColor;
}; };
Template.profile.rendered = function() { Template.profile.rendered = function() {
Accounts._loginButtonsSession.set('dropdownVisible', true); Accounts._loginButtonsSession.set('dropdownVisible', true);
document.getElementsByTagName("body")[0].style.color = Session.get("user").preferences.theme.textColor;
}; };
Template.selectOptionMenu.rendered = function() { Template.selectOptionMenu.rendered = function() {
@ -83,11 +89,6 @@ Template.registerHelper('divColor', (div) => { // Reactive color changing based
return Session.get("user").preferences.theme[div]; return Session.get("user").preferences.theme[div];
}); });
Template.registerHelper('textColor', () => { // Reactive color for text.
document.getElementsByTagName("body")[0].style.color = Session.get("user").preferences.theme.textColor;
return;
});
Template.registerHelper('overlayDim', (part) => { // Gets size of the overlay container. Template.registerHelper('overlayDim', (part) => { // Gets size of the overlay container.
var dim = [window.innerWidth * 0.25, window.innerHeight * 0.2]; var dim = [window.innerWidth * 0.25, window.innerHeight * 0.2];
var width = "width:" + dim[0].toString() + "px;"; var width = "width:" + dim[0].toString() + "px;";
@ -287,11 +288,6 @@ Template.main.helpers({
username() { // Returns user name. username() { // Returns user name.
return Session.get("user").name; return Session.get("user").name;
}, },
defaultMode() { //Loads the default display mode for user.
if (load)
load = false;
return;
},
bgSrc() { // Returns background. bgSrc() { // Returns background.
return "Backgrounds/" + Session.get("user").preferences.theme.background; return "Backgrounds/" + Session.get("user").preferences.theme.background;
}, },
@ -491,28 +487,14 @@ Template.main.events({
}, },
'click .classes' () { // Click classes mode button. 'click .classes' () { // Click classes mode button.
if (Session.equals("mode", "classes")) return; if (Session.equals("mode", "classes")) return;
var modeHolder = document.getElementById("mainBody"); toggleToMode("classes")
closeDivFade(modeHolder);
setTimeout(function() {
Session.set("mode", "classes");
openDivFade(modeHolder);
}, 300);
setTimeout(startDragula, 500); setTimeout(startDragula, 500);
Session.set("sidebarMode", Session.get("sidebarMode")[0], false); // Closes all sidebars.
toggleToSidebar(false); toggleToSidebar(false);
Session.set("sidebarMode", [null,null]);
}, },
'click .calendar' () { // Click calendar mode button. 'click .calendar' () { // Click calendar mode button.
if (Session.equals("mode", "calendar")) return; if (Session.equals("mode", "calendar")) return;
var modeHolder = document.getElementById("mainBody"); toggleToMode("calendar");
closeDivFade(modeHolder);
setTimeout(function() {
Session.set("mode", "calendar");
openDivFade(modeHolder);
}, 300);
Session.set("sidebarMode", Session.get("sidebarMode")[0], false); // Closes all sidebars.
toggleToSidebar(false); toggleToSidebar(false);
Session.set("sidebarMode", [null,null]);
}, },
'click .creWork' (event) { // Cick add work button. 'click .creWork' (event) { // Cick add work button.
var attr; var attr;
@ -873,6 +855,13 @@ function toggleOptionMenu(toggle, menu) {
} }
} }
function toggleToMode(mode) {
$("#mainBody").fadeOut(250, function() {
Session.set("mode",mode);
$("#mainBody").fadeIn(250);
});
}
function openDivFade(div) { function openDivFade(div) {
div.style.display = "block"; div.style.display = "block";
div.style.opacity = "0"; div.style.opacity = "0";