Skip to content

Commit

Permalink
Adjust property editor settings (#8251)
Browse files Browse the repository at this point in the history 
Co-authored-by: Bjarne Fyrstenborg <[email protected]>
  • Loading branch information
@bjarnef
bjarnef and Bjarne Fyrstenborg authored Jun 11, 2020
1 parent 1347b97 commit 349a46c
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 31 deletions.
1 change: 0 additions & 1 deletion src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,6 @@ input.umb-group-builder__group-sort-value {
text-align: left;
display: flex;
align-items: center;
max-width: calc(100% - 48px);
min-height: 80px;
color: @ui-action-discreet-type;

Expand Down
26 changes: 10 additions & 16 deletions ...aco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,34 +54,32 @@

<div class="editor-wrapper umb-control-group control-group" ng-model="model.property.editor" val-require-component ng-if="!model.property.locked">

<a data-element="editor-add" href="" ng-if="!model.property.editor" class="editor-placeholder" hotkey="alt+shift+e" ng-click="vm.openDataTypePicker(model.property)">
<button type="button" class="btn-reset editor-placeholder" data-element="editor-add" ng-if="!model.property.editor" hotkey="alt+shift+e" ng-click="vm.openDataTypePicker(model.property)">
<localize key="defaultdialogs_selectEditor"></localize>
<div ng-messages="model.property.editor" show-validation-on-submit>
<span class="umb-validation-label" ng-message="required">Required editor</span>
</div>
</a>
</button>

<div class="editor clearfix" ng-if="model.property.editor">

<button class="btn-reset editor-info" ng-click="vm.openDataTypeSettings(model.property)">
<button type="button" class="btn-reset editor-info" ng-click="vm.openDataTypeSettings(model.property)">
<div class="editor-icon-wrapper">
<i class="icon {{ model.property.dataTypeIcon }}" ng-class="{'icon-autofill': model.property.dataTypeIcon == null}"></i>
<i class="icon {{ model.property.dataTypeIcon }}" ng-class="{'icon-autofill': model.property.dataTypeIcon == null}" aria-hidden="true"></i>
</div>

<div class="editor-details">
<span class="editor-name">{{ model.property.dataTypeName }}</span>
<span class="editor-editor">{{ model.property.editor }}</span>
</div>

</button>

<button class="editor-remove-icon btn-reset pull-right"
<button type="button" class="editor-remove-icon btn-reset pull-right"
ng-click="vm.openDataTypePicker(model.property)"
hotkey="alt+shift+d"
localize="title"
title="@actions_changeDataType"
>
<i class="icon icon-wrong"></i>
title="@actions_changeDataType">
<i class="icon icon-wrong" aria-hidden="true"></i>
</button>
</div>

Expand All @@ -108,8 +106,7 @@ <h5><localize key="validation_validation"></localize></h5>
placeholder="@validation_mandatoryMessage"
ng-model="model.property.validation.mandatoryMessage"
ng-if="model.property.validation.mandatory"
ng-keypress="vm.submitOnEnter($event)">
</input>
ng-keypress="vm.submitOnEnter($event)" />

<label class="mt3">
<localize key="validation_customValidation"></localize>
Expand Down Expand Up @@ -144,8 +141,7 @@ <h5><localize key="validation_validation"></localize></h5>
<h5><localize key="contentTypeEditor_cultureVariantHeading" /></h5>
<umb-toggle data-element="permissions-allow-culture-variant"
checked="model.property.allowCultureVariant"
on-click="vm.toggleAllowCultureVariants()"
>
on-click="vm.toggleAllowCultureVariants()">
</umb-toggle>

</div>
Expand All @@ -155,8 +151,7 @@ <h5><localize key="contentTypeEditor_segmentVariantHeading" /></h5>

<umb-toggle data-element="permissions-allow-segment-variant"
checked="model.property.allowSegmentVariant"
on-click="vm.toggleAllowSegmentVariants()"
>
on-click="vm.toggleAllowSegmentVariants()">
</umb-toggle>

</div>
Expand Down Expand Up @@ -195,7 +190,6 @@ <h5><localize key="general_options"></localize></h5>
on-click="vm.toggleIsSensitiveData()">
</umb-toggle>


</div>
</div>

Expand Down
25 changes: 11 additions & 14 deletions src/Umbraco.Web.UI.Client/src/views/macros/infiniteeditors/parameter.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,25 +41,22 @@
</div>
</div>

<a data-element="editor-add" href="" ng-if="!model.parameter.editor" class="editor-placeholder" hotkey="alt+shift+e" ng-click="vm.openMacroParameterPicker(model.parameter)">
<button type="button" class="btn-reset editor-placeholder" data-element="editor-add" ng-if="!model.parameter.editor" hotkey="alt+shift+e" ng-click="vm.openMacroParameterPicker(model.parameter)">
<localize key="shortcuts_addEditor"></localize>
</a>
</button>

<div class="editor clearfix" ng-if="model.parameter.editor">

<div class="editor-details">
<button class="btn-reset editor-info" ng-click="vm.openMacroParameterPicker(model.parameter)">

<div class="editor-icon-wrapper">
<i class="icon {{model.parameter.dataTypeIcon}}" ng-class="{'icon-autofill': model.parameter.dataTypeIcon == null}"></i>
</div>
<button type="button" class="btn-reset editor-info" ng-click="vm.openMacroParameterPicker(model.parameter)">
<div class="editor-icon-wrapper">
<i class="icon {{ model.parameter.dataTypeIcon }}" ng-class="{'icon-autofill': model.parameter.dataTypeIcon == null}" aria-hidden="true"></i>
</div>

<div class="editor-details">
<a href="" class="editor-name">{{model.parameter.dataTypeName}}</a>
<a href="" class="editor-editor">{{model.parameter.editor}}</a>
</div>
</button>
</div>
<div class="editor-details">
<span class="editor-name">{{ model.parameter.dataTypeName }}</span>
<span class="editor-editor">{{ model.parameter.editor }}</span>
</div>
</button>

</div>

Expand Down

0 comments on commit 349a46c

Please sign in to comment.