diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js
index 48756cb..54c4f2b 100644
--- a/hourglass/client/main/main.js
+++ b/hourglass/client/main/main.js
@@ -10,24 +10,8 @@ var calWorkOpen = null;
var calWorkDate = null;
modifyingInput = null;
var clickDisabled = false;
-var filterOpen = [false,true,true];
-var sidebarMode = [null,null];
var optionOpen = false;
-
-var openValues = {
- "requests": "-235px"
-};
-
-// Sets colors for different assignment statuses
-var workColors = {
- "normal": "#2E4F74",
- "quiz": "#409333",
- "test": "#AD3C44",
- "project": "#D8831A",
- "other": "#852E6D"
-};
-
var defaultWork = {
name: "Name | Click here to edit...",
dueDate: "Click here to edit...",
@@ -83,40 +67,6 @@ Template.selectOptionMenu.rendered = function() {
);
}
-Template.sidebarMenuPlate.rendered = function() {
- $(".menuWrapper").slideDown(300);
-}
-
-Template.sidebarMenuPlate.helpers({
- modeStatus(status) { // Color status of display modes.
- return (Session.equals("mode", status)) ? Session.get("user").preferences.theme.modeHighlight : "rgba(0,0,0,0)";
- },
- types() {
- var types = Object.keys(workColors);
- var array = [];
- for (var i = 0; i < types.length; i++) {
- array.push({
- "type": types[i],
- "typeName": types[i][0].toUpperCase() + types[i].slice(1),
- "selected": (_.contains(Session.get("typeFilter"), types[i])) ? Session.get("user").preferences.theme.modeHighlight : "rgba(0,0,0,0)"
- });
- }
- return array;
- }
-});
-
-Template.sidebarOptionPlate.rendered = function() {
- $(".menuWrapper").slideDown(300);
-}
-
-Template.sidebarRequestPlate.rendered = function() {
- $(".menuWrapper").slideDown(300);
-}
-
-Template.sidebarCreatePlate.rendered = function() {
- $(".menuWrapper").slideDown(300);
-}
-
// Global Helpers
Template.registerHelper('adminPage', () => {
@@ -338,7 +288,7 @@ Template.main.helpers({
return Session.get("user").name;
},
defaultMode() { //Loads the default display mode for user.
- if (load) Session.set("mode", Session.get("user").preferences.mode);
+ if (load)
load = false;
return;
},
@@ -536,37 +486,9 @@ Template.main.events({
'click .fa-cog' (event) { // Click settings button.
toggleToSidebar("option");
},
- 'click .fa-question' (event) {
+ 'click .fa-question' (event) { // Click requests button.
toggleToSidebar("requests");
},
- 'click #filterHead' (event) {
- if(event.target.id === "disableFilter") return;
- if(!filterOpen[0]) {
- $("#filterWrapper").slideDown(300);
- } else {
- $("#filterWrapper").slideUp(300);
- }
- filterOpen[0] = !filterOpen[0];
- },
- 'click #typeFilterWrapper' () {
- if(!filterOpen[1]) {
- $("#classFilterHolder").slideDown(300);
- } else {
- $("#classFilterHolder").slideUp(300);
- }
- filterOpen[1] = !filterOpen[1];
- },
- 'click #classFilterWrapper' () {
- if(!filterOpen[2]) {
- $("#classListHolder").slideDown(300);
- } else {
- $("#classListHolder").slideUp(300);
- }
- filterOpen[2] = !filterOpen[2];
- },
- 'click #requests .fa-question' () {
- Session.set("requests", !Session.get("requests"));
- },
'click .classes' () { // Click classes mode button.
if (Session.equals("mode", "classes")) return;
var modeHolder = document.getElementById("mainBody");
diff --git a/hourglass/client/menus/menus.html b/hourglass/client/menus/menus.html
new file mode 100644
index 0000000..79a30e1
--- /dev/null
+++ b/hourglass/client/menus/menus.html
@@ -0,0 +1,123 @@
+
+
+
+
+
Filters
+ {{#if filterOn}}
+ Disable All
+ {{/if}}
+
+
+
+
+
By Type
+
+
+
+ {{#each types}}
+ {{> sideTypeFilter}}
+ {{/each}}
+
+
+
By Class
+
+
+
+ {{#each myClasses}}
+ {{> sidebarClasses}}
+ {{/each}}
+
+
+
+
+
Export
+
+
+
+
+
+
Preferences
+
+
+
+
+
Theme:
+
+ {{pref 'theme'}}
+
+
+ {{> selectOptionMenu optionName="theme"}}
+
+
+
Default Mode:
+
+ {{pref 'mode'}}
+
+
+ {{> selectOptionMenu optionName="mode"}}
+
+
+
Hide Homework:
+
+ {{pref 'timeHide'}}
+
+
+ {{> selectOptionMenu optionName="timeHide"}}
+
+
+
Hide Done:
+
+ {{pref 'done'}}
+
+
+ {{> selectOptionMenu optionName="done"}}
+
+
+
Hide Reported:
+
+ {{pref 'hideReport'}}
+
+
+ {{> selectOptionMenu optionName="hideReport"}}
+
+
+
+
+ Requests
+
+
+ {{restrict 'requestArea'}}
+ .
+
+ Send
+ Request sent!
+
+
+
+
+
+ Classes
+
+ {{#each myClasses}}
+ {{> sidebarClasses}}
+ {{/each}}
+
\ No newline at end of file
diff --git a/hourglass/client/menus/menus.js b/hourglass/client/menus/menus.js
new file mode 100644
index 0000000..0ce7261
--- /dev/null
+++ b/hourglass/client/menus/menus.js
@@ -0,0 +1,57 @@
+var filterOpen = [false,true,true];
+var sidebarMode = [null,null];
+
+Template.sidebarMenuPlate.rendered = function(){$(".menuWrapper").slideDown(300);}
+Template.sidebarOptionPlate.rendered = function(){$(".menuWrapper").slideDown(300);}
+Template.sidebarRequestPlate.rendered = function(){$(".menuWrapper").slideDown(300);}
+Template.sidebarCreatePlate.rendered = function(){$(".menuWrapper").slideDown(300);}
+
+Template.sidebarMenuPlate.helpers({
+ modeStatus(status) { // Color status of display modes.
+ return (Session.equals("mode", status)) ? Session.get("user").preferences.theme.modeHighlight : "rgba(0,0,0,0)";
+ },
+ types() {
+ var types = Object.keys(workColors);
+ var array = [];
+ for (var i = 0; i < types.length; i++) {
+ array.push({
+ "type": types[i],
+ "typeName": types[i][0].toUpperCase() + types[i].slice(1),
+ "selected": (_.contains(Session.get("typeFilter"), types[i])) ? Session.get("user").preferences.theme.modeHighlight : "rgba(0,0,0,0)"
+ });
+ }
+ return array;
+ }
+});
+
+Template.sidebarMenuPlate.events({
+ 'click #filterHead' (event) {
+ if(event.target.id === "disableFilter") return;
+ if(!filterOpen[0]) {
+ $("#filterWrapper").slideDown(300);
+ } else {
+ $("#filterWrapper").slideUp(300);
+ }
+ filterOpen[0] = !filterOpen[0];
+ },
+ 'click #typeFilterWrapper' () {
+ if(!filterOpen[1]) {
+ $("#classFilterHolder").slideDown(300);
+ } else {
+ $("#classFilterHolder").slideUp(300);
+ }
+ filterOpen[1] = !filterOpen[1];
+ },
+ 'click #classFilterWrapper' () {
+ if(!filterOpen[2]) {
+ $("#classListHolder").slideDown(300);
+ } else {
+ $("#classListHolder").slideUp(300);
+ }
+ filterOpen[2] = !filterOpen[2];
+ }
+});
+
+Template.sidebarOptionPlate.events({
+
+});
diff --git a/hourglass/lib/constants.js b/hourglass/lib/constants.js
index be7ec48..79ecb6e 100644
--- a/hourglass/lib/constants.js
+++ b/hourglass/lib/constants.js
@@ -67,6 +67,14 @@ themeColors = {
}
};
+workColors = {
+ "normal": "#2E4F74",
+ "quiz": "#409333",
+ "test": "#AD3C44",
+ "project": "#D8831A",
+ "other": "#852E6D"
+};
+
options = {
"theme": [
{"val": "lux", "alias": "Lux"},
diff --git a/hourglass/lib/router.js b/hourglass/lib/router.js
index 1365662..ebaf3b2 100644
--- a/hourglass/lib/router.js
+++ b/hourglass/lib/router.js
@@ -14,7 +14,6 @@ Router.route('/', {
},
action: function() {
if(_.contains([null, undefined, ""], Meteor.user().profile.school)) {
- Session.set("user", Meteor.user().profile);
this.redirect('/login');
} else {
Session.set("user", Meteor.user().profile);