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

Fixes: U4-6297 Add Settings to Grid Controls

Browse Source 
Added settings to grid controls in v.7.4.
This commit is contained in:
Claus
2016-01-15 10:04:49 +01:00
parent a468cb78c5
commit 54e3f0f9ec
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
View File

@@ -755,6 +755,7 @@
margin-right: 5px;
position: relative;
cursor: pointer;
display:inline-block;
}

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

@@ -330,8 +330,15 @@ angular.module("umbraco")
$scope.editGridItemSettings = function (gridItem, itemType) {
placeHolder = "{0}";
var styles = _.filter( angular.copy($scope.model.config.items.styles), function(item){return (item.applyTo === undefined || item.applyTo === itemType); });
var config = _.filter( angular.copy($scope.model.config.items.config), function(item){return (item.applyTo === undefined || item.applyTo === itemType); });
var styles, config;
if (itemType === 'control') {
styles = null;
config = angular.copy(gridItem.editor.config.settings);
} else {
styles = _.filter(angular.copy($scope.model.config.items.styles), function (item) { return (item.applyTo === undefined || item.applyTo === itemType); });
config = _.filter(angular.copy($scope.model.config.items.config), function (item) { return (item.applyTo === undefined || item.applyTo === itemType); });
}
if(angular.isObject(gridItem.config)){
_.each(config, function(cfg){
@@ -389,7 +396,7 @@ angular.module("umbraco")
};
};
function stripModifier(val, modifier) {
if (!val || !modifier || modifier.indexOf(placeHolder) < 0) {
return val;

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

@@ -191,6 +191,10 @@
<div class="umb-tools" ng-if="control.active">
<div class="umb-control-tool">
<i class="umb-control-tool-icon icon-settings" ng-click="editGridItemSettings(control, 'control')"></i>
</div>
<div class="umb-control-tool">
<i class="umb-control-tool-icon icon-trash" ng-click="togglePrompt(control)"></i>
<umb-confirm-action