Download as
Browse Code »

Commit 2e424f9704d9eb8c1074e843f05785e0c86b844c

Authored by Victor Costa
1 parent 0e9faadc
Exists in master and in 35 other branches activities_block, btn-new-post, cleaning-the-house, cosmetic_changes_people_and_communities_block, coverage, edit-blocks, edit-header-footer, env-tags-block, forgot_password, header_and_footer, helpers-evolution, layout_support, list_articles_on_blog, loading-indicator-component, login_modal, login_modal_improve, person_info_block, profile-article-resolvers, profile-blocks-sass, profile-view, profile_description_block_component, profile_page_improvements, profile_search, recent-activities, remove-article-confirmation, responsive-fixes, seo, signup_page, skin-small-change, staging, tags-block, theme-skin-yellow, translations, updated_signup_page, users_profile_page

Migrate boxes

Showing 7 changed files with 21 additions and 33 deletions   Show diff stats
src/app/components/noosfero-boxes/box.html
  Diff comments   View file @2e424f9
... ... @@ -4,7 +4,7 @@
4 4 <h3 class="panel-title">{{block.title}}</h3>
5 5 </div>
6 6 <div class="panel-body">
7   - <noosfero-block block="block" owner="$ctrl.owner"></noosfero-block>
  7 + <noosfero-block block="block" owner="ctrl.owner"></noosfero-block>
8 8 </div>
9 9 </div>
10 10 </div>
... ...
src/app/components/noosfero-boxes/boxes.component.js
View file @0e9faad
... ... @@ -1,26 +0,0 @@
1   -(function() {
2   - 'use strict';
3   -
4   - angular
5   - .module('noosferoApp')
6   - .component('noosferoBoxes', {
7   - restrict: 'E',
8   - bindings: {
9   - boxes: '<',
10   - owner: '<'
11   - },
12   - templateUrl: 'app/components/noosfero-boxes/boxes.html',
13   - controller: BoxesController
14   - });
15   -
16   - /** @ngInject */
17   - function BoxesController() {
18   - var vm = this;
19   -
20   - vm.boxesOrder = function(box) {
21   - if(box.position==2) return 0;
22   - return box.position;
23   - }
24   - }
25   -
26   -})();
src/app/components/noosfero-boxes/boxes.component.ts 0 → 100644
  Diff comments   View file @2e424f9
... ... @@ -0,0 +1,16 @@
  1 +import { Input, Inject, Component } from 'ng-forward';
  2 +
  3 +@Component({
  4 + selector: "noosfero-boxes",
  5 + templateUrl: "app/components/noosfero-boxes/boxes.html"
  6 +})
  7 +export class Boxes {
  8 +
  9 + @Input() boxes: any
  10 + @Input() owner: any
  11 +
  12 + boxesOrder(box) {
  13 + if (box.position == 2) return 0;
  14 + return box.position;
  15 + }
  16 +}
... ...
src/app/components/noosfero-boxes/boxes.html
  Diff comments   View file @2e424f9
1   -<ng-include ng-repeat="box in $ctrl.boxes | orderBy: $ctrl.boxesOrder" src="'app/components/noosfero-boxes/box.html'"></ng-include>
  1 +<ng-include ng-repeat="box in ctrl.boxes | orderBy: ctrl.boxesOrder" src="'app/components/noosfero-boxes/box.html'"></ng-include>
... ...
src/app/index.ts
  Diff comments   View file @2e424f9
... ... @@ -49,7 +49,6 @@ require(&quot;./components/noosfero-blocks/main-block/main-block.component.js&quot;);
49 49 require("./components/noosfero-blocks/members-block/members-block.component.js");
50 50 require("./components/noosfero-blocks/profile-image/profile-image.component.js");
51 51 require("./components/noosfero-blocks/recent-documents/recent-documents.component.js");
52   -require("./components/noosfero-boxes/boxes.component.js");
53 52 require("./components/noosfero/noosfero-template.filter.js");
54 53 require("./components/noosfero/noosfero.service.js");
55 54 require("./components/noosfero/profile-image/profile-image.component.js");
... ...
src/app/main/main.component.ts
  Diff comments   View file @2e424f9
1 1 import {bundle, Component, StateConfig} from "ng-forward";
2 2 import {NoosferoArticleBlog} from "./../components/noosfero-articles/blog/blog.component.ts";
3   -
4 3 import {ArticleDirective} from "../components/noosfero-articles/article/article.directive.ts";
5   -
6 4 import {Profile} from "../profile/profile.component";
  5 +import {Boxes} from "../components/noosfero-boxes/boxes.component";
7 6  
8 7 @Component({
9 8 selector: 'main-content',
... ... @@ -16,7 +15,7 @@ export class MainContent {
16 15 @Component({
17 16 selector: 'main',
18 17 template: '<div ng-view></div>',
19   - directives: [NoosferoArticleBlog, ArticleDirective]
  18 + directives: [NoosferoArticleBlog, ArticleDirective, Boxes]
20 19 })
21 20 @StateConfig([
22 21 {
... ...
src/app/profile/profile.html
  Diff comments   View file @2e424f9
1 1 <div class="profile-container">
2 2 <div class="row">
3   - <noosfero-boxes boxes="vm.boxes" owner="vm.profile"></noosfero-boxes>
  3 + <noosfero-boxes [boxes]="vm.boxes" [owner]="vm.profile"></noosfero-boxes>
4 4 </div>
5 5 </div>
... ...