diff --git a/example/example.js b/example/example.js index a135264..9d94329 100644 --- a/example/example.js +++ b/example/example.js @@ -90,9 +90,9 @@ function buildAssets(server,callbackDone) { function renderTemplate() { return function (req, res) { if (req.params.sub) { - res.render('include/' + req.params.page + '/' + req.params.sub); + res.render('thtml/' + req.params.page + '/' + req.params.sub); } else { - res.render('include/' + req.params.page); + res.render('thtml/' + req.params.page); } }; } @@ -126,8 +126,8 @@ buildAssets(server,function(err) { server.use('/static/module/bootstrap',express.static(path.join(__dirname,'node_modules/bootstrap/dist'))); server.use('/static/module/flot',express.static(path.join(__dirname,'node_modules/flot'))); - server.get('/example-ui/include/:page', renderTemplate()); - server.get('/example-ui/include/:page/:sub', renderTemplate()); + server.get('/example-ui/thtml/:page', renderTemplate()); + server.get('/example-ui/thtml/:page/:sub', renderTemplate()); server.get('/', sendRedirect()); server.get('/example-ui', renderPage(server)); server.get('/example-ui/*', renderPage(server)); // must be last; for HTML5 history diff --git a/example/www_static/js/controller/page-bar.js b/example/www_static/js/controller/page-bar.js index 0f26769..3f628ac 100644 --- a/example/www_static/js/controller/page-bar.js +++ b/example/www_static/js/controller/page-bar.js @@ -1,7 +1,7 @@ pageRouteInit.push(function ($routeProvider, $locationProvider) { $routeProvider.when('/example-ui/bar', { - templateUrl: '/example-ui/include/bar', + templateUrl: '/example-ui/thtml/bar', controller: PageFoo }); }); diff --git a/example/www_static/js/controller/page-foo.js b/example/www_static/js/controller/page-foo.js index 3365794..a5177b2 100644 --- a/example/www_static/js/controller/page-foo.js +++ b/example/www_static/js/controller/page-foo.js @@ -1,7 +1,7 @@ pageRouteInit.push(function ($routeProvider, $locationProvider) { $routeProvider.when('/example-ui/foo', { - templateUrl: '/example-ui/include/foo', + templateUrl: '/example-ui/thtml/foo', controller: PageFoo }); }); diff --git a/example/www_static/js/controller/page-index.js b/example/www_static/js/controller/page-index.js index 9850c61..2a3fd23 100644 --- a/example/www_static/js/controller/page-index.js +++ b/example/www_static/js/controller/page-index.js @@ -1,7 +1,7 @@ pageRouteInit.push(function ($routeProvider, $locationProvider) { $routeProvider.when('/example-ui', { - templateUrl: '/example-ui/include/index', + templateUrl: '/example-ui/thtml/index', controller: PageIndex }); }); diff --git a/example/www_views/index.jade b/example/www_views/index.jade index ec431c6..982f137 100644 --- a/example/www_views/index.jade +++ b/example/www_views/index.jade @@ -11,11 +11,11 @@ html(lang='en',ng-app='exampleUI') link(rel='stylesheet' href='#{cssFile}') body div(id='wrapper') - div(ng-include='\'/example-ui/include/layout/header\'') + div(ng-include='\'/example-ui/thtml/layout/header\'') div(id='page-wrapper') div(id='container-fluid') div(ng-view) - div(ng-include='\'/example-ui/include/layout/footer\'') + div(ng-include='\'/example-ui/thtml/layout/footer\'') each jsFile in includeJsFiles script(src='#{jsFile}') diff --git a/example/www_views/include/bar.jade b/example/www_views/thtml/bar.jade similarity index 100% rename from example/www_views/include/bar.jade rename to example/www_views/thtml/bar.jade diff --git a/example/www_views/include/foo.jade b/example/www_views/thtml/foo.jade similarity index 100% rename from example/www_views/include/foo.jade rename to example/www_views/thtml/foo.jade diff --git a/example/www_views/include/index.jade b/example/www_views/thtml/index.jade similarity index 100% rename from example/www_views/include/index.jade rename to example/www_views/thtml/index.jade diff --git a/example/www_views/include/layout/footer.jade b/example/www_views/thtml/layout/footer.jade similarity index 100% rename from example/www_views/include/layout/footer.jade rename to example/www_views/thtml/layout/footer.jade diff --git a/example/www_views/include/layout/header.jade b/example/www_views/thtml/layout/header.jade similarity index 100% rename from example/www_views/include/layout/header.jade rename to example/www_views/thtml/layout/header.jade