yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #642 from AussieInSeattle/U4-6297

Browse Source 
U4 6297
This commit is contained in:
Claus
2016-01-14 14:35:54 +01:00
parent d2c8268fc4 2276584c90
commit 151c28a20f
2 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
View File

@@ -306,6 +306,28 @@ angular.module("umbraco")
});
};
// *********************************************
// Control management functions
// *********************************************
$scope.editControlSettings = function (control) {
var obj = $scope.model.config;
obj.items.config = control.editor.config.settings;
dialogService.open(
{
template: "views/propertyeditors/grid/dialogs/config.html",
gridItem: { "config": (control.value ? control.value.settings : null) },
itemType: null,
config: obj,
callback: function (data) {
control.settings = data.config;
}
});
};
// *********************************************
// Area management functions

11
src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
View File

@@ -169,6 +169,15 @@
<i class="icon icon-settings" title="@grid_settings" localize="title"></i>
</a>
</div>
<!-- control setting area -->
<div class="cell-tools-edit" ng-style="hasSettings && $first && {'top': '99px'}" ng-if="control.editor.config && control.editor.config.settings">
<a class="iconBox"
ng-click="editControlSettings(control)"
href>
<i class="icon icon-hammer"></i>
</a>
</div>
</div>
@@ -261,4 +270,4 @@
</div>
</div>
</div>
</div>