Download as
Browse Code »

Commit fa8a58b893db9c40d44baad302a302abf4c76085

Authored by Victor Costa
1 parent 906a13d3
Exists in master and in 10 other branches cosmetic_changes_people_and_communities_block, forgot_password, layout_support, login_modal_improve, profile-blocks-sass, profile_description_block_component, recent-activities, staging, translations, users_profile_page

Fix design mode for blocks

Showing 2 changed files with 3 additions and 1 deletions   Show diff stats
src/app/layout/blocks/block.component.ts
  Diff comments   View file @fa8a58b
@@ -23,6 +23,7 @@ export class BlockComponent { @@ -23,6 +23,7 @@ export class BlockComponent {
23 currentUser: noosfero.User; 23 currentUser: noosfero.User;
24 isHomepage = true; 24 isHomepage = true;
25 editionMode = false; 25 editionMode = false;
  26 + designMode = false;
26 27
27 constructor(private $uibModal: any, 28 constructor(private $uibModal: any,
28 private $scope: ng.IScope, 29 private $scope: ng.IScope,
@@ -49,6 +50,7 @@ export class BlockComponent { @@ -49,6 +50,7 @@ export class BlockComponent {
49 }); 50 });
50 this.designModeService.onToggle.subscribe((designModeOn: boolean) => { 51 this.designModeService.onToggle.subscribe((designModeOn: boolean) => {
51 this.editionMode = designModeOn; 52 this.editionMode = designModeOn;
  53 + this.designMode = designModeOn;
52 this.$scope.$apply(); 54 this.$scope.$apply();
53 }); 55 });
54 } 56 }
src/app/layout/blocks/block.html
  Diff comments   View file @fa8a58b
1 -<div ng-show="ctrl.canDisplay() || ctrl.editionMode" ng-class="{'invisible-block': !ctrl.canDisplay()}" class="noosfero-block" ng-mouseover="displayActions = true" ng-mouseleave="displayActions = false"> 1 +<div ng-show="ctrl.canDisplay() || ctrl.editionMode || ctrl.designMode" ng-class="{'invisible-block': !ctrl.canDisplay()}" class="noosfero-block" ng-mouseover="displayActions = true" ng-mouseleave="displayActions = false">
2 <div ng-show="displayActions" class="actions block-actions" permission="ctrl.block.permissions" permission-action="allow_edit"> 2 <div ng-show="displayActions" class="actions block-actions" permission="ctrl.block.permissions" permission-action="allow_edit">
3 <button type="submit" class="btn btn-xs btn-default" ng-click="ctrl.openEdit()"><i class="fa fa-edit fa-fw"></i></button> 3 <button type="submit" class="btn btn-xs btn-default" ng-click="ctrl.openEdit()"><i class="fa fa-edit fa-fw"></i></button>
4 </div> 4 </div>