From 805c1bf8d06c44b7751ae6e084571613f559f3c8 Mon Sep 17 00:00:00 2001 From: Stefan Kip Date: Tue, 11 Nov 2014 13:59:09 +0100 Subject: [PATCH 1/5] Disabled trimming Set ngTrim to false. --- .../src/views/propertyeditors/textbox/textbox.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html index 7df7e9fded..b2c57b4737 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html @@ -2,7 +2,8 @@ + ng-required="model.validation.mandatory" + ng-trim="false" /> Required From a8c73296ea1f8d884ba8d75125edef6b619a8612 Mon Sep 17 00:00:00 2001 From: antoine Date: Tue, 11 Nov 2014 20:58:35 +0100 Subject: [PATCH 2/5] Right info and warm highlight for rows' and controls' options (remove, move and setting) --- .../src/less/gridview.less | 7 +- .../propertyeditors/grid/grid.controller.js | 44 +++++++------ .../src/views/propertyeditors/grid/grid.html | 64 +++++++++++-------- 3 files changed, 65 insertions(+), 50 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/gridview.less b/src/Umbraco.Web.UI.Client/src/less/gridview.less index 1367faf3c7..578353cf38 100644 --- a/src/Umbraco.Web.UI.Client/src/less/gridview.less +++ b/src/Umbraco.Web.UI.Client/src/less/gridview.less @@ -482,19 +482,16 @@ padding-bottom: 20px; } - .usky-grid .usky-row{ - - } - .usky-grid .usky-control{ margin: 10px 0 0 0; padding: 5px; + border: 1px dashed transparent; } .usky-grid .usky-templates-columns{ margin-top: 30px; } - + .usky-grid .usky-row-inner{ margin-right: 45px; border: 1px dashed transparent; diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js index ec47771491..05682dce29 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js @@ -184,20 +184,20 @@ angular.module("umbraco") $scope.currentRow = null; }; - $scope.setCurrentRemoveRow = function (Row) { - $scope.currentRemoveRow = Row; + $scope.setWarnighlightRow = function (row) { + $scope.currentWarnhighlightRow = row; }; - $scope.disableCurrentRemoveRow = function (Row) { - $scope.currentRemoveRow = null; + $scope.disableWarnhighlightRow = function () { + $scope.currentWarnhighlightRow = null; }; - $scope.setCurrentMovedRow = function (Row) { - $scope.currentMovedRow = Row; + $scope.setInfohighlightRow = function (row) { + $scope.currentInfohighlightRow = row; }; - $scope.disableCurrentMovedRow = function (Row) { - $scope.currentMovedRow = null; + $scope.disableInfohighlightRow = function () { + $scope.currentInfohighlightRow = null; }; $scope.getAllowedLayouts = function(column){ @@ -252,14 +252,14 @@ angular.module("umbraco") }; // ********************************************* - // Cell management functions + // Area management functions // ********************************************* $scope.setCurrentCell = function (cell) { $scope.currentCell = cell; }; - $scope.disableCurrentCell = function (cell) { + $scope.disableCurrentCell = function () { $scope.currentCell = null; }; @@ -272,7 +272,13 @@ angular.module("umbraco") } }; + $scope.setInfohighlightArea = function (cell) { + $scope.currentInfohighlightArea = cell; + }; + $scope.disableInfohighlightArea = function () { + $scope.currentInfohighlightArea = null; + }; // ********************************************* @@ -294,22 +300,20 @@ angular.module("umbraco") $scope.currentToolsControl = null; }; - $scope.setCurrentRemoveControl = function (Control) { - $scope.currentRemoveControl = Control; + $scope.setWarnhighlightControl = function (Control) { + $scope.currentWarnhighlightControl = Control; }; - $scope.disableCurrentRemoveControl = function (Control) { - $scope.currentRemoveControl = null; + $scope.disableWarnhighlightControl = function (Control) { + $scope.currentWarnhighlightControl = null; }; - $scope.setCurrentMovedControl = function (Control) { - $scope.currentRow = null; - $scope.currentRemoveControl = null; - $scope.currentMovedControl = Control; + $scope.setInfohighlightControl = function (Control) { + $scope.currentInfohighlightControl = Control; }; - $scope.disableCurrentMovedControl = function (Control) { - $scope.currentMovedControl = null; + $scope.disableInfohighlightControl = function (Control) { + $scope.currentInfohighlightControl = null; }; $scope.setUniqueId = function (cell, index) { diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html index e8ce3f9316..a726d9c036 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html @@ -65,8 +65,8 @@
+ ng-mouseover="setWarnighlightRow(row)" + ng-mouseleave="disableWarnhighlightRow(row)"> Are you sure? @@ -79,13 +79,19 @@
+ ng-mouseover="setInfohighlightRow(row)" + ng-mouseleave="disableInfohighlightRow(row)" + href>
- +
@@ -94,23 +100,25 @@
+ ng-class="{last:$last,first:$first,warnhighlight:currentWarnhighlightRow == row, infohighlight:currentInfohighlightRow == row}">
- +
- +
@@ -118,12 +126,12 @@ ng-animate="'fade'" ng-show="control && (currentControl == control)"> - +
+ ng-mouseover="setWarnhighlightControl(control)" + ng-mouseleave="disableWarnhighlightControl(control)"> Are you sure? @@ -134,25 +142,32 @@
- +
-
+ -
+
+
- +
+
-
-
- To start, click the - below and add your first element -

-
+
+ To start, click the + below and add your first element +

+
- +
From c68067eb09e6c739c7d3cbe20814f9a2b626c225 Mon Sep 17 00:00:00 2001 From: antoine Date: Tue, 11 Nov 2014 21:27:38 +0100 Subject: [PATCH 3/5] highlight area for setting, not control. --- .../src/views/propertyeditors/grid/grid.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html index a726d9c036..62d372512d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html @@ -108,8 +108,9 @@
@@ -117,8 +118,6 @@ ng-mouseover="setCurrentControl(control)" ng-mouseleave="disableCurrentControl(control)" ng-animate="'fade'" - ng-class="{infohighlight:currentInfohighlightArea == area, - warnhighlight:currentWarnhighlightArea == area}" class="usky-control"> From 3420694cca3c5a4eee16c58ad51625e94d2b52bf Mon Sep 17 00:00:00 2001 From: antoine Date: Tue, 11 Nov 2014 21:56:25 +0100 Subject: [PATCH 4/5] Some grid view css adjustments --- src/Umbraco.Web.UI.Client/src/less/gridview.less | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/gridview.less b/src/Umbraco.Web.UI.Client/src/less/gridview.less index 578353cf38..16d49939d4 100644 --- a/src/Umbraco.Web.UI.Client/src/less/gridview.less +++ b/src/Umbraco.Web.UI.Client/src/less/gridview.less @@ -186,7 +186,7 @@ .usky-grid .cell-tools-move { display:inline-block; position: absolute; - top: 40px; + top: 33px; right: 5px; z-index: 500; cursor: move @@ -194,7 +194,7 @@ .usky-grid .cell-tools-edit{ position: absolute; - top: 80px; + top: 66px; right: 5px; } @@ -229,11 +229,11 @@ /*border-bottom:1px solid rgba(182, 182, 182, 0.0) !important;*/ } -.usky-grid .warnhighlight{ +.usky-grid .warnhighlight, .usky-grid .td.last.warnhighlight{ border: 1px dashed @red !important; } -.usky-grid .infohighlight{ +.usky-grid .infohighlight, .usky-grid .td.last.infohighlight{ border: 1px dashed @blue !important; } @@ -327,7 +327,7 @@ // ICONS // ------------------------- .usky-grid .iconBox { - padding: 4px 7px 4px 7px; + padding: 4px 6px 4px 6px; display: inline-block; cursor: pointer; border-radius: 200px; @@ -339,6 +339,7 @@ background: @blue !important; color: white !important; border-color: @blue !important; + text-decoration:none; } .usky-grid .iconBox a:hover { @@ -370,12 +371,10 @@ .usky-grid .iconBox i { font-size:16px !important; color: #5F5F5F; + display:block; } - - - .usky-grid ul { display:inline-block; list-style:none; From 4562237a965130f5759db098832e8150e2616e24 Mon Sep 17 00:00:00 2001 From: antoine Date: Tue, 11 Nov 2014 22:04:30 +0100 Subject: [PATCH 5/5] U4-5778 Grid: Not all of the add-circle/button is clickable --- .../src/views/propertyeditors/grid/grid.html | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html index 62d372512d..7ecf2d4cbb 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html @@ -189,12 +189,10 @@ ng-if="!currentToolsControl" ng-animate="'fade'"> -
- - - -
- + + + +