tabbing

hourglass/.meteor/packages

@@ -33,3 +33,4 @@ eternicode:bootstrap-datepicker
 shell-server@0.2.1
 http@1.2.9
 underscore
+houston:admin

hourglass/.meteor/versions

@@ -1,6 +1,7 @@
 accounts-base@1.2.11
 accounts-google@1.0.10
 accounts-oauth@1.1.13
+accounts-password@1.1.13
 accounts-ui@1.1.9
 accounts-ui-unstyled@1.1.12
 alanning:roles@1.2.15
@@ -21,6 +22,7 @@ callback-hook@1.0.9
 check@1.2.3
 coffeescript@1.2.4_1
 dandv:caret-position@2.1.1
+dburles:mongo-collection-instances@0.3.4
 ddp@1.2.5
 ddp-client@1.3.1
 ddp-common@1.2.6
@@ -31,6 +33,7 @@ diff-sequence@1.0.6
 ecmascript@0.5.8
 ecmascript-runtime@0.3.14
 ejson@1.0.12
+email@1.0.16
 es5-shim@4.6.14
 eternicode:bootstrap-datepicker@1.6.0_3
 fastclick@1.0.12
@@ -38,6 +41,7 @@ fortawesome:fontawesome@4.5.0
 geojson-utils@1.0.9
 google@1.1.14
 hot-code-push@1.0.4
+houston:admin@2.0.7
 html-tools@1.0.10
 htmljs@1.0.10
 http@1.2.9
@@ -51,6 +55,7 @@ iron:middleware-stack@1.1.0
 iron:router@1.0.13
 iron:url@1.0.11
 jquery@1.11.9
+lai:collection-extensions@0.1.4
 launch-screen@1.0.12
 less@2.7.5
 livedata@1.0.18
@@ -70,6 +75,7 @@ modules-runtime@0.7.6
 momentjs:moment@2.14.4
 mongo@1.1.12
 mongo-id@1.0.5
+npm-bcrypt@0.8.6_3
 npm-mongo@1.5.48
 oauth@1.1.11
 oauth2@1.1.10
@@ -88,13 +94,16 @@ routepolicy@1.0.11
 rzymek:fullcalendar@2.7.2
 service-configuration@1.0.10
 session@1.1.6
+sha@1.0.8
 shell-server@0.2.1
 spacebars@1.0.12
 spacebars-compiler@1.0.12
+srp@1.0.9
 standard-minifier-css@1.2.0
 standard-minifier-js@1.2.0
 templating@1.2.14
 templating-tools@1.0.4
+tmeasday:paginated-subscription@0.2.4
 tracker@1.1.0
 ui@1.0.11
 underscore@1.0.9

hourglass/client/admin/admin.html

@@ -1,4 +1,6 @@
 <template name="admin">
+
+	  <div id="mainpage{{userProfile}}" onclick="window.location='/'"><h2>Main Page</h2></div>
     <div id="{{userProfile}}adminBanner" style="{{banner}}{{textColor}}">
 		    <ul id="adminTabs">
 			      <li id="aClasses" style="background-color:{{adminTabColor 'aClasses'}};margin-left:0">Classes</li>

hourglass/client/admin/admin.js

@@ -1,3 +1,4 @@
+/* jshint esversion: 6 */
 Session.set("adminTab","aClasses");
 
 Template.admin.helpers({
@@ -19,16 +20,12 @@ Template.admin.helpers({
 			  case "classes":
 				    var userClasses = classes.find().fetch();
 				    for(var i = 0; i < userClasses.length; i++) {
-					if(userClasses[i].privacy) {
+                userClasses[i].privacy = userClasses[i].privacy.toString();
-						userClasses[i].privacy = "True";
-					} else {
-						userClasses[i].privacy = "False";
-					}
 
 					      if(userClasses[i].code === "") {
 						        userClasses[i].code = "None";
 					      }
-					userClasses[i].category = userClasses[i].category.charAt(0).toUpperCase() + userClasses[i].category.slice(1);
+					      userClasses[i].category = userClasses[i].category;
 					      userClasses[i].admin = getEmail(userClasses[i].admin);
 					      var types = ["subscribers","moderators","banned"];
 					      for(var j = 0; j < types.length; j++) {
@@ -47,7 +44,6 @@ Template.admin.helpers({
 					      }
 				    }
 				    return userClasses;
-				break;
 			  case "users":
 				    break;
 			  case "work":

hourglass/lib/router.js

@@ -58,24 +58,24 @@ Router.route('/user/:email', {
     }
 });
 
-Router.route('/admin', {
+// Router.route('/admin', {
-    waitOn: function() {
+//     waitOn: function() {
-        return [
+//         return [
-            Meteor.subscribe('classes', this.params._id),
+//             Meteor.subscribe('classes', this.params._id),
-            Meteor.subscribe('schools', this.params._id),
+//             Meteor.subscribe('schools', this.params._id),
-            Meteor.subscribe('work', this.params._id),
+//             Meteor.subscribe('work', this.params._id),
-            Meteor.subscribe('requests', this.params._id),
+//             Meteor.subscribe('requests', this.params._id),
-            Meteor.subscribe('users', this.params._id)
+//             Meteor.subscribe('users', this.params._id)
-        ];
+//         ];
-    },
+//     },
-    action: function() {
+//     action: function() {
-        if (!Roles.userIsInRole(Meteor.userId(), ['admin', 'superadmin'])) {
+//         if (!Roles.userIsInRole(Meteor.userId(), ['admin', 'superadmin'])) {
-            this.render("NotFound");
+//             this.render("NotFound");
-        } else {
+//         } else {
-            this.render("admin");
+//             this.render("admin");
-        }
+//         }
-    }
+//     }
-});
+// });
 
 Router.configure({
     notFoundTemplate: "NotFound"