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

Added partial menu items

Browse Source
This commit is contained in:
Kenneth Jao 2016-11-03 17:36:07 -04:00
parent 3a9b505abe
commit 31e8ded42e
6 changed files with 101 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hourglass/.meteor/platforms
View File

@ -1,2 +1,3 @@
server
android
browser
server

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

@ -321,7 +321,7 @@ a
font-size: 2vh;
}
.noScroll .fa-plus, .creWork .fa-plus, .fa-minus, .noScroll .fa-graduation-cap, .fa-exchange {
.noScroll .fa-plus, .creWork .fa-plus, .fa-minus, .fa-exchange {
font-size: 130%;
padding: 5%;
}

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

@ -52,6 +52,8 @@
{{> fullcalendar calendarOptions}}
</div>
{{/if}}
</div>
</div>

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

@ -303,7 +303,7 @@ Template.main.helpers({
return openValues.requests;
},
currMode(name) { // Status of display mode.
return Session.equals("mode", name);
return (Session.equals("sidebarMode", "option")) ? Session.equals("settingMode", mode) : Session.equals("mode", name);
},
calendarOptions() { // Settings for the calendar, including work displaying.
return {
@ -485,17 +485,6 @@ Template.main.events({
'click .fa-question' (event) { // Click requests button.
toggleToSidebar("requests");
},
'click .classes' () { // Click classes mode button.
if (Session.equals("mode", "classes")) return;
toggleToMode("classes")
setTimeout(startDragula, 500);
toggleToSidebar(false);
},
'click .calendar' () { // Click calendar mode button.
if (Session.equals("mode", "calendar")) return;
toggleToMode("calendar");
toggleToSidebar(false);
},
'click .creWork' (event) { // Cick add work button.
var attr;
if (event.target.className !== "creWork") {
@ -821,21 +810,6 @@ Template.main.events({
// Other Functions
function toggleToSidebar(sidebar) {
if(Session.equals("sidebarMode", sidebar) || !sidebar) {
$("#menuContainer").hide("slide", {direction: "left"}, 250);
$("#divCenter").stop().animate({left: '6vh'}, 250, function() {
Session.set("sidebarMode", "");
});
} else {
$("#menuContainer").show("slide", {direction: "left"}, 250);
$("#divCenter").stop().animate({left: '36vh'}, 250);
$(".menuWrapper").fadeOut(200, function() {
Session.set("sidebarMode", sidebar);
});
}
}
function toggleOptionMenu(toggle, menu) {
if(toggle) {
$(".selectedOption").removeClass("selectedOption");
@ -855,13 +829,29 @@ function toggleOptionMenu(toggle, menu) {
}
}
function toggleToSidebar(sidebar) {
if(Session.equals("sidebarMode", sidebar) || !sidebar) {
$("#menuContainer").hide("slide", {direction: "left"}, 250);
$("#divCenter").stop().animate({left: '6vh'}, 250, function() {
Session.set("sidebarMode", "");
});
} else {
$("#menuContainer").show("slide", {direction: "left"}, 250);
$("#divCenter").stop().animate({left: '36vh'}, 250);
$(".menuWrapper").fadeOut(200, function() {
Session.set("sidebarMode", sidebar);
});
}
}
function toggleToMode(mode) {
$("#mainBody").fadeOut(250, function() {
Session.set("mode",mode);
(Session.equals("sidebarMode", "option")) ? Session.set("settingMode", mode) : Session.set("mode",mode);
$("#mainBody").fadeIn(250);
});
}
function openDivFade(div) {
div.style.display = "block";
div.style.opacity = "0";

28
hourglass/client/menus/menus.html
View File

@ -11,11 +11,6 @@
<i class="fa fa-calendar" aria-hidden="true"></i>
<h4>Calendar</h4>
</div>
<div class="mode manageClass" onclick="window.location='/profile'">
<div class="status"></div>
<i class="fa fa-tasks" aria-hidden="true"></i>
<h4>Manage Classes</h4>
</div>
</div>
<div id="filters">
<div id="filterHead" class="sectionTitle openable">
@ -53,7 +48,28 @@
</template>
<template name="sidebarOptionPlate">
<div id="preferencesWrapper" class="sectionTitle openable downOffset">
<div id="settingMode" class="sectionTitle openable downOffset">
<h3>Classes</h3>
<i class="fa fa-angle-down" aria-hidden="true"></i>
</div>
<div id="settingModeWrapper">
<div class="mode manageClass">
<div class="status" style="background-color:{{modeStatus 'manageClass'}}"></div>
<i class="fa fa-tasks" aria-hidden="true"></i>
<h4>Manage Classes</h4>
</div>
<div class="mode addClass">
<div class="status" style="background-color:{{modeStatus 'addClass'}}"></div>
<i class="fa fa-graduation-cap" aria-hidden="true"></i>
<h4>Join Classes</h4>
</div>
<div class="mode createClass">
<div class="status" style="background-color:{{modeStatus 'createClass'}}"></div>
<i class="fa fa-book" aria-hidden="true"></i>
<h4>Create Classes</h4>
</div>
</div>
<div id="preferencesWrapper" class="sectionTitle openable">
<h3>Preferences</h3>
<i class="fa fa-angle-down" aria-hidden="true"></i>
</div>

59
hourglass/client/menus/menus.js
View File

@ -1,4 +1,6 @@
var filterOpen = [false,true,true];
Session.set("settingMode", "manageClass");
var filterOpen = [false, true, true, true, true];
var sidebarMode = [null,null];
Template.sidebarMenuPlate.rendered = function(){$(".menuWrapper").slideDown(300);}
@ -25,6 +27,17 @@ Template.sidebarMenuPlate.helpers({
});
Template.sidebarMenuPlate.events({
'click .classes' () { // Click classes mode button.
if (Session.equals("mode", "classes")) return;
toggleToMode("classes")
setTimeout(startDragula, 500);
toggleToSidebar(false);
},
'click .calendar' () { // Click calendar mode button.
if (Session.equals("mode", "calendar")) return;
toggleToMode("calendar");
toggleToSidebar(false);
},
'click #filterHead' (event) {
if(event.target.id === "disableFilter") return;
if(!filterOpen[0]) {
@ -52,6 +65,46 @@ Template.sidebarMenuPlate.events({
}
});
Template.sidebarOptionPlate.events({
Template.sidebarOptionPlate.helpers({
modeStatus(status) { // Color status of display modes.
return (Session.equals("settingMode", status)) ? Session.get("user").preferences.theme.modeHighlight : "rgba(0,0,0,0)";
},
});
Template.sidebarOptionPlate.events({
'click .manageClass' () { // Click classes mode button.
if (Session.equals("settingMode", "manageClass")) return;
toggleToMode("manageClass");
},
'click .addClass' () { // Click classes mode button.
if (Session.equals("settingMode", "addClass")) return;
toggleToMode("addClass");
},
'click .createClass' () { // Click classes mode button.
if (Session.equals("settingMode", "createClass")) return;
toggleToMode("createClass");
},
'click #settingMode' () {
if(!filterOpen[3]) {
$("#settingModeWrapper").slideDown(300);
} else {
$("#settingModeWrapper").slideUp(300);
}
filterOpen[3] = !filterOpen[3];
},
'click #preferencesWrapper' () {
if(!filterOpen[4]) {
$("#prefCont").slideDown(300);
} else {
$("#prefCont").slideUp(300);
}
filterOpen[4] = !filterOpen[4];
}
});
function toggleToMode(mode) {
$("#mainBody").fadeOut(250, function() {
(Session.equals("sidebarMode", "option")) ? Session.set("settingMode", mode) : Session.set("mode",mode);
$("#mainBody").fadeIn(250);
});
}