Caio Almeida · Ábner Oliveira · Ábner Oliveira · Ábner Oliveira · Ábner Oliveira · Victor Costa
Showing 95 changed files Show diff stats
bower.json
gulp/watch.js
src/app/account/index.ts
src/app/account/register-component.html
src/app/account/register-terms.html
src/app/account/register.component.spec.ts
src/app/account/register.component.ts
src/app/account/register.controller.ts
src/app/account/register.html
src/app/account/scss/register.scss
src/app/index.ts
src/app/known-events.ts
src/app/layout/blocks/block.component.ts
src/app/layout/blocks/profile-image/profile-image-block.component.spec.ts
src/app/layout/blocks/profile-image/profile-image-block.component.ts
src/app/layout/blocks/profile-image/profile-image-block.html
src/app/layout/blocks/profile-image/profile-image-block.scss
src/app/layout/blocks/profile-images-plugin-profile-images/index.ts
src/app/layout/blocks/profile-images-plugin-profile-images/profile-images-plugin-profile-images-block.component.spec.ts
src/app/layout/blocks/profile-images-plugin-profile-images/profile-images-plugin-profile-images-block.component.ts
@@ -39,12 +39,20 @@
     "angular-click-outside": "^2.7.1",
     "ng-ckeditor": "^0.2.1",
     "angular-tag-cloud": "^0.3.0",
-    "angular-ui-switch": "^0.1.1"
+    "angular-ui-switch": "^0.1.1",
+    "angular-password": "^1.0.1",
+    "ng-file-upload": "^12.0.4",
+    "ng-img-crop": "^0.3.2"
   },
   "devDependencies": {
     "angular-mocks": "~1.5.0"
   },
   "overrides": {
+    "ng-file-upload": {
+      "main": [
+        "ng-file-upload-all.js"
+      ]
+    },
     "ng-ckeditor": {
       "main": [
         "ng-ckeditor.js",
@@ -46,6 +46,7 @@ gulp.task(&#39;watch&#39;, [&#39;inject&#39;], function () {
     watchPaths.push(path.join(src, '/app/**/*.html'));
     watchPaths.push(path.join(src, conf.paths.plugins, '/**/*.html'));
   });
+  watchPaths.push(stylePaths);
   gulp.watch(watchPaths, function(event) {
     browserSync.reload(event.path);
   });
@@ -0,0 +1 @@
+export * from "./register.component";
@@ -0,0 +1,77 @@
+<div class="register-page">
+  <div class="welcome-message">
+    <h1>{{"account.register.welcomeMessageTitle" | translate }}</h1>
+    <div class="environment-signup-intro" ng-bind-html="ctrl.environment.signup_intro"></div>
+  </div>
+  <form name="signupForm">
+    <div class="row">
+      <div class="col-md-12 register-field">
+        <div class="input-group">
+          <span class="input-group-addon"><i class="fa fa-male"></i><i class="fa fa-female"></i></span>
+          <input type="text" class="form-control" id="name" name="fullName" placeholder="{{'account.register.fullNameLabel' | translate }}" ng-model="ctrl.account.name">
+        </div>
+      </div>
+
+      <div class="form-group col-md-12 register-field" ng-class="ctrl.isInvalid(signupForm.username)">
+        <div class="input-group">
+          <span class="input-group-addon" style="font-weight: bold;"><i class="fa fa-globe"></i>&nbsp;{{ ctrl.environment.host }}</span>
+          <input type="text" id="username" name="username" class="form-control" placeholder="{{'account.register.usernameLabel' | translate }}" ng-model="ctrl.account.login" required>
+        </div>
+        <div class="help-block" ng-show="signupForm.username.$touched" ng-messages="signupForm.username.$error">
+          <ul class="list-unstyled">
+            <li ng-messages-include="languages/messages.html"></li>
+          </ul>
+        </div>
+      </div>
+
+      <div class="form-group col-md-12 register-field" ng-class="ctrl.isInvalid(signupForm.email)">
+        <div class="input-group">
+          <span class="input-group-addon"><i class="fa fa-envelope"></i></span>
+          <input type="email" class="form-control" id="email" name="email" placeholder="{{'account.register.emailLabel' | translate }}" ng-model="ctrl.account.email" required>
+        </div>
+        <div class="help-block" ng-show="signupForm.email.$touched" ng-messages="signupForm.email.$error">
+          <ul class="list-unstyled">
+            <li ng-messages-include="languages/messages.html"></li>
+          </ul>
+        </div>
+      </div>
+
+      <div class="form-group col-md-6 register-field" ng-class="ctrl.isInvalid(signupForm.password)">
+        <div class="input-group">
+          <span class="input-group-addon"><i class="fa fa-lock"></i></span>
+          <input type="password" class="form-control" id="password" name="password" placeholder="{{'account.register.passwordLabel' | translate }}" ng-model="ctrl.account.password" required>
+        </div>
+        <div class="help-block" ng-show="signupForm.password.$touched" ng-messages="signupForm.password.$error">
+          <ul class="list-unstyled">
+            <li ng-messages-include="languages/messages.html"></li>
+          </ul>
+        </div>
+      </div>
+
+      <div class="form-group col-md-6 register-field" ng-class="ctrl.isInvalid(signupForm.passwordConfirm)">
+        <div class="input-group">
+          <span class="input-group-addon"><i class="fa fa-unlock-alt"></i></span>
+          <input type="password" class="form-control" id="passwordConfirm" name="passwordConfirm" match-password="password" placeholder="{{'account.register.passwordConfirmationLabel' | translate}}" ng-model="ctrl.account.passwordConfirmation" required>
+        </div>
+        <div class="help-block" ng-show="signupForm.passwordConfirm.$touched" ng-messages="signupForm.passwordConfirm.$error">
+          <ul class="list-unstyled">
+            <li ng-messages-include="languages/messages.html"></li>
+            <li ng-message="passwordMatch" translate="messages.invalid.passwordMatch"></li>
+          </ul>
+        </div>
+      </div>
+
+      <div class="col-md-12">
+        <p class="terms-info">{{"account.register.accountCreatingMessage" | translate}} <a (click)="ctrl.openTerms()" href="#">{{"account.register.termsOfUseMessage" | translate}}</a>.</p>
+      </div>
+
+      <div class="col-md-12">
+        <button type="submit" class="btn btn-default" ng-disabled="signupForm.$invalid" ng-click="ctrl.signup()">{{"account.register.signupMessage" | translate}}</button>
+      </div>
+
+    </div>
+  </form>
+
+  <p class="already-registered-message">{{"account.register.haveAccountMessage" | translate}}</p>
+
+</div>
@@ -0,0 +1,7 @@
+<div class="modal-header">
+  <h3 class="modal-title">Register terms</h3>
+</div>
+<div class="modal-body modal-body-overflow" ng-bind-html="ctrl.environment.terms_of_use"></div>
+<div class="modal-footer">
+    <button class="btn btn-primary" type="button" (click)="vm.closeTerms()">OK</button>
+</div>
@@ -0,0 +1,52 @@
+import { ComponentTestHelper, createClass } from "../../spec/component-test-helper";
+import * as helpers from "../../spec/helpers";
+import { RegisterComponent } from "./register.component";
+// import {RegisterService} from "../../lib/ng-noosfero-api/http/register.service"
+
+
+describe("Register Component", () => {
+    const htmlTemplate: string = '<noosfero-register></noosfero-register>';
+
+    let helper: ComponentTestHelper<RegisterComponent>;
+    let registerService = helpers.mocks.registerService;
+    let stateService = jasmine.createSpyObj("$state", ["transitionTo"]);
+    let notificationService = helpers.mocks.notificationService;
+    notificationService.success = jasmine.createSpy('success');
+    notificationService.error = jasmine.createSpy('error');
+
+
+    let account: any = {
+        id: 1,
+        login: 'test',
+        email: 'test@email.com',
+        password: 'xxx',
+        passwordConfirmation: 'xxx'
+    };
+
+    beforeEach(() => {
+        angular.mock.module('templates');
+        angular.mock.module('ngSanitize');
+        angular.mock.module('ngMessages');
+        angular.mock.module('ngPassword');
+    });
+
+    beforeEach((done) => {
+        let cls = createClass({
+            template: htmlTemplate,
+            directives: [RegisterComponent],
+            providers: [
+                helpers.createProviderToValue('$state', stateService),
+                helpers.createProviderToValue('$uibModal', helpers.mocks.$modal),
+                helpers.createProviderToValue('RegisterService', registerService),
+                helpers.createProviderToValue('NotificationService', notificationService),
+                helpers.createProviderToValue('EnvironmentService', helpers.mocks.environmentService)
+            ]
+        });
+        helper = new ComponentTestHelper<RegisterComponent>(cls, done);
+    });
+
+    it('register page was rendered', () => {
+        expect(helper.debugElement.query('div.register-page').length).toEqual(1);
+    });
+
+});
@@ -0,0 +1,66 @@
+import { Inject, Input, Component, Output, EventEmitter, provide } from 'ng-forward';
+import { RegisterService } from "./../../lib/ng-noosfero-api/http/register.service";
+import { NotificationService } from "./../shared/services/notification.service";
+import { EnvironmentService } from "../../lib/ng-noosfero-api/http/environment.service";
+import { RegisterController } from "./register.controller";
+import { IModalComponent } from "../shared/components/interfaces";
+
+@Component({
+    selector: 'noosfero-register',
+    templateUrl: 'app/account/register-component.html',
+    providers: [
+        provide('registerService', { useClass: RegisterService })
+    ]
+})
+
+@Inject('$state', '$uibModal', '$scope', RegisterService, NotificationService, EnvironmentService)
+export class RegisterComponent {
+    @Input() account: any;
+    environment: noosfero.Environment;
+
+    modalInstance: ng.ui.bootstrap.IModalServiceInstance;
+
+    constructor(
+        private $state: ng.ui.IStateService,
+        private $uibModal: ng.ui.bootstrap.IModalService,
+        private $scope: ng.IScope,
+        public registerService: RegisterService,
+        private notificationService: NotificationService,
+        private environmentService: EnvironmentService
+    ) {
+        this.account = {};
+        this.environment = environmentService.getCurrentEnvironment();
+    }
+
+    signup() {
+        if (this.account.password === this.account.passwordConfirmation) {
+            this.registerService.createAccount(this.account).then((response) => {
+
+                if (response.status === 201) {
+                    this.$state.transitionTo('main.environment');
+                    this.notificationService.success({ title: "account.register.success.title", message: "account.register.success.message" });
+                } else {
+                    throw new Error('Invalid attributes');
+                }
+            });
+        } else {
+            this.notificationService.error({ message: "account.register.passwordConfirmation.failed" });
+        }
+    }
+
+    isInvalid(field: any): any {
+        return { 'has-error': field['$touched'] && field['$invalid'] };
+    }
+
+    openTerms() {
+
+        this.modalInstance = this.$uibModal.open({
+            templateUrl: 'app/account/register-terms.html',
+            size: 'lg',
+            controller: RegisterController,
+            controllerAs: 'vm',
+            bindToController: true,
+            scope: this.$scope
+        });
+    }
+}
@@ -0,0 +1,17 @@
+import { Input } from "ng-forward";
+import { IModalComponent } from "../shared/components/interfaces";
+
+export class RegisterController {
+
+    static $inject = ["$log", "$stateParams", "$scope"];
+    ctrl: IModalComponent;
+
+    constructor(
+        private $log: ng.ILogService,
+        private $stateParams: any
+    ) { }
+
+    closeTerms() {
+        this.ctrl.modalInstance.dismiss('ok');
+    }
+}
@@ -0,0 +1,10 @@
+<div class="row">
+  <div class="col-md-3"></div>
+
+  <!-- component at center of page -->
+  <div class="col-md-6">
+    <noosfero-register></noosfero-register>
+  </div>
+
+  <div class="col-md-3"></div>
+</div>
@@ -0,0 +1,44 @@
+.modal .modal-body-overflow {
+    max-height: 420px;
+    overflow-y: auto;
+}
+
+.register-page button {
+    width: 100%;
+    text-transform: uppercase;
+    font-weight: 600;
+}
+
+.register-page .light-text {
+    color: #BBB;
+    margin-top: 0px;
+    margin-bottom: 0px;
+    font-weight: 600;
+}
+
+.register-page .terms-info {
+    margin-top: 30px;
+    margin-bottom: 30px;
+    font-weight: bold;
+}
+
+.register-page .welcome-message {
+    text-align: center;
+}
+
+.register-page .already-registered-message {
+    margin-top: 60px;
+    text-align: center;
+}
+
+.register-page input {
+    height: 40px;
+}
+
+.register-page .register-field {
+    margin-bottom: 25px;
+}
+
+.register-page input:focus {
+    border: 2px solid #bbb;
+}
-import {bootstrap} from "ng-forward";
+import {bootstrap, provide} from "ng-forward";
 import {noosferoModuleConfig} from "./index.config";
 import {noosferoAngularRunBlock} from "./index.run";
 import {MainComponent} from "./main/main.component";
@@ -22,4 +22,13 @@ angular.module(&#39;noosfero.init&#39;, [&#39;noosfero.templates.app&#39;, &#39;noosfero.templates.p
     run(noosferoAngularRunBlock).
     constant("moment", moment).
     constant("AuthEvents", AuthEvents);
-bootstrap(MainComponent);
+
+
+import { EVENTS_HUB_KNOW_EVENT_NAMES } from './shared/services/events-hub.service';
+import { NoosferoKnownEvents } from './known-events';
+
+bootstrap(MainComponent,
+    [
+        provide(EVENTS_HUB_KNOW_EVENT_NAMES, { useClass: NoosferoKnownEvents })
+    ]
+);
@@ -0,0 +1,15 @@
+import { EventsHubKnownEventNames } from './shared/services/events-hub.service';
+
+export class NoosferoKnownEvents implements EventsHubKnownEventNames {
+    IMAGE_PROFILE_UPDATED: string = 'IMAGE_PROFILE_UPDATED';
+    PROFILE_INFO_UPDATED: string = 'PROFILE_INFO_UPDATED';
+    ARTICLE_UPDATED: string = 'ARTICLE_UPDATED';
+    TASK_CLOSED: string = 'TASK_CLOSED';
+
+    constructor() {
+    }
+
+    getNames() {
+        return Object.getOwnPropertyNames(this);
+    }
+}
@@ -18,7 +18,7 @@ export class BlockComponent {
     @Input() block: noosfero.Block;
     @Input() owner: noosfero.Profile | noosfero.Environment;
  
-    private modalInstance: any = null;
+    private modalInstance: ng.ui.bootstrap.IModalServiceInstance;
     originalBlock: noosfero.Block;
  
     currentUser: noosfero.User;
@@ -26,7 +26,8 @@ export class BlockComponent {
     editionMode = false;
     designMode = false;
  
-    constructor(private $uibModal: any,
+    constructor(
+        private $uibModal: ng.ui.bootstrap.IModalService,
         private $scope: ng.IScope,
         private $state: ng.ui.IStateService,
         private $rootScope: ng.IRootScopeService,
@@ -14,12 +14,22 @@ describe(&quot;Components&quot;, () =&gt; {
     describe("Profile Image Block Component", () => {
  
         beforeEach(angular.mock.module("templates"));
+	let personService = jasmine.createSpyObj("personService", ["upload"]);	
+
+        let profileService = jasmine.createSpyObj("ProfileService", ["isMember", "addMember", "removeMember"]);
+        profileService.isMember = jasmine.createSpy("isMember").and.returnValue(Promise.resolve(false));
  
         @Component({
             selector: 'test-container-component',
             template: htmlTemplate,
             directives: [ProfileImageBlockComponent],
-            providers: helpers.provideFilters("translateFilter")
+            providers: [
+                helpers.createProviderToValue('SessionService', helpers.mocks.sessionWithCurrentUser({})),
+		helpers.createProviderToValue("PersonService", personService),
+		helpers.createProviderToValue("$uibModal", helpers.mocks.$modal),
+                helpers.createProviderToValue('ProfileService', profileService),
+                helpers.createProviderToValue('NotificationService', helpers.mocks.notificationService)
+            ].concat(helpers.provideFilters("translateFilter"))
         })
         class BlockContainerComponent {
             block = { type: 'Block' };
@@ -42,5 +52,42 @@ describe(&quot;Components&quot;, () =&gt; {
             });
         });
  
+        it("display button to join community", (done: Function) => {
+            helpers.tcb.createAsync(BlockContainerComponent).then(fixture => {
+                let elProfile = fixture.debugElement.componentViewChildren[0];
+                expect(elProfile.query('.actions .join').length).toEqual(1);
+                done();
+            });
+        });
+
+        it("display button to leave community", (done: Function) => {
+            helpers.tcb.createAsync(BlockContainerComponent).then(fixture => {
+                let elProfile = fixture.debugElement.componentViewChildren[0];
+                elProfile.componentInstance['isMember'] = true;
+                fixture.detectChanges();
+                expect(elProfile.query('.actions .leave').length).toEqual(1);
+                done();
+            });
+        });
+
+        it("join community", (done: Function) => {
+            helpers.tcb.createAsync(BlockContainerComponent).then(fixture => {
+                let elProfile = fixture.debugElement.componentViewChildren[0];
+                profileService.addMember = jasmine.createSpy("addMember").and.returnValue(Promise.resolve({ data: {} }));
+                elProfile.componentInstance.join();
+                expect(profileService.addMember).toHaveBeenCalled();
+                done();
+            });
+        });
+
+        it("leave community", (done: Function) => {
+            helpers.tcb.createAsync(BlockContainerComponent).then(fixture => {
+                let elProfile = fixture.debugElement.componentViewChildren[0];
+                profileService.removeMember = jasmine.createSpy("removeMember").and.returnValue(Promise.resolve({ data: {} }));
+                elProfile.componentInstance.leave();
+                expect(profileService.removeMember).toHaveBeenCalled();
+                done();
+            });
+        });
     });
 });
 import {Inject, Input, Component} from "ng-forward";
 import {ProfileImageComponent} from "./../../../profile/image/image.component";
+import {ProfileService} from "../../../../lib/ng-noosfero-api/http/profile.service";
+import {SessionService} from "./../../../login";
+import {NotificationService} from "../../../shared/services/notification.service";
  
 @Component({
     selector: "noosfero-profile-image-block",
     templateUrl: 'app/layout/blocks/profile-image/profile-image-block.html',
     directives: [ProfileImageComponent]
 })
+@Inject(ProfileService, SessionService, NotificationService)
 export class ProfileImageBlockComponent {
  
     @Input() block: noosfero.Block;
     @Input() owner: noosfero.Profile;
  
+    private isMember: boolean;
+
+    constructor(private profileService: ProfileService, private session: SessionService, private notificationService: NotificationService) {
+    }
+
+    ngOnInit() {
+        this.loadMembership();
+    }
+
+    loadMembership() {
+        let person = this.session.currentUser() ? this.session.currentUser().person : null;
+        this.profileService.isMember(person, this.owner).then((val: boolean) => {
+            this.isMember = val;
+        });
+    }
+
+    join() {
+        let person = this.session.currentUser() ? this.session.currentUser().person : null;
+        this.profileService.addMember(person, this.owner).then((result: any) => {
+            if (result.data.pending) {
+                this.notificationService.success({ title: "blocks.profile_image.join.moderation.title", message: "blocks.profile_image.join.moderation.message" });
+            } else {
+                this.loadMembership();
+            }
+        });
+    }
+
+    leave() {
+        let person = this.session.currentUser() ? this.session.currentUser().person : null;
+        this.profileService.removeMember(person, this.owner).then(() => {
+            this.loadMembership();
+        });
+    }
 }
 <div class="center-block text-center profile-image-block">
   <a ui-sref="main.profile.info({profile: ctrl.owner.identifier})">
-    <noosfero-profile-image [profile]="ctrl.owner"></noosfero-profile-image>
+    <noosfero-profile-image [profile]="ctrl.owner" [editable]="true" [edit-class]="'profile-image-block-editable'"></noosfero-profile-image>
   </a>
   <a class="settings-link" target="_self" ui-sref="main.profile.settings({profile: ctrl.owner.identifier})">{{"blocks.profile_image.control_panel" | translate}}</a>
+  <div class="actions" ng-show="ctrl.isMember!=null">
+    <a ng-if="!ctrl.isMember" ng-click="ctrl.join()" class="btn btn-primary btn-sm join" href="#">{{"blocks.profile_image.join" | translate}}</a>
+    <a ng-if="ctrl.isMember" ng-click="ctrl.leave()" class="btn btn-warning btn-sm leave" href="#">{{"blocks.profile_image.leave" | translate}}</a>
+  </div>
 </div>
@@ -2,4 +2,22 @@
   .settings-link {
     display: block;
   }
+  .upload-camera-container {
+	top: 77%;
+	left: 6%;
+  }
+}
+
+.profile-image-block-editable {
+	top: 68%;
+    width: 284px;
+    font-weight: 700;
+    height: 43px;
+    padding-left: 30px;
+    padding-top: 13px;
 }
+
+
+
+
+
@@ -0,0 +1,2 @@
+/* Module Index Entry - generated using the script npm run generate-index */
+export * from "./profile-images-plugin-profile-images-block.component";
@@ -0,0 +1,65 @@
+import {TestComponentBuilder} from 'ng-forward/cjs/testing/test-component-builder';
+import {Provider, Input, provide, Component} from 'ng-forward';
+import {provideFilters} from '../../../../spec/helpers';
+import {ProfileImagesPluginProfileImagesBlockComponent} from './profile-images-plugin-profile-images-block.component';
+import * as helpers from "./../../../../spec/helpers";
+
+const htmlTemplate: string = '<noosfero-profile-images-plugin-profile-images-block [block]="ctrl.block" [owner]="ctrl.owner"></noosfero-profile-images-plugin-profile-images-block>';
+
+const tcb = new TestComponentBuilder();
+
+const images = [
+    {
+        title: 'Test',
+        id: 1,
+        view_url: { host: 'localhost', page: ['image'] },
+        path: '/articles/0000/0001/test.png'
+    }
+];
+
+describe("Components", () => {
+    describe("Profile Images Block Component", () => {
+
+        let settingsObj = {};
+        let person = <noosfero.Person>{ name: "Person" };
+        let mockedService = {
+            getApiContent: (block: noosfero.Block): any => {
+                return Promise.resolve({ images: images, headers: (name: string) => { return name; } });
+            }
+        };
+        beforeEach(angular.mock.module("templates"));
+
+        let state = jasmine.createSpyObj("state", ["go"]);
+
+
+        function getProviders() {
+            return [
+                new Provider('$state', { useValue: state }),
+                new Provider('BlockService', {
+                    useValue: mockedService
+                })
+            ].concat(provideFilters("truncateFilter", "stripTagsFilter"));
+        }
+        let componentClass: any = null;
+
+        function getComponent() {
+            @Component({ selector: 'test-container-component', template: htmlTemplate, directives: [ProfileImagesPluginProfileImagesBlockComponent], providers: getProviders() })
+            class BlockContainerComponent {
+                block = { type: 'Block', settings: settingsObj };
+                owner = person;
+                constructor() {
+                }
+            }
+            return BlockContainerComponent;
+        }
+
+        it("get images from the block service", done => {
+            tcb.createAsync(getComponent()).then(fixture => {
+                let ProfileImagesPluginProfileImagesBlock: ProfileImagesPluginProfileImagesBlockComponent = fixture.debugElement.componentViewChildren[0].componentInstance;
+                expect(ProfileImagesPluginProfileImagesBlock.images).toEqual(images);
+                done();
+            });
+        });
+
+    });
+});
@@ -0,0 +1,39 @@
+import {Component, Inject, Input} from "ng-forward";
+import {BlockService} from "./../../../../lib/ng-noosfero-api/http/block.service";
+import {Arrays} from "./../../../../lib/util/arrays";
+
+@Component({
+    selector: "noosfero-profile-images-plugin-profile-images-block",
+    templateUrl: 'app/layout/blocks/profile-images-plugin-profile-images/profile-images-plugin-profile-images-block.html'
+})
+@Inject(BlockService, "$state")
+export class ProfileImagesPluginProfileImagesBlockComponent {
+
+    @Input() block: any;
+    @Input() owner: any;
+
+    profile: any;
+    images: any;
+
+    constructor(private blockService: BlockService, private $state: any) { }
+
+    urlFor(params: any) {
+        let url = '//' + params.host;
+        if (params.port) {
+              url += ':' + params.port;
+        }
+        url += '/' + params.profile + '/';
+        if (params.page) {
+            url += params.page.join('/');
+        }
+        return url;
+    }
+
+    ngOnInit() {
+        this.profile = this.owner;
+        this.images = [];
+        this.blockService.getApiContent(this.block).then((content: any) => {
+            this.images = content.images;
+        });
+    }
+}
@@ -0,0 +1,8 @@
+<ul class="profile-images-plugin-profile-images">
+  <li ng-repeat="image in ctrl.images">
+    <a ng-href="{{ctrl.urlFor(image.view_url)}}" ng-style="{'background-image': 'url(' + image.path + ')'}">
+      <span>{{image.title}}</span>
+    </a>
+  </li>
+</ul>
+<br style="clear: both;" />
@@ -0,0 +1,29 @@
+.profile-images-plugin-profile-images {
+  padding: 0;
+  margin: 0;
+  display: block;
+  width: 100%;
+
+  li {
+    list-style: none;
+  }
+
+  a {
+    display: block;
+    width: 53px;
+    height: 53px;
+    float: left;
+    padding: 1px;
+    border: 1px solid #ccc;
+    margin: 4px;
+    background-size: cover;
+
+    &:hover {
+      border: 1px solid #000;
+    }
+
+    span {
+      display: none;
+    }
+  }  
+}
@@ -0,0 +1,3 @@
+<img ng-src="{{activity.params.first_image}}" ng-attr-alt="{{activity.params.name}}" class="event-image" />
+<p class="event-description"><b>{{activity.params.name}}</b><br />{{activity.params.lead | stripTags}}</p>
+<br style="clear: both;" />
@@ -18,7 +18,12 @@ export class RecentActivitiesPluginActivitiesBlockComponent {
     constructor(private blockService: BlockService, private $state: any) { }
  
     getActivityTemplate(activity: any) {
-        return 'app/layout/blocks/recent-activities-plugin-activities/activities/' + activity.verb + '.html';
+        if (activity.label === 'events') {
+          return 'app/layout/blocks/recent-activities-plugin-activities/activities/event.html';
+        }
+        else {
+          return 'app/layout/blocks/recent-activities-plugin-activities/activities/' + activity.verb + '.html';
+        }
     }
  
     urlFor(params: any) {
 <div class="deckgrid recent-activities-block">
   <div ng-repeat="activity in ctrl.activities" class="a-card panel media">
+
+    <div class="subheader">
+      <p ng-if="activity.label === 'events'">
+      {{ 'activities.event.description' | translate }} <b>{{ activity.start_date | date:longDate }}</b> {{ 'time.at' | translate }} {{ activity.start_date | date:'HH:mm' }} - <a ng-href="/{{activity.user.identifier}}">{{activity.user.name}}</a> <span class="activity-label">{{activity.label}}</span>
+      </p>
+
+      <p ng-if="activity.label !== 'events'">
+      {{ 'date.on' | translate }} <b>{{ activity.created_at | date:longDate }}</b> {{ 'time.at' | translate }} {{ activity.created_at | date:'HH:mm' }} - <a ng-href="/{{activity.user.identifier}}">{{activity.user.name}}</a> <span class="activity-label">{{activity.label}}</span>
+      </p>
+    </div>
+
     <div class="header media-body">
       <h5 class="title media-heading">
-        <a ng-href="/{{activity.user.identifier}}">{{activity.user.name}}</a>&nbsp;<ng-include src="ctrl.getActivityTemplate(activity)"></ng-include>
+        <ng-include src="ctrl.getActivityTemplate(activity)"></ng-include>
       </h5>
     </div>
-    <div class="subheader">
-      <span class="time">
-        <i class="fa fa-clock-o"></i> <span am-time-ago="activity.created_at | dateFormat"></span>
-      </span>
-    </div>
+
+    <hr />
   </div>
 </div>
@@ -20,4 +20,53 @@
       display: none;
     }
   }
+
+  .panel {
+    margin-bottom: 15px;
+    box-shadow: none;
+    border-radius: 0;
+  }
+
+  h5 {
+    text-transform: capitalize;
+  }
+
+  .subheader {
+    p {
+      margin: 2px 0;
+      font-size: 11px;
+    }
+  }
+
+  hr {
+    border: 0;
+    height: 1px;
+    background: #ccc;
+    margin: 0;
+    margin-top: 15px;
+  }
+
+  .activity-label {
+    @include border-radius(2px);
+    font-size: 11px;
+    text-transform: capitalize;
+    background: #333;
+    color: #fff;
+    padding: 2px;
+    margin-left: 5px;
+    display: inline-block;
+  }
+
+  .event-image {
+    width: 15%;
+    height: auto;
+    float: left;
+  }
+
+  .event-description {
+    width: 83%;
+    margin: 2px 0 0 2px;
+    float: left;
+    display: block;
+  }
 }
@@ -20,6 +20,12 @@
           <a ng-href="#" ng-click="ctrl.openLogin()">{{"navbar.login" | translate}}</a>
         </li>
  
+        <li ng-show="!ctrl.currentUser">
+          <a ui-sref="main.register">
+            Sign Up
+          </a>
+        </li>
+
         <li class="dropdown profile-menu" ng-show="ctrl.currentUser" uib-dropdown>
           <a href="#" class="dropdown-toggle" aria-expanded="false" uib-dropdown-toggle>
             <noosfero-profile-image [profile]="ctrl.currentUser.person" class="profile-image"></noosfero-profile-image>
@@ -39,10 +45,12 @@
           </ul>
         </li>
       </ul>
-
       <ul class="nav navbar-nav navbar-right">
         <language-selector class="nav navbar-nav navbar-right"></language-selector>
       </ul>
+      <ul class="nav navbar-nav navbar-right">
+        <tasks-menu class="nav navbar-nav navbar-right"></tasks-menu>
+      </ul>
       <div ui-view="actions"></div>
       <div class="nav navbar-nav search navbar-right">
         <search-form></search-form>
-import {Component, Inject, EventEmitter, Input} from "ng-forward";
-import {LanguageSelectorComponent} from "../language-selector/language-selector.component";
-import {SessionService, AuthService, AuthController, AuthEvents} from "./../../login";
-import {EnvironmentService} from "./../../../lib/ng-noosfero-api/http/environment.service";
-import {SidebarNotificationService} from "../sidebar/sidebar.notification.service";
-import {BodyStateClassesService} from '../services/body-state-classes.service';
-import {DesignModeTogglerComponent} from './../../admin/layout-edit/designModeToggler.component';
-import {BootstrapSwitcherComponent, BootstrapSwitcherItem} from './../../shared/components/bootstrap-switcher/bootstrap-switcher.component';
+import { Component, Inject, EventEmitter, Input } from "ng-forward";
+import { LanguageSelectorComponent } from "../language-selector/language-selector.component";
+import { SessionService, AuthService, AuthController, AuthEvents } from "./../../login";
+import { EnvironmentService } from "./../../../lib/ng-noosfero-api/http/environment.service";
+import { SidebarNotificationService } from "../sidebar/sidebar.notification.service";
+import { BodyStateClassesService } from '../services/body-state-classes.service';
+import { DesignModeTogglerComponent } from './../../admin/layout-edit/designModeToggler.component';
+import { BootstrapSwitcherComponent, BootstrapSwitcherItem } from './../../shared/components/bootstrap-switcher/bootstrap-switcher.component';
  
 @Component({
     selector: "acme-navbar",
@@ -17,14 +17,14 @@ import {BootstrapSwitcherComponent, BootstrapSwitcherItem} from &#39;./../../shared/
 export class Navbar {
  
     private currentUser: noosfero.User;
-    private modalInstance: any = null;
+    private modalInstance: ng.ui.bootstrap.IModalServiceInstance;
     public showHamburger: boolean = false;
     public currentEnvironment: noosfero.Environment = <any>{ name: '' };
     /**
      *
      */
     constructor(
-        private $uibModal: any,
+        private $uibModal: ng.ui.bootstrap.IModalService,
         public authService: AuthService,
         private session: SessionService,
         private $state: ng.ui.IStateService,
@@ -2,6 +2,10 @@ label {
   cursor: pointer;
 }
  
+.has-error .help-block {
+  font-weight: bold;
+}
+
 .checkbox-nice {
 	position: relative;
 	padding-left: 15px;
@@ -21,4 +21,7 @@
     </div>
     <button type="submit" class="btn btn-default btn-block" ng-click="vm.login()">{{"auth.form.login_button" | translate}}</button>
   </form>
+  <div class="text-center">
+    <a ui-sref="main.register" ng-click="$close()">{{"auth.createAccount" | translate}}</a>
+  </div>
 </div>
@@ -23,4 +23,4 @@ export class SessionService {
         return this.$localStorage.currentUser;
     };
  
-}
 \ No newline at end of file
+}
@@ -4,8 +4,9 @@ import {TestComponentBuilder, ComponentFixture} from &quot;ng-forward/cjs/testing/tes
  
 import {quickCreateComponent} from "../../spec/helpers";
 import {getAngularServiceFactory} from "../../spec/helpers";
+import { EVENTS_HUB_KNOW_EVENT_NAMES } from "../shared/services/events-hub.service";
  
-describe("MainComponent", function() {
+describe("MainComponent", function () {
  
     let localFixture: ComponentFixture;
     let $state: angular.ui.IStateService;
@@ -34,6 +35,15 @@ describe(&quot;MainComponent&quot;, function() {
                 {
                     useValue: environmentService
                 }),
+            provide(EVENTS_HUB_KNOW_EVENT_NAMES,
+                {
+                    useValue: [
+                        'IMAGE_PROFILE_UPDATED',
+                        'PROFILE_INFO_UPDATED',
+                        'ARTICLE_UPDATED',
+                        'TASK_CLOSED'
+                    ]
+                }),
         ]
     })
     class MainComponentParent {
@@ -57,7 +67,7 @@ describe(&quot;MainComponent&quot;, function() {
                 // navigates to the environment home
                 $state.go("main.environment.home");
                 localFixture.detectChanges();
-                // after changes were detected it checks the current $state route 
+                // after changes were detected it checks the current $state route
                 expect($state.current.name).toEqual("main.environment.home");
                 done();
             });
 import * as plugins from "../../plugins";
-import {bundle, Component, StateConfig, Inject} from "ng-forward";
-import {ArticleBlogComponent} from "./../article/types/blog/blog.component";
-
-import {ArticleViewComponent} from "./../article/article-default-view.component";
-
-import {ProfileComponent} from "../profile/profile.component";
-import {BoxesComponent} from "../layout/boxes/boxes.component";
-import {BlockContentComponent} from "../layout/blocks/block-content.component";
-import {BlockComponent} from "../layout/blocks/block.component";
-import {EnvironmentComponent} from "../environment/environment.component";
-import {EnvironmentHomeComponent} from "../environment/environment-home.component";
-import {PeopleBlockComponent} from "../layout/blocks/people/people-block.component";
-import {DisplayContentBlockComponent} from "../layout/blocks/display-content/display-content-block.component";
-import {LinkListBlockComponent} from "../layout/blocks/link-list/link-list-block.component";
-import {RecentDocumentsBlockComponent} from "../layout/blocks/recent-documents/recent-documents-block.component";
-import {ProfileImageBlockComponent} from "../layout/blocks/profile-image/profile-image-block.component";
-import {RawHTMLBlockComponent} from "../layout/blocks/raw-html/raw-html-block.component";
-import {StatisticsBlockComponent} from "../layout/blocks/statistics/statistics-block.component";
-import {PersonTagsPluginInterestsBlockComponent} from "../layout/blocks/person-tags-plugin-interests/person-tags-plugin-interests-block.component";
-import {TagsBlockComponent} from "../layout/blocks/tags/tags-block.component";
-import {CustomContentComponent} from "../profile/custom-content/custom-content.component";
-import {RecentActivitiesPluginActivitiesBlockComponent} from "../layout/blocks/recent-activities-plugin-activities/recent-activities-plugin-activities-block.component";
-
-import {MembersBlockComponent} from "../layout/blocks/members/members-block.component";
-import {CommunitiesBlockComponent} from "../layout/blocks/communities/communities-block.component";
-
-import {LoginBlockComponent} from "../layout/blocks/login-block/login-block.component";
-
-import {NoosferoTemplate} from "../shared/pipes/noosfero-template.filter";
-import {DateFormat} from "../shared/pipes/date-format.filter";
-
-import {AuthService} from "../login/auth.service";
-import {SessionService} from "../login/session.service";
-import {EnvironmentService} from "./../../lib/ng-noosfero-api/http/environment.service";
-import {NotificationService} from "../shared/services/notification.service";
-
-import {BodyStateClassesService} from "./../layout/services/body-state-classes.service";
-
-import {Navbar} from "../layout/navbar/navbar";
-
-import {SidebarComponent} from "../layout/sidebar/sidebar.component";
-
-import {MainBlockComponent} from "../layout/blocks/main/main-block.component";
-import {HtmlEditorComponent} from "../shared/components/html-editor/html-editor.component";
-import {PermissionDirective} from "../shared/components/permission/permission.directive";
-import {SearchComponent} from "../search/search.component";
-import {SearchFormComponent} from "../search/search-form/search-form.component";
+import { bundle, Component, StateConfig, Inject } from "ng-forward";
+import { ArticleBlogComponent } from "./../article/types/blog/blog.component";
+
+import { ArticleViewComponent } from "./../article/article-default-view.component";
+
+import { ProfileComponent } from "../profile/profile.component";
+import { BoxesComponent } from "../layout/boxes/boxes.component";
+import { BlockContentComponent } from "../layout/blocks/block-content.component";
+import { BlockComponent } from "../layout/blocks/block.component";
+import { EnvironmentComponent } from "../environment/environment.component";
+import { EnvironmentHomeComponent } from "../environment/environment-home.component";
+import { PeopleBlockComponent } from "../layout/blocks/people/people-block.component";
+import { DisplayContentBlockComponent } from "../layout/blocks/display-content/display-content-block.component";
+import { LinkListBlockComponent } from "../layout/blocks/link-list/link-list-block.component";
+import { RecentDocumentsBlockComponent } from "../layout/blocks/recent-documents/recent-documents-block.component";
+import { ProfileImageBlockComponent } from "../layout/blocks/profile-image/profile-image-block.component";
+import { RawHTMLBlockComponent } from "../layout/blocks/raw-html/raw-html-block.component";
+import { StatisticsBlockComponent } from "../layout/blocks/statistics/statistics-block.component";
+import { PersonTagsPluginInterestsBlockComponent } from "../layout/blocks/person-tags-plugin-interests/person-tags-plugin-interests-block.component";
+import { TagsBlockComponent } from "../layout/blocks/tags/tags-block.component";
+import { CustomContentComponent } from "../profile/custom-content/custom-content.component";
+import { RecentActivitiesPluginActivitiesBlockComponent } from "../layout/blocks/recent-activities-plugin-activities/recent-activities-plugin-activities-block.component";
+import { ProfileImagesPluginProfileImagesBlockComponent } from "../layout/blocks/profile-images-plugin-profile-images/profile-images-plugin-profile-images-block.component";
+import { RegisterComponent } from "../account/register.component";
+
+import { MembersBlockComponent } from "../layout/blocks/members/members-block.component";
+import { CommunitiesBlockComponent } from "../layout/blocks/communities/communities-block.component";
+
+import { LoginBlockComponent } from "../layout/blocks/login-block/login-block.component";
+
+import { NoosferoTemplate } from "../shared/pipes/noosfero-template.filter";
+import { DateFormat } from "../shared/pipes/date-format.filter";
+
+import { AuthService } from "../login/auth.service";
+import { SessionService } from "../login/session.service";
+import { EnvironmentService } from "./../../lib/ng-noosfero-api/http/environment.service";
+import { NotificationService } from "../shared/services/notification.service";
+import { RegisterService } from "./../../lib/ng-noosfero-api/http/register.service";
+
+import { BodyStateClassesService } from "./../layout/services/body-state-classes.service";
+
+import { Navbar } from "../layout/navbar/navbar";
+
+import { SidebarComponent } from "../layout/sidebar/sidebar.component";
+
+import { MainBlockComponent } from "../layout/blocks/main/main-block.component";
+import { HtmlEditorComponent } from "../shared/components/html-editor/html-editor.component";
+import { PermissionDirective } from "../shared/components/permission/permission.directive";
+import { SearchComponent } from "../search/search.component";
+import { SearchFormComponent } from "../search/search-form/search-form.component";
+import { EVENTS_HUB_KNOW_EVENT_NAMES, EventsHubService } from "../shared/services/events-hub.service";
+import { NoosferoKnownEvents } from "../known-events";
+import { TasksMenuComponent } from "../task/tasks-menu/tasks-menu.component";
+import { TaskListComponent } from "../task/task-list/task-list.component";
  
 /**
  * @ngdoc controller
@@ -62,12 +69,16 @@ import {SearchFormComponent} from &quot;../search/search-form/search-form.component&quot;;
     templateUrl: "app/main/main.html",
     providers: [AuthService, SessionService]
 })
-@Inject(BodyStateClassesService)
+@Inject(BodyStateClassesService, EVENTS_HUB_KNOW_EVENT_NAMES)
 export class MainContentComponent {
  
     public themeSkin: string = 'skin-whbl';
  
-    constructor(private bodyStateClassesService: BodyStateClassesService) {
+    constructor(
+        private bodyStateClassesService: BodyStateClassesService,
+        eventsNames: NoosferoKnownEvents,
+        eventsHubService: EventsHubService
+    ) {
         bodyStateClassesService.start({
             skin: this.themeSkin
         });
@@ -88,7 +99,8 @@ export class EnvironmentContent {
  * @name main.Main
  * @requires AuthService, Session, Notification, ArticleBlog, ArticleView, Boxes, Block, LinkListBlock,
  * MainBlock, RecentDocumentsBlock, Navbar, ProfileImageBlock, MembersBlock,
- * NoosferoTemplate, DateFormat, RawHTMLBlock, PersonTagsPluginInterestsBlock, RecentActivitiesPluginActivitiesBlock,
+ * NoosferoTemplate, DateFormat, RawHTMLBlock, PersonTagsPluginInterestsBlock,
+ * RecentActivitiesPluginActivitiesBlock, ProfileImagesPluginProfileImages
  * @description
  *  The Main controller for the Noosfero Angular Theme application.
  *
@@ -107,7 +119,8 @@ export class EnvironmentContent {
         MainBlockComponent, RecentDocumentsBlockComponent, Navbar, SidebarComponent, ProfileImageBlockComponent,
         MembersBlockComponent, NoosferoTemplate, DateFormat, RawHTMLBlockComponent, StatisticsBlockComponent,
         LoginBlockComponent, CustomContentComponent, PermissionDirective, SearchFormComponent, SearchComponent,
-        PersonTagsPluginInterestsBlockComponent, TagsBlockComponent, RecentActivitiesPluginActivitiesBlockComponent, BlockComponent
+        PersonTagsPluginInterestsBlockComponent, TagsBlockComponent, RecentActivitiesPluginActivitiesBlockComponent,
+        ProfileImagesPluginProfileImagesBlockComponent, BlockComponent, RegisterComponent, TasksMenuComponent, TaskListComponent
     ].concat(plugins.mainComponents).concat(plugins.hotspots),
     providers: [AuthService, SessionService, NotificationService, BodyStateClassesService,
         "ngAnimate", "ngCookies", "ngStorage", "ngTouch",
@@ -116,7 +129,7 @@ export class EnvironmentContent {
         "angular-bind-html-compile", "angularMoment", "angular.filter", "akoenig.deckgrid",
         "angular-timeline", "duScroll", "oitozero.ngSweetAlert",
         "pascalprecht.translate", "tmh.dynamicLocale", "angularLoad",
-        "angular-click-outside", "ngTagCloud", "noosfero.init", "uiSwitch"]
+        "angular-click-outside", "ngTagCloud", "noosfero.init", "uiSwitch", "ngFileUpload", "ngImgCrop"]
 })
 @StateConfig([
     {
@@ -147,6 +160,18 @@ export class EnvironmentContent {
         }
     },
     {
+        url: '/account/signup',
+        component: RegisterComponent,
+        name: 'main.register',
+        views: {
+            "content": {
+                templateUrl: "app/account/register.html",
+                controller: RegisterComponent,
+                controllerAs: "vm"
+            }
+        }
+    },
+    {
         url: "^/:profile",
         abstract: true,
         component: ProfileComponent,
@@ -12,6 +12,7 @@ const htmlTemplate: string = &#39;&lt;noosfero-activity [activity]=&quot;ctrl.activity&quot;&gt;&lt;/no
 describe("Components", () => {
  
     describe("Noosfero Activity", () => {
+        let activity = { name: "activity1", verb: "create_article" };
  
         beforeEach(angular.mock.module("templates"));
  
@@ -21,18 +22,54 @@ describe(&quot;Components&quot;, () =&gt; {
             directives: [ActivityComponent],
             providers: provideFilters("truncateFilter", "stripTagsFilter", "translateFilter")
         })
+
         class BlockContainerComponent {
-            activity = { name: "activity1", verb: "create_article" };
+            activity = activity;
         }
  
         it("render the specific template for an activity verb", done => {
             tcb.createAsync(BlockContainerComponent).then(fixture => {
                 let component: ActivityComponent = fixture.debugElement.componentViewChildren[0].componentInstance;
                 expect(component.getActivityTemplate()).toEqual('app/profile/activities/activity/create_article.html');
+                done();
+            });
+        });
+
+        it("render create article template correctly", done => {
+            activity = { name: "activity1", verb: "create_article" };
+            tcb.createAsync(BlockContainerComponent).then(fixture => {
+                let component: ActivityComponent = fixture.debugElement.componentViewChildren[0].componentInstance;
                 expect(fixture.debugElement.queryAll(".activity.create_article").length).toEqual(1);
                 done();
             });
         });
+
+        it("render add_member_in_community template correctly", done => {
+            activity = { name: "add_member_in_community1", verb: "add_member_in_community" };
+            tcb.createAsync(BlockContainerComponent).then(fixture => {
+                let component: ActivityComponent = fixture.debugElement.componentViewChildren[0].componentInstance;
+                expect(fixture.debugElement.queryAll(".activity.add_member_in_community").length).toEqual(1);
+                done();
+            });
+        });
+
+        it("render new_friendship template correctly", done => {
+            activity = { name: "new_friendship1", verb: "new_friendship" };
+            tcb.createAsync(BlockContainerComponent).then(fixture => {
+                let component: ActivityComponent = fixture.debugElement.componentViewChildren[0].componentInstance;
+                expect(fixture.debugElement.queryAll(".activity.new_friendship").length).toEqual(1);
+                done();
+            });
+        });
+
+        it("render leave scrap template correctly", done => {
+            activity = { name: "scrap1", verb: "leave_scrap" };
+            tcb.createAsync(BlockContainerComponent).then(fixture => {
+                let component: ActivityComponent = fixture.debugElement.componentViewChildren[0].componentInstance;
+                expect(fixture.debugElement.queryAll(".activity.leave_scrap").length).toEqual(1);
+                done();
+            });
+        });
     });
  
 });
@@ -0,0 +1,17 @@
+<timeline-badge class="success">
+  <i class="fa fa-commenting-o"></i>
+</timeline-badge>
+<timeline-panel>
+  <timeline-heading>
+    <h4 class="timeline-title">
+      <a ui-sref="main.profile.info({profile: ctrl.activity.user.identifier})"><strong ng-bind="ctrl.activity.user.name"></strong></a>
+      <span> {{"activities.scrap.description" | translate}} </span>
+    </h4>
+    <p><small class="text-muted"><i class="fa fa-clock-o"></i> <span am-time-ago="ctrl.activity.created_at | dateFormat"></span></small></p>
+  </timeline-heading>
+  <div class="timeline-body">
+    <div class="scrap">
+      <div ng-bind-html="ctrl.activity.content | stripTags | truncate: 100 : '...': true"></div>
+    </div>
+  </div>
+</timeline-panel>
-import {Component, Input, Inject} from 'ng-forward';
-import {ProfileService} from '../../../lib/ng-noosfero-api/http/profile.service';
-import {NotificationService} from '../../shared/services/notification.service';
-import {PermissionDirective} from '../../shared/components/permission/permission.directive';
-import {DesignModeService} from '../../admin/layout-edit/designMode.service';
+import { Component, Input, Inject } from 'ng-forward';
+import { ProfileService } from '../../../lib/ng-noosfero-api/http/profile.service';
+import { NotificationService } from '../../shared/services/notification.service';
+import { PermissionDirective } from '../../shared/components/permission/permission.directive';
+import { DesignModeService } from '../../admin/layout-edit/designMode.service';
  
 @Component({
     selector: 'custom-content',
@@ -21,9 +21,10 @@ export class CustomContentComponent {
  
     content: string;
     originalContent: string;
-    private modalInstance: any = null;
+    private modalInstance: ng.ui.bootstrap.IModalServiceInstance;
  
-    constructor(private $uibModal: any,
+    constructor(
+        private $uibModal: ng.ui.bootstrap.IModalService,
         private $scope: ng.IScope,
         private profileService: ProfileService,
         private notificationService: NotificationService,
@@ -4,22 +4,49 @@
  * @description
  *  This file contains the tests for the {@link components.noosfero.profile-image.ProfileImage} component.
  */
-
+import {ComponentTestHelper, createClass} from '../../../spec/component-test-helper';
 import {TestComponentBuilder, ComponentFixture} from 'ng-forward/cjs/testing/test-component-builder';
 import {Pipe, Input, provide, Component} from 'ng-forward';
+import {PersonService} from "../../../lib/ng-noosfero-api/http/person.service";
  
 import * as helpers from "../../../spec/helpers";
  
 import {ProfileImageComponent} from "./image.component";
  
-const tcb = new TestComponentBuilder();
+const htmlTemplate: string = '<noosfero-profile-image [editable]="true" [edit-class]="editable-class" [profile]="ctrl.profile"></noosfero-profile-image>';
  
 describe("Components", () => {
  
     describe("Profile Image Component", () => {
  
+        let helper: ComponentTestHelper<ProfileImageComponent>;
+
         beforeEach(angular.mock.module("templates"));
  
+        beforeEach((done) => {
+            let scope = helpers.mocks.scopeWithEvents;
+            let personService = jasmine.createSpyObj("personService", ["upload"]);
+            let properties = { profile: { custom_footer: "footer" } };
+            let cls = createClass({
+                template: htmlTemplate,
+                directives: [ProfileImageComponent],
+                properties: properties,
+                providers: [
+                    helpers.createProviderToValue("PersonService", personService),
+                    helpers.createProviderToValue("$uibModal", helpers.mocks.$modal),
+                    helpers.createProviderToValue("$scope", scope)
+                ]
+            });
+            helper = new ComponentTestHelper<ProfileImageComponent>(cls, done);
+        });
+
+        it("set modal instance when select files modal", () => {
+            helper.component['$uibModal'].open = jasmine.createSpy("open");
+            helper.component.fileSelected("file", []);
+            expect(helper.component['$uibModal'].open).toHaveBeenCalled();
+        });
+
+        /*    
         it("show community users image if profile is not Person", done => {
             helpers.tcb.createAsync(ProfileImageComponent).then(fixture => {
                 let profileImageComponent: ProfileImageComponent = fixture.componentInstance;
@@ -45,7 +72,7 @@ describe(&quot;Components&quot;, () =&gt; {
                 expect(profileImageComponent.defaultIcon).toEqual("fa-user", "The default icon should be person user");
                 done();
             });
-        });
+        });*/
  
     });
 });
 \ No newline at end of file
-import {Inject, Input, Component} from "ng-forward";
-
+import {Inject, Input, Component, provide} from "ng-forward";
+import {PersonService} from "../../../lib/ng-noosfero-api/http/person.service";
+import {ProfileImageEditorComponent} from "./profile-image-editor.component";
  
 /**
  * @ngdoc controller
@@ -10,7 +11,9 @@ import {Inject, Input, Component} from &quot;ng-forward&quot;;
 @Component({
     selector: "noosfero-profile-image",
     templateUrl: 'app/profile/image/image.html',
+    providers: [ provide('personService',  { useClass: PersonService }) ]
 })
+@Inject(PersonService, "$uibModal", "$scope")
 export class ProfileImageComponent {
  
     /**
@@ -30,6 +33,48 @@ export class ProfileImageComponent {
      */
     defaultIcon: string;
  
+    @Input() editable: boolean;
+
+    @Input() editClass: string;
+
+    picFile: any;
+    croppedDataUrl: any;
+    modalInstance: any;
+
+    constructor(private personService: PersonService, private $uibModal: any, private $scope: ng.IScope) {
+    }
+
+    fileSelected(file: any, errFiles: any) {
+        console.log("File selected: ", file);
+        if (file) {
+            this.picFile = file;
+            this.modalInstance = this.$uibModal.open({
+                templateUrl: 'app/profile/image/profile-image-editor.html',
+                controller: ProfileImageEditorComponent,
+                controllerAs: 'ctrl',
+                scope: this.$scope,
+                bindToController: true,
+                backdrop: 'static',
+                resolve: {
+                    picFile: this.picFile,
+                    profile: this.profile,
+                    personService: this.personService
+                }
+            });
+        }
+    }
+
+    private _showCamera: boolean = false;
+
+    showChange(show: boolean) {
+        this._showCamera = show;
+    }
+
+    showCamera() {
+        return this._showCamera;
+    }
+
+
     /**
      * @ngdoc method
      * @name ngOnInit
@@ -43,5 +88,6 @@ export class ProfileImageComponent {
             this.defaultIcon = 'fa-user';
         }
     }
+
 }
  
-<span class="profile-image-wrap" title="{{ctrl.profile.name}}">
-  <img ng-if="ctrl.profile.image" ng-src="{{ctrl.profile.image.url}}" class="img-responsive profile-image">
-  <i ng-if="!ctrl.profile.image" class="fa {{ctrl.defaultIcon}} fa-5x profile-image"></i>
-</span>
+<div id="profile-image-container" style="">    
+    <div class="profile-image-wrap" title="{{ctrl.profile.name}}" ng-mouseenter="ctrl.showChange(true)" ng-mouseleave="ctrl.showChange(false)">
+        <img ng-if="ctrl.profile.image" ng-src="{{ctrl.profile.image.url}}" class="img-responsive profile-image">
+        <i ng-if="!ctrl.profile.image" class="fa {{ctrl.defaultIcon}} fa-5x profile-image"></i>
+        <div ng-if="ctrl.editable" class="upload-camera-container">
+            <i id="camera" class="fa fa-camera upload-camera" aria-hidden="true"></i>
+        </div>
+        <div ng-if="ctrl.editable" id="select-photo-container" name="select-photo-container" class="select-photo-container container" ng-class="ctrl.editClass">
+            <a id="upload-container" class="upload-container" href="#" rel="dialog" role="button">
+                <!-- The upload button hidden behind the camera -->
+                <div class="upload-button" ngf-select="ctrl.fileSelected($file)"
+                    ngf-pattern="'image/*'" ngf-accept="'image/*'"
+                    ngf-max-size="20MB"	ngf-resize="{width: 100, height: 100}" 
+                    data-toggle="modal" data-target=".crop-dialog">
+                    {{"profile.image.upload" | translate}}
+                </div>
+            </a>        
+        </div>
+        
+    </div>
+</div>
@@ -5,3 +5,94 @@ i.profile-image {
   background-clip: padding-box;
   margin-bottom: 15px;
 }
+
+.profile-image-wrap {
+    display: inline;
+}
+
+#profile-image-container {
+    display: inline;
+}
+
+#profile-image-container:hover {
+    .select-photo-container {
+        z-index: 1;
+    }
+    .upload-camera-container {
+        transform: scale(.75);
+    }
+}
+
+.upload-camera-container {
+    text-align: left;
+    position: absolute;
+    z-index: 5;
+}
+
+.upload-camera {
+    color: white;
+    position: absolute;
+    transition: all .3s cubic-bezier(.175, .885, .32, 1.275);
+    opacity: 1;
+}
+
+.select-photo-container {
+    //overflow: hidden;
+    position: absolute;
+    z-index: -1;    
+    background: #000;
+    background: rgba(0, 0, 0, .6);
+    background: linear-gradient(transparent, rgba(0, 0, 0, .6) 70%, rgba(0, 0, 0, .6) 100%);
+    transition: top .13s ease-out;
+}
+
+#upload-container {
+    position: relative;
+    text-decoration: none;
+}
+
+.upload-container a:hover {
+    text-decoration: none;
+}
+
+.upload-button {
+    -webkit-font-smoothing: antialiased;
+    color: #fff;
+    //word-wrap: break-word;    
+}
+
+.upload-container {
+    color:#fff;
+    display: block;
+    overflow: hidden;
+    position: relative;
+    text-align: left;
+    min-width: 89px;
+}
+
+.cropArea {
+    background: #E4E4E4;
+    overflow: hidden;
+    width:300px;
+    height:150px;
+}
+
+.crop-area {
+    display: none;
+}
+
+form .progress {
+    line-height: 15px;
+}
+
+.progress {
+    display: inline-block;
+    width: 100px;
+    border: 3px groove #CCC;
+}
+.progress div {
+    font-size: smaller;
+    background: orange;
+    width: 0;
+}
+
@@ -0,0 +1,62 @@
+import {Pipe, Input, provide, Component} from 'ng-forward';
+import {ComponentTestHelper, createClass} from '../../../spec/component-test-helper';
+import * as helpers from "../../../spec/helpers";
+
+import {ProfileImageEditorComponent} from "./profile-image-editor.component";
+
+describe("Components", () => {
+
+    describe("Profile Image Editor Component", () => {
+
+        beforeEach(angular.mock.module("templates"));
+
+        let expectedData = "iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACtWK6eAAAgAElEQ…Cm2OLHvfdNPte3zrH709Q0esN1LPQ0t7DL696ERpu+9/8BVPLIpElf7VYAAAAASUVORK5CYII=";
+
+        let profile = <noosfero.Profile>{ name: "profile_name", id: 1, identifier: "test" };
+        let modal = helpers.mocks.$modal;
+        let modalInstance = jasmine.createSpyObj("$uibModalInstance", ["close"]);
+        let picFile = { type: "png" };
+        let $q: ng.IQService;
+        let personServiceMock: any;
+        let $rootScope: ng.IRootScopeService;
+
+        beforeEach(inject((_$q_: ng.IQService, _$rootScope_: ng.IRootScopeService) => {
+            $q = _$q_;
+            $rootScope = _$rootScope_;
+        }));
+
+        let comp = new ProfileImageEditorComponent(picFile, this.profile, personServiceMock, modalInstance);
+
+        it("get data", done => {
+            let testDataUrl = "data:image/png;base64," + expectedData;
+            let result = comp.getData(testDataUrl);
+            expect(result).toBe(expectedData);
+            done();
+        });
+
+        it("get image name", done => {
+            let imageName = "image1";
+            let expectedName = "profile_name_" + imageName;
+            comp['profile'] = profile;
+            let result = comp.getImageName(imageName);
+            expect(result).toBe(expectedName);
+            done();
+        });
+
+        it("upload image", done => {
+            let testDataUrl = "data:image/png;base64," + expectedData;
+            let imageName = "image1";
+            personServiceMock = jasmine.createSpyObj("personServiceMock", ["uploadImage"]);
+            console.log("PersonServiceMock:", personServiceMock);
+            let deferredUploadImage = $q.defer();
+            personServiceMock.uploadImage = jasmine.createSpy('uploadImage').and.returnValue(deferredUploadImage.promise);
+            comp.personService = personServiceMock;
+            comp.uploadImage(testDataUrl, imageName);
+            deferredUploadImage.resolve();
+            $rootScope.$apply();
+            expect(comp.$uibModalInstance.close).toHaveBeenCalled();
+            done();
+        });
+
+    });
+});
@@ -0,0 +1,43 @@
+import {StateConfig, Component, Input, Output, Inject, provide} from 'ng-forward';
+import {TranslateProfile} from "../../shared/pipes/translate-profile.filter";
+import {PersonService} from "../../../lib/ng-noosfero-api/http/person.service";
+
+export class ProfileImageEditorComponent {
+
+    activities: any;
+    croppedDataUrl: string;
+    static $inject = ["picFile", "profile", "personService", "$uibModalInstance"];
+
+    constructor(public picFile: any, public profile: noosfero.Profile, public personService: PersonService,
+        public $uibModalInstance: any) {
+    }
+
+    uploadImage(dataUrl: any, name: any) {
+        let base64_image_json = this.getBase64ImageJson(dataUrl, name);
+        this.personService.uploadImage(this.profile, base64_image_json).then( (result: any) => {
+            this.$uibModalInstance.close(name);
+        });
+    }
+
+    getBase64ImageJson(dataUrl: any, name: any) {
+        let data = this.getData(dataUrl);
+        let image_name = this.getImageName(name);
+        return {
+            tempfile: data,
+            filename: image_name,
+            type: this.picFile.type
+        };
+    }
+
+    getImageName(name: any) {
+        return this.profile.name + "_" + name;
+    }
+
+    getData(dataUrl: any) {
+        return dataUrl.substring(dataUrl.indexOf('base64,') + 7);
+    }
+
+    cancel() {
+        this.$uibModalInstance.close();
+    }
+}
@@ -0,0 +1,24 @@
+<div class="modal-header">
+  <h3>{{"profile.image.edit" | translate}}</h3>
+</div>
+<div class="modal-body">
+  <form class="">
+		<div ngf-drop ng-model="ctrl.picFile" ngf-pattern="image/*" class="cropArea">
+			<img-crop image="ctrl.picFile  | ngfDataUrl" area-type="square"
+				result-image="ctrl.croppedDataUrl" ng-init="ctrl.croppedDataUrl=''">
+			</img-crop>
+		</div>
+		<div>
+			<img ng-src="{{ctrl.croppedDataUrl}}" />
+		</div>        
+		<span class="progress" ng-show="progress >= 0">
+			<div style="width: {{progress" ng-bind="progress + '%'"></div>
+		</span> <span ng-show="ctrl.result">Upload Successful</span> <span class="err"
+			ng-show="ctrl.errorMsg">{{errorMsg}}</span>
+  </form>
+
+  <div class="actions">
+    <button type="submit" class="btn btn-default" ng-click="ctrl.uploadImage(ctrl.croppedDataUrl, ctrl.picFile.name)">Upload</button>
+    <button type="submit" class="btn btn-danger" ng-click="ctrl.cancel()">Cancel</button>
+  </div>
+</div>
@@ -6,10 +6,12 @@
         <h2>{{vm.profile.name}}</h2>
       </header>
       <div id="profile-left" class="main-box-body clearfix">
-        <noosfero-profile-image [profile]="vm.profile" class="img-responsive center-block"></noosfero-profile-image>
-        <span class="label" ng-class="{'label-danger': vm.profile.type == 'Community', 'label-info': vm.profile.type == 'Person'}">{{vm.profile | translateProfile}}</span>
-        <div class="profile-since">
-          {{"profile.member_since" | translate}}: {{vm.profile.created_at | amDateFormat:'MMMM YYYY'}}
+        <noosfero-profile-image [profile]="vm.profile" [editable]="true" [edit-class]="'profile-info-editable'" class="img-responsive center-block profile-info"></noosfero-profile-image>
+        <div id="profile-info-extrainfo" class="profile-info-extrainfo">
+          <span class="label" ng-class="{'label-danger': vm.profile.type == 'Community', 'label-info': vm.profile.type == 'Person'}">{{vm.profile | translateProfile}}</span>
+          <div class="profile-since">
+            {{"profile.member_since" | translate}}: {{vm.profile.created_at | amDateFormat:'MMMM YYYY'}}
+          </div>
         </div>
       </div>
     </div>
@@ -0,0 +1,21 @@
+.profile-info .upload-camera-container {
+    top: 55%;
+    left: 39px;
+}
+
+.profile-info-editable {
+    top: 51%;
+    width: 103px;
+    height: 28px;
+}
+
+.profile-info-editable .upload-button {
+	font-size: 0.8em;
+    padding-top: 9px;
+    padding-left: 6px;
+    font-weight: bold;
+}
+
+.profile-info-extrainfo {
+	margin-top: 10px;
+}
 \ No newline at end of file
-import {StateConfig, Component, Inject, provide} from 'ng-forward';
-import {ProfileInfoComponent} from './info/profile-info.component';
-import {ProfileHomeComponent} from './profile-home.component';
-import {BasicEditorComponent} from '../article/cms/basic-editor/basic-editor.component';
-import {CmsComponent} from '../article/cms/cms.component';
-import {ContentViewerComponent} from "../article/content-viewer/content-viewer.component";
-import {ContentViewerActionsComponent} from "../article/content-viewer/content-viewer-actions.component";
-import {ActivitiesComponent} from "./activities/activities.component";
-import {ProfileService} from "../../lib/ng-noosfero-api/http/profile.service";
-import {NotificationService} from "../shared/services/notification.service";
-import {MyProfileComponent} from "./myprofile.component";
-import {ProfileActionsComponent} from "./profile-actions.component";
-import {ConfigBarComponent} from "./config-bar.component";
+import { StateConfig, Component, Inject, provide } from 'ng-forward';
+import { ProfileInfoComponent } from './info/profile-info.component';
+import { ProfileHomeComponent } from './profile-home.component';
+import { BasicEditorComponent } from '../article/cms/basic-editor/basic-editor.component';
+import { CmsComponent } from '../article/cms/cms.component';
+import { ContentViewerComponent } from "../article/content-viewer/content-viewer.component";
+import { ContentViewerActionsComponent } from "../article/content-viewer/content-viewer-actions.component";
+import { ActivitiesComponent } from "./activities/activities.component";
+import { ProfileService } from "../../lib/ng-noosfero-api/http/profile.service";
+import { NotificationService } from "../shared/services/notification.service";
+import { MyProfileComponent } from "./myprofile.component";
+import { ProfileActionsComponent } from "./profile-actions.component";
+import { ConfigBarComponent } from "./config-bar.component";
+import { TasksComponent } from "../task/tasks/tasks.component";
+
 /**
  * @ngdoc controller
  * @name profile.Profile
@@ -92,6 +94,18 @@ import {ConfigBarComponent} from &quot;./config-bar.component&quot;;
         }
     },
     {
+        name: 'main.profile.tasks',
+        url: "^/myprofile/:profile/tasks",
+        component: TasksComponent,
+        views: {
+            "mainBlockContent": {
+                templateUrl: "app/task/tasks/tasks.html",
+                controller: TasksComponent,
+                controllerAs: "vm"
+            }
+        }
+    },
+    {
         name: 'main.profile.home',
         url: "",
         component: ProfileHomeComponent,
-
-
 export interface IComponentWithPermissions {
     permissions: () => string[];
-}
 \ No newline at end of file
+}
+
+export interface IModalComponent {
+    $uibModal: ng.ui.bootstrap.IModalService;
+    modalInstance: ng.ui.bootstrap.IModalServiceInstance;
+}
@@ -0,0 +1,46 @@
+import { OpaqueToken } from 'ng-forward';
+import { EventsHubService, EventsHubKnownEventNames } from './events-hub.service';
+
+
+describe("EventsHubService", () => {
+    let eventsHubService: EventsHubService;
+    let event1 = 'Event 1';
+    let eventsHubKnownEventNames = <EventsHubKnownEventNames>{ getNames: () => { return [ event1]; }};
+    it("emits events for the known events", (done) => {
+
+        let eventListener = () => {
+        };
+        // creates the events hub service which known the event "Event1"
+        eventsHubService = new EventsHubService(eventsHubKnownEventNames);
+        // subscribe to the event passing the done Function as the eventListener
+        // if the event emits works the done function is called and the
+        // test will pass
+        eventsHubService.subscribeToEvent<any>(event1, done);
+        // emits the event
+        eventsHubService.emitEvent(event1, null);
+    });
+
+    it("throws error when trying to emit an unknow event", () => {
+        let eventListener = () => {
+        };
+        // creates the events hub service which known the event "Event1"
+        eventsHubService = new EventsHubService(eventsHubKnownEventNames);
+
+        // emits the event
+        expect(
+            () => { eventsHubService.emitEvent('NotKnownEvent', null); }
+        ).toThrowError('Unknown event named NotKnownEvent');
+    });
+
+    it("throws error when trying to subscribe to an unknow event", () => {
+        let eventListener = () => {
+        };
+        // creates the events hub service which known the event "Event1"
+        eventsHubService = new EventsHubService(eventsHubKnownEventNames);
+
+        // emits the event
+        expect(
+            () => { eventsHubService.subscribeToEvent<void>('NotKnownEvent', () => {}); }
+        ).toThrowError('Unknown event named NotKnownEvent');
+    });
+});
 \ No newline at end of file
@@ -0,0 +1,56 @@
+import { Injectable, Inject, OpaqueToken, EventEmitter } from 'ng-forward';
+
+export const EVENTS_HUB_KNOW_EVENT_NAMES = new OpaqueToken('EVENTS_HUB_KNOW_EVENT_NAMES');
+
+export interface EventsHubKnownEventNames {
+    getNames(): string[];
+}
+
+function isEventsHubKnownEventNames(object: any): object is EventsHubKnownEventNames {
+    return 'getNames' in object;
+}
+
+@Injectable()
+@Inject(EVENTS_HUB_KNOW_EVENT_NAMES)
+export class EventsHubService {
+
+    private emitters: Map<string, EventEmitter<any>>;
+    private knownEvents: string[] = [];
+
+    constructor(private eventsHubKnownEventNames: EventsHubKnownEventNames | string[]) {
+        if (isEventsHubKnownEventNames(eventsHubKnownEventNames)) {
+            this.knownEvents = eventsHubKnownEventNames.getNames();
+        } else if (Array.isArray(eventsHubKnownEventNames)) {
+            this.knownEvents = eventsHubKnownEventNames;
+        }
+
+        this.emitters = new Map<string, EventEmitter<any>>();
+        this.setupEmitters();
+    }
+
+    emitEvent(eventType: string, payload?: any) {
+        this.checkKnownEvent(eventType);
+        let event = this.emitters.get(eventType);
+        if (event) this.emitters.get(eventType).next(payload);
+    }
+
+    subscribeToEvent<T>(eventType: string, generatorOrNext?: ((p?: T) => void), error?: any, complete?: any) {
+        this.checkKnownEvent(eventType);
+        let event = this.emitters.get(eventType);
+        if (event) event.subscribe(generatorOrNext, error, complete);
+    }
+
+    private setupEmitters() {
+        for (let i: number = 0; i < this.knownEvents.length; i++) {
+            this.emitters.set(this.knownEvents[i], new EventEmitter<any>());
+        }
+    }
+
+    private checkKnownEvent(eventType: string) {
+        if (!this.emitters.has(eventType)) {
+            throw new Error('Unknown event named ' + eventType.toString());
+        }
+    }
+
+
+}
@@ -0,0 +1,10 @@
+<div class="task-accept task-confirmation">
+  <div class="accept-title confirmation-title">{{"tasks.actions.accept.confirmation.title" | translate}}</div>
+  <div class="accept-fields confirmation-details">
+    <task-accept ng-if="ctrl.currentTask.accept_details" [task]="ctrl.currentTask" [confirmation-task]="ctrl.confirmationTask"></task-accept>
+  </div>
+  <div class="actions">
+    <button type="submit" class="btn btn-default" ng-click="ctrl.callAccept()">{{"tasks.actions.confirmation.yes" | translate}}</button>
+    <button type="button" class="btn btn-warning" ng-click="ctrl.cancel()">{{"tasks.actions.confirmation.cancel" | translate}}</button>
+  </div>
+</div>
@@ -0,0 +1,10 @@
+<div class="task-reject task-confirmation">
+  <div class="reject-title confirmation-title">{{"tasks.actions.reject.confirmation.title" | translate}}</div>
+  <div class="reject-fields confirmation-details">
+    <input ng-model="ctrl.confirmationTask.reject_explanation" id="rejectionExplanationInput" type="text" placeholder="{{'tasks.actions.reject.explanation.label' | translate}}" class="rejection-explanation form-control">
+  </div>
+  <div class="actions">
+    <button type="submit" class="btn btn-default" ng-click="ctrl.callReject()">{{"tasks.actions.confirmation.yes" | translate}}</button>
+    <button type="button" class="btn btn-warning" ng-click="ctrl.cancel()">{{"tasks.actions.confirmation.cancel" | translate}}</button>
+  </div>
+</div>
@@ -0,0 +1,33 @@
+import { Provider, provide, Component } from 'ng-forward';
+import * as helpers from "../../../spec/helpers";
+import { TaskAcceptComponent } from './task-accept.component';
+
+const htmlTemplate: string = '<task-accept [task]="ctrl.task"></task-accept>';
+
+describe("Components", () => {
+    describe("Task Accept Component", () => {
+
+        let task = { id: 1, type: "AddMember" };
+        let roleService = jasmine.createSpyObj("roleService", ["getByProfile"]);
+
+        beforeEach(angular.mock.module("templates"));
+
+        function createComponent() {
+            return helpers.quickCreateComponent({
+                template: htmlTemplate,
+                directives: [TaskAcceptComponent],
+                properties: { task: task },
+                providers: [
+                    helpers.createProviderToValue("RoleService", roleService)
+                ].concat(helpers.provideFilters("translateFilter"))
+            });
+        }
+
+        it("replace element with the specific task accept component", (done: Function) => {
+            createComponent().then(fixture => {
+                expect(fixture.debugElement.queryAll("add-member-task-accept").length).toBe(1);
+                done();
+            });
+        });
+    });
+});
@@ -0,0 +1,22 @@
+import { Input, Inject, Component } from 'ng-forward';
+import { AddMemberTaskAcceptComponent } from "../types/add-member/add-member-task-accept.component";
+
+@Component({
+    selector: 'task-accept',
+    template: '<div></div>',
+    directives: [AddMemberTaskAcceptComponent]
+})
+@Inject("$element", "$scope", "$injector", "$compile")
+export class TaskAcceptComponent {
+
+    @Input() task: noosfero.Task;
+    @Input() confirmationTask: noosfero.Task;
+
+    ngOnInit() {
+        let componentName = this.task.type.replace(/::/, '').replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
+        componentName += "-task-accept";
+        this.$element.replaceWith(this.$compile(`<${componentName} [task]="ctrl.task" [confirmation-task]="ctrl.confirmationTask"></${componentName}>`)(this.$scope));
+    }
+
+    constructor(private $element: any, private $scope: ng.IScope, private $injector: ng.auto.IInjectorService, private $compile: ng.ICompileService) { }
+}
@@ -0,0 +1,106 @@
+import { Provider, provide, Component } from 'ng-forward';
+import * as helpers from "../../../spec/helpers";
+import { ComponentTestHelper, createClass } from '../../../spec/component-test-helper';
+import { TaskListComponent } from './task-list.component';
+
+const htmlTemplate: string = '<task-list [task]="ctrl.task"></task-list>';
+
+describe("Components", () => {
+    describe("Task List Component", () => {
+
+        let helper: ComponentTestHelper<TaskListComponent>;
+        let taskService = jasmine.createSpyObj("taskService", ["getAllPending"]);
+        let tasks = [{ id: 1 }, { id: 2 }];
+        let modal = helpers.mocks.$modal;
+        let eventsHubService = jasmine.createSpyObj("eventsHubService", ["subscribeToEvent", "emitEvent"]);
+        taskService.getAllPending = jasmine.createSpy("getAllPending").and.returnValue(Promise.resolve({ headers: () => { }, data: tasks }));
+
+        beforeEach(angular.mock.module("templates"));
+
+        beforeEach((done) => {
+            let cls = createClass({
+                template: htmlTemplate,
+                directives: [TaskListComponent],
+                providers: [
+                    helpers.createProviderToValue("TaskService", taskService),
+                    helpers.createProviderToValue("EventsHubService", eventsHubService),
+                    helpers.createProviderToValue('NotificationService', helpers.mocks.notificationService),
+                    helpers.createProviderToValue('$uibModal', modal),
+                ].concat(helpers.provideFilters("groupByFilter")),
+                properties: { tasks: tasks }
+            });
+            helper = new ComponentTestHelper<TaskListComponent>(cls, done);
+        });
+
+        it("return specific template for a task", () => {
+            let task = { type: "AddMember" };
+            expect(helper.component.getTaskTemplate(<any>task)).toEqual("app/task/types/add-member/add-member.html");
+        });
+
+        it("return the default template for a task", () => {
+            let task = { type: "" };
+            expect(helper.component.getTaskTemplate(<any>task)).toEqual("app/task/types/default.html");
+        });
+
+        it("open confirmation modal when it has details to accept a task", () => {
+            let task = { accept_details: true };
+            helper.component.accept(<any>task);
+            expect(modal.open).toHaveBeenCalled();
+        });
+
+        it("open confirmation modal when it has details to reject a task", () => {
+            let task = { reject_details: true };
+            helper.component.reject(<any>task);
+            expect(modal.open).toHaveBeenCalled();
+        });
+
+        it("call api directly when it has no details to accept a task", () => {
+            let task = { accept_details: false };
+            helper.component.callAccept = jasmine.createSpy("callAccept");
+            helper.component.accept(<any>task);
+            expect(helper.component.callAccept).toHaveBeenCalled();
+        });
+
+        it("call api directly when it has no details to reject a task", () => {
+            let task = { accept_details: false };
+            helper.component.callReject = jasmine.createSpy("callReject");
+            helper.component.reject(<any>task);
+            expect(helper.component.callReject).toHaveBeenCalled();
+        });
+
+        it("call cancel and emit event when accept was called successfully", () => {
+            helper.component.currentTask = <any>{ id: 1 };
+            let result = helpers.mocks.promiseResultTemplate({ data: { id: 1 } });
+            taskService.closeTask = jasmine.createSpy("closeTask").and.returnValue(result);
+            helper.component.cancel = jasmine.createSpy("cancel");
+            helper.component.callAccept();
+            expect(helper.component.cancel).toHaveBeenCalled();
+            expect((<any>helper.component)['eventsHubService'].emitEvent).toHaveBeenCalled();
+        });
+
+        it("call cancel and emit event when reject was called successfully", () => {
+            helper.component.currentTask = <any>{ id: 1 };
+            let result = helpers.mocks.promiseResultTemplate({ data: { id: 1 } });
+            taskService.closeTask = jasmine.createSpy("closeTask").and.returnValue(result);
+            helper.component.cancel = jasmine.createSpy("cancel");
+            helper.component.callReject();
+            expect(helper.component.cancel).toHaveBeenCalled();
+            expect((<any>helper.component)['eventsHubService'].emitEvent).toHaveBeenCalled();
+        });
+
+        it("reset currentTask and close modal when call cancel", () => {
+            let modalInstance = jasmine.createSpyObj("modalInstance", ["close"]);
+            helper.component["modalInstance"] = modalInstance;
+            helper.component.currentTask = <any>{ id: 1 };
+            helper.component.cancel();
+            expect(modalInstance.close).toHaveBeenCalled();
+            expect(helper.component.currentTask).toBeNull();
+        });
+
+        it("not fail when call cancel with no modalInstance", () => {
+            helper.component["modalInstance"] = null;
+            helper.component.currentTask = null;
+            helper.component.cancel();
+        });
+    });
+});
@@ -0,0 +1,107 @@
+import { Component, Input, Inject, provide } from "ng-forward";
+import { NotificationService } from "../../shared/services/notification.service";
+import { TaskService } from "../../../lib/ng-noosfero-api/http/task.service";
+import { TaskAcceptComponent } from "./task-accept.component";
+import { Arrays } from "../../../lib/util/arrays";
+import { EventsHubService } from "../../shared/services/events-hub.service";
+import { NoosferoKnownEvents } from "../../known-events";
+
+@Component({
+    selector: "task-list",
+    templateUrl: "app/task/task-list/task-list.html",
+    directives: [TaskAcceptComponent],
+    providers: [
+        provide('eventsHubService', { useClass: EventsHubService })
+    ]
+})
+@Inject(NotificationService, "$scope", "$uibModal", TaskService, EventsHubService)
+export class TaskListComponent {
+
+    @Input() tasks: noosfero.Task[];
+
+    private taskTemplates = ["AddFriend", "AddMember", "CreateCommunity", "SuggestArticle", "AbuseComplaint"];
+
+    currentTask: noosfero.Task;
+    confirmationTask: noosfero.Task;
+    eventsNames: NoosferoKnownEvents;
+    private modalInstance: any = null;
+
+    constructor(private notificationService: NotificationService,
+        private $scope: ng.IScope,
+        private $uibModal: any,
+        private taskService: TaskService,
+        private eventsHubService: EventsHubService) {
+
+        this.eventsNames = new NoosferoKnownEvents();
+    }
+
+    ngOnInit() {
+        this.eventsHubService.subscribeToEvent(this.eventsNames.TASK_CLOSED, (task: noosfero.Task) => {
+            Arrays.remove(this.tasks, task);
+        });
+    }
+
+    getTaskTemplate(task: noosfero.Task) {
+        if (this.taskTemplates.indexOf(task.type) >= 0) {
+            let templateName = this.getTemplateName(task);
+            return `app/task/types/${templateName}/${templateName}.html`;
+        } else {
+            return 'app/task/types/default.html';
+        }
+    }
+
+    accept(task: noosfero.Task) {
+        this.closeTask(task, task.accept_details, "app/task/task-list/accept.html", () => { this.callAccept(); });
+    }
+
+    reject(task: noosfero.Task) {
+        this.closeTask(task, task.reject_details, "app/task/task-list/reject.html", () => { this.callReject(); });
+    }
+
+    private closeTask(task: noosfero.Task, hasDetails: boolean, templateUrl: string, confirmationFunction: Function) {
+        this.currentTask = task;
+        this.confirmationTask = <any>{ id: task.id };
+        if (hasDetails) {
+            this.modalInstance = this.$uibModal.open({
+                templateUrl: templateUrl,
+                controller: TaskListComponent,
+                controllerAs: 'modal',
+                bindToController: true,
+                scope: this.$scope
+            });
+        } else {
+            confirmationFunction();
+        }
+    }
+
+    callAccept() {
+        this.callCloseTask("finish", "tasks.actions.accept.title", "tasks.actions.accept.message");
+    }
+
+    callReject() {
+        this.callCloseTask("cancel", "tasks.actions.reject.title", "tasks.actions.reject.message");
+    }
+
+    private callCloseTask(action: string, title: string, message: string) {
+        this.taskService.closeTask(this.confirmationTask, action).then(() => {
+            this.eventsHubService.emitEvent(this.eventsNames.TASK_CLOSED, this.currentTask);
+            this.notificationService.success({ title: title, message: message });
+        }).finally(() => {
+            this.cancel();
+        });
+    }
+
+    cancel() {
+        if (this.modalInstance) {
+            this.modalInstance.close();
+            this.modalInstance = null;
+        }
+        this.currentTask = null;
+        this.confirmationTask = null;
+    }
+
+    private getTemplateName(task: noosfero.Task) {
+        return task.type.replace(/::/, '').replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
+    }
+
+}
@@ -0,0 +1,24 @@
+<ul class="task-list">
+  <li class="task-group" ng-repeat="(target, tasks) in ctrl.tasks | groupBy: 'target.name'">
+    <div class="task-target">
+      <noosfero-profile-image ng-if="tasks[0].target.type" [profile]="tasks[0].target"></noosfero-profile-image>
+      <div class="target-name">{{target}}</div>
+    </div>
+    <div class="task-body" ng-repeat="task in tasks | orderBy: 'created_at':true">
+      <div class="task">
+        <ng-include src="ctrl.getTaskTemplate(task)"></ng-include>
+      </div>
+      <div class="actions">
+        <a href="#" ng-if="!task.accept_disabled" ng-click="ctrl.accept(task)" class="accept" uib-tooltip="{{'tasks.actions.accept' | translate}}">
+          <i class="fa fa-check"></i>
+        </a>
+        <a href="#" ng-if="!task.reject_disabled" ng-click="ctrl.reject(task)" class="reject" uib-tooltip="{{'tasks.actions.reject' | translate}}">
+          <i class="fa fa-close"></i>
+        </a>
+      </div>
+      <span class="time">
+        <span class="bullet-separator">•</span> <span am-time-ago="task.created_at | dateFormat"></span>
+      </span>
+    </div>
+  </li>
+</ul>
@@ -0,0 +1,86 @@
+$task-action-accept-color: #77c123;
+$task-action-reject-color: #d64e18;
+
+.task-list {
+  width: 100%;
+  padding: 0;
+  list-style-type: none;
+  .task-group {
+    border-top: 1px solid #f3f3f3;
+    padding: 4px 16px 8px 16px;
+  }
+  .task-target {
+    margin-top: 12px;
+    .profile-image {
+      color: #2c3e50;
+      font-size: 25px;
+      width: 25px;
+      display: inline-block;
+      @extend .img-rounded;
+    }
+    .target-name {
+      display: inline-block;
+      margin-left: 10px;
+      font-size: 18px;
+      font-weight: bold;
+    }
+  }
+  .task-body {
+    margin-left: 35px;
+    padding: 2px;
+    .task {
+      display: inline-block;
+      color: #949494;
+      .task-icon {
+        font-size: 18px;
+        color: #e84e40;
+      }
+      .requestor, .target {
+         font-style: italic;
+         color: #676767;
+      }
+    }
+    .actions {
+      display: inline-block;
+      font-size: 19px;
+      a {
+        text-decoration: none;
+      }
+      .accept {
+        color: $task-action-accept-color;
+        &:hover {
+          color: darken($task-action-accept-color, 10%);
+        }
+      }
+      .reject {
+        color: $task-action-reject-color;
+        &:hover {
+          color: darken($task-action-reject-color, 10%);
+        }
+      }
+    }
+    .time {
+      color: #c1c1c1;
+      font-size: 12px;
+      .bullet-separator {
+        font-size: 10px;
+        color: #d1d1d1;
+      }
+    }
+  }
+}
+.task-confirmation {
+  @extend .form-group;
+  .confirmation-details {
+    margin-bottom: 20px;
+  }
+  .confirmation-title {
+    text-align: center;
+    font-size: 30px;
+    font-weight: bold;
+    margin-bottom: 20px;
+  }
+  .actions {
+    text-align: center;
+  }
+}
@@ -0,0 +1,44 @@
+import { Provider, provide, Component } from 'ng-forward';
+import * as helpers from "../../../spec/helpers";
+import { ComponentTestHelper, createClass } from '../../../spec/component-test-helper';
+import { TasksMenuComponent } from './tasks-menu.component';
+import { AuthEvents } from "./../../login";
+
+const htmlTemplate: string = '<tasks-menu></tasks-menu>';
+
+describe("Components", () => {
+    describe("Task Menu Component", () => {
+
+        let helper: ComponentTestHelper<TasksMenuComponent>;
+        let taskService = jasmine.createSpyObj("taskService", ["getAllPending"]);
+        let tasks = [{ id: 1 }, { id: 2 }];
+        let eventsHubService = jasmine.createSpyObj("eventsHubService", ["subscribeToEvent", "emitEvent"]);
+        taskService.getAllPending = jasmine.createSpy("getAllPending").and.returnValue(Promise.resolve({ headers: () => { }, data: tasks }));
+
+        beforeEach(angular.mock.module("templates"));
+
+        beforeEach((done) => {
+            let cls = createClass({
+                template: htmlTemplate,
+                directives: [TasksMenuComponent],
+                providers: [
+                    helpers.createProviderToValue("TaskService", taskService),
+                    helpers.createProviderToValue("EventsHubService", eventsHubService),
+                    helpers.createProviderToValue('SessionService', helpers.mocks.sessionWithCurrentUser({}))
+                ]
+            });
+            helper = new ComponentTestHelper<TasksMenuComponent>(cls, done);
+        });
+
+        it("load person tasks", () => {
+            expect(taskService.getAllPending).toHaveBeenCalled();
+        });
+
+        it("load person tasks when receive a login event", () => {
+            helper.component.loadTasks = jasmine.createSpy("loadTasks");
+            helper.component.ngOnInit();
+            (<any>helper.component['authService'])[AuthEvents[AuthEvents.loginSuccess]].next({});
+            expect(helper.component.loadTasks).toHaveBeenCalled();
+        });
+    });
+});
@@ -0,0 +1,46 @@
+import { Component, Inject } from "ng-forward";
+import { TaskService } from "../../../lib/ng-noosfero-api/http/task.service";
+import { AuthService, SessionService, AuthEvents } from "./../../login";
+import { EventsHubService } from "../../shared/services/events-hub.service";
+import { NoosferoKnownEvents } from "../../known-events";
+
+@Component({
+    selector: "tasks-menu",
+    templateUrl: "app/task/tasks-menu/tasks-menu.html"
+})
+@Inject(TaskService, SessionService, AuthService, EventsHubService)
+export class TasksMenuComponent {
+
+    tasks: noosfero.Task[];
+    total: number;
+    perPage = 5;
+    person: noosfero.Person;
+    eventsNames: NoosferoKnownEvents;
+
+    constructor(private taskService: TaskService,
+        private session: SessionService,
+        private authService: AuthService,
+        private eventsHubService: EventsHubService) {
+
+        this.eventsNames = new NoosferoKnownEvents();
+    }
+
+    ngOnInit() {
+        this.eventsHubService.subscribeToEvent(this.eventsNames.TASK_CLOSED, (task: noosfero.Task) => {
+            this.total--;
+        });
+        this.authService.subscribe(AuthEvents[AuthEvents.loginSuccess], () => {
+            this.loadTasks();
+        });
+        this.loadTasks();
+    }
+
+    loadTasks() {
+        if (!this.session.currentUser()) return;
+        this.person = this.session.currentUser().person;
+        this.taskService.getAllPending({ per_page: this.perPage }).then((result: noosfero.RestResult<noosfero.Task[]>) => {
+            this.total = result.headers('total');
+            this.tasks = result.data;
+        });
+    }
+}
@@ -0,0 +1,11 @@
+<li class="btn-nav tasks-menu" uib-dropdown  ng-show="ctrl.total > 0" ng-if="ctrl.total">
+  <a href="#" uib-dropdown-toggle>
+    <i class="fa fa-bell-o fa-fw fa-2x"></i>
+    <span class="badge">{{ctrl.total}}</span>
+  </a>
+  <div class="dropdown-menu task-panel" uib-dropdown-menu>
+    <div class="task-menu-header">{{"tasks.menu.header" | translate:{tasks: ctrl.total}:"messageformat"}}</div>
+    <task-list [tasks]="ctrl.tasks"></task-list>
+    <a ui-sref="main.profile.tasks({profile: ctrl.person.identifier})" class="all-tasks btn btn-default btn-xs">{{"tasks.menu.all" | translate}}</a>
+  </div>
+</li>
@@ -0,0 +1,29 @@
+tasks-menu {
+  .tasks-menu {
+    position: relative;
+    margin-right: 0;
+    .badge {
+      position: absolute;
+      top: 1px;
+      right: 8px;
+      border-radius: 6px;
+      background-color: #e84e40;
+      color: #fff;
+    }
+    .all-tasks {
+      text-align: center;
+      width: 100%;
+      display: block;
+      line-height: 25px;
+    }
+    .task-panel {
+      width: 550px;
+      padding: 0;
+    }
+    .task-menu-header {
+      text-align: center;
+      padding: 7px;
+      font-weight: bold;
+    }
+  }
+}
@@ -0,0 +1,34 @@
+import { Provider, provide, Component } from 'ng-forward';
+import * as helpers from "../../../spec/helpers";
+import { ComponentTestHelper, createClass } from '../../../spec/component-test-helper';
+import { TasksComponent } from './tasks.component';
+import { AuthEvents } from "./../../login";
+
+const htmlTemplate: string = '<tasks></tasks>';
+
+describe("Components", () => {
+    describe("Task Menu Component", () => {
+
+        let helper: ComponentTestHelper<TasksComponent>;
+        let taskService = jasmine.createSpyObj("taskService", ["getAllPending"]);
+        let tasks = [{ id: 1 }, { id: 2 }];
+        taskService.getAllPending = jasmine.createSpy("getAllPending").and.returnValue(Promise.resolve({ headers: () => { }, data: tasks }));
+
+        beforeEach(angular.mock.module("templates"));
+
+        beforeEach((done) => {
+            let cls = createClass({
+                template: htmlTemplate,
+                directives: [TasksComponent],
+                providers: [
+                    helpers.createProviderToValue("TaskService", taskService)
+                ]
+            });
+            helper = new ComponentTestHelper<TasksComponent>(cls, done);
+        });
+
+        it("load person tasks", () => {
+            expect(taskService.getAllPending).toHaveBeenCalled();
+        });
+    });
+});
@@ -0,0 +1,30 @@
+import { Component, Inject, provide } from "ng-forward";
+import { TaskService } from "../../../lib/ng-noosfero-api/http/task.service";
+
+@Component({
+    selector: "tasks",
+    templateUrl: "app/task/tasks/tasks.html",
+    providers: [
+        provide('taskService', { useClass: TaskService })
+    ]
+})
+@Inject(TaskService)
+export class TasksComponent {
+
+    tasks: noosfero.Task[];
+    total: number;
+    currentPage: number;
+    perPage = 5;
+
+    constructor(private taskService: TaskService) {
+        this.loadPage();
+    }
+
+    loadPage() {
+        this.taskService.getAllPending({ page: this.currentPage, per_page: this.perPage }).then((result: noosfero.RestResult<noosfero.Task[]>) => {
+            this.total = result.headers('total');
+            this.tasks = result.data;
+        });
+    }
+
+}
@@ -0,0 +1,8 @@
+<h3>{{"tasks.header" | translate}}</h3>
+
+<task-list [tasks]="vm.tasks"></task-list>
+
+<uib-pagination ng-model="vm.currentPage" total-items="vm.total" class="pagination-sm center-block"
+  boundary-links="true" items-per-page="vm.perPage" ng-change="vm.loadPage()"
+  first-text="«" last-text="»" previous-text="‹" next-text="›">
+</uib-pagination>
@@ -0,0 +1,2 @@
+<i class="task-icon fa fa-fw fa-user-times"></i>
+<span class="requestor">{{task.requestor.name}}</span> {{"tasks.abuse_complaint.message" | translate}}
@@ -0,0 +1,2 @@
+<i class="task-icon fa fa-fw fa-user-plus"></i>
+<span class="requestor">{{task.requestor.name}}</span> {{"tasks.add_friend.message" | translate}} <span class="target">{{task.target.name}}</span>
@@ -0,0 +1,11 @@
+<div class="add-member-details">
+  <label>{{"tasks.add_member.accept.select_role" | translate}}</label>
+  <div class="form-group roles">
+    <div class="checkbox-nice" ng-repeat="role in ctrl.roles">
+      <input type="checkbox" id="role_{{role.name}}" (click)="ctrl.toggleSelection(role)">
+      <label for="role_{{role.name}}">
+        {{role.name}}
+      </label>
+    </div>
+  </div>
+</div>
@@ -0,0 +1,44 @@
+import { Provider, provide, Component } from 'ng-forward';
+import * as helpers from "../../../../spec/helpers";
+import { ComponentTestHelper, createClass } from '../../../../spec/component-test-helper';
+import { AddMemberTaskAcceptComponent } from './add-member-task-accept.component';
+
+const htmlTemplate: string = '<add-member-task-accept [task]="ctrl.task" [confirmation-task]="ctrl.confirmationTask"></add-member-task-accept>';
+
+describe("Components", () => {
+    describe("Add Member Task Accept Component", () => {
+
+        let helper: ComponentTestHelper<AddMemberTaskAcceptComponent>;
+        let roleService = jasmine.createSpyObj("roleService", ["getByProfile"]);
+        let roles = [{ id: 1 }, { id: 2 }];
+        let task = <any>{ target: { id: 5 } };
+        roleService.getByProfile = jasmine.createSpy("getByProfile").and.returnValue(Promise.resolve({ headers: () => { }, data: roles }));
+
+        beforeEach(angular.mock.module("templates"));
+
+        beforeEach((done) => {
+            let cls = createClass({
+                template: htmlTemplate,
+                directives: [AddMemberTaskAcceptComponent],
+                providers: [
+                    helpers.createProviderToValue("RoleService", roleService)
+                ].concat(helpers.provideFilters("translateFilter")),
+                properties: { task: task, confirmationTask: task }
+            });
+            helper = new ComponentTestHelper<AddMemberTaskAcceptComponent>(cls, done);
+        });
+
+        it("insert role id in roles list when toggle selection", () => {
+            let role = { id: 1 };
+            helper.component.toggleSelection(<any>role);
+            expect(helper.component.confirmationTask.roles).toEqual([role.id]);
+        });
+
+        it("remove role id from roles list when toggle selection", () => {
+            let role = { id: 1 };
+            helper.component.confirmationTask.roles = [role.id];
+            helper.component.toggleSelection(<any>role);
+            expect(helper.component.confirmationTask.roles).toEqual([]);
+        });
+    });
+});
@@ -0,0 +1,33 @@
+import { Component, Input, Inject } from "ng-forward";
+import { RoleService } from "../../../../lib/ng-noosfero-api/http/role.service";
+
+@Component({
+    selector: "add-member-task-accept",
+    templateUrl: "app/task/types/add-member/add-member-accept.html",
+})
+@Inject(RoleService)
+export class AddMemberTaskAcceptComponent {
+
+    @Input() task: noosfero.Task;
+    @Input() confirmationTask: noosfero.AddMemberTask;
+    roles: noosfero.Role[];
+
+    constructor(private roleService: RoleService) { }
+
+    ngOnInit() {
+        if (!this.task.target) return;
+        this.confirmationTask.roles = [];
+        this.roleService.getByProfile(this.task.target.id).then((result: noosfero.RestResult<noosfero.Role[]>) => {
+            this.roles = result.data;
+        });
+    }
+
+    toggleSelection(role: noosfero.Role) {
+        let index = this.confirmationTask.roles.indexOf(role.id);
+        if (index >= 0) {
+            this.confirmationTask.roles.splice(index, 1);
+        } else {
+            this.confirmationTask.roles.push(role.id);
+        }
+    }
+}
@@ -0,0 +1,2 @@
+<i class="task-icon fa fa-fw fa-user-plus"></i>
+<span class="requestor">{{task.requestor.name}}</span> {{"tasks.add_member.message" | translate}} <span class="target">{{task.target.name}}</span>
@@ -0,0 +1,5 @@
+.add-member-details {
+  .roles {
+    margin-left: 40px;
+  }
+}
@@ -0,0 +1,2 @@
+<i class="task-icon fa fa-fw fa-users"></i>
+<span class="requestor">{{task.requestor.name}}</span> {{"tasks.create_community.message" | translate}} <span class="target">{{task.data.name}}</span>
@@ -0,0 +1 @@
+<!-- not implemented yet -->
@@ -0,0 +1,2 @@
+<i class="task-icon fa fa-fw fa-file-text"></i>
+<span class="requestor">{{task.requestor.name}}</span> {{"tasks.suggest_article.message" | translate}} <span class="target">{{task.data.article.name}}</span>
 {
   "noosfero.name" : "Noosfero",
   "blocks.profile_image.control_panel": "Control Panel",
+  "blocks.profile_image.join": "Join community",
+  "blocks.profile_image.leave": "Leave community",
+  "blocks.profile_image.join.moderation.title": "Good job!",
+  "blocks.profile_image.join.moderation.message": "Your membership is waiting for approval",
   "navbar.profile": "Profile",
   "navbar.settings": "Settings",
   "navbar.logout": "Log Out",
@@ -19,8 +23,10 @@
   "profile.others_info": "Others",
   "profile.community.title": "Community",
   "profile.person.title": "Person",
+  "profile.image.upload": "Upload Photo",
   "activities.title": "Activities",
   "activities.create_article.description": "has published on",
+  "activities.scrap.description": "wrote in its timeline",
   "activities.add_member_in_community.description": "has joined the community",
   "activities.new_friendship.description": "has made {friends, plural, one{one new friend} other{# new friends}}:",
   "auth.title": "Great to have you back!",
@@ -28,6 +34,7 @@
   "auth.form.password": "Password",
   "auth.form.keepLoggedIn": "Keep me logged in",
   "auth.form.login_button": "Login",
+  "auth.createAccount": "Create account",
   "navbar.content_viewer_actions.new_item": "New Item",
   "navbar.profile_actions.new_item": "New Item",
   "navbar.content_viewer_actions.new_post": "New Post",
@@ -97,5 +104,47 @@
   "block.edition.display_user.all": "All users",
   "block.edition.display_user.logged": "Logged",
   "block.edition.display_user.not_logged": "Not logged",
-  "block.edition.language.label": "Show for:"
+  "block.edition.language.label": "Show for:",
+  "activities.event.description": "Event on",
+  "time.at": "at",
+  "date.on": "On",
+  "account.register.welcomeMessageTitle": "Nice to have you there!",
+  "account.register.fullNameLabel": "Full name",
+  "account.register.usernameLabel": "Username",
+  "account.register.emailLabel": "Email",
+  "account.register.passwordLabel": "Password",
+  "account.register.passwordConfirmationLabel": "Password confirmation",
+  "account.register.accountCreatingMessage": "By creating an account, you are agreeing with the ",
+  "account.register.signupMessage": "Register",
+  "account.register.haveAccountMessage": "Already have an account?",
+  "account.register.termsOfUseMessage": "terms of use",
+  "account.register.success.title": "Good job!",
+  "account.register.success.message": "Account created!",
+  "account.register.passwordConfirmation.failed": "Wrong password confirmation",
+  "messages.invalid.required": "This field is required",
+  "messages.invalid.maxlength": "This field is too long",
+  "messages.invalid.minlength": "This field is too short",
+  "messages.invalid.email": "This needs to be a valid email",
+  "messages.invalid.passwordMatch": "Your passwords did not match",
+  "tasks.menu.all": "All tasks",
+  "tasks.menu.all": "See all tasks",
+  "tasks.menu.header": "You have {tasks, plural, one{one pending task} other{# pending tasks}}",
+  "tasks.actions.accept": "Accept",
+  "tasks.actions.reject": "Reject",
+  "tasks.header": "Tasks",
+  "tasks.actions.accept.confirmation.title": "Confirm task acceptance?",
+  "tasks.actions.reject.confirmation.title": "Confirm task rejection?",
+  "tasks.actions.confirmation.yes": "Yes",
+  "tasks.actions.confirmation.cancel": "Cancel",
+  "tasks.actions.accept.title": "Good job!",
+  "tasks.actions.reject.title": "Good job!",
+  "tasks.actions.accept.message": "Task Accepted",
+  "tasks.actions.reject.message": "Task Rejected",
+  "tasks.actions.reject.explanation.label": "Rejection explanation",
+  "tasks.add_member.accept.select_role": "Select Roles:",
+  "tasks.abuse_complaint.message": "was reported due to inappropriate behavior",
+  "tasks.add_friend.message": "wants to be friend of",
+  "tasks.add_member.message": "wants to join",
+  "tasks.create_community.message": "wants to create a new community:",
+  "tasks.suggest_article.message": "suggested a new article:"
 }
@@ -0,0 +1,4 @@
+<li ng-message="required" translate="messages.invalid.required"></li>
+<li ng-message="minlength" translate="messages.invalid.minlength"></li>
+<li ng-message="maxlength" translate="messages.invalid.maxlength"></li>
+<li ng-message="email" translate="messages.invalid.email"></li>
 {
   "noosfero.name" : "Noosfero",
   "blocks.profile_image.control_panel": "Painel de Controle",
+  "blocks.profile_image.join": "Entrar na comunidade",
+  "blocks.profile_image.leave": "Sair da comunidade",
+  "blocks.profile_image.join.moderation.title": "Bom trabalho!",
+  "blocks.profile_image.join.moderation.message": "Sua participação está pendente de aprovação",
   "navbar.profile": "Perfil",
   "navbar.settings": "Configurações",
   "navbar.logout": "Sair",
@@ -19,8 +23,10 @@
   "profile.others_info": "Outras informações",
   "profile.community.title": "Comunidade",
   "profile.person.title": "Pessoa",
+  "profile.image.upload": "Enviar photo",
   "activities.title": "Atividades",
   "activities.create_article.description": "publicou em",
+  "activities.scrap.description": "escreveu em sua linha do tempo",
   "activities.add_member_in_community.description": "entrou na comunidade",
   "activities.new_friendship.description": "fez {friends, plural, one{um novo amigo} other{# novos amigos}}:",
   "auth.title": "Legal ter você de volta!",
@@ -28,9 +34,10 @@
   "auth.form.password": "Senha",
   "auth.form.keepLoggedIn": "Continuar logado",
   "auth.form.login_button": "Login",
+  "auth.createAccount": "Criar conta",
   "navbar.content_viewer_actions.new_item": "Novo Item",
   "navbar.profile_actions.new_item": "Novo Item",
-  "navbar.content_viewer_actions.new_post": "Novo Artigo",
+  "navbar.content_viewer_actions.new_post": "Novo Post",
   "navbar.content_viewer_actions.new_discussion": "Nova Consulta",
   "navbar.profile_actions.new_discussion": "Nova Discussão",
   "notification.error.default.message": "Algo deu errado!",
@@ -97,5 +104,50 @@
   "block.edition.display_user.all": "Todos os usuários",
   "block.edition.display_user.logged": "Logados",
   "block.edition.display_user.not_logged": "Não logados",
-  "block.edition.language.label": "Exibir para:"
+  "block.edition.language.label": "Exibir para:",
+  "activities.event.description": "Evento em",
+  "time.at": "às",
+  "date.on": "Em",
+  "account.register.welcomeMessageTitle": "Ótimo ter você aqui!",
+  "account.register.seeMoreMessage": "Saiba mais ",
+  "account.register.informationsMessage": "informações",
+  "account.register.fullNameLabel": "Nome completo",
+  "account.register.lastNameLabel": "Sobrenome",
+  "account.register.usernameLabel": "Nome de usuário",
+  "account.register.emailLabel": "Email",
+  "account.register.passwordLabel": "Senha",
+  "account.register.passwordConfirmationLabel": "Confirmar senha",
+  "account.register.accountCreatingMessage": "Ao criar uma conta, você está concordando com os ",
+  "account.register.termsOfUseMessage": "termos de uso",
+  "account.register.signupMessage": "Criar Conta",
+  "account.register.haveAccountMessage": "Já possui uma conta?",
+  "account.register.success.title": "Bom trabalho!",
+  "account.register.success.message": "Conta criada com sucesso!",
+  "account.register.passwordConfirmation.failed": "A confirmação de senha não corresponde à senha",
+  "messages.invalid.required": "Campo obrigatório",
+  "messages.invalid.maxlength": "O valor é muito longo",
+  "messages.invalid.minlength": "O valor é muito curto",
+  "messages.invalid.email": "Informe um email válido",
+  "messages.invalid.passwordMatch": "As senhas não coincidem",
+  "tasks.menu.all": "Todas as tarefas",
+  "tasks.menu.all": "Veja todas as tarefas",
+  "tasks.menu.header": "Você tem {tasks, plural, one{uma tarefa pendente} other{# tarefas pendentes}}",
+  "tasks.actions.accept": "Aceitar",
+  "tasks.actions.reject": "Rejeitar",
+  "tasks.header": "Tarefas",
+  "tasks.actions.accept.confirmation.title": "Confirmar aprovação da tarefa?",
+  "tasks.actions.reject.confirmation.title": "Confirmar reprovação da tarefa?",
+  "tasks.actions.confirmation.yes": "Sim",
+  "tasks.actions.confirmation.cancel": "Cancelar",
+  "tasks.actions.accept.title": "Bom trabalho!",
+  "tasks.actions.reject.title": "Bom trabalho!",
+  "tasks.actions.accept.message": "Tarefa Aceita",
+  "tasks.actions.reject.message": "Tarefa Rejeitada",
+  "tasks.actions.reject.explanation.label": "Motivo da rejeição",
+  "tasks.add_member.accept.select_role": "Selecionar papéis:",
+  "tasks.abuse_complaint.message": "foi notificado por comportamento inadequado",
+  "tasks.add_friend.message": "quer ser amigo de",
+  "tasks.add_member.message": "quer entrar em",
+  "tasks.create_community.message": "quer criar uma nova comunidade:",
+  "tasks.suggest_article.message": "sugeriu um novo artigo:"
 }
@@ -17,7 +17,6 @@ describe(&quot;Services&quot;, () =&gt; {
             articleService = _ArticleService_;
         }));
  
-
         describe("Succesfull requests", () => {
  
             it("should remove article", (done) => {
@@ -92,6 +91,5 @@ describe(&quot;Services&quot;, () =&gt; {
             });
         });
  
-
     });
 });
@@ -28,4 +28,19 @@ export class PersonService extends RestangularService&lt;noosfero.Person&gt; {
         p.catch(this.getHandleErrorFunction<noosfero.RestResult<any>>(deferred));
         return deferred.promise;
     }
+
+    uploadImage(profile: noosfero.Profile, base64_image_json: any) {
+        let headers = { 'Content-Type': 'application/json' };
+        let deferred = this.$q.defer<noosfero.RestResult<noosfero.Profile>>();
+        // TODO dynamically copy the selected attributes to update
+        let attributesToUpdate: any = {
+            person: { image_builder: base64_image_json }
+        };
+        let restRequest: ng.IPromise<noosfero.RestResult<any>> =
+            this.getElement(profile.id).customPOST(attributesToUpdate, null, null, headers);
+        restRequest.then(this.getHandleSuccessFunction(deferred))
+            .catch(this.getHandleErrorFunction(deferred));
+        return deferred.promise;
+    }
+
 }
@@ -111,6 +111,56 @@ describe(&quot;Services&quot;, () =&gt; {
                 });
                 $httpBackend.flush();
             });
+
+            it("should return the profile members", (done) => {
+                let profileId = 1;
+                $httpBackend.expectGET(`/api/v1/profiles/${profileId}/members`).respond(200, { people: [{ id: 2 }] });
+                profileService.getMembers(<any>{ id: profileId }).then((response: restangular.IResponse) => {
+                    expect(response.data.people).toEqual([{ id: 2 }]);
+                    done();
+                });
+                $httpBackend.flush();
+            });
+
+            it("should return true if the person is a profile member", (done) => {
+                let profileId = 1;
+                $httpBackend.expectGET(`/api/v1/profiles/${profileId}/members`).respond(200, { people: [{ id: 2 }] });
+                profileService.isMember(<any>{ id: 2 }, <any>{ id: profileId }).then((response: restangular.IResponse) => {
+                    expect(response).toEqual(true);
+                    done();
+                });
+                $httpBackend.flush();
+            });
+
+            it("should return false if the person is a profile member", (done) => {
+                let profileId = 1;
+                $httpBackend.expectGET(`/api/v1/profiles/${profileId}/members`).respond(200, { people: [] });
+                profileService.isMember(<any>{ id: 2 }, <any>{ id: profileId }).then((response: restangular.IResponse) => {
+                    expect(response).toEqual(false);
+                    done();
+                });
+                $httpBackend.flush();
+            });
+
+            it("should add member to profile", (done) => {
+                let profileId = 1;
+                $httpBackend.expectPOST(`/api/v1/profiles/${profileId}/members`).respond(200, { pending: false });
+                profileService.addMember(<any>{ id: 2 }, <any>{ id: profileId }).then((response: restangular.IResponse) => {
+                    expect(response.data.pending).toEqual(false);
+                    done();
+                });
+                $httpBackend.flush();
+            });
+
+            it("should remove member from profile", (done) => {
+                let profileId = 1;
+                $httpBackend.expectDELETE(`/api/v1/profiles/${profileId}/members`).respond(200, { person: { id: 2 } });
+                profileService.removeMember(<any>{ id: 2 }, <any>{ id: profileId }).then((response: restangular.IResponse) => {
+                    expect(response.data.person).toEqual({ id: 2 });
+                    done();
+                });
+                $httpBackend.flush();
+            });
         });
  
  
@@ -64,4 +64,29 @@ export class ProfileService {
         let headers = { 'Content-Type': 'application/json' };
         return this.get(profile.id).customPOST({ profile: profile }, null, null, headers);
     }
+
+    getMembers(profile: noosfero.Profile, params?: any) {
+        let p = this.get(profile.id);
+        return p.customGET('members', params);
+    }
+
+    isMember(person: noosfero.Person, profile: noosfero.Profile) {
+        let deferred = this.$q.defer();
+        if (person) {
+            this.getMembers(profile, { identifier: person.identifier }).then((result: any) => {
+                deferred.resolve(result.data.people.length > 0);
+            });
+        } else {
+            deferred.resolve(false);
+        }
+        return deferred.promise;
+    }
+
+    addMember(person: noosfero.Person, profile: noosfero.Profile) {
+        return this.get(profile.id).customPOST({}, "members", null, null);
+    }
+
+    removeMember(person: noosfero.Person, profile: noosfero.Profile) {
+        return this.get(profile.id).customDELETE("members", null, null);
+    }
 }
@@ -0,0 +1,39 @@
+import { RegisterService } from "./register.service";
+
+describe("Services", () => {
+
+    describe("Register Service", () => {
+
+        let $httpBackend: ng.IHttpBackendService;
+        let registerService: RegisterService;
+        let $rootScope: ng.IRootScopeService;
+        let user: any = {
+            id: 1,
+            login: 'test',
+            email: 'test@email.com'
+        };
+
+        beforeEach(angular.mock.module("main", ($translateProvider: angular.translate.ITranslateProvider) => {
+            $translateProvider.translations('en', {});
+        }));
+
+        beforeEach(inject((_$httpBackend_: ng.IHttpBackendService, _RegisterService_: RegisterService, _$rootScope_: ng.IRootScopeService) => {
+            $httpBackend = _$httpBackend_;
+            registerService = _RegisterService_;
+            $rootScope = _$rootScope_;
+        }));
+
+        describe("Succesfull requests", () => {
+
+            it("should creaet a new account", (done) => {
+
+                $httpBackend.expectPOST(`/api/v1/register?email=${user.email}&id=${user.id}&login=${user.login}`).respond(201, [{ login: "test" }]);
+                registerService.createAccount(user).then((response: restangular.IResponse) => {
+                    expect(response.data[0].login).toEqual("test");
+                    done();
+                });
+                $httpBackend.flush();
+            });
+        });
+    });
+});
@@ -0,0 +1,14 @@
+import { Injectable, Inject } from "ng-forward";
+import { RestangularService } from "./restangular_service";
+
+@Injectable()
+@Inject("Restangular")
+export class RegisterService {
+    constructor(private Restangular: restangular.IService) {
+        this.Restangular = Restangular;
+    }
+
+    createAccount(user: noosfero.User): ng.IPromise<noosfero.RestResult<noosfero.User>> {
+        return this.Restangular.all("").customPOST(user, "register", user);
+    }
+}
@@ -80,14 +80,16 @@ export abstract class RestangularService&lt;T extends noosfero.RestModel&gt; {
         }
         return {
             data: (response.data[dataKey] || response.data),
-            headers: response.headers
+            headers: response.headers,
+            status: response.status
         };
     };
  
     protected buildResult(response: restangular.IResponse): noosfero.RestResult<T> {
         return {
             data: response.data,
-            headers: response.headers
+            headers: response.headers,
+            status: response.status
         };
     };
     /**
@@ -0,0 +1,33 @@
+import { RoleService } from "./role.service";
+
+describe("Services", () => {
+
+    describe("Role Service", () => {
+
+        let $httpBackend: ng.IHttpBackendService;
+        let roleService: RoleService;
+
+        beforeEach(angular.mock.module("main", ($translateProvider: angular.translate.ITranslateProvider) => {
+            $translateProvider.translations('en', {});
+        }));
+
+        beforeEach(inject((_$httpBackend_: ng.IHttpBackendService, _RoleService_: RoleService) => {
+            $httpBackend = _$httpBackend_;
+            roleService = _RoleService_;
+        }));
+
+
+        describe("Succesfull requests", () => {
+
+            it("list organization roles", (done) => {
+                $httpBackend.expectGET(`/api/v1/profiles/1/roles`).respond(200, { roles: [{ id: 1 }] });
+                roleService.getByProfile(1).then((result: noosfero.RestResult<noosfero.Role[]>) => {
+                    expect(result.data).toEqual([{ id: 1 }]);
+                    done();
+                });
+                $httpBackend.flush();
+            });
+        });
+
+    });
+});
@@ -0,0 +1,27 @@
+import { Injectable, Inject } from "ng-forward";
+import { RestangularService } from "./restangular_service";
+
+@Injectable()
+@Inject("Restangular", "$q", "$log")
+export class RoleService extends RestangularService<noosfero.Role> {
+
+    constructor(Restangular: restangular.IService, $q: ng.IQService, $log: ng.ILogService) {
+        super(Restangular, $q, $log);
+    }
+
+    getResourcePath() {
+        return "roles";
+    }
+
+    getDataKeys() {
+        return {
+            singular: 'role',
+            plural: 'roles'
+        };
+    }
+
+    getByProfile(profileId: number, params: any = {}) {
+        return this.list(this.restangularService.one("profiles", profileId), params);
+    }
+
+}
@@ -0,0 +1,56 @@
+import { TaskService } from "./task.service";
+
+
+describe("Services", () => {
+
+    describe("Task Service", () => {
+
+        let $httpBackend: ng.IHttpBackendService;
+        let taskService: TaskService;
+
+        beforeEach(angular.mock.module("main", ($translateProvider: angular.translate.ITranslateProvider) => {
+            $translateProvider.translations('en', {});
+        }));
+
+        beforeEach(inject((_$httpBackend_: ng.IHttpBackendService, _TaskService_: TaskService) => {
+            $httpBackend = _$httpBackend_;
+            taskService = _TaskService_;
+        }));
+
+
+        describe("Succesfull requests", () => {
+
+            it("list pending tasks", (done) => {
+                $httpBackend.expectGET(`/api/v1/tasks?all_pending=true&status=1`).respond(200, { tasks: [{ id: 1 }] });
+                taskService.getAllPending().then((result: noosfero.RestResult<noosfero.Task[]>) => {
+                    expect(result.data).toEqual([{ id: 1 }]);
+                    done();
+                });
+                $httpBackend.flush();
+            });
+
+            it("finish a task", (done) => {
+                let taskId = 1;
+                let task: noosfero.Task = <any>{ id: taskId };
+                $httpBackend.expectPUT(`/api/v1/tasks/${taskId}/finish`).respond(200, { task: { id: taskId } });
+                taskService.finishTask(task).then((result: noosfero.RestResult<noosfero.Task>) => {
+                    expect(result.data).toEqual({ id: 1 });
+                    done();
+                });
+                $httpBackend.flush();
+            });
+
+            it("cancel a task", (done) => {
+                let taskId = 1;
+                let task: noosfero.Task = <any>{ id: taskId };
+                $httpBackend.expectPUT(`/api/v1/tasks/${taskId}/cancel`).respond(200, { task: { id: taskId } });
+                taskService.cancelTask(task).then((result: noosfero.RestResult<noosfero.Task>) => {
+                    expect(result.data).toEqual({ id: 1 });
+                    done();
+                });
+                $httpBackend.flush();
+            });
+        });
+
+    });
+});
@@ -0,0 +1,46 @@
+import { Injectable, Inject } from "ng-forward";
+import { RestangularService } from "./restangular_service";
+
+@Injectable()
+@Inject("Restangular", "$q", "$log")
+export class TaskService extends RestangularService<noosfero.Task> {
+
+    constructor(Restangular: restangular.IService, $q: ng.IQService, $log: ng.ILogService) {
+        super(Restangular, $q, $log);
+    }
+
+    getResourcePath() {
+        return "tasks";
+    }
+
+    getDataKeys() {
+        return {
+            singular: 'task',
+            plural: 'tasks'
+        };
+    }
+
+    getAllPending(params: any = {}) {
+        params['all_pending'] = true;
+        params['status'] = 1;
+        return this.list(null, params);
+    }
+
+    finishTask(task: noosfero.Task) {
+        return this.closeTask(task, "finish");
+    }
+
+    cancelTask(task: noosfero.Task) {
+        return this.closeTask(task, "cancel");
+    }
+
+    closeTask(task: noosfero.Task, action: string) {
+        let element = this.getElement(task.id);
+        delete task.id;
+        let put = element.customPUT({ task: task }, action);
+        let deferred = this.$q.defer<noosfero.RestResult<noosfero.Task>>();
+        put.then(this.getHandleSuccessFunction<noosfero.RestResult<noosfero.Task>>(deferred));
+        put.catch(this.getHandleErrorFunction<noosfero.RestResult<noosfero.Task>>(deferred));
+        return deferred.promise;
+    }
+}
@@ -0,0 +1,11 @@
+namespace noosfero {
+    /**
+     * @ngdoc interface
+     * @name noosfero.AddMemberTask
+     * @description
+     *  A representation of an AddMemberTask in Noosfero.
+     */
+    export interface AddMemberTask extends Task {
+        roles: number[];
+    }
+}
@@ -5,7 +5,7 @@ namespace noosfero {
      * @name noofero.Environment
      * @description
      *  A representation of a Noosfero Environment.
-     */    
+     */
     export interface Environment extends RestModel {
         /**
          * @ngdoc property
@@ -23,6 +23,21 @@ namespace noosfero {
          * @returns {string} The Environment layout (e.g. default, rightbar)
          */
         layout_template: string;
+
+        /**
+         * @ngdoc property
+         * @name signup_intro
+         * @propertyOf noofero.Environment
+         * @returns {string} The Environment signup introduction HTML (e.g. Welcome to Noosfero...!!)
+         */
+        signup_intro: string;
+
+        /**
+         * @ngdoc property
+         * @name host
+         * @propertyOf noofero.Environment
+         * @returns {string} The Environment default domain address with 'http://' prefix (e.g. http://localhost)
+         */
+        host: string;
     }
 }
-
@@ -3,5 +3,6 @@ namespace noosfero {
     export interface RestResult<T> {
         data: T;
         headers: Function;
+        status: Number;
     }
-}
 \ No newline at end of file
+}
@@ -0,0 +1,12 @@
+namespace noosfero {
+    /**
+     * @ngdoc interface
+     * @name noosfero.Role
+     * @description
+     *  A representation of a Role in Noosfero.
+     */
+    export interface Role extends RestModel {
+        name: string;
+        key: string;
+    }
+}
@@ -0,0 +1,14 @@
+namespace noosfero {
+    /**
+     * @ngdoc interface
+     * @name noosfero.Task
+     * @description
+     *  A representation of a Task in Noosfero.
+     */
+    export interface Task extends RestModel {
+        type: string;
+        accept_details: boolean;
+        reject_details: boolean;
+        target: noosfero.Profile | noosfero.Environment;
+    }
+}
@@ -40,6 +40,11 @@ export var mocks: any = {
             return this.modalInstance;
         }
     },
+    registerService: {
+        createAccount: (user: noosfero.User) => {
+            return Promise.resolve({ status: 201 });
+        }
+    },
     authService: {
         loginSuccess: {
             event: Function,
@@ -145,6 +150,15 @@ export var mocks: any = {
             return mocks.promiseResultTemplate({
                 people: {}
             });
+        },
+        getCurrentEnvironment: (): any => {
+            return {
+                id: 1,
+                settings: {},
+                layout_template: '',
+                signup_intro: 'Welcome to Noosfero',
+                host: 'http://localhost'
+            };
         }
     },
     profileService: {
@@ -223,11 +237,16 @@ export var mocks: any = {
         }
     },
     promiseResultTemplate: (response?: {}) => {
-
-        return {
-            then: (func?: (response: any) => void) => {
-                if (func) { return func(response); }
+        let callback = (func?: (response: any) => any) => {
+            if (func) {
+                let ret = func(response);
+                if (ret && typeof ret.then === "function") return ret;
             }
+            return mocks.promiseResultTemplate(response);
+        };
+        return {
+            then: callback,
+            finally: callback
         };
     },
     $log: {
@@ -240,6 +259,7 @@ export var mocks: any = {
     },
     notificationService: {
         success: () => { },
-        confirmation: () => { }
+        confirmation: () => { },
+        error: () => { }
     }
 };
@@ -8,6 +8,7 @@
     "angular-mocks": "github:DefinitelyTyped/DefinitelyTyped/angularjs/angular-mocks.d.ts",
     "angular-translate": "github:DefinitelyTyped/DefinitelyTyped/angular-translate/angular-translate.d.ts#19850bf86c876e0c2544842114878ece4664941a",
     "angular-ui-router": "github:DefinitelyTyped/DefinitelyTyped/angular-ui-router/angular-ui-router.d.ts#655f8c1bf3c71b0e1ba415b36309604f79326ac8",
+    "angular-ui-bootstrap": "github:DefinitelyTyped/DefinitelyTyped/angular-ui-bootstrap/angular-ui-bootstrap.d.ts",
     "es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#4de74cb527395c13ba20b438c3a7a419ad931f1c",
     "jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#dd638012d63e069f2c99d06ef4dcc9616a943ee4",
     "jquery": "github:DefinitelyTyped/DefinitelyTyped/jquery/jquery.d.ts#470954c4f427e0805a2d633636a7c6aa7170def8",
...	...	@@ -39,12 +39,20 @@
39	39	"angular-click-outside": "^2.7.1",
40	40	"ng-ckeditor": "^0.2.1",
41	41	"angular-tag-cloud": "^0.3.0",
42		- "angular-ui-switch": "^0.1.1"
	42	+ "angular-ui-switch": "^0.1.1",
	43	+ "angular-password": "^1.0.1",
	44	+ "ng-file-upload": "^12.0.4",
	45	+ "ng-img-crop": "^0.3.2"
43	46	},
44	47	"devDependencies": {
45	48	"angular-mocks": "~1.5.0"
46	49	},
47	50	"overrides": {
	51	+ "ng-file-upload": {
	52	+ "main": [
	53	+ "ng-file-upload-all.js"
	54	+ ]
	55	+ },
48	56	"ng-ckeditor": {
49	57	"main": [
50	58	"ng-ckeditor.js",
...	...
...	...	@@ -46,6 +46,7 @@ gulp.task('watch', ['inject'], function () {
46	46	watchPaths.push(path.join(src, '/app/*/.html'));
47	47	watchPaths.push(path.join(src, conf.paths.plugins, '/*/.html'));
48	48	});
	49	+ watchPaths.push(stylePaths);
49	50	gulp.watch(watchPaths, function(event) {
50	51	browserSync.reload(event.path);
51	52	});
...	...
...	...	@@ -0,0 +1 @@
	1	+export * from "./register.component";
...	...
...	...	@@ -0,0 +1,77 @@
	1	+<div class="register-page">
	2	+ <div class="welcome-message">
	3	+ <h1>{{"account.register.welcomeMessageTitle" \| translate }}</h1>
	4	+ <div class="environment-signup-intro" ng-bind-html="ctrl.environment.signup_intro"></div>
	5	+ </div>
	6	+ <form name="signupForm">
	7	+ <div class="row">
	8	+ <div class="col-md-12 register-field">
	9	+ <div class="input-group">
	10	+ <span class="input-group-addon"><i class="fa fa-male"></i><i class="fa fa-female"></i></span>
	11	+ <input type="text" class="form-control" id="name" name="fullName" placeholder="{{'account.register.fullNameLabel' \| translate }}" ng-model="ctrl.account.name">
	12	+ </div>
	13	+ </div>
	14	+
	15	+ <div class="form-group col-md-12 register-field" ng-class="ctrl.isInvalid(signupForm.username)">
	16	+ <div class="input-group">
	17	+ <span class="input-group-addon" style="font-weight: bold;"><i class="fa fa-globe"></i> {{ ctrl.environment.host }}</span>
	18	+ <input type="text" id="username" name="username" class="form-control" placeholder="{{'account.register.usernameLabel' \| translate }}" ng-model="ctrl.account.login" required>
	19	+ </div>
	20	+ <div class="help-block" ng-show="signupForm.username.$touched" ng-messages="signupForm.username.$error">
	21	+ <ul class="list-unstyled">
	22	+ <li ng-messages-include="languages/messages.html"></li>
	23	+ </ul>
	24	+ </div>
	25	+ </div>
	26	+
	27	+ <div class="form-group col-md-12 register-field" ng-class="ctrl.isInvalid(signupForm.email)">
	28	+ <div class="input-group">
	29	+ <span class="input-group-addon"><i class="fa fa-envelope"></i></span>
	30	+ <input type="email" class="form-control" id="email" name="email" placeholder="{{'account.register.emailLabel' \| translate }}" ng-model="ctrl.account.email" required>
	31	+ </div>
	32	+ <div class="help-block" ng-show="signupForm.email.$touched" ng-messages="signupForm.email.$error">
	33	+ <ul class="list-unstyled">
	34	+ <li ng-messages-include="languages/messages.html"></li>
	35	+ </ul>
	36	+ </div>
	37	+ </div>
	38	+
	39	+ <div class="form-group col-md-6 register-field" ng-class="ctrl.isInvalid(signupForm.password)">
	40	+ <div class="input-group">
	41	+ <span class="input-group-addon"><i class="fa fa-lock"></i></span>
	42	+ <input type="password" class="form-control" id="password" name="password" placeholder="{{'account.register.passwordLabel' \| translate }}" ng-model="ctrl.account.password" required>
	43	+ </div>
	44	+ <div class="help-block" ng-show="signupForm.password.$touched" ng-messages="signupForm.password.$error">
	45	+ <ul class="list-unstyled">
	46	+ <li ng-messages-include="languages/messages.html"></li>
	47	+ </ul>
	48	+ </div>
	49	+ </div>
	50	+
	51	+ <div class="form-group col-md-6 register-field" ng-class="ctrl.isInvalid(signupForm.passwordConfirm)">
	52	+ <div class="input-group">
	53	+ <span class="input-group-addon"><i class="fa fa-unlock-alt"></i></span>
	54	+ <input type="password" class="form-control" id="passwordConfirm" name="passwordConfirm" match-password="password" placeholder="{{'account.register.passwordConfirmationLabel' \| translate}}" ng-model="ctrl.account.passwordConfirmation" required>
	55	+ </div>
	56	+ <div class="help-block" ng-show="signupForm.passwordConfirm.$touched" ng-messages="signupForm.passwordConfirm.$error">
	57	+ <ul class="list-unstyled">
	58	+ <li ng-messages-include="languages/messages.html"></li>
	59	+ <li ng-message="passwordMatch" translate="messages.invalid.passwordMatch"></li>
	60	+ </ul>
	61	+ </div>
	62	+ </div>
	63	+
	64	+ <div class="col-md-12">
	65	+ <p class="terms-info">{{"account.register.accountCreatingMessage" \| translate}} <a (click)="ctrl.openTerms()" href="#">{{"account.register.termsOfUseMessage" \| translate}}</a>.</p>
	66	+ </div>
	67	+
	68	+ <div class="col-md-12">
	69	+ <button type="submit" class="btn btn-default" ng-disabled="signupForm.$invalid" ng-click="ctrl.signup()">{{"account.register.signupMessage" \| translate}}</button>
	70	+ </div>
	71	+
	72	+ </div>
	73	+ </form>
	74	+
	75	+ <p class="already-registered-message">{{"account.register.haveAccountMessage" \| translate}}</p>
	76	+
	77	+</div>
...	...
...	...	@@ -0,0 +1,7 @@
	1	+<div class="modal-header">
	2	+ <h3 class="modal-title">Register terms</h3>
	3	+</div>
	4	+<div class="modal-body modal-body-overflow" ng-bind-html="ctrl.environment.terms_of_use"></div>
	5	+<div class="modal-footer">
	6	+ <button class="btn btn-primary" type="button" (click)="vm.closeTerms()">OK</button>
	7	+</div>
...	...
...	...	@@ -0,0 +1,52 @@
	1	+import { ComponentTestHelper, createClass } from "../../spec/component-test-helper";
	2	+import * as helpers from "../../spec/helpers";
	3	+import { RegisterComponent } from "./register.component";
	4	+// import {RegisterService} from "../../lib/ng-noosfero-api/http/register.service"
	5	+
	6	+
	7	+describe("Register Component", () => {
	8	+ const htmlTemplate: string = '<noosfero-register></noosfero-register>';
	9	+
	10	+ let helper: ComponentTestHelper<RegisterComponent>;
	11	+ let registerService = helpers.mocks.registerService;
	12	+ let stateService = jasmine.createSpyObj("$state", ["transitionTo"]);
	13	+ let notificationService = helpers.mocks.notificationService;
	14	+ notificationService.success = jasmine.createSpy('success');
	15	+ notificationService.error = jasmine.createSpy('error');
	16	+
	17	+
	18	+ let account: any = {
	19	+ id: 1,
	20	+ login: 'test',
	21	+ email: 'test@email.com',
	22	+ password: 'xxx',
	23	+ passwordConfirmation: 'xxx'
	24	+ };
	25	+
	26	+ beforeEach(() => {
	27	+ angular.mock.module('templates');
	28	+ angular.mock.module('ngSanitize');
	29	+ angular.mock.module('ngMessages');
	30	+ angular.mock.module('ngPassword');
	31	+ });
	32	+
	33	+ beforeEach((done) => {
	34	+ let cls = createClass({
	35	+ template: htmlTemplate,
	36	+ directives: [RegisterComponent],
	37	+ providers: [
	38	+ helpers.createProviderToValue('$state', stateService),
	39	+ helpers.createProviderToValue('$uibModal', helpers.mocks.$modal),
	40	+ helpers.createProviderToValue('RegisterService', registerService),
	41	+ helpers.createProviderToValue('NotificationService', notificationService),
	42	+ helpers.createProviderToValue('EnvironmentService', helpers.mocks.environmentService)
	43	+ ]
	44	+ });
	45	+ helper = new ComponentTestHelper<RegisterComponent>(cls, done);
	46	+ });
	47	+
	48	+ it('register page was rendered', () => {
	49	+ expect(helper.debugElement.query('div.register-page').length).toEqual(1);
	50	+ });
	51	+
	52	+});
...	...
...	...	@@ -0,0 +1,66 @@
	1	+import { Inject, Input, Component, Output, EventEmitter, provide } from 'ng-forward';
	2	+import { RegisterService } from "./../../lib/ng-noosfero-api/http/register.service";
	3	+import { NotificationService } from "./../shared/services/notification.service";
	4	+import { EnvironmentService } from "../../lib/ng-noosfero-api/http/environment.service";
	5	+import { RegisterController } from "./register.controller";
	6	+import { IModalComponent } from "../shared/components/interfaces";
	7	+
	8	+@Component({
	9	+ selector: 'noosfero-register',
	10	+ templateUrl: 'app/account/register-component.html',
	11	+ providers: [
	12	+ provide('registerService', { useClass: RegisterService })
	13	+ ]
	14	+})
	15	+
	16	+@Inject('$state', '$uibModal', '$scope', RegisterService, NotificationService, EnvironmentService)
	17	+export class RegisterComponent {
	18	+ @Input() account: any;
	19	+ environment: noosfero.Environment;
	20	+
	21	+ modalInstance: ng.ui.bootstrap.IModalServiceInstance;
	22	+
	23	+ constructor(
	24	+ private $state: ng.ui.IStateService,
	25	+ private $uibModal: ng.ui.bootstrap.IModalService,
	26	+ private $scope: ng.IScope,
	27	+ public registerService: RegisterService,
	28	+ private notificationService: NotificationService,
	29	+ private environmentService: EnvironmentService
	30	+ ) {
	31	+ this.account = {};
	32	+ this.environment = environmentService.getCurrentEnvironment();
	33	+ }
	34	+
	35	+ signup() {
	36	+ if (this.account.password === this.account.passwordConfirmation) {
	37	+ this.registerService.createAccount(this.account).then((response) => {
	38	+
	39	+ if (response.status === 201) {
	40	+ this.$state.transitionTo('main.environment');
	41	+ this.notificationService.success({ title: "account.register.success.title", message: "account.register.success.message" });
	42	+ } else {
	43	+ throw new Error('Invalid attributes');
	44	+ }
	45	+ });
	46	+ } else {
	47	+ this.notificationService.error({ message: "account.register.passwordConfirmation.failed" });
	48	+ }
	49	+ }
	50	+
	51	+ isInvalid(field: any): any {
	52	+ return { 'has-error': field['$touched'] && field['$invalid'] };
	53	+ }
	54	+
	55	+ openTerms() {
	56	+
	57	+ this.modalInstance = this.$uibModal.open({
	58	+ templateUrl: 'app/account/register-terms.html',
	59	+ size: 'lg',
	60	+ controller: RegisterController,
	61	+ controllerAs: 'vm',
	62	+ bindToController: true,
	63	+ scope: this.$scope
	64	+ });
	65	+ }
	66	+}
...	...
...	...	@@ -0,0 +1,17 @@
	1	+import { Input } from "ng-forward";
	2	+import { IModalComponent } from "../shared/components/interfaces";
	3	+
	4	+export class RegisterController {
	5	+
	6	+ static $inject = ["$log", "$stateParams", "$scope"];
	7	+ ctrl: IModalComponent;
	8	+
	9	+ constructor(
	10	+ private $log: ng.ILogService,
	11	+ private $stateParams: any
	12	+ ) { }
	13	+
	14	+ closeTerms() {
	15	+ this.ctrl.modalInstance.dismiss('ok');
	16	+ }
	17	+}
...	...
...	...	@@ -0,0 +1,10 @@
	1	+<div class="row">
	2	+ <div class="col-md-3"></div>
	3	+
	4	+ <!-- component at center of page -->
	5	+ <div class="col-md-6">
	6	+ <noosfero-register></noosfero-register>
	7	+ </div>
	8	+
	9	+ <div class="col-md-3"></div>
	10	+</div>
...	...
...	...	@@ -0,0 +1,44 @@
	1	+.modal .modal-body-overflow {
	2	+ max-height: 420px;
	3	+ overflow-y: auto;
	4	+}
	5	+
	6	+.register-page button {
	7	+ width: 100%;
	8	+ text-transform: uppercase;
	9	+ font-weight: 600;
	10	+}
	11	+
	12	+.register-page .light-text {
	13	+ color: #BBB;
	14	+ margin-top: 0px;
	15	+ margin-bottom: 0px;
	16	+ font-weight: 600;
	17	+}
	18	+
	19	+.register-page .terms-info {
	20	+ margin-top: 30px;
	21	+ margin-bottom: 30px;
	22	+ font-weight: bold;
	23	+}
	24	+
	25	+.register-page .welcome-message {
	26	+ text-align: center;
	27	+}
	28	+
	29	+.register-page .already-registered-message {
	30	+ margin-top: 60px;
	31	+ text-align: center;
	32	+}
	33	+
	34	+.register-page input {
	35	+ height: 40px;
	36	+}
	37	+
	38	+.register-page .register-field {
	39	+ margin-bottom: 25px;
	40	+}
	41	+
	42	+.register-page input:focus {
	43	+ border: 2px solid #bbb;
	44	+}
...	...