diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/html/umbcontrolgroup.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/html/umbcontrolgroup.directive.js index 3eec10f332..01a35e6cd9 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/html/umbcontrolgroup.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/html/umbcontrolgroup.directive.js @@ -8,7 +8,7 @@ angular.module("umbraco.directives.html") return { scope: { label: "@label", - description: "@", + description: "@description", hideLabel: "@", alias: "@" }, @@ -33,6 +33,14 @@ angular.module("umbraco.directives.html") else { scope.labelstring = scope.label; } + + if (scope.description && scope.description[0] === "@") { + scope.descriptionstring = localizationService.localize(scope.description.substring(1)); + } + else { + scope.descriptionstring = scope.description; + } + } }; }); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/html/umb-control-group.html b/src/Umbraco.Web.UI.Client/src/views/directives/html/umb-control-group.html index 9d144d79d3..b07c2b9c72 100644 --- a/src/Umbraco.Web.UI.Client/src/views/directives/html/umb-control-group.html +++ b/src/Umbraco.Web.UI.Client/src/views/directives/html/umb-control-group.html @@ -3,7 +3,7 @@
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml index 588a924928..38b6a1e7c4 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml @@ -854,6 +854,36 @@ 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