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

Adjust the wording of some of the helper text around the new Block Grid editor (#13484)

Browse Source 
(cherry picked from commit 2461b7d805)

# Conflicts:
#	src/Umbraco.Core/EmbeddedResources/Lang/en.xml
#	src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml
This commit is contained in:
Marc Goodson
2022-11-30 14:36:23 +00:00
committed by Sebastiaan Janssen
parent c0d022be10
commit b87b9bebe2
6 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Umbraco.Core/EmbeddedResources/Lang/en.xml
View File

@@ -2777,29 +2777,29 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
<key alias="sizeOptions">Size options</key>
<key alias="sizeOptionsHelp">Define one or more size options, this enables resizing of the Block</key>
<key alias="allowedBlockColumns">Available column spans</key>
<key alias="allowedBlockColumnsHelp">Define the different number of columns this block is allowed to span across. This does not prevent Blocks to be placed in Areas of a smaller column span.</key>
<key alias="allowedBlockColumnsHelp">Define the different number of columns this block is allowed to span across. This does not prevent Blocks from being placed in Areas with a smaller column span.</key>
<key alias="allowedBlockRows">Available row spans</key>
<key alias="allowedBlockRowsHelp">Define the range of layout rows this block is allowed to span across.</key>
<key alias="allowBlockInRoot">Allow in root</key>
<key alias="allowBlockInRootHelp">Make this block available in the root of the layout.</key>
<key alias="allowBlockInAreas">Allow in areas</key>
<key alias="allowBlockInAreasHelp">Make this block available within other Blocks.</key>
<key alias="areaAllowedBlocksEmpty">When empty all Blocks allowed for Areas can be created.</key>
<key alias="allowBlockInAreasHelp">Make this block available for use within the areas of other Blocks (unless explicit permissions are set for these areas).</key>
<key alias="areaAllowedBlocksEmpty">By default, all block types are allowed in an Area, Use this option to allow only selected types.</key>
<key alias="areas">Areas</key>
<key alias="areasLayoutColumns">Grid Columns for Areas</key>
<key alias="areasLayoutColumnsHelp">Define how many columns that will be available for areas. If not defined, the number of columns defined for the entire layout will be used.</key>
<key alias="areasConfigurations">Areas</key>
<key alias="areasConfigurationsHelp">To enable nesting of blocks within this block, define one or more areas for blocks to be nested within. Areas follow their own layout witch is defined by the Grid Columns for Areas. Each Area column span and row span can be adjusted by using the scale-handler in the bottom right corner.</key>
<key alias="areasConfigurationsHelp">To enable the nesting of blocks within this block, define one or more areas. Areas follow the layout defined by their own grid column configuration. The 'column span' and 'row span' for each area can be adjusted by using the scale-handler box in the bottom right hand corner of the selected area.</key>
<key alias="invalidDropPosition"><![CDATA[<strong>%0%</strong> is not allowed at this spot.]]></key>
<key alias="defaultLayoutStylesheet">Default layout stylesheet</key>
<key alias="confirmPasteDisallowedNestedBlockHeadline">Disallowed content was rejected</key>
<key alias="confirmPasteDisallowedNestedBlockMessage">
<![CDATA[The inserted content contained disallowed content, which has not been created. Would you like to keep the rest of this content anyway?]]></key>
<key alias="areaAliasHelp">
<![CDATA[The alias will be printed by GetBlockGridHTML(), use the alias to target the Element representing this area. Ex. .umb-block-grid__area[data-area-alias="MyAreaAlias"] { ... }]]></key>
<![CDATA[When using GetBlockGridHTML() to render the Block Grid, the alias will be rendered in the markup as a 'data-area-alias' attribute. Use the alias attribute to target the element for the area. Example. .umb-block-grid__area[data-area-alias="MyAreaAlias"] { ... }]]></key>
<key alias="scaleHandlerButtonTitle">Drag to scale</key>
<key alias="areaCreateLabelTitle">Create Button Label</key>
<key alias="areaCreateLabelHelp">Overwrite the label on the create button of this Area.</key>
<key alias="areaCreateLabelHelp">Override the label text for adding a new Block to this Area, Example: 'Add Widget'</key>
<key alias="showSizeOptions">Show resize options</key>
<key alias="addBlockType">Add Block</key>
<key alias="addBlockGroup">Add group</key>

12
src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml
View File

@@ -2879,29 +2879,29 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
<key alias="sizeOptions">Size options</key>
<key alias="sizeOptionsHelp">Define one or more size options, this enables resizing of the Block</key>
<key alias="allowedBlockColumns">Available column spans</key>
<key alias="allowedBlockColumnsHelp">Define the different number of columns this block is allowed to span across. This does not prevent Blocks to be placed in Areas of a smaller column span.</key>
<key alias="allowedBlockColumnsHelp">Define the different number of columns this block is allowed to span across. This does not prevent Blocks from being placed in Areas with a smaller column span.</key>
<key alias="allowedBlockRows">Available row spans</key>
<key alias="allowedBlockRowsHelp">Define the range of layout rows this block is allowed to span across.</key>
<key alias="allowBlockInRoot">Allow in root</key>
<key alias="allowBlockInRootHelp">Make this block available in the root of the layout.</key>
<key alias="allowBlockInAreas">Allow in areas</key>
<key alias="allowBlockInAreasHelp">Make this block available within other Blocks.</key>
<key alias="areaAllowedBlocksEmpty">When empty all Blocks allowed for Areas can be created.</key>
<key alias="allowBlockInAreasHelp">Make this block available for use within the areas of other Blocks (unless explicit permissions are set for these areas).</key>
<key alias="areaAllowedBlocksEmpty">By default, all block types are allowed in an Area, Use this option to allow only selected types.</key>
<key alias="areas">Areas</key>
<key alias="areasLayoutColumns">Grid Columns for Areas</key>
<key alias="areasLayoutColumnsHelp">Define how many columns that will be available for areas. If not defined, the number of columns defined for the entire layout will be used.</key>
<key alias="areasConfigurations">Areas</key>
<key alias="areasConfigurationsHelp">To enable nesting of blocks within this block, define one or more areas for blocks to be nested within. Areas follow their own layout witch is defined by the Grid Columns for Areas. Each Area column span and row span can be adjusted by using the scale-handler in the bottom right corner.</key>
<key alias="areasConfigurationsHelp">To enable the nesting of blocks within this block, define one or more areas. Areas follow the layout defined by their own grid column configuration. The 'column span' and 'row span' for each area can be adjusted by using the scale-handler box in the bottom right hand corner of the selected area.</key>
<key alias="invalidDropPosition"><![CDATA[<strong>%0%</strong> is not allowed at this spot.]]></key>
<key alias="defaultLayoutStylesheet">Default layout stylesheet</key>
<key alias="confirmPasteDisallowedNestedBlockHeadline">Disallowed content was rejected</key>
<key alias="confirmPasteDisallowedNestedBlockMessage">
<![CDATA[The inserted content contained disallowed content, which has not been created. Would you like to keep the rest of this content anyway?]]></key>
<key alias="areaAliasHelp">
<![CDATA[The alias will be printed by GetBlockGridHTML(), use the alias to target the Element representing this area. Ex. .umb-block-grid__area[data-area-alias="MyAreaAlias"] { ... }]]></key>
<![CDATA[When using GetBlockGridHTML() to render the Block Grid, the alias will be rendered in the markup as a 'data-area-alias' attribute. Use the alias attribute to target the element for the area. Example. .umb-block-grid__area[data-area-alias="MyAreaAlias"] { ... }]]></key>
<key alias="scaleHandlerButtonTitle">Drag to scale</key>
<key alias="areaCreateLabelTitle">Create Button Label</key>
<key alias="areaCreateLabelHelp">Overwrite the label on the create button of this Area.</key>
<key alias="areaCreateLabelHelp">Override the label text for adding a new Block to this Area, Example: 'Add Widget'</key>
<key alias="showSizeOptions">Show resize options</key>
<key alias="addBlockType">Add Block</key>
<key alias="addBlockGroup">Add group</key>

8
src/Umbraco.Core/PropertyEditors/BlockGridConfiguration.cs
View File

@@ -10,13 +10,13 @@ namespace Umbraco.Cms.Core.PropertyEditors;
/// </summary>
public class BlockGridConfiguration
{
[ConfigurationField("blocks", "Blocks", "views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.html", Description = "Define Blocks based on Element Types.")]
[ConfigurationField("blocks", "Blocks", "views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.html", Description = "Define Blocks based on Element Types. Use Groups to help organise their selection. Example Groups: 'Layout' and 'Content'")]
public BlockGridBlockConfiguration[] Blocks { get; set; } = Array.Empty<BlockGridBlockConfiguration>();
[ConfigurationField("blockGroups", "Block Groups", "views/propertyeditors/blockgrid/prevalue/blockgrid.groupconfiguration.html", HideLabel = true)]
public BlockGridGroupConfiguration[] BlockGroups { get; set; } = Array.Empty<BlockGridGroupConfiguration>();
[ConfigurationField("validationLimit", "Amount", "numberrange", Description = "Set a required range of blocks")]
[ConfigurationField("validationLimit", "Amount", "numberrange", Description = "Set the required range for the allowed number of blocks")]
public NumberRange ValidationLimit { get; set; } = new NumberRange();
[ConfigurationField("useLiveEditing", "Live editing mode", "boolean", Description = "Live update content when editing in overlay")]
@@ -28,10 +28,10 @@ public class BlockGridConfiguration
[ConfigurationField("gridColumns", "Grid Columns", "number", Description = "Set the number of columns for the layout. (defaults to 12)")]
public int? GridColumns { get; set; }
[ConfigurationField("layoutStylesheet", "Layout Stylesheet", "views/propertyeditors/blockgrid/prevalue/blockgrid.stylesheetpicker.html", Description = "Overwrite default stylesheet for layout.")]
[ConfigurationField("layoutStylesheet", "Layout Stylesheet", "views/propertyeditors/blockgrid/prevalue/blockgrid.stylesheetpicker.html", Description = "Override default stylesheet for backoffice layout.")]
public string? LayoutStylesheet { get; set; }
[ConfigurationField("createLabel", "Create Button Label", "textstring", Description = "Overwrite the root create button label")]
[ConfigurationField("createLabel", "Create Button Label", "textstring", Description = "Override the label text for adding a new block, Example 'Add Widget'")]
public string? CreateLabel { get; set; }
[DataContract]

4
src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.area.overlay.html
View File

@@ -29,7 +29,7 @@
<label class="control-label" for="alias"><localize key="general_alias">Alias</localize></label>
<strong class="umb-control-required">*</strong>
<umb-property-info-button button-title-key="general_readMore">
<localize key="blockEditor_areaAliasHelp">The alias will be printed by GetBlockGridHTML(), use the alias to target the Element representing this area. Ex. .umb-block-grid__area[data-area-alias="MyAreaAlias"] { ... }</localize>
<localize key="blockEditor_areaAliasHelp">When using GetBlockGridHTML() to render the Block Grid, the alias will be rendered in the markup as a 'data-area-alias' attribute. Use the alias attribute to target the element for the area. Example. .umb-block-grid__area[data-area-alias="MyAreaAlias"] { ... }</localize>
</umb-property-info-button>
<div class="controls">
<input type="text" name="alias" ng-model="vm.area.alias" val-server="alias" style="width:100%" required umb-auto-focus/>
@@ -48,7 +48,7 @@
<div class="umb-el-wrap">
<label class="control-label" for="createLabel"><localize key="blockEditor_areaCreateLabelTitle">Create Button Label</localize></label>
<umb-property-info-button button-title-key="general_readMore">
<localize key="blockEditor_areaCreateLabelHelp">Overwrite the label on the create button of this Area.</localize>
<localize key="blockEditor_areaCreateLabelHelp">Override the label text for adding a new Block to this Area, Example: 'Add Widget'</localize>
</umb-property-info-button>
<div class="controls">
<input type="text" name="createLabel" ng-model="vm.area.createLabel" style="width:100%" umb-auto-focus/>

2
src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.overlay.html
View File

@@ -210,7 +210,7 @@
<div class="umb-el-wrap">
<label class="control-label" for="label"><localize key="blockEditor_areasConfigurations">Area configurations</localize></label>
<umb-property-info-button button-title-key="general_readMore">
<localize key="blockEditor_areasConfigurationsHelp">To enable nesting of blocks within this block, define one or more areas for blocks to be nested within. Areas follow their own layout witch is defined by the Area Layout Columns. Each Areas column and row span can be adjusted by using the scale-handler in the bottom right.</localize>
<localize key="blockEditor_areasConfigurationsHelp">To enable the nesting of blocks within this block, define one or more areas. Areas follow the layout defined by their own grid column configuration. The 'column span' and 'row span' for each area can be adjusted by using the scale-handler box in the bottom right hand corner of the selected area.</localize>
</umb-property-info-button>
<div class="controls">
<umb-block-grid-area-editor model="vm.block.areas" block="vm.block" grid-columns="model.gridColumns" all-block-types="model.allBlockTypes" all-block-groups="model.allBlockGroups" loaded-element-types="model.loadedElementTypes"></umb-block-grid-area-editor>

2
src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-area-allowance-editor.html
View File

@@ -57,7 +57,7 @@
</button>
<div ng-if="vm.model.length === 0" class="__empty-label">
<localize key="blockEditor_areaAllowedBlocksEmpty">When empty all Blocks allowed for Areas can be created.</localize>
<localize key="blockEditor_areaAllowedBlocksEmpty">By default, all block types are allowed in an Area, Use this option to allow only selected types.</localize>
</div>
</div>