diff --git a/chromebook-checkout-meteor/client/admin.js b/chromebook-checkout-meteor/client/admin.js index 491709c..38bd669 100644 --- a/chromebook-checkout-meteor/client/admin.js +++ b/chromebook-checkout-meteor/client/admin.js @@ -1,6 +1,6 @@ Template.admin.helpers({ chromebooks: function() { - return Chromebooks.find(); + return Chromebooks.find({}, {sort: {number: 1}}); }, carts: function() { return carts.find(); @@ -36,7 +36,7 @@ Template.admin.events({ "serial": chromebook_serial, "number": chromebook_number }); - + // Clear form $("input[name='anumber']")[0].value = ""; $("input[name='aserial']")[0].value = ""; @@ -117,6 +117,8 @@ Template.admin.events({ Template.admin.rendered = function() { $(".border.tabs-content").mCustomScrollbar({ - theme: 'dark' + theme: 'dark', + scrollInertia: 0, + mouseWheelPixels: 30 }); } \ No newline at end of file diff --git a/chromebook-checkout-meteor/client/checkout.js b/chromebook-checkout-meteor/client/checkout.js index 6cb298e..2753822 100644 --- a/chromebook-checkout-meteor/client/checkout.js +++ b/chromebook-checkout-meteor/client/checkout.js @@ -1,6 +1,6 @@ Template.checkout.helpers({ chromebooks: function() { - return Chromebooks.find(); + return Chromebooks.find({}, {sort: {number: 1}}); } }); @@ -25,6 +25,8 @@ Template.checkout.events({ Template.checkout.rendered = function() { $(".chckChromebooks").mCustomScrollbar({ - theme: 'dark' + theme: 'dark', + scrollInertia: 0, + mouseWheelPixels: 30 }); } \ No newline at end of file diff --git a/chromebook-checkout-meteor/client/chromebook.js b/chromebook-checkout-meteor/client/chromebook.js index 7394c81..fd3754a 100644 --- a/chromebook-checkout-meteor/client/chromebook.js +++ b/chromebook-checkout-meteor/client/chromebook.js @@ -38,4 +38,5 @@ Template.chromebook.events({ Chromebooks.update(this._id, {$set: {user: null}}); } } -}); \ No newline at end of file +}); + diff --git a/chromebook-checkout-meteor/client/main.css b/chromebook-checkout-meteor/client/main.css index f249a8c..bb0c8da 100644 --- a/chromebook-checkout-meteor/client/main.css +++ b/chromebook-checkout-meteor/client/main.css @@ -50,7 +50,7 @@ h6 { box-shadow: 0px 5px 10px #222222; } .main-center, .main-center-admin { - max-height:700px; + max-height:650px; margin-top:4%; } .main-center { diff --git a/chromebook-checkout-meteor/client/tabs.css b/chromebook-checkout-meteor/client/tabs.css index d005617..c2a8fd5 100644 --- a/chromebook-checkout-meteor/client/tabs.css +++ b/chromebook-checkout-meteor/client/tabs.css @@ -8,7 +8,7 @@ font-weight: 600; font-size: 13px; float: left; - padding: 13px 23.2%; + padding: 13px 23.18%; margin: 0; list-style: none; cursor: pointer; @@ -19,7 +19,7 @@ border: 1px solid #ddd; border-bottom: none; margin-bottom: -1px !important; - padding: 13px 23.18% 14px 23.18% !important; + padding: 13px 23.15% 14px 23.15% !important; background-color: #fff; color: #333; } diff --git a/chromebook-checkout-meteor/client/teacher.js b/chromebook-checkout-meteor/client/teacher.js index 2b2d9f8..fc7c227 100644 --- a/chromebook-checkout-meteor/client/teacher.js +++ b/chromebook-checkout-meteor/client/teacher.js @@ -16,7 +16,7 @@ Template.teacher.helpers({ Template.teacher.helpers({ chromebooks: function() { - return Chromebooks.find(); + return Chromebooks.find({}, {sort: {number: 1}}); }, carts: function() { return carts.find(); @@ -25,6 +25,8 @@ Template.teacher.helpers({ Template.teacher.rendered = function() { $(".tchChromebooks").mCustomScrollbar({ - theme: 'dark' + theme: 'dark', + scrollInertia: 0, + mouseWheelPixels: 30 }); } diff --git a/chromebook-checkout-meteor/server/users.js b/chromebook-checkout-meteor/server/users.js index e8001cb..87cb2cc 100644 --- a/chromebook-checkout-meteor/server/users.js +++ b/chromebook-checkout-meteor/server/users.js @@ -1,7 +1,6 @@ Meteor.publish('chromebook', function() { if (Roles.userIsInRole(this.userId, ['admin'])) { - return Chromebooks.find(); }