From e4705c472d27461ed06927b8fda752581a0affd4 Mon Sep 17 00:00:00 2001
From: Kenneth Jao <ksjdragon@gmail.com>
Date: Fri, 21 Oct 2016 03:03:11 -0400
Subject: [PATCH] minor fixes, started admin editing

---
 hourglass/client/main/main.css                 |  2 +-
 hourglass/client/main/main.js                  |  2 ++
 hourglass/collections/main.js                  |  9 +++++++++
 hourglass/lib/constants.js                     | 18 +++++++++++++++++-
 .../packages/meteor-admin-lte/admin-lte.html   |  2 +-
 5 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/hourglass/client/main/main.css b/hourglass/client/main/main.css
index de8c18e..a00d5ff 100644
--- a/hourglass/client/main/main.css
+++ b/hourglass/client/main/main.css
@@ -286,7 +286,7 @@ body {
 	filter: drop-shadow(2px 2px 5px #666);
 }
 
-.fa-plus, .fa-minus, .fa-tasks, .fa-graduation-cap, .fa-exchange {
+.noScroll .fa-plus, .creWork .fa-plus, .fa-minus, .fa-tasks, .fa-graduation-cap, .fa-exchange {
 	font-size: 130%;
 	padding: 5%;
 
diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js
index ebe9b70..3730400 100644
--- a/hourglass/client/main/main.js
+++ b/hourglass/client/main/main.js
@@ -947,6 +947,8 @@ function sendData(funcName) { // Call Meteor function, and do actions after func
             Session.set("currentWork", work.findOne({
                 _id: currWork._id
             }));
+        } else {
+            Session.set("currentWork",null);
         }
     });
 }
diff --git a/hourglass/collections/main.js b/hourglass/collections/main.js
index d7b8281..1d751a7 100644
--- a/hourglass/collections/main.js
+++ b/hourglass/collections/main.js
@@ -23,6 +23,7 @@ classes.schema = new SimpleSchema({
 	  subscribers: {type: [String], optional: true}
 });
 
+
 work.schema = new SimpleSchema({
 	  name: {type: String},
 	  class: {type: String},
@@ -42,3 +43,11 @@ requests.schema = new SimpleSchema({
     request: {type: String},
     timeRequested: {type: Date}
 });
+
+classes.helpers({
+	fullUserInfo() {
+		var user = Meteor.users.findOne({_id: this.admin});
+		console.log(user);
+		return this.admin + " | " + user.services.google.email + " | " + user.profile.name;
+	}
+})
diff --git a/hourglass/lib/constants.js b/hourglass/lib/constants.js
index 2195443..411f23a 100644
--- a/hourglass/lib/constants.js
+++ b/hourglass/lib/constants.js
@@ -117,7 +117,23 @@ AdminConfig = {
     name: 'Hourglass',
     collections: {
         schools: {},
-        classes: {},
+        classes: {
+            tableColumns: [
+                { label: 'ID', name: '_id' },
+                { label: 'School', name: 'school' },
+                { label: 'Name', name: 'name' },
+                { label: 'Hour', name: 'hour' },
+                { label: 'Teacher', name: 'teacher' },
+                { label: 'Admin', name: 'admin' },
+                { label: 'Status', name: 'status' },
+                { label: 'Code', name: 'code' },
+                { label: 'Privacy', name: 'privacy' },
+                { label: 'Category', name: 'category' },
+                { label: 'Moderators', name: 'moderators' },
+                { label: 'Banned', name: 'banned' },
+                { label: 'Subscribers', name: 'subscribers' }
+            ]
+        },
         work: {},
         requests: {}
     }
diff --git a/hourglass/packages/meteor-admin-lte/admin-lte.html b/hourglass/packages/meteor-admin-lte/admin-lte.html
index 4b90e8b..58cb77c 100644
--- a/hourglass/packages/meteor-admin-lte/admin-lte.html
+++ b/hourglass/packages/meteor-admin-lte/admin-lte.html
@@ -1,5 +1,5 @@
 <template name="AdminLTE">
-  <link rel="stylesheet" type="text/css" href="bootstrap/bootstrap.min.css">
+  <link rel="stylesheet" type="text/css" href="/bootstrap/bootstrap.min.css">
   {{#unless isReady}}
     {{> Template.dynamic template=loadingTemplate}}
   {{else}}