in progress updates for merge

diff --git a/app.js b/app.js
index ce7010c3b46b15781f926d4177d82fcdfff30707..60871714762747ac6eb809f369c2991c2d8c0b56 100644 (file)
--- a/app.js
+++ b/app.js
@@ -134,6 +134,7 @@ app.configure(function(){
   // Sessions are stored in mongodb which allows them
   // to be persisted even between server restarts.
   app.set( 'sessionStore', new mongoStore( {
+    'db' : 'fc',
     'url' : app.set( 'dbUri' )
   }));
 
@@ -162,13 +163,8 @@ app.configure(function(){
   app.use( app.router );
 
   app.use(express.logger({ format: ':method :url' }));
-  // This is the errorHandler set in configuration earlier
-  // being set to a variable to be used after all other
-  // middleware is loaded. Error handling should always
-  // come last or near the bottom.
-  var errorHandler = app.set( 'errorHandler' );
-
-  app.use( errorHandler );
+  // This is the command to use the default express error logger/handler
+  app.use(express.errorHandler({ dumpExceptions: true }));
 });
 
 
@@ -1818,8 +1814,8 @@ process.on('uncaughtException', function (e) {
 
 // Launch
 
-mongoose.connect( app.set( 'dbUri' ) );
-mongoose.connection.db.serverConfig.connection.autoReconnect = true
+// mongoose now exepects a mongo url
+mongoose.connect( 'mongodb://localhost/fc' ); // FIXME: make relative to hostname
 
 var mailer = new Mailer( app.set('awsAccessKey'), app.set('awsSecretKey') );
 

diff --git a/public/index.html b/public/index.html
index eda1fd422ac7e4324b71f11913756c8090263bb1..e9fbf41a9306142dd2a2f0fd7c7bb2727790799e 100644 (file)
--- a/public/index.html
+++ b/public/index.html
@@ -4,11 +4,13 @@
                <title>FinalsClub.org: Online Social Note-Taking</title>
                <link rel="stylesheet" href="/assets/css/include.css" type="text/css" media="screen" />
                <script type="text/javascript" src="/assets/js/modernizr.custom.js"></script>
-               <script type="text/javascript" src="/assets/js/load.js"></script>
                <script type="text/javascript" src="http://use.typekit.com/cbx6gxx.js"></script>
                <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
 
                <script type='text/javascript' src='/javascripts/jquery.min.js'></script>
+               <script type='text/javascript' src='/javascripts/jquery.tmpl.js'></script>
+               <!--<script type='text/javascript' src='/javascripts/jquery.min.js'></script> -->
+               <!--<script type="text/javascript" src="/assets/js/load.js"></script>-->
                <script type='text/javascript' src='/javascripts/es5-shim.min.js'></script>
                <script type='text/javascript' src='/javascripts/protodiv.js'></script>
                <script type='text/javascript' src='/javascripts/main.js'></script>
@@ -117,13 +119,18 @@
                                </div>
                        </div>
       <!--================================================================= -->
-                       <div class=page id=pg_schools>
+                       <div class="page" id="pg_schools">
                                <h1>Universities</h1>
-                               <div class="proto school" id=PROTO_school onclick="goPage('/school/___id__')">
+                       </div>
+            <script id="schoolTmpl" type="text/x-jquery-tmpl">
+                ${name}<br/>
+            </script>
+            <script id="course" type="text/x-jquery-tmpl">
+                               <div class="proto school" id="PROTO_school" onclick="goPage('/school/___id__')">
                                        <div class=name>__name__</div>
                                        <div class=desc>__description__</div>
                                </div>
-                       </div>
+            </script>
       <!--================================================================= -->
                        <div class=page id=pg_courses>
                                <h1>Courses for <span id=school_name></span></h1>

diff --git a/public/javascripts/main.js b/public/javascripts/main.js
index 0aafffeb78b5ffad636b63196ea6d5fbd78bed87..f81cd7b2dc4889121b3278f0a68288bf782dfd8f 100644 (file)
--- a/public/javascripts/main.js
+++ b/public/javascripts/main.js
@@ -59,6 +59,7 @@ function render(pageId, response) {
     $('#register_link').show();
     $('#profile_link').hide();
   }
+  //if (asdfasdfasdf){
   if (response) {
     if (response instanceof Array) {
       $.each(response, function() {
@@ -121,13 +122,17 @@ router.add('home', false, function(cb) {
 
 // go to the page that lists the schools
 router.add('schools', function(data, cb) {
+  console.log(data);
   $('#school_link').addClass('active');
-  var response = {
+  response = {
     id: 'school',
     data: data.schools
   }
-
-  cb("schools", response);
+  console.log('blanking html');
+  $('#pg_schools').html('');
+  console.log(data.schools);
+  $('#pg_schools').css('display', 'block');
+  $('#schoolTmpl').tmpl( data.schools ).appendTo("#pg_schools");
 });