Fix rebase imports and syntax errors

Michel Felipe
1 parent 451be0ef
Showing 3 changed files with 23 additions and 21 deletions Show diff stats
src/app/layout/blocks/display-content/display-content-block.component.ts
src/app/layout/services/body-state-classes.service.ts
src/app/main/main.component.ts
@@ -17,16 +17,7 @@ export class DisplayContentBlockComponent {
     documentsLoaded: boolean = false;
-    /**
-     * This configuration doesn't exists on Noosfero. Statically typing here.
-     */
-    private addDefaultSections() {
-        let author: noosfero.Section = <noosfero.Section>{ value: 'author', checked: 'author' };
-        this.sections.push(author);
-    }
-
-    constructor(private articleService: ArticleService, private $state: ng.ui.IStateService) {
-    }
+    constructor(private articleService: ArticleService, private $state: ng.ui.IStateService) {}
     ngOnInit() {
         this.profile = this.owner;
@@ -42,8 +33,16 @@ export class DisplayContentBlockComponent {
     }
     /**
+     * This configuration doesn't exists on Noosfero. Statically typing here.
+     */
+    private addDefaultSections() {
+        let author: noosfero.Section = <noosfero.Section>{ value: 'author', checked: 'author' };
+        this.sections.push(author);
+    }
+
+    /**
      * Returns whether a settings section should be displayed.
-     * 
+     *
      */
     private display(section_name: string): boolean {
         let section: noosfero.Section = this.sections.find( function(section: noosfero.Section) {
@@ -51,5 +50,5 @@ export class DisplayContentBlockComponent {
         });
         return section !== undefined && section.checked !== undefined;
     }
-}
+}
 import {Directive, Inject, Injectable} from "ng-forward";
-import {AuthEvents} from "./../../login/auth-events";
+import {AuthEvents} from "../../login/auth-events";
 import {AuthService} from "./../../login/auth.service";
 import {HtmlUtils} from "../html-utils";
 import {INgForwardJQuery} from 'ng-forward/cjs/util/jqlite-extensions';
@@ -9,16 +9,19 @@ import {BoxesComponent} from &quot;../layout/boxes/boxes.component&quot;;
 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-block/people-block.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.component";
-import {RecentDocumentsBlockComponent} from "../layout/blocks/recent-documents/recent-documents.component";
-import {ProfileImageBlockComponent} from "../layout/blocks/profile-image-block/profile-image-block.component";
-import {RawHTMLBlockComponent} from "../layout/blocks/raw-html/raw-html.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 {MembersBlockComponent} from "./../layout/blocks/members-block/members-block.component";
-import {CommunitiesBlockComponent} from "./../layout/blocks/communities-block/communities-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";
@@ -81,7 +84,7 @@ export class EnvironmentContent {
  * NoosferoTemplate, DateFormat, RawHTMLBlock
  * @description
  *  The Main controller for the Noosfero Angular Theme application.
- * 
+ *
  *  The main route '/' is defined as the URL for this controller, which routes
  * requests to the {@link main.MainContentComponent} controller and also, the '/profile' route,
  * which routes requests to the {@link profile.Profile} controller. See {@link profile.Profile}
1	import {Directive, Inject, Injectable} from "ng-forward";	1	import {Directive, Inject, Injectable} from "ng-forward";
2	-import {AuthEvents} from "./../../login/auth-events";	2	+import {AuthEvents} from "../../login/auth-events";
3	import {AuthService} from "./../../login/auth.service";	3	import {AuthService} from "./../../login/auth.service";
4	import {HtmlUtils} from "../html-utils";	4	import {HtmlUtils} from "../html-utils";
5	import {INgForwardJQuery} from 'ng-forward/cjs/util/jqlite-extensions';	5	import {INgForwardJQuery} from 'ng-forward/cjs/util/jqlite-extensions';