diff --git a/src/app/components/noosfero-boxes/box.html b/src/app/components/noosfero-boxes/box.html index f1fe26f..6658633 100644 --- a/src/app/components/noosfero-boxes/box.html +++ b/src/app/components/noosfero-boxes/box.html @@ -4,7 +4,7 @@

{{block.title}}

- +
diff --git a/src/app/components/noosfero-boxes/boxes.component.js b/src/app/components/noosfero-boxes/boxes.component.js deleted file mode 100644 index a95b81b..0000000 --- a/src/app/components/noosfero-boxes/boxes.component.js +++ /dev/null @@ -1,26 +0,0 @@ -(function() { - 'use strict'; - - angular - .module('noosferoApp') - .component('noosferoBoxes', { - restrict: 'E', - bindings: { - boxes: '<', - owner: '<' - }, - templateUrl: 'app/components/noosfero-boxes/boxes.html', - controller: BoxesController - }); - - /** @ngInject */ - function BoxesController() { - var vm = this; - - vm.boxesOrder = function(box) { - if(box.position==2) return 0; - return box.position; - } - } - -})(); diff --git a/src/app/components/noosfero-boxes/boxes.component.ts b/src/app/components/noosfero-boxes/boxes.component.ts new file mode 100644 index 0000000..1378163 --- /dev/null +++ b/src/app/components/noosfero-boxes/boxes.component.ts @@ -0,0 +1,16 @@ +import { Input, Inject, Component } from 'ng-forward'; + +@Component({ + selector: "noosfero-boxes", + templateUrl: "app/components/noosfero-boxes/boxes.html" +}) +export class Boxes { + + @Input() boxes: any + @Input() owner: any + + boxesOrder(box) { + if (box.position == 2) return 0; + return box.position; + } +} diff --git a/src/app/components/noosfero-boxes/boxes.html b/src/app/components/noosfero-boxes/boxes.html index 219b148..7dd1978 100644 --- a/src/app/components/noosfero-boxes/boxes.html +++ b/src/app/components/noosfero-boxes/boxes.html @@ -1 +1 @@ - + diff --git a/src/app/index.ts b/src/app/index.ts index 59147e5..fa33a2d 100644 --- a/src/app/index.ts +++ b/src/app/index.ts @@ -49,7 +49,6 @@ require("./components/noosfero-blocks/main-block/main-block.component.js"); require("./components/noosfero-blocks/members-block/members-block.component.js"); require("./components/noosfero-blocks/profile-image/profile-image.component.js"); require("./components/noosfero-blocks/recent-documents/recent-documents.component.js"); -require("./components/noosfero-boxes/boxes.component.js"); require("./components/noosfero/noosfero-template.filter.js"); require("./components/noosfero/noosfero.service.js"); require("./components/noosfero/profile-image/profile-image.component.js"); diff --git a/src/app/main/main.component.ts b/src/app/main/main.component.ts index a91f5ec..769decd 100644 --- a/src/app/main/main.component.ts +++ b/src/app/main/main.component.ts @@ -1,9 +1,8 @@ import {bundle, Component, StateConfig} from "ng-forward"; import {NoosferoArticleBlog} from "./../components/noosfero-articles/blog/blog.component.ts"; - import {ArticleDirective} from "../components/noosfero-articles/article/article.directive.ts"; - import {Profile} from "../profile/profile.component"; +import {Boxes} from "../components/noosfero-boxes/boxes.component"; @Component({ selector: 'main-content', @@ -16,7 +15,7 @@ export class MainContent { @Component({ selector: 'main', template: '
', - directives: [NoosferoArticleBlog, ArticleDirective] + directives: [NoosferoArticleBlog, ArticleDirective, Boxes] }) @StateConfig([ { diff --git a/src/app/profile/profile.html b/src/app/profile/profile.html index e69c9c0..c4e0b1a 100644 --- a/src/app/profile/profile.html +++ b/src/app/profile/profile.html @@ -1,5 +1,5 @@
- +
-- libgit2 0.21.2