From a08db123698db508a305b57258bdc64d5d431800 Mon Sep 17 00:00:00 2001 From: Kenneth Jao Date: Sun, 23 Oct 2016 22:38:14 -0400 Subject: [PATCH] Made filter parts openable, added slim scroll --- hourglass/.meteor/packages | 1 + hourglass/.meteor/versions | 1 + hourglass/client/main/main.css | 17 ++++++----------- hourglass/client/main/main.html | 20 ++++++++++++-------- hourglass/client/main/main.js | 29 ++++++++++++++++++++++++++--- 5 files changed, 46 insertions(+), 22 deletions(-) diff --git a/hourglass/.meteor/packages b/hourglass/.meteor/packages index 70b9a54..fd6193a 100644 --- a/hourglass/.meteor/packages +++ b/hourglass/.meteor/packages @@ -43,3 +43,4 @@ yogiben:admin-edit mfactory:admin-lte mrt:jquery-ui standard-minifier-css@1.2.0_1 +rochal:slimscroll diff --git a/hourglass/.meteor/versions b/hourglass/.meteor/versions index d3a88b5..afe6c32 100644 --- a/hourglass/.meteor/versions +++ b/hourglass/.meteor/versions @@ -102,6 +102,7 @@ reactive-var@1.0.10 reload@1.1.10 retry@1.0.8 reywood:publish-composite@1.4.2 +rochal:slimscroll@1.3.3 routepolicy@1.0.11 rzymek:fullcalendar@2.7.2 service-configuration@1.0.10 diff --git a/hourglass/client/main/main.css b/hourglass/client/main/main.css index 6158ef6..a93bb02 100644 --- a/hourglass/client/main/main.css +++ b/hourglass/client/main/main.css @@ -328,15 +328,10 @@ a #classListHolder { max-height: 48%; width: 100%; - padding-right: 50%; overflow-y: auto; } -#sideClassWrapper { - max-height: 20vh; -} - .sideClass, .sideFilter { width: 100%; @@ -367,12 +362,12 @@ a } .sideClassName { - width: 65%; + width: 50%; padding-left: 5%; } .sideClassHour { - width: 30%; + width: 50%; color: #CCC; } @@ -394,7 +389,7 @@ a white-space: nowrap; } -#filterHead { +#filterHead, #filterWrapper .sectionTitle { font-weight: 200; padding: 0; @@ -406,18 +401,18 @@ a transition: background-color 0.4s ease; } -#filterHead:hover { +#filterHead:hover, #filterWrapper .sectionTitle:hover { background-color: rgba(255,255,255,0.2); } -#filterHead h3:first-child { +#filterHead h3:first-child, #filterWrapper .sectionTitle h3:first-child { font-weight: 200; padding: 5%; display: inline-block; pointer-events: none; } -#filterHead .fa { +#filterHead .fa, #filterWrapper .sectionTitle .fa { font-size: 120%; padding: 5%; float: right; diff --git a/hourglass/client/main/main.html b/hourglass/client/main/main.html index 7ea8d7a..ee0c83e 100644 --- a/hourglass/client/main/main.html +++ b/hourglass/client/main/main.html @@ -40,19 +40,23 @@
-

By Type

+
+

By Type

+ +
{{#each types}} {{> sideTypeFilter}} {{/each}}
-
-

By Class

-
- {{#each myClasses}} - {{> sidebarClasses}} - {{/each}} -
+
+

By Class

+ +
+
+ {{#each myClasses}} + {{> sidebarClasses}} + {{/each}}
diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js index a518483..23fb4af 100644 --- a/hourglass/client/main/main.js +++ b/hourglass/client/main/main.js @@ -10,7 +10,7 @@ var calWorkOpen = null; var calWorkDate = null; modifyingInput = null; dropOpen = null; -var filterOpen = false; +var filterOpen = [false,true,true]; var sidebarMode = [null,null] var openValues = { @@ -66,6 +66,13 @@ Template.main.rendered = function() { } ); $("#menuContainer").toggle(); + $("#classListHolder").slimScroll({ + height: '30vh', + size: '5px', + railVisible: true, + railColor: '#222', + railOpacity: 0.1, + }) }; Template.profile.rendered = function() { @@ -543,12 +550,28 @@ Template.main.events({ }, 'click #filterHead' (event) { if(event.target.id === "disableFilter") return; - if(!filterOpen) { + if(!filterOpen[0]) { $("#filterWrapper").slideDown(300); } else { $("#filterWrapper").slideUp(300); } - filterOpen = !filterOpen; + 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"));