Switching to the new admin templates and removing old jade files

vleontyev · Sep 3, 2015 · ca95e92 · ca95e92
1 parent f668030
commit ca95e92
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 361 deletions.
diff --git a/lib/core/render.js b/lib/core/render.js
@@ -19,7 +19,7 @@ function render(req, res, view, ext) {
 
 	var keystone = this;
 
-	var templatePath = __dirname + '/../../templates/views/' + view + '.jade';
+	var templatePath = __dirname + '/../../admin/templates/' + view + '.jade';
 
 	debug('rendering ' + templatePath);
 
@@ -28,11 +28,6 @@ function render(req, res, view, ext) {
 		pretty: keystone.get('env') !== 'production'
 	};
 
-	// TODO: Allow custom basePath for extensions... like this or similar
-	// if (keystone.get('extensions')) {
-	// 	jadeOptions.basedir = keystone.getPath('extensions') + '/templates';
-	// }
-
 	var compileTemplate = function() {
 		debug('compiling');
 		return jade.compile(fs.readFileSync(templatePath, 'utf8'), jadeOptions);
@@ -128,7 +123,7 @@ function render(req, res, view, ext) {
 
 	var html = template(_.extend(locals, ext));
 
-	debug('sending down html');
+	debug('sending html');
 	res.send(html);
 }
 

diff --git a/templates/layout/base.jade b/templates/layout/base.jade
diff --git a/templates/mixins/columns.jade b/templates/mixins/columns.jade
diff --git a/templates/mixins/flashMessages.jade b/templates/mixins/flashMessages.jade
diff --git a/templates/mixins/pagination.jade b/templates/mixins/pagination.jade
diff --git a/templates/mixins/rows.jade b/templates/mixins/rows.jade
diff --git a/templates/partials/pagination.jade b/templates/partials/pagination.jade
diff --git a/templates/partials/row.jade b/templates/partials/row.jade
diff --git a/templates/views/home.jade b/templates/views/home.jade
diff --git a/templates/views/item.jade b/templates/views/item.jade
diff --git a/templates/views/list.jade b/templates/views/list.jade