Download as
Browse Code »

Commit 1b8b0e00711f92a0caa96a08be0e939a70db0984

Authored by Michel Felipe
1 parent 451be0ef
Exists in master and in 26 other branches activities_block, btn-new-post, cosmetic_changes_people_and_communities_block, edit-blocks, edit-header-footer, env-tags-block, forgot_password, layout_support, list_articles_on_blog, loading-indicator-component, login_modal, login_modal_improve, person_info_block, profile-article-resolvers, profile-blocks-sass, profile_description_block_component, profile_page_improvements, recent-activities, remove-article-confirmation, skin-small-change, staging, tags-block, theme-skin-yellow, translations, updated_signup_page, users_profile_page

Fix rebase imports and syntax errors

Showing 3 changed files with 23 additions and 21 deletions   Show diff stats
src/app/layout/blocks/display-content/display-content-block.component.ts
  Diff comments   View file @1b8b0e0
... ... @@ -17,16 +17,7 @@ export class DisplayContentBlockComponent {
17 17  
18 18 documentsLoaded: boolean = false;
19 19  
20   - /**
21   - * This configuration doesn't exists on Noosfero. Statically typing here.
22   - */
23   - private addDefaultSections() {
24   - let author: noosfero.Section = <noosfero.Section>{ value: 'author', checked: 'author' };
25   - this.sections.push(author);
26   - }
27   -
28   - constructor(private articleService: ArticleService, private $state: ng.ui.IStateService) {
29   - }
  20 + constructor(private articleService: ArticleService, private $state: ng.ui.IStateService) {}
30 21  
31 22 ngOnInit() {
32 23 this.profile = this.owner;
... ... @@ -42,8 +33,16 @@ export class DisplayContentBlockComponent {
42 33 }
43 34  
44 35 /**
  36 + * This configuration doesn't exists on Noosfero. Statically typing here.
  37 + */
  38 + private addDefaultSections() {
  39 + let author: noosfero.Section = <noosfero.Section>{ value: 'author', checked: 'author' };
  40 + this.sections.push(author);
  41 + }
  42 +
  43 + /**
45 44 * Returns whether a settings section should be displayed.
46   - *
  45 + *
47 46 */
48 47 private display(section_name: string): boolean {
49 48 let section: noosfero.Section = this.sections.find( function(section: noosfero.Section) {
... ... @@ -51,5 +50,5 @@ export class DisplayContentBlockComponent {
51 50 });
52 51 return section !== undefined && section.checked !== undefined;
53 52 }
54   -}
55 53  
  54 +}
... ...
src/app/layout/services/body-state-classes.service.ts
  Diff comments   View file @1b8b0e0
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 @1b8b0e0
... ... @@ -9,16 +9,19 @@ import {BoxesComponent} from &quot;../layout/boxes/boxes.component&quot;;
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}
... ...