Merge branch 'master' into staging

Victor Costa
2 parents e5598799 8aa6d299
Showing 67 changed files with 1475 additions and 103 deletions Show diff stats
bower.json
gulp/watch.js
src/app/article/comment/comment.component.ts
src/app/article/comment/comment.html
src/app/environment/environment.component.ts
src/app/index.config.ts
src/app/known-events.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/navbar/navbar.html
src/app/main/main.component.spec.ts
src/app/main/main.component.ts
src/app/profile/image/image.component.spec.ts
src/app/profile/image/image.component.ts
src/app/profile/image/image.html
src/app/profile/image/image.scss
src/app/profile/image/profile-image-editor.component.spec.ts
src/app/profile/image/profile-image-editor.component.ts
@@ -40,12 +40,19 @@
     "ng-ckeditor": "^0.2.1",
     "angular-tag-cloud": "^0.3.0",
     "angular-ui-switch": "^0.1.1",
-    "angular-password": "^1.0.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);
   });
@@ -2,6 +2,8 @@ import { Inject, Input, Component, Output, EventEmitter } from &#39;ng-forward&#39;;
 import { PostCommentComponent } from "./post-comment/post-comment.component";
 import { CommentService } from "../../../lib/ng-noosfero-api/http/comment.service";
 import { NotificationService } from "../../shared/services/notification.service";
+import { PermissionDirective } from '../../shared/components/permission/permission.directive';
+
  
 @Component({
     selector: 'noosfero-comment',
@@ -22,7 +22,7 @@
         <span class="bullet-separator">•</span>
         {{"comment.reply" | translate}}
       </a>
-      <a href="#" (click)="ctrl.remove()" class="action small text-muted remove" ng-if="ctrl.allowRemove()">
+      <a permission="ctrl.comment.permissions" permission-action="allow_destroy" href="#" (click)="ctrl.remove()" class="action small text-muted remove" ng-if="ctrl.allowRemove()">
         <span class="bullet-separator">•</span>
         {{"comment.remove" | translate}}
       </a>
@@ -32,7 +32,7 @@ import {SearchComponent} from &quot;../search/search.component&quot;;
         }
     },
     {
-        url: '^/search?query',
+        url: '^/search?query&per_page',
         component: SearchComponent,
         name: 'main.environment.search',
         views: {
@@ -25,13 +25,16 @@ export function noosferoModuleConfig($logProvider: ng.ILogProvider,
 }
  
 function configTranslation($translateProvider: angular.translate.ITranslateProvider, tmhDynamicLocaleProvider: any) {
+    let defaultLanguage = (<any>navigator)['languages'] ? (<any>navigator)['languages'][0] : (navigator.language || (<any>navigator)['userLanguage']);
+    defaultLanguage = defaultLanguage && (<any>navigator)['userAgent'].indexOf('PhantomJS') === -1 ? defaultLanguage.replace(/-br|-us/i, '') : 'en';
+
     $translateProvider.useStaticFilesLoader({
         prefix: '/languages/',
         suffix: '.json'
     });
     $translateProvider.addInterpolation('$translateMessageFormatInterpolation');
     $translateProvider.useMissingTranslationHandlerLog();
-    $translateProvider.preferredLanguage('en');
+    $translateProvider.preferredLanguage(defaultLanguage);
     $translateProvider.useSanitizeValueStrategy('escape');
     tmhDynamicLocaleProvider.localeLocationPattern('bower_components/angular-i18n/angular-locale_{{locale}}.js');
     tmhDynamicLocaleProvider.useCookieStorage();
 import { EventsHubKnownEventNames } from './shared/services/events-hub.service';
  
-export class NoosferoKnownEvents implements EventsHubKnownEventNames  {
+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() {
     }
@@ -11,4 +12,4 @@ export class NoosferoKnownEvents implements EventsHubKnownEventNames  {
     getNames() {
         return Object.getOwnPropertyNames(this);
     }
-}
 \ No newline at end of file
+}
-import {TestComponentBuilder, ComponentFixture} from 'ng-forward/cjs/testing/test-component-builder';
-import {Pipe, Input, provide, Component} from 'ng-forward';
+import { TestComponentBuilder, ComponentFixture } from 'ng-forward/cjs/testing/test-component-builder';
+import { Pipe, Input, provide, Component } from 'ng-forward';
  
-import {ProfileImageBlockComponent} from './profile-image-block.component';
+import { ProfileImageBlockComponent } from './profile-image-block.component';
  
 import * as helpers from "./../../../../spec/helpers";
  
@@ -14,6 +14,7 @@ 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));
@@ -24,6 +25,8 @@ describe(&quot;Components&quot;, () =&gt; {
             directives: [ProfileImageBlockComponent],
             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"))
@@ -31,8 +34,7 @@ describe(&quot;Components&quot;, () =&gt; {
         class BlockContainerComponent {
             block = { type: 'Block' };
             owner = { name: 'profile-name' };
-            constructor() {
-            }
+            constructor() { }
         }
  
         it("show image if present", () => {
@@ -52,7 +54,19 @@ 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);
+                expect(elProfile.componentInstance.displayOrganizationActions()).toBeTruthy();
+                expect(elProfile.query('.actions .organization-actions .join').length).toEqual(1);
+                done();
+            });
+        });
+
+        it("not display button to join community for person", (done: Function) => {
+            helpers.tcb.createAsync(BlockContainerComponent).then(fixture => {
+                let elProfile = fixture.debugElement.componentViewChildren[0];
+                elProfile.componentInstance.owner = { name: 'person-name', type: 'Person' };
+                fixture.detectChanges();
+                expect(elProfile.componentInstance.displayOrganizationActions()).toBeFalsy();
+                expect(elProfile.queryAll('.actions .organization-actions .join').length).toEqual(0);
                 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";
+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",
@@ -48,4 +48,8 @@ export class ProfileImageBlockComponent {
             this.loadMembership();
         });
     }
+
+    displayOrganizationActions() {
+        return this.owner.type !== 'Person';
+    }
 }
 <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 class="organization-actions" ng-if="ctrl.displayOrganizationActions()">
+      <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>
 </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;
 }
+
+
+
+
+
@@ -45,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>
@@ -40,7 +40,8 @@ describe(&quot;MainComponent&quot;, function () {
                     useValue: [
                         'IMAGE_PROFILE_UPDATED',
                         'PROFILE_INFO_UPDATED',
-                        'ARTICLE_UPDATED'
+                        'ARTICLE_UPDATED',
+                        'TASK_CLOSED'
                     ]
                 }),
         ]
@@ -49,9 +49,11 @@ import { HtmlEditorComponent } from &quot;../shared/components/html-editor/html-edito
 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
  * @name main.MainContentComponent
@@ -118,16 +120,16 @@ export class EnvironmentContent {
         MembersBlockComponent, NoosferoTemplate, DateFormat, RawHTMLBlockComponent, StatisticsBlockComponent,
         LoginBlockComponent, CustomContentComponent, PermissionDirective, SearchFormComponent, SearchComponent,
         PersonTagsPluginInterestsBlockComponent, TagsBlockComponent, RecentActivitiesPluginActivitiesBlockComponent,
-        ProfileImagesPluginProfileImagesBlockComponent, BlockComponent, RegisterComponent
+        ProfileImagesPluginProfileImagesBlockComponent, BlockComponent, RegisterComponent, TasksMenuComponent, TaskListComponent
     ].concat(plugins.mainComponents).concat(plugins.hotspots),
-    providers: [AuthService, SessionService, NotificationService, BodyStateClassesService, RegisterService,
+    providers: [AuthService, SessionService, NotificationService, BodyStateClassesService,
         "ngAnimate", "ngCookies", "ngStorage", "ngTouch",
         "ngSanitize", "ngMessages", "ngAria", "restangular",
         "ui.router", "ui.bootstrap", "toastr", "ngCkeditor",
         "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", "ngPassword"]
+        "angular-click-outside", "ngTagCloud", "noosfero.init", "uiSwitch", "ngFileUpload", "ngImgCrop"]
 })
 @StateConfig([
     {
@@ -148,6 +150,7 @@ export class EnvironmentContent {
         url: '/',
         component: EnvironmentComponent,
         name: 'main.environment',
+        abstract: true,
         views: {
             "content": {
                 templateUrl: "app/environment/environment.html",
@@ -4,48 +4,72 @@
  * @description
  *  This file contains the tests for the {@link components.noosfero.profile-image.ProfileImage} component.
  */
-
-import {TestComponentBuilder, ComponentFixture} from 'ng-forward/cjs/testing/test-component-builder';
-import {Pipe, Input, provide, Component} from 'ng-forward';
+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";
+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"));
  
-        it("show community users image if profile is not Person", done => {
-            helpers.tcb.createAsync(ProfileImageComponent).then(fixture => {
-                let profileImageComponent: ProfileImageComponent = fixture.componentInstance;
-                let profile = <noosfero.Profile>{ id: 1, identifier: "myprofile", type: "Community" };
-                profileImageComponent.profile = profile;
-                profileImageComponent.ngOnInit();
-
-                // Check the attribute
-                expect(profileImageComponent.defaultIcon).toBe("fa-users", "The default icon should be community users");
-                // var elProfile = fixture.debugElement.componentViewChildren[0];
-                // expect(elProfile.query('div.profile-image-block').length).toEqual(1);
-                done();
+        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("show Person image if profile is Person", done => {
-            tcb.createAsync(ProfileImageComponent).then(fixture => {
-                let profileImageComponent: ProfileImageComponent = fixture.componentInstance;
-                let profile = <noosfero.Profile>{ id: 1, identifier: "myprofile", type: "Person" };
-                profileImageComponent.profile = profile;
-                profileImageComponent.ngOnInit();
-                // Check the attribute
-                expect(profileImageComponent.defaultIcon).toEqual("fa-user", "The default icon should be person user");
-                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) => {
+
+            let profile = <noosfero.Profile>{ id: 1, identifier: "myprofile", type: "Community" };
+            helper.component.profile = profile;
+            helper.component.ngOnInit();
+
+            // Check the attribute
+            expect(helper.component.defaultIcon).toBe("fa-users", "The default icon should be community users");
+            // var elProfile = fixture.debugElement.componentViewChildren[0];
+            // expect(elProfile.query('div.profile-image-block').length).toEqual(1);
+            done();
+
+        });
+
+        it("show Person image if profile is Person", (done) => {
+
+            let profile = <noosfero.Profile>{ id: 1, identifier: "myprofile", type: "Person" };
+            helper.component.profile = profile;
+            helper.component.ngOnInit();
+            // Check the attribute
+            expect(helper.component.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,14 +11,16 @@ 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 {
  
     /**
      * @ngdoc property
      * @name profile
      * @propertyOf components.noosfero.profile-image.ProfileImage
-     * @description 
+     * @description
      *  The Noosfero {@link models.Profile} holding the image.
      */
     @Input() profile: noosfero.Profile;
@@ -30,12 +33,53 @@ export class ProfileImageComponent {
      */
     defaultIcon: string;
  
+    @Input() editable: boolean;
+
+    @Input() editClass: string;
+
+    picFile: any;
+    croppedDataUrl: any;
+    modalInstance: any;
+
+    constructor(private personService: PersonService, private $uibModal: ng.ui.bootstrap.IModalService, private $scope: ng.IScope) {
+    }
+
+    fileSelected(file: any, errFiles: any) {
+        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
      * @methodOf components.noosfero.profile-image.ProfileImage
-     * @description 
-     *  Initializes the icon names to their corresponding values depending on the profile type passed to the controller 
+     * @description
+     *  Initializes the icon names to their corresponding values depending on the profile type passed to the controller
      */
     ngOnInit() {
         this.defaultIcon = 'fa-users';
@@ -43,5 +87,5 @@ 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,91 @@ 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 {
+    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;
+}
+
+.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,61 @@
+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 testDataUrl = "data:image/png;base64," + expectedData;
+
+        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 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 imageName = "image1";
+            personServiceMock = jasmine.createSpyObj("personServiceMock", ["uploadImage"]);
+            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.modalInstance.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 modalInstance: ng.ui.bootstrap.IModalServiceInstance) {
+    }
+
+    uploadImage(dataUrl: any, name: any) {
+        let base64ImageJson = this.getBase64ImageJson(dataUrl, name);
+        this.personService.uploadImage(this.profile, base64ImageJson).then((result: any) => {
+            this.modalInstance.close(name);
+        });
+    }
+
+    getBase64ImageJson(dataUrl: any, name: any): 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): string {
+        return this.profile.name + "_" + name;
+    }
+
+    getData(dataUrl: any): string {
+        return dataUrl.substring(dataUrl.indexOf('base64,') + 7);
+    }
+
+    cancel() {
+        this.modalInstance.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" (click)="ctrl.uploadImage(ctrl.croppedDataUrl, ctrl.picFile.name)">Upload</button>
+    <button type="submit" class="btn btn-danger" (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,25 @@
+.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;
+}
-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,
@@ -8,7 +8,7 @@ describe(&quot;Components&quot;, () =&gt; {
     describe("Search Component", () => {
  
         let helper: ComponentTestHelper<SearchComponent>;
-        let stateParams = { query: 'query' };
+        let stateParams = { query: 'query', per_page: 20 };
         let articleService = jasmine.createSpyObj("ArticleService", ["search"]);
         let result = Promise.resolve({ data: [{ id: 1 }], headers: (param: string) => { return 1; } });
         articleService.search = jasmine.createSpy("search").and.returnValue(result);
@@ -30,7 +30,7 @@ describe(&quot;Components&quot;, () =&gt; {
         });
  
         it("load first page with search results", () => {
-            expect(articleService.search).toHaveBeenCalledWith({ query: 'query', per_page: 10, page: 0 });
+            expect(articleService.search).toHaveBeenCalledWith({ query: 'query', per_page: 20, page: 0 });
         });
  
         it("display search results", () => {
@@ -19,6 +19,7 @@ export class SearchComponent {
  
     constructor(private articleService: ArticleService, private $stateParams: ng.ui.IStateParamsService, private $state: ng.ui.IStateService) {
         this.query = this.$stateParams['query'];
+        this.perPage = this.$stateParams['per_page'] || this.perPage;
         this.loadPage();
     }
  
+$green-color: #6e9e7b;
+
 .search-results {
   .summary {
     color: #bbbbbb;
@@ -13,10 +15,10 @@
     }
     .info {
       .profile {
-        color: #6e9e7b;
+        color: $green-color;
       }
       .time {
-        color: #6e9e7b;
+        color: $green-color;
         font-size: 12px;
       }
       .bullet-separator {
@@ -31,13 +31,13 @@ export class EventsHubService {
     emitEvent(eventType: string, payload?: any) {
         this.checkKnownEvent(eventType);
         let event = this.emitters.get(eventType);
-        if ( event ) this.emitters.get(eventType).next(payload);
+        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);
+        if (event) event.subscribe(generatorOrNext, error, complete);
     }
  
     private setupEmitters() {
@@ -53,4 +53,4 @@ export class EventsHubService {
     }
  
  
-}
 \ No newline at end of file
+}
@@ -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>
@@ -23,6 +23,8 @@
   "profile.others_info": "Others",
   "profile.community.title": "Community",
   "profile.person.title": "Person",
+  "profile.image.edit": "Crop photo",
+  "profile.image.upload": "Upload Photo",
   "activities.title": "Activities",
   "activities.create_article.description": "has published on",
   "activities.scrap.description": "wrote in its timeline",
@@ -124,5 +126,26 @@
   "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"
+  "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:"
 }
@@ -23,6 +23,8 @@
   "profile.others_info": "Outras informações",
   "profile.community.title": "Comunidade",
   "profile.person.title": "Pessoa",
+  "profile.image.edit": "Recortar photo",
+  "profile.image.upload": "Enviar photo",
   "activities.title": "Atividades",
   "activities.create_article.description": "publicou em",
   "activities.scrap.description": "escreveu em sua linha do tempo",
@@ -127,5 +129,26 @@
   "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"
+  "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:"
 }
 import { Injectable, Inject } from "ng-forward";
-import {RestangularService} from "./restangular_service";
-import {ProfileService} from "./profile.service";
+import { RestangularService } from "./restangular_service";
+import { ProfileService } from "./profile.service";
  
 @Injectable()
 @Inject("Restangular", "$q", "$log", ProfileService)
@@ -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, base64ImageJson: 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: base64ImageJson }
+        };
+        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;
+    }
+
 }
@@ -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[];
+    }
+}
@@ -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;
+    }
+}
@@ -12,7 +12,7 @@ comment-paragraph-plugin-allow-comment {
       }
     }
     .paragraph-content {
-      width: 95%;
+      width: 94%;
       display: inline-block;
     }
     .paragraph-actions {
 <div class="discussion-header" ng-if="ctrl.isDiscussion()">
-  <div class="icon">
-    <i class="fa fa-calendar fa-fw fa-lg"></i>
-  </div>
   <div class="period">
     <div ng-if="ctrl.notOpened()" class="description not-opened">
       {{"comment-paragraph-plugin.discussion.notOpened.header" | translate:{date: (ctrl.article.start_date | dateFormat | amTimeAgo)} }}
@@ -18,4 +15,7 @@
       {{"comment-paragraph-plugin.discussion.closed.header" | translate:{date: (ctrl.article.end_date | dateFormat | amTimeAgo)} }}
     </div>
   </div>
+  <div class="icon">
+    <i class="fa fa-calendar fa-fw fa-lg"></i>
+  </div>
 </div>
 .discussion-header {
-  @extend .pull-right;
+  text-align: right;
   margin-bottom: 20px;
   .period {
-    @extend .pull-right;
+    display: inline-block;
     .description {
       font-weight: bold;
       color: #A2A2A2;
     }
   }
   .icon {
-    @extend .pull-right;
+    display: inline-block;
     margin-left: 8px;
   }
 }
@@ -237,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: {
...	...	@@ -40,12 +40,19 @@
40	40	"ng-ckeditor": "^0.2.1",
41	41	"angular-tag-cloud": "^0.3.0",
42	42	"angular-ui-switch": "^0.1.1",
43		- "angular-password": "^1.0.1"
	43	+ "angular-password": "^1.0.1",
	44	+ "ng-file-upload": "^12.0.4",
	45	+ "ng-img-crop": "^0.3.2"
44	46	},
45	47	"devDependencies": {
46	48	"angular-mocks": "~1.5.0"
47	49	},
48	50	"overrides": {
	51	+ "ng-file-upload": {
	52	+ "main": [
	53	+ "ng-file-upload-all.js"
	54	+ ]
	55	+ },
49	56	"ng-ckeditor": {
50	57	"main": [
51	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	});
...	...
...	...	@@ -2,6 +2,8 @@ import { Inject, Input, Component, Output, EventEmitter } from 'ng-forward';
2	2	import { PostCommentComponent } from "./post-comment/post-comment.component";
3	3	import { CommentService } from "../../../lib/ng-noosfero-api/http/comment.service";
4	4	import { NotificationService } from "../../shared/services/notification.service";
	5	+import { PermissionDirective } from '../../shared/components/permission/permission.directive';
	6	+
5	7
6	8	@Component({
7	9	selector: 'noosfero-comment',
...	...
...	...	@@ -22,7 +22,7 @@
22	22	<span class="bullet-separator">•</span>
23	23	{{"comment.reply" \| translate}}
24	24	</a>
25		- <a href="#" (click)="ctrl.remove()" class="action small text-muted remove" ng-if="ctrl.allowRemove()">
	25	+ <a permission="ctrl.comment.permissions" permission-action="allow_destroy" href="#" (click)="ctrl.remove()" class="action small text-muted remove" ng-if="ctrl.allowRemove()">
26	26	<span class="bullet-separator">•</span>
27	27	{{"comment.remove" \| translate}}
28	28	</a>
...	...
...	...	@@ -32,7 +32,7 @@ import {SearchComponent} from "../search/search.component";
32	32	}
33	33	},
34	34	{
35		- url: '^/search?query',
	35	+ url: '^/search?query&per_page',
36	36	component: SearchComponent,
37	37	name: 'main.environment.search',
38	38	views: {
...	...
...	...	@@ -25,13 +25,16 @@ export function noosferoModuleConfig($logProvider: ng.ILogProvider,
25	25	}
26	26
27	27	function configTranslation($translateProvider: angular.translate.ITranslateProvider, tmhDynamicLocaleProvider: any) {
	28	+ let defaultLanguage = (<any>navigator)['languages'] ? (<any>navigator)['languages'][0] : (navigator.language \|\| (<any>navigator)['userLanguage']);
	29	+ defaultLanguage = defaultLanguage && (<any>navigator)['userAgent'].indexOf('PhantomJS') === -1 ? defaultLanguage.replace(/-br\|-us/i, '') : 'en';
	30	+
28	31	$translateProvider.useStaticFilesLoader({
29	32	prefix: '/languages/',
30	33	suffix: '.json'
31	34	});
32	35	$translateProvider.addInterpolation('$translateMessageFormatInterpolation');
33	36	$translateProvider.useMissingTranslationHandlerLog();
34		- $translateProvider.preferredLanguage('en');
	37	+ $translateProvider.preferredLanguage(defaultLanguage);
35	38	$translateProvider.useSanitizeValueStrategy('escape');
36	39	tmhDynamicLocaleProvider.localeLocationPattern('bower_components/angular-i18n/angular-locale_{{locale}}.js');
37	40	tmhDynamicLocaleProvider.useCookieStorage();
...	...
1	1	import { EventsHubKnownEventNames } from './shared/services/events-hub.service';
2	2
3		-export class NoosferoKnownEvents implements EventsHubKnownEventNames {
	3	+export class NoosferoKnownEvents implements EventsHubKnownEventNames {
4	4	IMAGE_PROFILE_UPDATED: string = 'IMAGE_PROFILE_UPDATED';
5	5	PROFILE_INFO_UPDATED: string = 'PROFILE_INFO_UPDATED';
6	6	ARTICLE_UPDATED: string = 'ARTICLE_UPDATED';
	7	+ TASK_CLOSED: string = 'TASK_CLOSED';
7	8
8	9	constructor() {
9	10	}
...	...	@@ -11,4 +12,4 @@ export class NoosferoKnownEvents implements EventsHubKnownEventNames {
11	12	getNames() {
12	13	return Object.getOwnPropertyNames(this);
13	14	}
14		-}
15	15	\ No newline at end of file
	16	+}
...	...
1		-import {TestComponentBuilder, ComponentFixture} from 'ng-forward/cjs/testing/test-component-builder';
2		-import {Pipe, Input, provide, Component} from 'ng-forward';
	1	+import { TestComponentBuilder, ComponentFixture } from 'ng-forward/cjs/testing/test-component-builder';
	2	+import { Pipe, Input, provide, Component } from 'ng-forward';
3	3
4		-import {ProfileImageBlockComponent} from './profile-image-block.component';
	4	+import { ProfileImageBlockComponent } from './profile-image-block.component';
5	5
6	6	import * as helpers from "./../../../../spec/helpers";
7	7
...	...	@@ -14,6 +14,7 @@ describe("Components", () => {
14	14	describe("Profile Image Block Component", () => {
15	15
16	16	beforeEach(angular.mock.module("templates"));
	17	+ let personService = jasmine.createSpyObj("personService", ["upload"]);
17	18
18	19	let profileService = jasmine.createSpyObj("ProfileService", ["isMember", "addMember", "removeMember"]);
19	20	profileService.isMember = jasmine.createSpy("isMember").and.returnValue(Promise.resolve(false));
...	...	@@ -24,6 +25,8 @@ describe("Components", () => {
24	25	directives: [ProfileImageBlockComponent],
25	26	providers: [
26	27	helpers.createProviderToValue('SessionService', helpers.mocks.sessionWithCurrentUser({})),
	28	+ helpers.createProviderToValue("PersonService", personService),
	29	+ helpers.createProviderToValue("$uibModal", helpers.mocks.$modal),
27	30	helpers.createProviderToValue('ProfileService', profileService),
28	31	helpers.createProviderToValue('NotificationService', helpers.mocks.notificationService)
29	32	].concat(helpers.provideFilters("translateFilter"))
...	...	@@ -31,8 +34,7 @@ describe("Components", () => {
31	34	class BlockContainerComponent {
32	35	block = { type: 'Block' };
33	36	owner = { name: 'profile-name' };
34		- constructor() {
35		- }
	37	+ constructor() { }
36	38	}
37	39
38	40	it("show image if present", () => {
...	...	@@ -52,7 +54,19 @@ describe("Components", () => {
52	54	it("display button to join community", (done: Function) => {
53	55	helpers.tcb.createAsync(BlockContainerComponent).then(fixture => {
54	56	let elProfile = fixture.debugElement.componentViewChildren[0];
55		- expect(elProfile.query('.actions .join').length).toEqual(1);
	57	+ expect(elProfile.componentInstance.displayOrganizationActions()).toBeTruthy();
	58	+ expect(elProfile.query('.actions .organization-actions .join').length).toEqual(1);
	59	+ done();
	60	+ });
	61	+ });
	62	+
	63	+ it("not display button to join community for person", (done: Function) => {
	64	+ helpers.tcb.createAsync(BlockContainerComponent).then(fixture => {
	65	+ let elProfile = fixture.debugElement.componentViewChildren[0];
	66	+ elProfile.componentInstance.owner = { name: 'person-name', type: 'Person' };
	67	+ fixture.detectChanges();
	68	+ expect(elProfile.componentInstance.displayOrganizationActions()).toBeFalsy();
	69	+ expect(elProfile.queryAll('.actions .organization-actions .join').length).toEqual(0);
56	70	done();
57	71	});
58	72	});
...	...
1		-import {Inject, Input, Component} from "ng-forward";
2		-import {ProfileImageComponent} from "./../../../profile/image/image.component";
3		-import {ProfileService} from "../../../../lib/ng-noosfero-api/http/profile.service";
4		-import {SessionService} from "./../../../login";
5		-import {NotificationService} from "../../../shared/services/notification.service";
	1	+import { Inject, Input, Component } from "ng-forward";
	2	+import { ProfileImageComponent } from "./../../../profile/image/image.component";
	3	+import { ProfileService } from "../../../../lib/ng-noosfero-api/http/profile.service";
	4	+import { SessionService } from "./../../../login";
	5	+import { NotificationService } from "../../../shared/services/notification.service";
6	6
7	7	@Component({
8	8	selector: "noosfero-profile-image-block",
...	...	@@ -48,4 +48,8 @@ export class ProfileImageBlockComponent {
48	48	this.loadMembership();
49	49	});
50	50	}
	51	+
	52	+ displayOrganizationActions() {
	53	+ return this.owner.type !== 'Person';
	54	+ }
51	55	}
...	...
1	1	<div class="center-block text-center profile-image-block">
2	2	<a ui-sref="main.profile.info({profile: ctrl.owner.identifier})">
3		- <noosfero-profile-image [profile]="ctrl.owner"></noosfero-profile-image>
	3	+ <noosfero-profile-image [profile]="ctrl.owner" [editable]="true" [edit-class]="'profile-image-block-editable'"></noosfero-profile-image>
4	4	</a>
5	5	<a class="settings-link" target="_self" ui-sref="main.profile.settings({profile: ctrl.owner.identifier})">{{"blocks.profile_image.control_panel" \| translate}}</a>
6	6	<div class="actions" ng-show="ctrl.isMember!=null">
7		- <a ng-if="!ctrl.isMember" ng-click="ctrl.join()" class="btn btn-primary btn-sm join" href="#">{{"blocks.profile_image.join" \| translate}}</a>
8		- <a ng-if="ctrl.isMember" ng-click="ctrl.leave()" class="btn btn-warning btn-sm leave" href="#">{{"blocks.profile_image.leave" \| translate}}</a>
	7	+ <div class="organization-actions" ng-if="ctrl.displayOrganizationActions()">
	8	+ <a ng-if="!ctrl.isMember" ng-click="ctrl.join()" class="btn btn-primary btn-sm join" href="#">{{"blocks.profile_image.join" \| translate}}</a>
	9	+ <a ng-if="ctrl.isMember" ng-click="ctrl.leave()" class="btn btn-warning btn-sm leave" href="#">{{"blocks.profile_image.leave" \| translate}}</a>
	10	+ </div>
9	11	</div>
10	12	</div>
...	...