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

Merge branch 'v8/feature/reintroduce-tabs' of https://github.com/umbraco/Umbraco-CMS into v8/feature/reintroduce-tabs

Browse Source
This commit is contained in:
Ronald Barendse
2021-07-13 15:05:10 +02:00
parent ec761adee2 3d951ac7fe
commit da95bc0d14
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
View File

@@ -23,8 +23,14 @@
</umb-property>
</umb-box-content>
</umb-box>
<div class="umb-group-panel" retrive-dom-element="registerPropertyGroup(element[0], attributes.appAnchor)" data-app-anchor="{{group.id}}" data-element="group-{{group.alias}}" ng-repeat="group in content.tabs track by group.id" ng-show="(group.parentKey === activeTabKey && group.type === 0) || tabs.length === 0">
<div class="umb-group-panel"
retrive-dom-element="registerPropertyGroup(element[0], attributes.appAnchor)"
data-app-anchor="{{group.id}}"
data-element="group-{{group.alias}}"
ng-repeat="group in content.tabs track by group.id"
ng-show="(group.parentKey === activeTabKey && group.type === 0) || tabs.length === 0">
<div class="umb-group-panel__header">
<div id="group-{{group.id}}">{{ group.label }}</div>
</div>

11
src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
View File

@@ -113,10 +113,15 @@
</button>
</umb-box-content>
</umb-box>
<!-- Groups -->
<div class="umb-group-builder__groups" ui-sortable="sortableOptionsGroup" ng-model="model.groups">
<div ng-repeat="(groupIndex, group) in model.groups track by group.key" ng-show="group.type === 0 && group.parentKey === openTabKey" ng-class="{'umb-group-builder__group-sortable': sortingMode && !group.inherited}" data-group-key="{{group.key}}">
<div
ng-repeat="(groupIndex, group) in model.groups track by group.key"
ng-show="group.type === 0 && group.parentKey === openTabKey"
ng-class="{'umb-group-builder__group-sortable': sortingMode && !group.inherited}"
data-group-key="{{group.key}}">
<umb-content-type-group
ng-if="group.tabState !== 'init'"
on-focus="activateGroup(group)"
@@ -128,7 +133,7 @@
on-change-sort-order-value="onChangeGroupSortOrderValue(group)"
val-server-field-name="{{'Groups[' + $index + '].Name'}}"
val-tab-alias="{{group.validationAlias}}">
<ul class="umb-group-builder__properties" ui-sortable="sortableOptionsProperty" ng-model="group.properties" ng-show="group.properties.length > 0 || sortingMode">
<li ng-repeat="(propertyIndex, property) in group.properties track by property.alias" ng-class="{'umb-group-builder__property-sortable': sortingMode && !property.inherited}">
<umb-content-type-property