Added yogiben:admin and adjusted css to not apply to admin page

hourglass/.meteor/packages

@@ -6,22 +6,22 @@
 
 meteor-base@1.0.4             # Packages every Meteor app needs to have
 mobile-experience@1.0.4       # Packages for a great mobile UX
-mongo@1.1.12                   # The database Meteor supports right now
+mongo@1.1.12_1                   # The database Meteor supports right now
 blaze-html-templates@1.0.4    # Compile .html files into Meteor Blaze views
 reactive-var@1.0.10            # Reactive variable for tracker
-jquery                  # Helpful client-side library
+jquery@1.11.9                  # Helpful client-side library
 tracker@1.1.0                 # Meteor's client-side reactive programming library
 
-standard-minifier-css@1.2.0   # CSS minifier run for production mode
+standard-minifier-css@1.2.0_1   # CSS minifier run for production mode
-standard-minifier-js@1.2.0    # JS minifier run for production mode
+standard-minifier-js@1.2.0_1    # JS minifier run for production mode
-es5-shim@4.6.14                # ECMAScript 5 compatibility for older browsers.
+es5-shim@4.6.14_1                # ECMAScript 5 compatibility for older browsers.
-ecmascript@0.5.8              # Enable ECMAScript2015+ syntax in app code
+ecmascript@0.5.8_1              # Enable ECMAScript2015+ syntax in app code
 
 fortawesome:fontawesome
 session@1.1.6
 proyk:meteor-cookies
 aldeed:simple-schema
-accounts-google
+accounts-google@1.0.10
 accounts-ui@1.1.9
 iron:router
 ongoworks:security
@@ -31,13 +31,16 @@ rzymek:fullcalendar
 momentjs:moment
 eternicode:bootstrap-datepicker
 shell-server@0.2.1
-http@1.2.9
+http@1.2.9_1
-underscore
+underscore@1.0.9
 ahref:dragula
 harrison:papa-parse
 pfafman:filesaver
 flemay:less-autoprefixer
+natestrauser:select2
 juliancwirko:s-alert
 juliancwirko:s-alert-stackslide
 aldeed:collection2
-yogiben:admin
+dburles:collection-helpers
+yogiben:admin-edit
+mfactory:admin-lte

hourglass/.meteor/release

@@ -1 +1 @@
-METEOR@1.4.1.1
+METEOR@1.4.1.2

hourglass/.meteor/versions

@@ -12,8 +12,8 @@ aldeed:tabular@1.4.2
 aldeed:template-extension@4.0.0
 allow-deny@1.0.5
 autoupdate@1.3.11
-babel-compiler@6.9.1
+babel-compiler@6.9.1_1
-babel-runtime@0.1.11
+babel-runtime@0.1.11_1
 base64@1.0.9
 binary-heap@1.0.9
 blaze@2.1.9
@@ -27,6 +27,7 @@ check@1.2.3
 coffeescript@1.2.4
 cosmos:browserify@0.9.4
 dandv:caret-position@2.1.1
+dburles:collection-helpers@1.0.4
 ddp@1.2.5
 ddp-client@1.3.1
 ddp-common@1.2.6
@@ -34,11 +35,11 @@ ddp-rate-limiter@1.0.5
 ddp-server@1.3.10
 deps@1.0.12
 diff-sequence@1.0.6
-ecmascript@0.5.8
+ecmascript@0.5.8_1
-ecmascript-runtime@0.3.14
+ecmascript-runtime@0.3.14_1
 ejson@1.0.12
 email@1.0.16
-es5-shim@4.6.14
+es5-shim@4.6.14_1
 eternicode:bootstrap-datepicker@1.6.0_3
 fastclick@1.0.12
 flemay:less-autoprefixer@1.2.0
@@ -49,7 +50,7 @@ harrison:papa-parse@1.1.1
 hot-code-push@1.0.4
 html-tools@1.0.11
 htmljs@1.0.11
-http@1.2.9
+http@1.2.9_1
 id-map@1.0.8
 iron:controller@1.0.12
 iron:core@1.0.11
@@ -66,24 +67,25 @@ launch-screen@1.0.12
 less@2.7.5
 livedata@1.0.18
 localstorage@1.0.11
-logging@1.1.15
+logging@1.1.15_1
 mdg:validation-error@0.5.1
-meteor@1.2.17
+meteor@1.2.17_1
 meteor-base@1.0.4
 meteorhacks:meteorx@1.4.1
 meteorhacks:unblock@1.1.0
 mfactory:admin-lte@0.0.2
 minifier-css@1.2.14
-minifier-js@1.2.14
+minifier-js@1.2.14_1
 minimongo@1.0.17
 mizzao:autocomplete@0.5.1
 mobile-experience@1.0.4
 mobile-status-bar@1.0.12
-modules@0.7.6
+modules@0.7.6_1
-modules-runtime@0.7.6
+modules-runtime@0.7.6_1
 momentjs:moment@2.15.1
-mongo@1.1.12
+mongo@1.1.12_1
 mongo-id@1.0.5
+natestrauser:select2@4.0.3
 npm-mongo@1.5.49
 oauth@1.1.11
 oauth2@1.1.10
@@ -109,17 +111,16 @@ shell-server@0.2.1
 spacebars@1.0.13
 spacebars-compiler@1.0.13
 standard-minifier-css@1.2.1
-standard-minifier-js@1.2.0
+standard-minifier-js@1.2.0_1
 templating@1.2.15
 templating-compiler@1.2.15
 templating-runtime@1.2.15
 templating-tools@1.0.5
 tracker@1.1.0
-twbs:bootstrap@3.3.6
 ui@1.0.12
 underscore@1.0.9
 url@1.0.10
-webapp@1.3.11
+webapp@1.3.11_1
 webapp-hashing@1.0.9
-yogiben:admin@1.2.8
+yogiben:admin-edit@1.2.8
 zimme:active-route@2.3.2

hourglass/client/main/main.css

@@ -126,19 +126,19 @@ body {
 	float: left;
 }
 
-h1,h2,h3,h4,h5 {
+.noScroll h1,.noScroll h2,.noScroll h3,.noScroll h4,.noScroll h5 {
 	margin: 0;
 
 	-webkit-filter: drop-shadow(2px 2px 5px #666);
 	filter: drop-shadow(2px 2px 5px #666);
 }
 
-h1 {
+.noScroll h1 {
 	padding: 0.4%;
 	float: left;
 }
 
-h4 {
+.noScroll h4 {
 	font-size: 130%;
 	font-weight: 200;
 	padding: 5%;
@@ -153,7 +153,7 @@ h4 {
 	transition: color 0.5s ease; 
 }
 
-input, textarea {
+.noScroll input, .noScroll textarea {
 	font-family: 'Raleway';
 	background-color: #EBEBEB;
 	border: 3px solid #EBEBEB;
@@ -656,7 +656,7 @@ textarea.clickModify {
 	float: right;
 }
 
-.dropdown {
+.clickModify.dropdown {
 	font-size: 2.5vh;
 	width: 100%;
 	height: 3vh;

hourglass/client/main/main.js

@@ -72,6 +72,10 @@ Template.registerHelper('userProfile', () => {
     return;
 });
 
+Template.registerHelper('adminPage', () => {
+    return window.location.pathname.includes("/");
+});
+
 Template.registerHelper('screen', (multiplier, fraction) => {
     if (typeof multiplier !== "string") return screen.width.toString() + "px";
     if (typeof fraction !== "string") return (screen.width * parseFloat(multiplier)).toString() + "px";
@@ -660,7 +664,7 @@ Template.main.events({
         event.target.click();
         dropOpen = true;
     },*/
-    'click .dropdown' (event) {        
+    'click .clickModify.dropdown' (event) {        
         if(event.target.id === modifyingInput && dropOpen) {
             $("#" + modifyingInput).next()
             .fadeOut(200)

hourglass/lib/router.js

@@ -1,4 +1,7 @@
 Router.route('/', {
+    data: function() {
+        return false;
+    },
     waitOn: function() {
         if (!Meteor.userId() || _.contains([null, undefined, ""], Meteor.user().profile.school)) {
             this.redirect('/login');
@@ -17,17 +20,25 @@ Router.route('/', {
     }
 });
 
-Router.route('/login', function() {
+Router.route('/login', {
-    if (!Meteor.userId()) {
+    data: function() {
-        this.render("login");
+        return false;
-    } else if (!Meteor.user().profile.school) {
+    },
-        this.redirect('/profile');
+    action:  function() {
-    } else {
+        if (!Meteor.userId()) {
-        this.redirect('/');
+            this.render("login");
+        } else if (!Meteor.user().profile.school) {
+            this.redirect('/profile');
+        } else {
+            this.redirect('/');
+        }
     }
 });
 
 Router.route('/profile', {
+    data: function() {
+        return false;
+    },
     waitOn: function() {
         if (!Meteor.userId()) {
             this.redirect('/login');
@@ -69,8 +80,10 @@ Router.route('/user/:email', {
 });
 
 /*Router.route('/admin', {
+    data: function() {
+        return true;
+    },
     action: function() {
-        console.log("hi");
         if (!Roles.userIsInRole(Meteor.userId(), ['admin', 'superadmin'])) {
             this.redirect("/");
         } else {
@@ -80,12 +93,5 @@ Router.route('/user/:email', {
 });*/
 
 Router.configure({
-    notFoundTemplate: "NotFound",
+    notFoundTemplate: "NotFound"
-    waitOn: function () {
-        var route = Router.current().route.name;
-        if(route === undefined) $('head').find('link[type="text/css"]:not(.__meteor-css__)').remove();
-        if(route.indexOf('adminDashboard')==-1) {
-            $('head').find('link[type="text/css"]:not(.__meteor-css__)').remove();
-        }
-    }
 });