Download as
Browse Code »

Commit c429e371020feb6614df0937feee3408d1360b63

Authored by Michel Felipe
1 parent 451be0ef

Fix rebase imports and sintax errors

Showing 2 changed files with 12 additions and 9 deletions   Show diff stats
src/app/layout/services/body-state-classes.service.ts
  Diff comments   View file @c429e37
1 1 import {Directive, Inject, Injectable} from "ng-forward";
2   -import {AuthEvents} from "./../../login/auth-events";
  2 +import {AuthEvents} from "../../login/auth-events";
3 3 import {AuthService} from "./../../login/auth.service";
4 4 import {HtmlUtils} from "../html-utils";
5 5 import {INgForwardJQuery} from 'ng-forward/cjs/util/jqlite-extensions';
... ...
src/app/main/main.component.ts
  Diff comments   View file @c429e37
... ... @@ -9,16 +9,19 @@ import {BoxesComponent} from "../layout/boxes/boxes.component";
9 9 import {BlockComponent} from "../layout/blocks/block.component";
10 10 import {EnvironmentComponent} from "../environment/environment.component";
11 11 import {EnvironmentHomeComponent} from "../environment/environment-home.component";
12   -import {PeopleBlockComponent} from "../layout/blocks/people-block/people-block.component";
  12 +import {PeopleBlockComponent} from "../layout/blocks/people/people-block.component";
13 13 import {DisplayContentBlockComponent} from "../layout/blocks/display-content/display-content-block.component";
14   -import {LinkListBlockComponent} from "./../layout/blocks/link-list/link-list.component";
15   -import {RecentDocumentsBlockComponent} from "../layout/blocks/recent-documents/recent-documents.component";
16   -import {ProfileImageBlockComponent} from "../layout/blocks/profile-image-block/profile-image-block.component";
17   -import {RawHTMLBlockComponent} from "../layout/blocks/raw-html/raw-html.component";
  14 +import {LinkListBlockComponent} from "../layout/blocks/link-list/link-list-block.component";
  15 +import {RecentDocumentsBlockComponent} from "../layout/blocks/recent-documents/recent-documents-block.component";
  16 +import {ProfileImageBlockComponent} from "../layout/blocks/profile-image/profile-image-block.component";
  17 +import {RawHTMLBlockComponent} from "../layout/blocks/raw-html/raw-html-block.component";
18 18 import {StatisticsBlockComponent} from "../layout/blocks/statistics/statistics-block.component";
19 19  
20   -import {MembersBlockComponent} from "./../layout/blocks/members-block/members-block.component";
21   -import {CommunitiesBlockComponent} from "./../layout/blocks/communities-block/communities-block.component";
  20 +import {MembersBlockComponent} from "../layout/blocks/members/members-block.component";
  21 +import {CommunitiesBlockComponent} from "../layout/blocks/communities/communities-block.component";
  22 +
  23 +import {LoginBlockComponent} from "../layout/blocks/login-block/login-block.component";
  24 +
22 25 import {NoosferoTemplate} from "../shared/pipes/noosfero-template.filter";
23 26 import {DateFormat} from "../shared/pipes/date-format.filter";
24 27  
... ... @@ -81,7 +84,7 @@ export class EnvironmentContent {
81 84 * NoosferoTemplate, DateFormat, RawHTMLBlock
82 85 * @description
83 86 * The Main controller for the Noosfero Angular Theme application.
84   - *
  87 + *
85 88 * The main route '/' is defined as the URL for this controller, which routes
86 89 * requests to the {@link main.MainContentComponent} controller and also, the '/profile' route,
87 90 * which routes requests to the {@link profile.Profile} controller. See {@link profile.Profile}
... ...