From 3c8be919da506aaa26e836d4661db6d0dd984e8b Mon Sep 17 00:00:00 2001 From: per ploug Date: Mon, 17 Nov 2014 20:47:22 +0100 Subject: [PATCH] Fixes U4-5824 Grid editor lacks localized labels --- .../propertyeditors/grid/dialogs/additem.html | 2 +- .../grid/dialogs/layoutconfig.html | 12 +- .../grid/dialogs/rowconfig.html | 10 +- .../src/views/propertyeditors/grid/grid.html | 15 +- .../propertyeditors/grid/grid.prevalues.html | 197 +++++------------- src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 33 +++ 6 files changed, 109 insertions(+), 160 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/additem.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/additem.html index dec1d8a3bc..d945aa5a26 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/additem.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/additem.html @@ -2,7 +2,7 @@ ng-style="overlayMenu.style" delayed-mouseleave="closeItemOverlay()"> -
Insert control
+
@@ -91,7 +91,7 @@
{{row.name}}
- {{row.areas.length}} configurable cells
+ {{row.areas.length}} cells
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 38ead7b06d..855025dc33 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 @@ -3,10 +3,10 @@ ng-controller="Umbraco.PropertyEditors.GridPrevalueEditor.RowConfigController">
-
Row configuration
-

Adjust the row by setting cell widths and adding additional cells

+
+

- + @@ -34,7 +34,7 @@ ng-controller="Umbraco.PropertyEditors.GridPrevalueEditor.RowConfigController">
- +
@@ -57,7 +57,7 @@ ng-controller="Umbraco.PropertyEditors.GridPrevalueEditor.RowConfigController"> ng-model="currentCell.allowAll" ng-checked="currentCell.allowed === undefined" ng-change="toggleCollection(currentCell.allowed, currentCell.allowAll)" /> - Allow all editors + 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 a8a859f21d..04357be332 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 @@ -32,7 +32,7 @@
-

Add rows to your layout

+

@@ -67,8 +67,8 @@ ng-mouseleave="disableWarnhighlightRow(row)"> - Are you sure? - Yes + + @@ -131,8 +131,8 @@ ng-mouseleave="disableWarnhighlightControl(control)"> - Are you sure? - Yes + + @@ -178,8 +178,7 @@
- To start, click the - below and add your first element +

@@ -237,7 +236,7 @@

- Add rows to your layout +

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html index f5ecf5daf8..7447372b21 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html @@ -1,59 +1,54 @@
-
-
+
-

Grid layouts

-

Layouts are the overall work area for the grid editor, usually you only need one or two differnt layouts

+

+

-
    +
      -
    • +
    • -
      +
      -
      -
      - -
      -
      +
      +
      +
      -
      - -
      - {{template.name}}
      - {{template.sections.length}} sections
      - - Delete
      +
      -
      -
    +
    + {{template.name}}
    + + +
    - -
+
+ + + +
- -
-
+
-

Row configurations

-

Rows are predefined cells arranged horizontally

+

+


- +
-
- -
Row configuration
- - - - - - - -
- -
-
- - - - - - - -
-
-
- -
- -
- - - - {{currentArea.grid}} - - - -
- - - -
    -
  • - -
    • -
- -
-
-
    -
  • - -
    • -
-
- - - - - Delete cell -
- - - - - -
-
-
- + +
+ + - + +
    @@ -206,17 +123,17 @@ - - + diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index 9dfdb392d1..43e2a2eeaa 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -841,6 +841,39 @@ To manage your website, simply open the Umbraco back office and start adding con Quick Guide to Umbraco template tags Template + + + + Insert control + Add rows to your layout + below and add your first element]]> + + Grid layouts + Layouts are the overall work area for the grid editor, usually you only need one or two differnt layouts + Add grid layout + Adjust the layout by setting column widths and adding additional sections + + Row configurations + Rows are predefined cells arranged horizontally + Add row configuration + Adjust the row by setting cell widths and adding additional cells + + Columns + Total combined number of columns in the grid layout + + Settings + Configure what settings editors can change + + + Styles + Configure what styling editors can change + + Settings will only save if the entered json configuration is valid + + Allow all editors + Allow all row configurations + + Alternative field Alternative Text