summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--index.js3
-rw-r--r--public/assets/js/lib/ProjectView.js2
-rw-r--r--public/assets/js/lib/SiteRouter.js4
3 files changed, 4 insertions, 5 deletions
diff --git a/index.js b/index.js
index fe51393..a3dc063 100644
--- a/index.js
+++ b/index.js
@@ -53,8 +53,7 @@ var app = okcms.createApp({
views: {
'/': viewConfig,
- '/page/:id': viewConfig,
- '/project/:id': viewConfig,
+ '/:id': viewConfig,
},
services: {
diff --git a/public/assets/js/lib/ProjectView.js b/public/assets/js/lib/ProjectView.js
index e9835ec..9413cc2 100644
--- a/public/assets/js/lib/ProjectView.js
+++ b/public/assets/js/lib/ProjectView.js
@@ -86,7 +86,7 @@ var ProjectView = View.extend({
app.router.pushState("/")
}
else {
- app.router.pushState("/project/" + this.project_id)
+ app.router.pushState("/" + this.project_id)
}
this.$images.each(function(){
diff --git a/public/assets/js/lib/SiteRouter.js b/public/assets/js/lib/SiteRouter.js
index 7f1cec6..4cd36a9 100644
--- a/public/assets/js/lib/SiteRouter.js
+++ b/public/assets/js/lib/SiteRouter.js
@@ -5,8 +5,8 @@ var SiteRouter = Router.extend({
routes: {
'/': 'home',
- '/page/:id': 'project',
- '/project/:id': 'project',
+ '/:id': 'project',
+ '/:id': 'project',
},
initial_route: null,