From 284e9d9f6ee19b3f9bbd9c39112203f01fe01d15 Mon Sep 17 00:00:00 2001
From: Michel Felipe de Oliveira Ferreira <michel.ferreira@serpro.gov.br>
Date: Mon, 21 Mar 2016 15:27:47 -0300
Subject: [PATCH] Fix paths to login popup on navbar

---
 README.md                            | 14 +++++++-------
 src/app/layout/navbar/navbar.spec.ts |  6 +++---
 src/app/layout/navbar/navbar.ts      |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index bbdf8c5..95aca16 100644
--- a/README.md
+++ b/README.md
@@ -20,10 +20,10 @@ Just set the profile theme to `angular-theme`.
 The folder structure of this project was sorted by feature.
 See some important folders bellow:
 
-- Directives for blocks: `src/app/components/noosfero-blocks`
-- Directives for articles: `src/app/components/noosfero-articles`
-- Directives for activities: `src/app/components/noosfero-activities`
-- Service to connect with Noosfero API: `src/app/components/noosfero`
-- Content viewer controller: `src/app/content-viewer`
-- Profile controller: `src/app/profile`
-- Profile info controller: `src/app/profile-info`
+- Directives for blocks: `src/app/layout/blocks`
+- Directives for articles: `src/app/article`
+- Directives for activities: `src/app/profile/activities`
+- Service to connect with Noosfero API: `src/lib/ng-noosfero-api`
+- Content viewer component: `src/app/article/content-viewer`
+- Profile component: `src/app/profile`
+- Profile Info component: `src/app/profile/info`
diff --git a/src/app/layout/navbar/navbar.spec.ts b/src/app/layout/navbar/navbar.spec.ts
index 95adfe0..dddc452 100644
--- a/src/app/layout/navbar/navbar.spec.ts
+++ b/src/app/layout/navbar/navbar.spec.ts
@@ -24,7 +24,7 @@ describe("Components", () => {
 
         let provideFunc = provide;
 
-        // before Each -> loading mocks on locals variables 
+        // before Each -> loading mocks on locals variables
         beforeEach(() => {
             user = <noosfero.User>{
                 id: 1,
@@ -46,7 +46,7 @@ describe("Components", () => {
         // this function allow build the fixture of the container component
         // and is reused in each test
         // The main idea behing not prebuild it on a general beforeEach block is
-        // to allow tests configure the mock services accordilly their own needs   
+        // to allow tests configure the mock services accordilly their own needs
         let buildComponent = (): Promise<ComponentFixture> => {
             return helpers.quickCreateComponent({
                 providers: [
@@ -97,7 +97,7 @@ describe("Components", () => {
                 navbarComp.openLogin();
                 expect($modal.open).toHaveBeenCalled();
                 expect($modal.open).toHaveBeenCalledWith({
-                    templateUrl: 'app/components/auth/login.html',
+                    templateUrl: 'app/login/login.html',
                     controller: AuthController,
                     controllerAs: 'vm',
                     bindToController: true
diff --git a/src/app/layout/navbar/navbar.ts b/src/app/layout/navbar/navbar.ts
index cb34349..6ebd4da 100644
--- a/src/app/layout/navbar/navbar.ts
+++ b/src/app/layout/navbar/navbar.ts
@@ -43,7 +43,7 @@ export class Navbar {
 
     openLogin() {
         this.modalInstance = this.$modal.open({
-            templateUrl: 'app/components/auth/login.html',
+            templateUrl: 'app/login/login.html',
             controller: AuthController,
             controllerAs: 'vm',
             bindToController: true
--
libgit2 0.21.2