Improve blocks structure

Victor Costa
1 parent 04836b51
Showing 8 changed files with 15 additions and 10 deletions Show diff stats
src/app/components/noosfero/blocks/block.directive.js
src/app/components/noosfero/blocks/link-list.directive.js
src/app/components/noosfero/blocks/profile-image.directive.js
src/app/components/noosfero/blocks/profile-image.html
src/app/main/main.controller.js
src/app/main/main.html
src/app/views/profile/block.html
src/assets/images/icons-app/community-big.png
@@ -10,11 +10,12 @@
     var directive = {
       restrict: 'E',
       scope: {
-          block: '='
+          block: '=',
+          owner: '='
       },
       link: function(scope, element, attrs) {
         var blockName = scope.block.type.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
-        element.replaceWith($compile('<noosfero-'+blockName+' block="block"></noosfero-'+blockName+'>')(scope));
+        element.replaceWith($compile('<noosfero-'+blockName+' block="block" owner="owner"></noosfero-'+blockName+'>')(scope));
       }
     };
     return directive;
@@ -11,7 +11,8 @@
       restrict: 'E',
       templateUrl: 'app/components/noosfero/blocks/link-list.html',
       scope: {
-          block: '='
+          block: '=',
+          owner: '='
       },
       controller: LinkListBlockController,
       controllerAs: 'vm',
@@ -11,7 +11,8 @@
       restrict: 'E',
       templateUrl: 'app/components/noosfero/blocks/profile-image.html',
       scope: {
-          block: '='
+          block: '=',
+          owner: '='
       },
       controller: ProfileImageBlockController,
       controllerAs: 'vm',
@@ -23,7 +24,7 @@
     /** @ngInject */
     function ProfileImageBlockController(moment) {
       var vm = this;
-      vm.links = vm.block.settings.links;
+      vm.profile = vm.owner;
     }
   }
  
-image
+<div class="profile-image">
+  <img src="assets/images/icons-app/community-big.png">
+</div>
@@ -14,7 +14,7 @@
     function activate() {
       noosfero.communities().get({id: 67, private_token: '1b00325e5f769a0c38550bd35b3f1d64'}).$promise.then(function (profile) {
         $log.log(profile);
-        vm.boxes = profile.community.boxes;
+        vm.owner = profile.community;
       });
     }
   }
@@ -5,7 +5,7 @@
   </div>
  
   <div class="row">
-    <ng-include ng-repeat="box in main.boxes | orderBy: 'position'" src="'app/views/profile/box.html'"></ng-include>
+    <ng-include ng-repeat="box in main.owner.boxes | orderBy: 'position'" src="'app/views/profile/box.html'"></ng-include>
   </div>
  
 </div>
 <div class="panel panel-primary" >
-  <div class="panel-heading">
+  <div class="panel-heading" ng-show="block.title">
     <h3 class="panel-title">{{block.title}}</h3>
   </div>
   <div class="panel-body">
     <pre>{{block}}</pre>
-    <noosfero-block block="block"></noosfero-block>
+    <noosfero-block block="block" owner="main.owner"></noosfero-block>
   </div>
 </div>
...	...	@@ -10,11 +10,12 @@
10	10	var directive = {
11	11	restrict: 'E',
12	12	scope: {
13		- block: '='
	13	+ block: '=',
	14	+ owner: '='
14	15	},
15	16	link: function(scope, element, attrs) {
16	17	var blockName = scope.block.type.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
17		- element.replaceWith($compile('<noosfero-'+blockName+' block="block"></noosfero-'+blockName+'>')(scope));
	18	+ element.replaceWith($compile('<noosfero-'+blockName+' block="block" owner="owner"></noosfero-'+blockName+'>')(scope));
18	19	}
19	20	};
20	21	return directive;
...	...
...	...	@@ -11,7 +11,8 @@
11	11	restrict: 'E',
12	12	templateUrl: 'app/components/noosfero/blocks/link-list.html',
13	13	scope: {
14		- block: '='
	14	+ block: '=',
	15	+ owner: '='
15	16	},
16	17	controller: LinkListBlockController,
17	18	controllerAs: 'vm',
...	...
1		-image
	1	+<div class="profile-image">
	2	+ <img src="assets/images/icons-app/community-big.png">
	3	+</div>
...	...
...	...	@@ -14,7 +14,7 @@
14	14	function activate() {
15	15	noosfero.communities().get({id: 67, private_token: '1b00325e5f769a0c38550bd35b3f1d64'}).$promise.then(function (profile) {
16	16	$log.log(profile);
17		- vm.boxes = profile.community.boxes;
	17	+ vm.owner = profile.community;
18	18	});
19	19	}
20	20	}
...	...
...	...	@@ -5,7 +5,7 @@
5	5	</div>
6	6
7	7	<div class="row">
8		- <ng-include ng-repeat="box in main.boxes \| orderBy: 'position'" src="'app/views/profile/box.html'"></ng-include>
	8	+ <ng-include ng-repeat="box in main.owner.boxes \| orderBy: 'position'" src="'app/views/profile/box.html'"></ng-include>
9	9	</div>
10	10
11	11	</div>
...	...
1	1	<div class="panel panel-primary" >
2		- <div class="panel-heading">
	2	+ <div class="panel-heading" ng-show="block.title">
3	3	<h3 class="panel-title">{{block.title}}</h3>
4	4	</div>
5	5	<div class="panel-body">
6	6	<pre>{{block}}</pre>
7		- <noosfero-block block="block"></noosfero-block>
	7	+ <noosfero-block block="block" owner="main.owner"></noosfero-block>
8	8	</div>
9	9	</div>
...	...