From 847be5316aa293695fb250b7af1aff3688b71689 Mon Sep 17 00:00:00 2001 From: Json Shen Date: Tue, 1 May 2012 22:27:54 +0800 Subject: [PATCH 1/2] fix ie the top bar to black issues --- public/stylesheets/style.css | 10 +------- views/layout.html | 48 +++++++++++++++++------------------- 2 files changed, 24 insertions(+), 34 deletions(-) diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css index f6efb64..3bc7f68 100644 --- a/public/stylesheets/style.css +++ b/public/stylesheets/style.css @@ -474,20 +474,12 @@ a.count:hover { /* custom bootstrap */ .navbar { margin-bottom: 0px; + background-color: #323f4b; } .navbar .container { width: 960px; margin: 0px auto; } -.navbar .navbar-inner{ - -webkit-border-radius: 0px; - -moz-border-radius: 0px; - padding-left: 0px; - padding-right: 0px; - border-radius: 0px; - background-image: none; - background-color: #323f4b; -} .navbar .brand { padding: 7px 0px 0px 20px; width: 150px; diff --git a/views/layout.html b/views/layout.html index 64c350a..53012e8 100644 --- a/views/layout.html +++ b/views/layout.html @@ -27,31 +27,29 @@
-
-
- <%- config.site_logo || config.name %> - -
    -
  • 首页
    • - <% - var site_navs = config.site_navs || []; - for (var i = 0, l = site_navs.length; i < l; i++) { - var nav = site_navs[i]; - %> -
  • <%- nav[1] %>
    • - <% } %> -
  • - <% if (locals.current_user) { %> -
  • 设置
    • -
  • 退出
    • - <% } else { %> -
  • 注册
    • -
  • 登录
    • - <% } %> -
-
+
+ <%- config.site_logo || config.name %> + +
    +
  • 首页
    • + <% + var site_navs = config.site_navs || []; + for (var i = 0, l = site_navs.length; i < l; i++) { + var nav = site_navs[i]; + %> +
  • <%- nav[1] %>
    • + <% } %> +
  • + <% if (locals.current_user) { %> +
  • 设置
    • +
  • 退出
    • + <% } else { %> +
  • 注册
    • +
  • 登录
    • + <% } %> +
From 68190e27fb8bd2f09ef0621f06bd1368011ec919 Mon Sep 17 00:00:00 2001 From: Json Shen Date: Mon, 14 May 2012 23:58:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BF=BD=E7=95=A5=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=97=B6=E6=A3=80=E6=9F=A5csrf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app.js b/app.js index 59fa68f..04dd6b6 100644 --- a/app.js +++ b/app.js @@ -26,7 +26,14 @@ app.configure(function() { })); // custom middleware app.use(require('./controllers/sign').auth_user); - app.use(express.csrf()); + + var csrf = express.csrf(); + app.use(function(req, res, next){ + // ignore upload image + if (req.body && req.body.user_action === 'upload_image') + return next(); + csrf(req, res, next); + }); // plugins var plugins = config.plugins || [];