[Fix] Test ajax with the site.

public/javascripts/bootstrap.js

@@ -2022,4 +2022,4 @@
   })
 
 
-}(window.jQuery);
+}(window.jQuery);

public/stylesheets/index.less

@@ -112,3 +112,22 @@
     }
   }
 }
+
+.popup {
+  overflow: hidden;
+
+  .date {
+    padding: 10px;
+    font-size: 2em;
+    background-color: #049cdb;
+    color: #efefef;
+  }
+
+  .text {
+    padding: 10px;
+  }
+
+  .no-result {
+    padding: 10px;
+  }
+}

routes/article.js

@@ -17,11 +17,17 @@ exports.catalog = function catalog(req, res) {
     }
   }, function (err, results) {
       if (!err) {
-        res.render('catalog', {
-          title: results.catalog.name,
-          description: results.catalog.description,
-          posts: results.posts
-        });
+        if (! req.xhr) {
+          res.render('catalog', {
+            title: results.catalog.name,
+            description: results.catalog.description,
+            posts: results.posts
+          });
+        } else {
+          res.render('catalog-ajax', {
+            posts: results.posts
+          });
+        }
       } else {
         common.error(res, err, '/');
       }

routes/home.js

@@ -6,7 +6,8 @@ var model = require('../my/model')
   , common = require('../my/view/common');
 
 exports.index = function index(req, res) {
-  model.Picture.list(3, function(err, slides) {
+  model.Picture.find({'tag':{ $in: ['home']}}).limit(3)
+  .exec(function(err, slides) {
     if (err) {
       common.error(res, err, '/');
     } else {

routes/index.js

@@ -44,9 +44,13 @@ module.exports = {
     post: feedback.submit
   },
 
-  'admin/*': {
+  'admin(*)': {
     all: user.checkLogin,
   },
-  'admin': require('./admin/')
+  'admin': require('./admin/'),
+
+  'setup': {
+    all: require('./setup')
+  }
 };
 

routes/setup.js

@@ -0,0 +1,66 @@
+
+/**
+ * The initialization module for Neuola.
+ *
+ */
+
+var model = require('../my/model')
+  , async = require('async')
+  ;
+
+module.exports = function (req, res) {
+  model.User.find({role:0}).count(function (err, count) {
+    if (count == 0) {
+      function catalog(meta) {
+        var c = new model.Catalog(meta);
+        return function (callback) {
+          c.save(callback);
+        };
+      }
+      var tasks = {
+        admin: function (callback) {
+          var admin = new model.User({
+            name: 'admin',
+            password: 'admin',
+            role: 0,
+            description: '高级管理员',
+            verified: true
+          });
+          admin.save(function (err) {
+            if (err) {
+              res.render('res');
+            }
+          });
+        },
+        catalogExplore: catalog({
+          name: '精选',
+          description: '发现这个世界的故事。',
+          id: 'explore'
+        }),
+        catalogActivities: catalog({
+          name: '活动',
+          description: '正在进行的活动。',
+          id: 'news'
+        })
+      };
+      async.parallel(tasks, function (err, result) {
+        if (err) {
+          res.render('error', {
+            message: '初始化错误！',
+            link: '/'
+          });
+        } else {
+          res.render('info', {
+            message: '初始化成功！',
+            link: '/'
+          });
+        }
+      });
+    } else {
+      res.render('error', {
+        message: 'Nothing',
+        link: '/'
+      });
+    }
+  });
+};

routes/user.js

@@ -93,7 +93,7 @@ exports.login = function login(req, res) {
       if (user && ! user.verified) {
         message = '用户尚未激活。';
       }
-      common.error(res, message, '/user/register');
+      common.error(res, message, '/user/login');
     } 
   });
 };

views/admin/picture-edit.jade

@@ -1,6 +1,6 @@
 .main-stage-inner
   form(
-    action='#{actionUrl}'
+    action=_('#{actionUrl}')
     method='POST'
     enctype='multipart/form-data'
   ).form-horizontal

views/catalog-ajax.jade

@@ -0,0 +1,6 @@
+if posts.length > 0
+  .date #{posts[0].date.getMonth()}月#{posts[0].date.getDate()}日
+  .text 「文章」 
+    a(href=_('/article/'+posts[0].url)) #{posts[0].title}
+else
+  .no-result 还没有文章哦~

views/index.jade

@@ -13,22 +13,58 @@ block append head
         height: $logo.height()
       });
 
-      $('<div id="overlay"></div>').css({
+      $('<div></div>').css({
         position: 'absolute',
         left: $cover.css('left'),
         top: $cover.css('top'),
         backgroundColor: 'white',
-        opacity: '0.4',
+        opacity: '0.6',
         width: '50%',
         height: $cover.height() + 'px',
         zIndex: 9,
-        borderRadius: '0 10px 10px 0'
-      }).appendTo($('.logo'));
+        borderRadius: '0 10px 10px 0',
+        boxShadow: '0 0 10px #ccc'
+      }).appendTo($('.overlay').parent());
+
+      var $box = $('<div class="popup">abc</div>').css({
+        position: 'absolute',
+        left: 100, top: 100,
+        zIndex: 20,
+        width: '250px', backgroundColor: 'white',
+        borderRadius: '0.3em',
+        boxShadow: '0 0 0.5em #ccc',
+        display: 'none'
+      }).appendTo(document.body).mouseover(function (event) {
+        clearTimeout($box.data('popover-timer'));
+      }).mouseleave(function (event) {
+        $box.fadeOut();
+      });
+
+      $('.navbar a.catalog').mouseover(function (event) {
+        var $this = $(this);
+        clearTimeout($box.data('popover-timer'));
+
+        $.get($this.attr('href')).success(function (data) {
+          $box.html(data);
+        });
+
+        var offset = $this.offset();
+        $box.clearQueue().animate({
+          top: offset.top + $this.outerHeight()+5,
+          left: offset.left-$box.width()/2+$this.outerWidth()/2
+        }).fadeIn();
+      }).mouseleave(function (event) {
+        var $this = $(this);
+        $box.data('popover-timer', setTimeout(function () {
+          $box.hide();
+        }, 1000));
+      });
+
     });
 
 block main-stage
   .logo
-    #cover
+    #cover.overlay
       h1 东大在线
       form(action=_('/articles/'), method='GET')
         .input-append

views/site.jade

@@ -9,20 +9,20 @@ block content
           block navbar
             li
               a(href=_("/")) 主页
-            li 
-              a(href=_("/catalog/explore")) 精选
             li
-              a(href=_("/catalog/news")) 活动
+              a(href=_("/catalog/explore")).catalog 精选
+            li
+              a(href=_("/catalog/news")).catalog 活动
             li
               a(href=_("/about")) 关于
 
-          if session.user 
-            a(href=_('/user/logout')).btn.pull-right 退出
+        if session.user 
+          a(href=_('/user/logout')).btn.pull-right 退出
 
   .main-stage.container
     block main-stage
 
   footer#footer.container
-    p.pull-right: a(href='http://github.com/yfwz100/neuola') 项目主页
+    p.pull-right: a(href='http://gitorious.org/neuola/node-site') 项目主页
     p Neuola © 东大在线