Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GitHub issue#11299 fix #11483

Closed
wants to merge 2 commits into from
Closed

GitHub issue#11299 fix #11483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7825cb7
adding localization
Oct 25, 2021
c361e70
adding validation message
Oct 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
149 changes: 83 additions & 66 deletions ...co.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.doctypepicker.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,70 +1,87 @@
<div id="{{model.alias}}" class="umb-nested-content__doctypepicker" ng-controller="Umbraco.PropertyEditors.NestedContent.DocTypePickerController">
<div>
<table class="table table-striped">
<thead>
<tr>
<th></th>
<th>
<localize key="contentTypeEditor_elementType">Element Type</localize>
</th>
<th>
<localize key="general_group">Group</localize>
</th>
<th>
<localize key="template_template">Template</localize>
</th>
<th></th>
</tr>
</thead>
<tbody ui-sortable="sortableOptions" ng-model="model.value">
<tr ng-repeat="config in model.value">
<td>
<umb-icon icon="icon-navigation" class="handle"></umb-icon>
</td>
<td>
{{ph = placeholder(config);""}}
<button type="button" class="btn-reset umb-nested-content__placeholder" ng-class="{'umb-nested-content__placeholder--selected':ph}" ng-click="openElemTypeModal($event, config)">
<umb-node-preview ng-if="ph" icon="ph.icon" name="ph.name"></umb-node-preview>
<localize key="content_nestedContentAddElementType" ng-if="!ph">Add element type</localize>
</button>

</td>
<td>
<select id="{{model.alias}}_tab_select"
ng-options="t for t in elemTypeTabs[config.ncAlias]"
ng-model="config.ncTabAlias" required></select>
</td>
<td>
<input type="text" ng-model="config.nameTemplate" />
</td>
<td>
<button type="button" class="btn btn-danger" ng-click="remove($index)">
<localize key="general_delete">Delete</localize>
</button>
</td>
</tr>
</tbody>
</table>
<div>
<button type="button" class="btn" ng-click="add()" ng-disabled="!canAdd()">
<localize key="general_add">Add</localize>
<div id="{{model.alias}}" class="umb-nested-content__doctypepicker" ng-controller="Umbraco.PropertyEditors.NestedContent.DocTypePickerController">
<div>
<table class="table table-striped">
<thead>
<tr>
<th></th>
<th>
<localize key="contentTypeEditor_elementType">Element Type</localize>
</th>
<th>
<localize key="general_group">Group</localize>
</th>
<th>
<localize key="template_template">Template</localize>
</th>
<th></th>
</tr>
</thead>
<tbody ui-sortable="sortableOptions" ng-model="model.value">
<tr ng-repeat="config in model.value">
<td>
<umb-icon icon="icon-navigation" class="handle"></umb-icon>
</td>
<td>
{{ph = placeholder(config);""}}
<button type="button" class="btn-reset umb-nested-content__placeholder" ng-class="{'umb-nested-content__placeholder--selected':ph}" ng-click="openElemTypeModal($event, config)">
<umb-node-preview ng-if="ph" icon="ph.icon" name="ph.name"></umb-node-preview>
<localize key="content_nestedContentAddElementType" ng-if="!ph">Add element type</localize>
</button>
<button type="button" class="btn-reset umb-nested-content__help-action" ng-click="showHelpText = !showHelpText">
<umb-icon icon="icon-help-alt" class="medium umb-nested-content__help-icon"></umb-icon>
</td>

<td>

<select ng-show="elemTypeTabs[config.ncAlias].length || config.ncAlias==''" id="{{model.alias}}_tab_select"
ng-options="t for t in elemTypeTabs[config.ncAlias]"
ng-model="config.ncTabAlias" required></select>

<p ng-show="!elemTypeTabs[config.ncAlias].length && config.ncAlias!==''" class="red">
-<localize key="contentTypeEditor_noGroups">
You have not added any groups
</localize> <br/>
*<localize key="content_nestedContentTabsAreNotSupported">
Tabs are not supported by this editor, either change them to groups or use the Block List editor.
</localize>*
</p>
</td>
<td>
<input type="text" ng-model="config.nameTemplate" />
</td>
<td>
<button type="button" class="btn btn-danger" ng-click="remove($index)">
<localize key="general_delete">Delete</localize>
</button>
</div>
</div>
<br />
<div class="umb-nested-content__help-text" ng-show="showHelpText">
<p>
<strong><localize key="general_group">Group</localize>:</strong><br />
<localize key="content_nestedContentGroupHelpText">Select the group whose properties should be displayed. If left blank, the first group on the element type will be used.</localize>
</p>
<p>
<strong><localize key="template_template">Template</localize>:</strong><br />
<localize key="content_nestedContentTemplateHelpTextPart1">Enter an angular expression to evaluate against each item for its name. Use</localize>
<code ng-non-bindable>{{$index}}</code>
<localize key="content_nestedContentTemplateHelpTextPart2">to display the item index</localize>
</p>
</td>
</tr>
</tbody>
</table>
<div>
<button type="button" class="btn" ng-click="add()" ng-disabled="!canAdd()">
<localize key="general_add">Add</localize>
</button>
<button type="button" class="btn-reset umb-nested-content__help-action" ng-click="showHelpText = !showHelpText">
<umb-icon icon="icon-help-alt" class="medium umb-nested-content__help-icon"></umb-icon>
</button>
</div>
</div>
<br />
<div class="umb-nested-content__help-text" ng-show="showHelpText">
<p>
<strong><localize key="general_group">Group</localize>:</strong><br />
<localize key="content_nestedContentGroupHelpText">Select the group whose properties should be displayed. If left blank, the first group on the element type will be used.</localize>
</p>
<p>
<strong><localize key="template_template">Template</localize>:</strong><br />
<localize key="content_nestedContentTemplateHelpTextPart1">Enter an angular expression to evaluate against each item for its name. Use</localize>
<code ng-non-bindable>{{$index}}</code>
<localize key="content_nestedContentTemplateHelpTextPart2">to display the item index</localize>
</p>
<p>
<strong><localize key="settings_tab">Tab</localize>:</strong><br />
<localize key="content_nestedContentTabsAreNotSupported">
Tabs are not supported by this editor, either change them to groups or use the Block List editor.
</localize>
</p>
</div>
</div>

1 change: 1 addition & 0 deletions src/Umbraco.Web.UI/umbraco/config/lang/cs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@
<key alias="nestedContentGroupHelpText">Select the group whose properties should be displayed. If left blank, the first group on the element type will be used.</key>
<key alias="nestedContentTemplateHelpTextPart1">Enter an angular expression to evaluate against each item for its name. Use</key>
<key alias="nestedContentTemplateHelpTextPart2">to display the item index</key>
<key alias="nestedContentTabsAreNotSupported">Tabs are not supported by this editor, either change them to groups or use the Block List editor</key>
<key alias="addTextBox">Add another text box</key>
<key alias="removeTextBox">Remove this text box</key>
<key alias="contentRoot">Content root</key>
Expand Down
1 change: 1 addition & 0 deletions src/Umbraco.Web.UI/umbraco/config/lang/en.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,7 @@
<key alias="nestedContentGroupHelpText">Select the group whose properties should be displayed. If left blank, the first group on the Element Type will be used.</key>
<key alias="nestedContentTemplateHelpTextPart1">Enter an angular expression to evaluate against each item for its name. Use</key>
<key alias="nestedContentTemplateHelpTextPart2">to display the item index</key>
<key alias="nestedContentTabsAreNotSupported">Tabs are not supported by this editor, either change them to groups or use the Block List editor</key>
<key alias="addTextBox">Add another text box</key>
<key alias="removeTextBox">Remove this text box</key>
<key alias="contentRoot">Content root</key>
Expand Down
1 change: 1 addition & 0 deletions src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@
<key alias="nestedContentGroupHelpText">Select the group whose properties should be displayed. If left blank, the first group on the Element Type will be used.</key>
<key alias="nestedContentTemplateHelpTextPart1">Enter an angular expression to evaluate against each item for its name. Use</key>
<key alias="nestedContentTemplateHelpTextPart2">to display the item index</key>
<key alias="nestedContentTabsAreNotSupported">Tabs are not supported by this editor, either change them to groups or use the Block List editor</key>
<key alias="addTextBox">Add another text box</key>
<key alias="removeTextBox">Remove this text box</key>
<key alias="contentRoot">Content root</key>
Expand Down