From 917e05a16cceecd2aad95aca3db6e3483f4946bd Mon Sep 17 00:00:00 2001 From: Jakub Swietek Date: Wed, 21 Sep 2016 12:55:05 +0200 Subject: [PATCH 1/4] Changed section's minimum width to 1 --- .../propertyeditors/grid/dialogs/layoutconfig.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js index e886cb977e..a93d8c2d00 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js @@ -16,7 +16,7 @@ angular.module("umbraco") }; $scope.scaleDown = function(section){ - var remove = (section.grid > 1) ? 1 : section.grid; + var remove = (section.grid > 1) ? 1 : 0; section.grid = section.grid-remove; }; From 44ad842542614d155d938ee4148a477def860bb1 Mon Sep 17 00:00:00 2001 From: Jakub Swietek Date: Wed, 21 Sep 2016 12:56:31 +0200 Subject: [PATCH 2/4] Added option to delete selected section from layout --- .../grid/dialogs/layoutconfig.controller.js | 9 ++++++--- .../views/propertyeditors/grid/dialogs/layoutconfig.html | 7 +++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js index a93d8c2d00..e2422e7da0 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js @@ -49,9 +49,12 @@ angular.module("umbraco") $scope.currentSection = section; }; - - $scope.deleteSection = function(index){ - $scope.currentTemplate.sections.splice(index, 1); + $scope.deleteSection = function(section, template) { + if ($scope.currentSection === section) { + $scope.currentSection = undefined; + } + var index = template.sections.indexOf(section) + template.sections.splice(index, 1); }; $scope.closeSection = function(){ diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html index 9cbe74bae2..5f5c956c22 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html @@ -46,6 +46,13 @@ + + + + Delete + + +
    From a28cd8a54fb4d3b6c61a0978f07d6b0c33b5037a Mon Sep 17 00:00:00 2001 From: Jakub Swietek Date: Wed, 21 Sep 2016 12:57:57 +0200 Subject: [PATCH 3/4] Changed row cell's minimum width to 1 --- .../views/propertyeditors/grid/dialogs/rowconfig.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js index 09fa263354..f2c529fbe0 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js @@ -14,7 +14,7 @@ function RowConfigController($scope) { }; $scope.scaleDown = function(section) { - var remove = (section.grid > 1) ? 1 : section.grid; + var remove = (section.grid > 1) ? 1 : 0; section.grid = section.grid - remove; }; From 6d9a747b343b8ce783c6ae17ea0e7f59449b4a3d Mon Sep 17 00:00:00 2001 From: Jakub Swietek Date: Wed, 21 Sep 2016 13:00:02 +0200 Subject: [PATCH 4/4] Added option to delete cell from a row --- .../propertyeditors/grid/dialogs/rowconfig.controller.js | 9 +++++++-- .../views/propertyeditors/grid/dialogs/rowconfig.html | 6 ++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js index f2c529fbe0..3cd16301cd 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js @@ -58,9 +58,14 @@ function RowConfigController($scope) { } }; - $scope.deleteArea = function(index) { - $scope.currentRow.areas.splice(index, 1); + $scope.deleteArea = function (cell, row) { + if ($scope.currentCell === cell) { + $scope.currentCell = undefined; + } + var index = row.areas.indexOf(cell) + row.areas.splice(index, 1); }; + $scope.closeArea = function() { $scope.currentCell = undefined; }; diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html index f47a1958ae..93b9bcce44 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html @@ -57,6 +57,12 @@ + + + + Delete + +