diff --git a/examples/error-pages/index.js b/examples/error-pages/index.js index 2c17d7f0ee..2683515374 100644 --- a/examples/error-pages/index.js +++ b/examples/error-pages/index.js @@ -8,7 +8,7 @@ var express = require('../../') // general config app.set('views', __dirname + '/views'); -app.set('view engine', 'jade'); +app.set('view engine', 'ejs'); // our custom "verbose errors" setting // which we can use in the templates @@ -82,7 +82,7 @@ app.use(function(err, req, res, next){ // Routes app.get('/', function(req, res){ - res.render('index.jade'); + res.render('index.ejs'); }); app.get('/404', function(req, res, next){ diff --git a/examples/error-pages/views/404.ejs b/examples/error-pages/views/404.ejs new file mode 100644 index 0000000000..a72369e2d2 --- /dev/null +++ b/examples/error-pages/views/404.ejs @@ -0,0 +1,3 @@ +<% include error_header %> +

Cannot find <%= url %>

+<% include footer %> diff --git a/examples/error-pages/views/404.jade b/examples/error-pages/views/404.jade deleted file mode 100644 index db7b05d9fc..0000000000 --- a/examples/error-pages/views/404.jade +++ /dev/null @@ -1,5 +0,0 @@ - -extends error - -block content - h2 Cannot find #{url} \ No newline at end of file diff --git a/examples/error-pages/views/500.ejs b/examples/error-pages/views/500.ejs new file mode 100644 index 0000000000..8c1e0e80fb --- /dev/null +++ b/examples/error-pages/views/500.ejs @@ -0,0 +1,8 @@ +<% include error_header %> +

Error: <%= error.message %>

+<% if (settings['verbose errors']) { %> +
<%= error.stack %>
+<% } else { %> +

An error occurred!

+<% } %> +<% include footer %> diff --git a/examples/error-pages/views/500.jade b/examples/error-pages/views/500.jade deleted file mode 100644 index e44489de99..0000000000 --- a/examples/error-pages/views/500.jade +++ /dev/null @@ -1,13 +0,0 @@ - -// note that we extend a different -// layout with jade for 4xx & 5xx -// responses - -extends error - -block content - h1 Error: #{error.message} - if settings['verbose errors'] - pre= error.stack - else - p An error ocurred! \ No newline at end of file diff --git a/examples/error-pages/views/error.jade b/examples/error-pages/views/error.jade deleted file mode 100644 index bf750c0087..0000000000 --- a/examples/error-pages/views/error.jade +++ /dev/null @@ -1,6 +0,0 @@ -html - head - title Error - body - h1 An error occurred! - block content \ No newline at end of file diff --git a/examples/error-pages/views/error_header.ejs b/examples/error-pages/views/error_header.ejs new file mode 100644 index 0000000000..6d541dd9f5 --- /dev/null +++ b/examples/error-pages/views/error_header.ejs @@ -0,0 +1,8 @@ + + + +Error + + + +

An error occurred!

diff --git a/examples/error-pages/views/footer.ejs b/examples/error-pages/views/footer.ejs new file mode 100644 index 0000000000..308b1d01b6 --- /dev/null +++ b/examples/error-pages/views/footer.ejs @@ -0,0 +1,2 @@ + + diff --git a/examples/error-pages/views/index.ejs b/examples/error-pages/views/index.ejs new file mode 100644 index 0000000000..04a1a7847b --- /dev/null +++ b/examples/error-pages/views/index.ejs @@ -0,0 +1,18 @@ + + + +Custom Pages Example + + + +

My Site

+

Pages Example

+ + + + + diff --git a/examples/error-pages/views/index.jade b/examples/error-pages/views/index.jade deleted file mode 100644 index da8f0f1698..0000000000 --- a/examples/error-pages/views/index.jade +++ /dev/null @@ -1,15 +0,0 @@ - -extends layout - -block content - h2 Pages Example - ul - li - | visit - a(href="/500") 500 - li - | visit - a(href="/404") 404 - li - | visit - a(href='/403') 403 \ No newline at end of file diff --git a/examples/error-pages/views/layout.jade b/examples/error-pages/views/layout.jade deleted file mode 100644 index 8a6f7b1747..0000000000 --- a/examples/error-pages/views/layout.jade +++ /dev/null @@ -1,6 +0,0 @@ -html - head - title Custom Pages Example - body - h1 My Site - block content \ No newline at end of file diff --git a/examples/mvc/controllers/pet/index.js b/examples/mvc/controllers/pet/index.js index 9f3c34525e..a0cbaea59c 100644 --- a/examples/mvc/controllers/pet/index.js +++ b/examples/mvc/controllers/pet/index.js @@ -1,7 +1,7 @@ var db = require('../../db'); -exports.engine = 'jade'; +exports.engine = 'ejs'; exports.before = function(req, res, next){ var pet = db.pets[req.params.pet_id]; diff --git a/examples/mvc/controllers/pet/views/edit.ejs b/examples/mvc/controllers/pet/views/edit.ejs new file mode 100644 index 0000000000..0158181ba5 --- /dev/null +++ b/examples/mvc/controllers/pet/views/edit.ejs @@ -0,0 +1,16 @@ + + + + +Edit <%= pet.name %> + + + +

<%= pet.name %>

+
+ + + +
+ + diff --git a/examples/mvc/controllers/pet/views/edit.jade b/examples/mvc/controllers/pet/views/edit.jade deleted file mode 100644 index 911a54a308..0000000000 --- a/examples/mvc/controllers/pet/views/edit.jade +++ /dev/null @@ -1,7 +0,0 @@ -link(rel='stylesheet', href='/style.css') -h1= pet.name -form(action='/pet/#{pet.id}', method='post') - input(type='hidden', name='_method', value='put') - label Name: - input(type='text', name='user[name]', value=pet.name) - input(type='submit', value='Update') diff --git a/examples/mvc/controllers/pet/views/show.ejs b/examples/mvc/controllers/pet/views/show.ejs new file mode 100644 index 0000000000..2ec7b0bf06 --- /dev/null +++ b/examples/mvc/controllers/pet/views/show.ejs @@ -0,0 +1,13 @@ + + + + +<%= pet.name %> + + + +

<%= pet.name %> edit

+ +

You are viewing <%= pet.name %>

+ + diff --git a/examples/mvc/controllers/pet/views/show.jade b/examples/mvc/controllers/pet/views/show.jade deleted file mode 100644 index ad57ae7384..0000000000 --- a/examples/mvc/controllers/pet/views/show.jade +++ /dev/null @@ -1,6 +0,0 @@ -link(rel='stylesheet', href='/style.css') - -h1= pet.name - a(href='/pet/#{pet.id}/edit') edit - -p You are viewing #{pet.name} diff --git a/package.json b/package.json index f7ade51bd8..2a46553425 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,6 @@ "should": "~4.3.0", "supertest": "~0.15.0", "ejs": "~1.0.0", - "jade": "~1.7.0", "hjs": "~0.0.6", "marked": "0.3.2" },