From 31e8ded42e044dd25012d4a7a400f2f60eeeb46f Mon Sep 17 00:00:00 2001 From: Kenneth Jao Date: Thu, 3 Nov 2016 17:36:07 -0400 Subject: [PATCH 1/3] Added partial menu items --- hourglass/.meteor/platforms | 3 +- hourglass/client/main/main.css | 2 +- hourglass/client/main/main.html | 2 ++ hourglass/client/main/main.js | 46 ++++++++++-------------- hourglass/client/menus/menus.html | 28 +++++++++++---- hourglass/client/menus/menus.js | 59 +++++++++++++++++++++++++++++-- 6 files changed, 101 insertions(+), 39 deletions(-) diff --git a/hourglass/.meteor/platforms b/hourglass/.meteor/platforms index efeba1b..0b0ddcc 100644 --- a/hourglass/.meteor/platforms +++ b/hourglass/.meteor/platforms @@ -1,2 +1,3 @@ -server +android browser +server diff --git a/hourglass/client/main/main.css b/hourglass/client/main/main.css index 6bfb37f..afb6c47 100644 --- a/hourglass/client/main/main.css +++ b/hourglass/client/main/main.css @@ -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%; } diff --git a/hourglass/client/main/main.html b/hourglass/client/main/main.html index e3eb7ca..244f5d2 100644 --- a/hourglass/client/main/main.html +++ b/hourglass/client/main/main.html @@ -52,6 +52,8 @@ {{> fullcalendar calendarOptions}} {{/if}} + + diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js index 53f9a4e..3f46264 100644 --- a/hourglass/client/main/main.js +++ b/hourglass/client/main/main.js @@ -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"; diff --git a/hourglass/client/menus/menus.html b/hourglass/client/menus/menus.html index 79a30e1..990d5ed 100644 --- a/hourglass/client/menus/menus.html +++ b/hourglass/client/menus/menus.html @@ -11,11 +11,6 @@

Calendar

-
-
- -

Manage Classes

-
@@ -53,7 +48,28 @@ + + + + diff --git a/hourglass/client/menus/menus.js b/hourglass/client/menus/menus.js index 5620dff..06b64bd 100644 --- a/hourglass/client/menus/menus.js +++ b/hourglass/client/menus/menus.js @@ -23,7 +23,10 @@ Template.sidebarMenuPlate.helpers({ }); } return array; - } + }, + filterOn() { + return Session.get("classDisp").length !== 0 || Session.get("typeFilter").length !== 0; + }, }); Template.sidebarMenuPlate.events({ @@ -62,6 +65,80 @@ Template.sidebarMenuPlate.events({ $("#classListHolder").slideUp(300); } filterOpen[2] = !filterOpen[2]; + }, + // CLASS FILTERS + 'click .sideClass' (event) { // Click class list in sidebar. + var div = event.target; + while (div.getAttribute("classid") === null) div = div.parentNode; + var classid = div.getAttribute("classid"); + + if (Session.equals("sidebarMode","create")) { // If creating work from calendar. + var newSetting = Session.get("currentWork"); + newSetting.class = classid; + Session.set("currentWork", newSetting); + openDivFade(document.getElementsByClassName("overlay")[0]); + } else { // Normal clicking turns on filter. + var array = Session.get("classDisp"); + if (array.indexOf(classid) !== -1) { + array.splice(array.indexOf(classid), 1); + } else { + array.push(classid); + } + Session.set("classDisp", array); + } + }, + 'click .sideFilter' (event) { + var div = event.target; + while (div.getAttribute("type") === null) div = div.parentNode; + var type = div.getAttribute("type"); + + var array = Session.get("typeFilter"); + if (array.indexOf(type) !== -1) { + array.splice(array.indexOf(type), 1); + } else { + array.push(type); + } + Session.set("typeFilter", array); + }, + 'click #disableFilter' () { + Session.set("classDisp", []); + Session.set("typeFilter", []); + }, + 'mouseover .sideClass' (event) { // Highlight/scale filter on-hover. + var div; + if (event.target.className !== "sideClass") { + div = event.target.parentNode; + } else { + div = event.target; + } + while (div.getAttribute("classid") === null) div = div.parentNode; + var classid = div.getAttribute("classid"); + Session.set("classDispHover", classid); + }, + 'mouseleave .sideClass' (event) { // Turn off highlight/scale filter on-leave. + if (event.target.className !== "sideClass") { + var div = event.target.parentNode; + if (div.contains(event.target)) return; + } + Session.set("classDispHover", null); + }, + 'mouseover .sideFilter' (event) { + var div; + if (event.target.className !== "sideFilter") { + div = event.target.parentNode; + } else { + div = event.target; + } + while (div.getAttribute("type") === null) div = div.parentNode; + var type = div.getAttribute("type"); + Session.set("typeFilterHover", type); + }, + 'mouseleave .sideFilter' (event) { + if (event.target.className !== "sideFilter") { + var div = event.target.parentNode; + if (div.contains(event.target)) return; + } + Session.set("typeFilterHover", null); } }); diff --git a/hourglass/client/profile/profile.css b/hourglass/client/profile/profile.css index 4d1ba54..52a98ca 100644 --- a/hourglass/client/profile/profile.css +++ b/hourglass/client/profile/profile.css @@ -235,62 +235,6 @@ 100% { width: 30%; } } -#label { - margin-top: 2.5%; - margin-bottom: 2%; - - background-color: rgba(0,0,0,0.2); - box-shadow: none; - - display: table; - cursor: default; -} - -.classHolder { - width: 100%; - max-height: 41vh; - padding: 1%; - padding-right: 100%; - - display: inline-block; - - overflow-x: hidden; - overflow-y: scroll; -} - -.classHolder h3 { - font-style: italic; - font-weight: 200; - margin-left: 1%; - - color: #999; - - -webkit-filter :none; - filter: none; -} - -.classBox { - font-size: 1.3vw; - width: 94%; - margin-bottom: 3%; - padding: 2%; - - background-color: #19B3B3; - box-shadow: 2px 2px 5px 3px #666; - display: table; - table-layout: fixed; - cursor: pointer; - - -webkit-transition: background-color 0.4s ease; - -moz-transition: background-color 0.4s ease; - -ms-transition: background-color 0.4s ease; - transition: background-color 0.4s ease; -} - -.classBox:hover { - background-color: #138686; -} - #joinTop .fa-search { font-size: 1.3vw; margin-right: 3%; @@ -315,38 +259,7 @@ background-color: rgba(0,0,0,0.1); } -.owned { - background-color: #27646D; - -webkit-transition: background-color 0.4s ease; - -moz-transition: background-color 0.4s ease; - -ms-transition: background-color 0.4s ease; - transition: background-color 0.4s ease; -} - -.owned:hover { - background-color: #52848B; -} - -.classText { - margin-left: .5%; - margin-right: 10%; - display: table-cell; - text-align: left; -} - -.classBox .fa-times { - display: table-cell; - width: 5%; -} - -.name { - width: 40%; -} - -.hour.classText, .subscribers.classText { - text-align: center; -} #creRules { margin: 5%; diff --git a/hourglass/client/profile/profile.html b/hourglass/client/profile/profile.html index d197e5a..7f921a6 100644 --- a/hourglass/client/profile/profile.html +++ b/hourglass/client/profile/profile.html @@ -292,20 +292,6 @@
- -