diff --git a/bower.json b/bower.json index e8ad744..27865f4 100644 --- a/bower.json +++ b/bower.json @@ -9,7 +9,7 @@ "angular-messages": "~1.4.2", "angular-aria": "~1.4.2", "angular-resource": "~1.4.2", - "angular-route": "~1.4.2", + "angular-ui-router": "~0.2.15", "bootstrap-sass": "~3.3.5", "angular-bootstrap": "~0.13.4", "malarkey": "yuanqing/malarkey#~1.3.1", diff --git a/src/app/components/noosfero-blocks/main-block/main-block.directive.js b/src/app/components/noosfero-blocks/main-block/main-block.directive.js index cb67faa..5bb4d15 100644 --- a/src/app/components/noosfero-blocks/main-block/main-block.directive.js +++ b/src/app/components/noosfero-blocks/main-block/main-block.directive.js @@ -6,7 +6,7 @@ .directive('noosferoMainBlock', noosferoMainBlock); /** @ngInject */ - function noosferoMainBlock($log, $routeParams, noosfero) { + function noosferoMainBlock($log, $stateParams, noosfero) { var directive = { restrict: 'E', templateUrl: 'app/components/noosfero-blocks/main-block/main-block.html', @@ -24,8 +24,8 @@ /** @ngInject */ function MainBlockController() { var vm = this; - $log.log($routeParams.page); - noosfero.articles().get({path: $routeParams.page, private_token: '1b00325e5f769a0c38550bd35b3f1d64'}).$promise.then(function (article) { + $log.log($stateParams.page); + noosfero.articles().get({path: $stateParams.page, private_token: '1b00325e5f769a0c38550bd35b3f1d64'}).$promise.then(function (article) { //FIXME vm.article = article.articles[0]; $log.log(vm.article); diff --git a/src/app/content-viewer/content-viewer.controller.js b/src/app/content-viewer/content-viewer.controller.js index fc07ebd..882f0d7 100644 --- a/src/app/content-viewer/content-viewer.controller.js +++ b/src/app/content-viewer/content-viewer.controller.js @@ -7,16 +7,16 @@ /** @ngInject */ - function ContentViewerController($timeout, noosfero, $log, $routeParams) { + function ContentViewerController(noosfero, $log, $stateParams) { var vm = this; vm.article = null; activate(); function activate() { - $log.log($routeParams.page); - noosfero.articles().get({path: $routeParams.page, private_token: '1b00325e5f769a0c38550bd35b3f1d64'}).$promise.then(function (article) { + $log.log($stateParams.page); + noosfero.articles().get({path: $stateParams.page, private_token: '1b00325e5f769a0c38550bd35b3f1d64'}).$promise.then(function (article) { //FIXME - vm.article = article.articles[0]; + vm.content = article.articles[0]; }); } } diff --git a/src/app/content-viewer/page.html b/src/app/content-viewer/page.html new file mode 100644 index 0000000..1164a76 --- /dev/null +++ b/src/app/content-viewer/page.html @@ -0,0 +1,13 @@ +
You are using an outdated browser. Please upgrade your browser to improve your experience.
- + -- libgit2 0.21.2