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

Merge pull request #8605 from bjarnef/v8/bug/fix-self-closing-umb-toggle

Browse Source 
Fix self closing umb-toggle
This commit is contained in:
Claus
2020-08-07 09:42:31 +02:00
committed by GitHub
parent 8b1bf3c16f deef02bd32
commit f7588da514
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
View File

@@ -8,10 +8,13 @@
<div class="flex mb3">
<umb-toggle
checked="vm.includeUnpublished"
input-id="includeUnpublished"
on-click="vm.toggleIncludeUnpublished()"
class="mr2"
/>
<localize key="content_includeUnpublished"></localize>
class="mr2">
</umb-toggle>
<label for="includeUnpublished">
<localize key="content_includeUnpublished">Include drafts and unpublished content items.</localize>
</label>
</div>
</div>
@@ -25,10 +28,13 @@
<div class="flex mb3">
<umb-toggle
checked="vm.includeUnpublished"
input-id="includeUnpublished"
on-click="vm.toggleIncludeUnpublished()"
class="mr2"
/>
<localize key="content_includeUnpublished"></localize>
class="mr2">
</umb-toggle>
<label for="includeUnpublished">
<localize key="content_includeUnpublished">Include drafts and unpublished content items.</localize>
</label>
</div>
<div class="umb-list umb-list--condensed">

4
src/Umbraco.Web.UI.Client/src/views/macros/views/settings.html
View File

@@ -38,10 +38,10 @@
<umb-box-header title="Editor settings"></umb-box-header>
<umb-box-content>
<umb-control-group label="Use in rich text editor and the grid">
<umb-toggle checked="model.macro.useInEditor" on-click="model.toggle('useInEditor')" ></umb-toggle>
<umb-toggle checked="model.macro.useInEditor" on-click="model.toggle('useInEditor')"></umb-toggle>
</umb-control-group>
<umb-control-group label="Render in rich text editor and the grid" ng-if="model.macro.useInEditor">
<umb-toggle checked="model.macro.renderInEditor && model.macro.useInEditor" on-click="model.toggle('renderInEditor')" ></umb-toggle>
<umb-toggle checked="model.macro.renderInEditor && model.macro.useInEditor" on-click="model.toggle('renderInEditor')"></umb-toggle>
</umb-control-group>
</umb-box-content>
</umb-box>