From 4b87b0d6f8b15f19e2c4b43744085d045240836c Mon Sep 17 00:00:00 2001
From: ksjdragon <ksjdragon@ksjtech.(none)>
Date: Sun, 18 Jan 2015 18:57:17 -0500
Subject: [PATCH] custom scrollbar added

---
 chromebook-checkout-meteor/.meteor/packages      | 2 +-
 chromebook-checkout-meteor/.meteor/versions      | 2 +-
 chromebook-checkout-meteor/client/admin.css      | 3 +--
 chromebook-checkout-meteor/client/admin.js       | 9 ++++++++-
 chromebook-checkout-meteor/client/checkout.js    | 9 +++++++--
 chromebook-checkout-meteor/client/chromebook.css | 3 ++-
 chromebook-checkout-meteor/client/router.js      | 6 +++++-
 chromebook-checkout-meteor/client/tabs.css       | 2 +-
 chromebook-checkout-meteor/client/teacher.js     | 6 ++++++
 9 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/chromebook-checkout-meteor/.meteor/packages b/chromebook-checkout-meteor/.meteor/packages
index 4279f3c..c41a5eb 100644
--- a/chromebook-checkout-meteor/.meteor/packages
+++ b/chromebook-checkout-meteor/.meteor/packages
@@ -13,5 +13,5 @@ alanning:roles
 mrt:purecss
 fortawesome:fontawesome
 templates:tabs
-mrt:malihu-custom-scrollbar
 accounts-ui
+maazalik:malihu-jquery-custom-scrollbar
diff --git a/chromebook-checkout-meteor/.meteor/versions b/chromebook-checkout-meteor/.meteor/versions
index d109e1a..ad2ebf5 100644
--- a/chromebook-checkout-meteor/.meteor/versions
+++ b/chromebook-checkout-meteor/.meteor/versions
@@ -42,6 +42,7 @@ less@1.0.12
 livedata@1.0.12
 localstorage@1.0.2
 logging@1.0.6
+maazalik:malihu-jquery-custom-scrollbar@3.0.6
 meteor@1.1.4
 meteor-platform@1.2.1
 minifiers@1.1.3
@@ -49,7 +50,6 @@ minimongo@1.0.6
 mobile-status-bar@1.0.2
 momentjs:moment@2.8.4
 mongo@1.0.10
-mrt:malihu-custom-scrollbar@0.1.1
 mrt:purecss@0.6.0
 oauth@1.1.3
 oauth2@1.1.2
diff --git a/chromebook-checkout-meteor/client/admin.css b/chromebook-checkout-meteor/client/admin.css
index 00d2e57..61c560a 100644
--- a/chromebook-checkout-meteor/client/admin.css
+++ b/chromebook-checkout-meteor/client/admin.css
@@ -41,9 +41,8 @@
   text-decoration: none;
 }
 .border {
-  padding: 1% 15px 1% 15px;
+  padding: 1% 0px 1% 15px;
   overflow:auto;
-  max-height:550px;
   min-width:700px;
  }
 .remove {
diff --git a/chromebook-checkout-meteor/client/admin.js b/chromebook-checkout-meteor/client/admin.js
index f67c155..491709c 100644
--- a/chromebook-checkout-meteor/client/admin.js
+++ b/chromebook-checkout-meteor/client/admin.js
@@ -112,4 +112,11 @@ Template.admin.events({
       alert("Access Denied");
     }
   }
-});
\ No newline at end of file
+});
+
+Template.admin.rendered = function() {
+
+    $(".border.tabs-content").mCustomScrollbar({
+        theme: 'dark'
+    });
+}
\ No newline at end of file
diff --git a/chromebook-checkout-meteor/client/checkout.js b/chromebook-checkout-meteor/client/checkout.js
index c86b381..6cb298e 100644
--- a/chromebook-checkout-meteor/client/checkout.js
+++ b/chromebook-checkout-meteor/client/checkout.js
@@ -4,7 +4,6 @@ Template.checkout.helpers({
   }
 });
 
-
 Template.checkout.events({
   'click .edit': function() {
     if (Roles.userIsInRole(Meteor.userId(), ['admin'])) {
@@ -22,4 +21,10 @@ Template.checkout.events({
       alert("Access Denied");
     }
   }
-});
\ No newline at end of file
+});
+Template.checkout.rendered = function() {
+
+    $(".chckChromebooks").mCustomScrollbar({
+        theme: 'dark'
+    });
+}
\ No newline at end of file
diff --git a/chromebook-checkout-meteor/client/chromebook.css b/chromebook-checkout-meteor/client/chromebook.css
index 23b4ca7..5074619 100644
--- a/chromebook-checkout-meteor/client/chromebook.css
+++ b/chromebook-checkout-meteor/client/chromebook.css
@@ -11,7 +11,8 @@ body {
   font-family: Lato;
   padding-left:2%;
   margin-left:3%;
-  margin-bottom: 3%;
+  margin-bottom: 1%;
+  margin-top: 1%;
   box-shadow: 3px 3px 10px #c2c2c2;
   color: #000000;
   height: 10%;
diff --git a/chromebook-checkout-meteor/client/router.js b/chromebook-checkout-meteor/client/router.js
index f91a8b5..bae15ce 100644
--- a/chromebook-checkout-meteor/client/router.js
+++ b/chromebook-checkout-meteor/client/router.js
@@ -13,6 +13,10 @@ Router.route('/checkout', function() {
 Router.route('/login', function() {
   if (Meteor.user()) {
     this.redirect('/checkout');
+  } else if (Roles.userIsInRole(Meteor.userId(), ['admin'])) {
+    this.redirect('/admin');
+  } else if (Roles.userIsInRole(Meteor.userId(), ['teacher'])) {
+    this.redirect('/teacher');
   } else {
     this.render("login");
   }
@@ -31,5 +35,5 @@ Router.route('/teacher', function() {
     this.render("teacher");
   } else {
        this.redirect('/login');
-    }
+  }
 });
\ No newline at end of file
diff --git a/chromebook-checkout-meteor/client/tabs.css b/chromebook-checkout-meteor/client/tabs.css
index e7d554a..d005617 100644
--- a/chromebook-checkout-meteor/client/tabs.css
+++ b/chromebook-checkout-meteor/client/tabs.css
@@ -27,7 +27,7 @@
   padding: 4.2% 15px 15px 15px;
 }
 .tabs-content {
-overflow-y: scroll;
+overflow: auto;
 min-height: 425px;
 max-height: 425px;
 }
\ No newline at end of file
diff --git a/chromebook-checkout-meteor/client/teacher.js b/chromebook-checkout-meteor/client/teacher.js
index 7b53d5a..2b2d9f8 100644
--- a/chromebook-checkout-meteor/client/teacher.js
+++ b/chromebook-checkout-meteor/client/teacher.js
@@ -22,3 +22,9 @@ Template.teacher.helpers({
     return carts.find();
   }
 });
+Template.teacher.rendered = function() {
+
+    $(".tchChromebooks").mCustomScrollbar({
+        theme: 'dark'
+    });
+}