From b084846224d63124d59a5a67ac62cd9a78ad800c Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Thu, 14 Jan 2016 11:59:56 -0300 Subject: [PATCH] Refactor url generation --- src/app/components/navbar/navbar.html | 4 ++-- src/app/components/noosfero-activities/activity/create_article.html | 3 ++- src/app/components/noosfero-articles/blog/blog.html | 2 +- src/app/components/noosfero-blocks/profile-image/profile-image.html | 2 +- src/app/index.route.js | 5 ++++- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/app/components/navbar/navbar.html b/src/app/components/navbar/navbar.html index 62a9161..963db90 100644 --- a/src/app/components/navbar/navbar.html +++ b/src/app/components/navbar/navbar.html @@ -7,7 +7,7 @@ - + Noosfero @@ -31,7 +31,7 @@ Profile
  • - Settings + Settings
  • diff --git a/src/app/components/noosfero-activities/activity/create_article.html b/src/app/components/noosfero-activities/activity/create_article.html index 27ae485..6f88f4e 100644 --- a/src/app/components/noosfero-activities/activity/create_article.html +++ b/src/app/components/noosfero-activities/activity/create_article.html @@ -9,7 +9,8 @@
    diff --git a/src/app/components/noosfero-articles/blog/blog.html b/src/app/components/noosfero-articles/blog/blog.html index e07a503..c7f432f 100644 --- a/src/app/components/noosfero-articles/blog/blog.html +++ b/src/app/components/noosfero-articles/blog/blog.html @@ -10,7 +10,7 @@
    diff --git a/src/app/components/noosfero-blocks/profile-image/profile-image.html b/src/app/components/noosfero-blocks/profile-image/profile-image.html index affcee2..2217706 100644 --- a/src/app/components/noosfero-blocks/profile-image/profile-image.html +++ b/src/app/components/noosfero-blocks/profile-image/profile-image.html @@ -5,6 +5,6 @@
    diff --git a/src/app/index.route.js b/src/app/index.route.js index a9943fa..288d2e9 100644 --- a/src/app/index.route.js +++ b/src/app/index.route.js @@ -32,10 +32,13 @@ controllerAs: 'vm' }) .state('main.profile.page', { - url: '/{page:.*}', + url: '/{page:any}', templateUrl: 'app/content-viewer/page.html', controller: 'ContentViewerController', controllerAs: 'vm' + }) + .state('main.profile.settings', { + url: '^/myprofile/:profile' }); $urlRouterProvider.otherwise('/'); -- libgit2 0.21.2