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.

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 v8 #11493

Merged
merged 9 commits into from
Oct 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,22 @@
<umb-icon icon="icon-navigation" class="handle"></umb-icon>
</td>
<td>
{{ph = placeholder(config);""}}
{{ph = placeholder(config);hasTabsOrFirstRender = (elemTypeTabs[config.ncAlias].length || config.ncAlias=='');""}}
<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"
<select ng-show="hasTabsOrFirstRender" id="{{model.alias}}_tab_select"
ng-options="t for t in elemTypeTabs[config.ncAlias]"
ng-model="config.ncTabAlias" required></select>
<span ng-show="!hasTabsOrFirstRender" class="red">
<localize key="content_nestedContentNoGroups">
The selected element type does not contain any supported groups (tabs are not supported by this editor, either change them to groups or use the Block List editor).
</localize>
</span>
</td>
<td>
<input type="text" ng-model="config.nameTemplate" />
Expand Down
19 changes: 9 additions & 10 deletions src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,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="nestedContentNoGroups">The selected element type does not contain any supported groups (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 Expand Up @@ -1090,17 +1091,16 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
<key alias="notificationsSavedFor">Notification settings saved for</key>
<key alias="mailBody"><![CDATA[
Hi %0%

This is an automated mail to inform you that the task '%1%'
has been performed on the page '%2%'
by the user '%3%'

Go to http://%4%/#/content/content/edit/%5% to edit.

%6%

Have a nice day!

Cheers from the Umbraco robot
]]></key>
<key alias="mailBodyVariantSummary">The following languages have been modified %0%</key>
Expand Down Expand Up @@ -1795,17 +1795,16 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
<key alias="includeSubpages">Include subpages</key>
<key alias="mailBody"><![CDATA[
Hi %0%

This is an automated mail to inform you that the document '%1%'
has been requested for translation into '%5%' by %2%.

Go to http://%3%/translation/details.aspx?id=%4% to edit.

Or log into Umbraco to get an overview of your translation tasks
http://%3%

Have a nice day!

Cheers from the Umbraco robot
]]></key>
<key alias="noTranslators">No translator users found. Please create a translator user before you start sending content to translation</key>
Expand Down
1 change: 1 addition & 0 deletions src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,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="nestedContentNoGroups">The selected element type does not contain any supported groups (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