diff --git a/hourglass/.meteor/packages b/hourglass/.meteor/packages index b378b53..e361ba4 100644 --- a/hourglass/.meteor/packages +++ b/hourglass/.meteor/packages @@ -33,7 +33,6 @@ eternicode:bootstrap-datepicker shell-server@0.2.1 http@1.2.9 underscore -houston:admin ahref:dragula harrison:papa-parse pfafman:filesaver @@ -41,3 +40,5 @@ flemay:less-autoprefixer natestrauser:select2 juliancwirko:s-alert juliancwirko:s-alert-stackslide +yogiben:admin-edit +mfactory:admin-lte-edit diff --git a/hourglass/.meteor/versions b/hourglass/.meteor/versions index 0767d64..a442702 100644 --- a/hourglass/.meteor/versions +++ b/hourglass/.meteor/versions @@ -1,12 +1,15 @@ accounts-base@1.2.11 accounts-google@1.0.10 accounts-oauth@1.1.13 -accounts-password@1.3.0 accounts-ui@1.1.9 accounts-ui-unstyled@1.1.12 ahref:dragula@3.5.4 alanning:roles@1.2.15 +aldeed:autoform@5.5.1 +aldeed:collection2@2.5.0 aldeed:simple-schema@1.5.3 +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 @@ -21,10 +24,9 @@ caching-compiler@1.1.7 caching-html-compiler@1.0.7 callback-hook@1.0.9 check@1.2.3 -coffeescript@1.2.4_1 +coffeescript@1.2.4 cosmos:browserify@0.9.4 dandv:caret-position@2.1.1 -dburles:mongo-collection-instances@0.3.5 ddp@1.2.5 ddp-client@1.3.1 ddp-common@1.2.6 @@ -35,7 +37,7 @@ diff-sequence@1.0.6 ecmascript@0.5.8 ecmascript-runtime@0.3.14 ejson@1.0.12 -email@1.1.17 +email@1.0.16 es5-shim@4.6.14 eternicode:bootstrap-datepicker@1.6.0_3 fastclick@1.0.12 @@ -45,7 +47,6 @@ geojson-utils@1.0.9 google@1.1.14 harrison:papa-parse@1.1.1 hot-code-push@1.0.4 -houston:admin@2.0.7 html-tools@1.0.11 htmljs@1.0.11 http@1.2.9 @@ -61,7 +62,6 @@ iron:url@1.0.11 jquery@1.11.9 juliancwirko:s-alert@3.2.0 juliancwirko:s-alert-stackslide@3.1.3 -lai:collection-extensions@0.2.1_1 launch-screen@1.0.12 less@2.7.5 livedata@1.0.18 @@ -70,6 +70,9 @@ logging@1.1.15 mdg:validation-error@0.5.1 meteor@1.2.17 meteor-base@1.0.4 +meteorhacks:meteorx@1.4.1 +meteorhacks:unblock@1.1.0 +mfactory:admin-lte-edit@0.0.2 minifier-css@1.2.14 minifier-js@1.2.14 minimongo@1.0.17 @@ -82,7 +85,6 @@ momentjs:moment@2.15.1 mongo@1.1.12 mongo-id@1.0.5 natestrauser:select2@4.0.3 -npm-bcrypt@0.9.1 npm-mongo@1.5.49 oauth@1.1.11 oauth2@1.1.10 @@ -92,31 +94,32 @@ ordered-dict@1.0.8 pfafman:filesaver@1.3.2 promise@0.8.7 proyk:meteor-cookies@0.0.1 +raix:handlebar-helpers@0.2.5 random@1.0.10 rate-limit@1.0.5 reactive-dict@1.1.8 reactive-var@1.0.10 reload@1.1.10 retry@1.0.8 +reywood:publish-composite@1.4.2 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.13 spacebars-compiler@1.0.13 -srp@1.0.9 standard-minifier-css@1.2.1 standard-minifier-js@1.2.0 templating@1.2.15 templating-compiler@1.2.15 templating-runtime@1.2.15 templating-tools@1.0.5 -tmeasday:paginated-subscription@0.2.4 tracker@1.1.0 ui@1.0.12 underscore@1.0.9 url@1.0.10 webapp@1.3.11 webapp-hashing@1.0.9 +yogiben:admin-edit@1.2.8 +zimme:active-route@2.3.2 diff --git a/hourglass/lib/constants.js b/hourglass/lib/constants.js index d64aff5..3cfc179 100644 --- a/hourglass/lib/constants.js +++ b/hourglass/lib/constants.js @@ -93,4 +93,14 @@ options = { ] } +AdminConfig = { + name: 'Hourglass', + collections: { + schools: {}, + classes: {}, + work: {}, + requests: {} + } +}; + serverData = null; \ No newline at end of file diff --git a/hourglass/lib/router.js b/hourglass/lib/router.js index 737aa8b..16ed994 100644 --- a/hourglass/lib/router.js +++ b/hourglass/lib/router.js @@ -80,5 +80,12 @@ 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(); + } + } });