Skip to content

Block grid area allowance editor #14582

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

Merged
georgebid merged 4 commits into from
Jul 26, 2023
Merged

Block grid area allowance editor #14582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c160434
Add position relative to button to fix issue with umb-outline on butt…
bjarnef Jul 19, 2023
b44cb66
Add pattern attribute to get more specific virtual numeric keyboard o…
bjarnef Jul 19, 2023
a438f8f
Fix missing localization of title attributes due missing @ prefix
bjarnef Jul 19, 2023
d555aac
Fix incorrect end-closing tag
bjarnef Jul 19, 2023
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
17 changes: 9 additions & 8 deletions ...nt/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-area-allowance-editor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,38 +8,39 @@
<select
ng-model="allowance.$chosenValue"
localize="title"
title="blockEditor_pickSpecificAllowance"
required
>
title="@blockEditor_pickSpecificAllowance"
required>
<option ng-repeat="blockGroup in vm.allBlockGroups" value="groupKey:{{blockGroup.key}}">{{blockGroup.name}}</option>
<option disabled value="">---------</option>
<option ng-repeat="blockType in vm.allBlockTypes" ng-init="elementType = vm.getElementTypeByKey(blockType.contentElementTypeKey)" value="elementTypeKey:{{elementType.key}}">{{elementType.name}}</option>
</select>
<input
type="number"
pattern="[0-9]*"
name="label"
min="0"
ng-max="model.value.max"
placeholder="0"
ng-model="allowance.minAllowed"
localize="title"
title="blockEditor_allowanceMinimum"
fix-number/>
title="@blockEditor_allowanceMinimum"
fix-number />
<span>–</span>
<input
type="number"
pattern="[0-9]*"
name="label"
ng-model="allowance.maxAllowed"
placeholder="∞"
ng-min="model.value.min || 0"
localize="title"
title="blockEditor_allowanceMaximum"
fix-number/>
title="@blockEditor_allowanceMaximum"
fix-number />
<button
type="button"
class="btn-reset umb-outline"
localize="title"
title="actions_delete"
title="@actions_delete"
ng-click="vm.deleteAllowance(allowance);">
<umb-icon icon="icon-trash" class="icon"></umb-icon>
<span class="sr-only">
Expand Down
6 changes: 3 additions & 3 deletions ...nt/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-area-allowance-editor.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,19 @@
}

.umb-block-grid-area-allowance-editor__entry button {
position: relative;
border-radius: 3px;
color: @ui-action-type;

height: 32px;
display: inline-flex;
justify-content: center;
align-items: center;
width: 32px;

margin-left: 5px;
align-self: normal;
}

.umb-block-grid-area-allowance-editor__entry button:hover {
background-color: @ui-action-hover;
color: @ui-action-type-hover;
}
}
2 changes: 1 addition & 1 deletion ...eb.UI.Client/src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-area-editor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<umb-load-indicator ng-if="vm.loading"></umb-load-indicator>

<div ng-if="vm.loading === false"
<div ng-if="vm.loading === false"
class="umb-block-grid-area-editor__grid-wrapper"
style="--umb-block-grid--block-grid-columns: {{vm.block.areaGridColumns || vm.rootLayoutColumns}}"
umb-block-grid-sorter="::vm.sorterOptions"
Expand Down
22 changes: 15 additions & 7 deletions ...src/views/propertyeditors/blockgrid/prevalue/umb-block-grid-configuration-area-entry.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,36 @@
<div>

<div class="__label">{{vm.area.alias}}</div>

<div class="umb-block-grid__area--actions">

<button type="button" class="btn-reset umb-outline action --edit" localize="title" title="blockEditor_configureArea"
<button type="button"
class="btn-reset umb-outline action --edit"
localize="title"
title="@blockEditor_configureArea"
ng-click="vm.onEditClick($event);">
<umb-icon icon="icon-edit" class="icon"></umb-icon>
<span class="sr-only">
<localize key="blockEditor_configureArea">Edit</localize>
</span>
</button>
<button type="button" class="btn-reset umb-outline action --delete" localize="title" title="blockEditor_deleteArea"
<button type="button"
class="btn-reset umb-outline action --delete"
localize="title"
title="@blockEditor_deleteArea"
ng-click="vm.onDeleteClick($event);">
<umb-icon icon="icon-trash" class="icon"></umb-icon>
<span class="sr-only">
<localize key="blockEditor_deleteArea">Delete</localize>
</span>
</button>
</div>

<button type="button" class="btn-reset umb-block-grid-area-editor__scale-handler umb-outline" ng-mousedown="vm.scaleHandlerMouseDown($event)" ng-keyup="vm.scaleHandlerKeyUp($event)">

<button type="button"
class="btn-reset umb-block-grid-area-editor__scale-handler umb-outline"
ng-mousedown="vm.scaleHandlerMouseDown($event)"
ng-keyup="vm.scaleHandlerKeyUp($event)">
</button>

<div class="umb-block-grid-area-editor__scale-label">
{{vm.area.columnSpan}} x {{vm.area.rowSpan}}
</div>
<div>
</div>