From b084846224d63124d59a5a67ac62cd9a78ad800c Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
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 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" ng-href="/">
+      <a class="navbar-brand" ui-sref="main">
         <span class="noosfero-logo"><img src="assets/images/logo-noosfero.png"></span> Noosfero
       </a>
     </div>
@@ -31,7 +31,7 @@
                   <a ui-sref="main.profile.info({profile: vm.currentUser.person.identifier})"><i class="fa fa-fw fa-user"></i> Profile</a>
               </li>
               <li>
-                  <a target="_self" ng-href="/myprofile/{{vm.currentUser.person.identifier}}"><i class="fa fa-fw fa-gear"></i> Settings</a>
+                  <a target="_self" ui-sref="main.profile.settings({profile: vm.currentUser.person.identifier})"><i class="fa fa-fw fa-gear"></i> Settings</a>
               </li>
               <li class="divider"></li>
               <li>
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 @@
   <div class="timeline-body">
     <div class="article">
       <div class="title">
-        <a ng-href="/{{vm.activity.target.article.profile.identifier}}/{{vm.activity.target.article.path}}">{{vm.activity.target.article.title}}</a>
+        <a ui-sref="main.profile.page({profile: vm.activity.target.article.profile.identifier, page: vm.activity.target.article.path})"
+           ng-bind="vm.activity.target.article.title"></a>
       </div>
       <div class="lead small">
         <div ng-bind-html="vm.activity.target.article.body | stripTags | truncate: 100 : '...'"></div>
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 @@
 <div>
   <div ng-repeat="child in vm.article.children | orderBy: 'created_at':true">
     <div class="page-header">
-      <a ng-href="/{{vm.profile.identifier}}/{{child.path}}"><h4 ng-bind="child.title"></h4></a>
+      <a ui-sref="main.profile.page({profile: vm.profile.identifier, page: child.path})"><h4 ng-bind="child.title"></h4></a>
       <div ng-bind-html="child.body | truncate: 500: '...'"></div>
     </div>
   </div>
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 @@
     </a>
   </div>
   <div class='admin-link'>
-    <a target="_self" ng-href="/myprofile/{{vm.owner.identifier}}">Control panel</a>
+    <a target="_self" ui-sref="main.profile.settings({profile: vm.owner.identifier})">Control panel</a>
   </div>
 </div>
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