Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	package.json

README.md

@@ -4,6 +4,7 @@ node-diary
 [![Build Status](https://travis-ci.org/tatsy/node-diary.svg?branch=master)](https://travis-ci.org/tatsy/node-diary)
 [![Coverage Status](https://coveralls.io/repos/tatsy/node-diary/badge.svg?branch=master)](https://coveralls.io/r/tatsy/node-diary?branch=master)
 [![Dependency Status](https://david-dm.org/tatsy/node-diary.svg)](https://david-dm.org/tatsy/node-diary)
+[![devDependency Status](https://david-dm.org/tatsy/node-diary/dev-status.svg)](https://david-dm.org/tatsy/node-diary#info=devDependencies)
 
 > A Markdown-based note tool especially for users who want to archive images, videos, or source codes.
 > The node-diary provides you not only Github flavored Markdown but also some original notations.

lib/connect.js

@@ -121,7 +121,6 @@ function onConnection(socket) {
     socket.on('code save', function(articleInfo) {
       var relativeDir = 'upload';
       var rendered = renderCode(articleInfo.code, uploadDir, relativeDir);
-      console.log(rendered);
       var html = jade.renderFile('./views/article.jade', { title: articleInfo.title, content: rendered });
       fs.writeFileSync(am.dir + articleInfo.id + '/index.html', html);
       fs.writeFileSync(am.dir + articleInfo.id + '/index.md', articleInfo.code);

lib/en-utils.js

@@ -191,15 +191,15 @@ function enmlize(code) {
       linenoStr += i.toString() + '<br />';
     }
     after = '<table><tr>';
-    after += '<td style="color:#ccc; border-right:1px';
-    after += ' solid #eee; text-align:right; width: 30px;">' + linenoStr + '</td>';
+    after += '<td style="padding-right: 5px; color:#ccc; border-right:1px solid #eee; text-align:right; width: 30px;">';
+    after += '<pre><code>' + linenoStr + '</code></pre></td>';
     after += '<td style="padding-left: 5px;">' + matchCode[0] + '</td>';
     after += '</tr></table>';
     code = code.replace(regexCode, after);
   } while (matchCode);
 
   // remove 'class' and 'id'
-  code = extendCssInline(code);
+  code = removeIdClass(code);
 
   // replace single <tag> to <tag />
   var regSingle = /\<(hr)\>/;

routes/index.js

@@ -36,7 +36,6 @@ exports.edit = function(req, res) {
         var articleId = md5.digest('hex');
         var folder = am.dir + articleId;
 
-        console.log("hogehoge");
         fs.mkdir(folder, function(err) {
           if (err) {
             console.log('Failed to make a new directory');
@@ -64,6 +63,10 @@ exports.edit = function(req, res) {
 
           res.render('edit', {
             fields: formData,
+            config: {
+              host: config.host,
+              port: config.port
+            }
           });
         });
       } else {