Commit 7386c517 authored by Zach Knox's avatar Zach Knox
Browse files

Merge branch 'issue18jadeToPug' into '1.0'

Issue18jade to pug

:zmknox: if you would be so kind as to make sure this works and merge it in that would be fantastic!

merges in #18 

See merge request !6
parents c7d1eece 78668def
...@@ -29,7 +29,7 @@ var app = express(); ...@@ -29,7 +29,7 @@ var app = express();
// view engine setup // view engine setup
app.set('views', path.join(__dirname, 'views')); app.set('views', path.join(__dirname, 'views'));
app.set('view engine', 'jade'); app.set('view engine', 'pug');
app.use(logger('dev')); app.use(logger('dev'));
app.use(bodyParser.json()); app.use(bodyParser.json());
......
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
"cookie-parser": "~1.4.3", "cookie-parser": "~1.4.3",
"debug": "~2.2.0", "debug": "~2.2.0",
"express": "~4.13.4", "express": "~4.13.4",
"jade": "~1.11.0",
"mongoose": "^4.5.5", "mongoose": "^4.5.5",
"mongoose-redis-cache": "0.0.3", "mongoose-redis-cache": "0.0.3",
"morgan": "~1.7.0", "morgan": "~1.7.0",
"node-sass": "^3.8.0", "node-sass": "^3.8.0",
"node-sass-middleware": "0.8.0" "node-sass-middleware": "0.8.0",
"pug": "^2.0.0-beta6"
} }
} }
////////////////////////////////////////////////////////////////////////////////
// Mason SRCT: Schedules Docs Page
// - This is the page that contains the docs site for the schedules app.
// - This file extends the non-app template and simply adds in content.
////////////////////////////////////////////////////////////////////////////////
extends non-app
// TODO: add actual content here.
block docs-content
center
h1 Test
//-/////////////////////////////////////////////////////////////////////////////
//- Mason SRCT: Schedules Docs Page
//- - This is the page that contains the docs site for the schedules app.
//- - This file extends the non-app template and simply adds in content.
//-/////////////////////////////////////////////////////////////////////////////
extends non-app
//-TODO: add actual content here.
block docs-content
center
h1 Test
////////////////////////////////////////////////////////////////////////////////
// Mason SRCT: Schedules Error Page
// - For any given error, this page will render, showing a stacktrace.
// - When not in dev mode, this will not render.
////////////////////////////////////////////////////////////////////////////////
extends layout
block content
h1= message
h2= error.status
pre #{error.stack}
//-/////////////////////////////////////////////////////////////////////////////
//- Mason SRCT: Schedules Error Page
//- - For any given error, this page will render, showing a stacktrace.
//- - When not in dev mode, this will not render.
//-/////////////////////////////////////////////////////////////////////////////
extends layout
block content
h1= message
h2= error.status
pre #{error.stack}
//////////////////////////////////////////////////////////////////////////////// //-/////////////////////////////////////////////////////////////////////////////
// Mason SRCT: Schedules Global Head File //- Mason SRCT: Schedules Global Head File
// - This contains the global header for the entire site. //- - This contains the global header for the entire site.
// - Take care to remember that these resources load on all pages, so look into //- - Take care to remember that these resources load on all pages, so look into
// other options before using this. //- other options before using this.
//////////////////////////////////////////////////////////////////////////////// //-/////////////////////////////////////////////////////////////////////////////
head head
// Metadata // Metadata
......
//////////////////////////////////////////////////////////////////////////////// //-/////////////////////////////////////////////////////////////////////////////
// Mason SRCT: Schedules Main Page //- Mason SRCT: Schedules Main Page
// - This page is the main application page. //- - This page is the main application page.
// - Extends the layout.jade file //- - Extends the layout.pug file
//////////////////////////////////////////////////////////////////////////////// //-/////////////////////////////////////////////////////////////////////////////
extends layout extends layout
block content block content
...@@ -12,7 +12,7 @@ block content ...@@ -12,7 +12,7 @@ block content
// Main site column // Main site column
div.col-md-8 div.col-md-8
// Site title include // Site title include
include main-title.jade include main-title
// Content div // Content div
div.row div.row
// Left padding // Left padding
......
//////////////////////////////////////////////////////////////////////////////// //-/////////////////////////////////////////////////////////////////////////////
// Mason SRCT: Schedules Master Layout //- Mason SRCT: Schedules Master Layout
// - This is the master layout for the entire site, with any placeholders needed //- - This is the master layout for the entire site, with any placeholders needed
// for furthur customization. //- for furthur customization.
//////////////////////////////////////////////////////////////////////////////// //-/////////////////////////////////////////////////////////////////////////////
doctype html doctype html
html html
include head include head
......
//////////////////////////////////////////////////////////////////////////////// //-/////////////////////////////////////////////////////////////////////////////
// Mason SRCT: Schedules Main Title Mixin //- Mason SRCT: Schedules Main Title Mixin
// - This is an include file that can be brought into any other jade file. //- - This is an include file that can be brought into any other pug file.
//////////////////////////////////////////////////////////////////////////////// //-/////////////////////////////////////////////////////////////////////////////
// Site branding row // Site branding row
div.row.center-text div.row.center-text
......
//////////////////////////////////////////////////////////////////////////////// //-/////////////////////////////////////////////////////////////////////////////
// Mason SRCT: Schedules Navbar //- Mason SRCT: Schedules Navbar
// - This include file is for the nav bar //- - This include file is for the nav bar
//////////////////////////////////////////////////////////////////////////////// //-/////////////////////////////////////////////////////////////////////////////
nav.navbar.navbar-default.navbar-fixed-top nav.navbar.navbar-default.navbar-fixed-top
div.container-fluid div.container-fluid
div.navbar-header div.navbar-header
......
//////////////////////////////////////////////////////////////////////////////// //-/////////////////////////////////////////////////////////////////////////////
// Mason SRCT: Schedules Non-app Layout //- Mason SRCT: Schedules Non-app Layout
// - Any non-app page will extend this layout file. //- - Any non-app page will extend this layout file.
//////////////////////////////////////////////////////////////////////////////// //-/////////////////////////////////////////////////////////////////////////////
extends layout extends layout
block content block content
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment