Skip to content

Commit a1019ad

Browse files
committed
Improve attribute labeling edit section with tooltip and aria label. Additionally, remove usages of id selectors in css and further BEMing
1 parent 4390430 commit a1019ad

4 files changed

Lines changed: 30 additions & 26 deletions

File tree

src/main/js/bundles/dn_labeling/LabelingWidget.vue

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,29 @@
3434
</v-sheet>
3535
<v-sheet
3636
v-show="edit"
37-
class="my-1"
37+
class="my-1 ct-labeling-widget__edit-section"
3838
>
39-
<v-btn
40-
id="iconRight"
41-
icon
42-
small
43-
@click="edit = !edit"
44-
>
45-
<v-icon>close</v-icon>
46-
</v-btn>
47-
<div id="editText">
39+
<div class="align-right">
40+
<v-tooltip
41+
top
42+
open-delay="800"
43+
>
44+
<template #activator="{ on }">
45+
<v-btn
46+
class="ct-labeling-widget__edit-close-section mr-2"
47+
icon
48+
small
49+
v-on="on"
50+
:aria-label="i18n.finishEditingAttributeLabel"
51+
@click="edit = !edit"
52+
>
53+
<v-icon>close</v-icon>
54+
</v-btn>
55+
</template>
56+
<span>{{ i18n.finishEditingAttributeLabel }}</span>
57+
</v-tooltip>
58+
</div>
59+
<div class="ct-labeling-widget__edit-inputs">
4860
<v-text-field
4961
v-model="editedField.prefix"
5062
:label="i18n.prefix"
@@ -59,7 +71,6 @@
5971
<h3>{{ i18n.selectionFields }}</h3>
6072
<!--TODO: Element not focusable with keyboard, even when not disabled-->
6173
<v-select
62-
id="autocomplete"
6374
v-model="selectedFields"
6475
:items="fields"
6576
rounded
@@ -68,7 +79,7 @@
6879
label="Felder auswählen"
6980
item-text="name"
7081
return-object
71-
class="draggableSelect pt-1 mt-0"
82+
class="ct-labeling-widget__draggable-select pt-1 mt-0"
7283
clearable
7384
:disabled="!selectedLayer"
7485
>

src/main/js/bundles/dn_labeling/css/styles.css

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
.v-chip {
3232
width: 98%;
3333

34-
.v-chip__content{
34+
.v-chip__content {
3535
width: 100%;
3636
padding: 0;
3737
cursor: move;
@@ -55,25 +55,16 @@
5555
}
5656
}
5757

58-
.v-btn--icon{
58+
.v-btn--icon {
5959
margin: 0;
6060
}
6161

62-
/* TODO: remove usages of ID slectors */
63-
#editText{
62+
.ct-labeling-widget__edit-inputs {
6463
padding: 5px;
6564
margin: 10px;
6665
}
6766

68-
#iconRight{
69-
float: right;
70-
}
71-
72-
#autocomplete {
73-
display: none;
74-
}
75-
76-
.draggableSelect.v-input--is-dirty .v-input__slot:before {
67+
.ct-labeling-widget__draggable-select.v-input--is-dirty .v-input__slot:before {
7768
display: none;
7869
}
7970

src/main/js/bundles/dn_labeling/nls/bundle.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ const i18n = {
3939
selectionTitle: "Select Layer",
4040
selectionFields: "Select Fields",
4141
editAttributeLabel: "Edit attribute label",
42+
finishEditingAttributeLabel: "Finish editing attribute label",
4243
deleteAttributeLabel: "Delete attribute label",
4344
edgesLabel: "Label Edge Lengths",
4445
autoUpdate: "Keep updated",

src/main/js/bundles/dn_labeling/nls/de/bundle.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ export default {
4141
selectionTitle: "Layer auswählen",
4242
selectionFields: "Felder auswählen",
4343
editAttributeLabel: "Attributbeschriftung bearbeiten",
44-
deleteAttributeLabel: "Attributebeschriftung entfernen",
44+
finishEditingAttributeLabel: "Bearbeitung der Attributbeschriftung beenden",
45+
deleteAttributeLabel: "Attributbeschriftung entfernen",
4546
edgesLabel: "Kantenlängen beschriften",
4647
autoUpdate: "Änderungen automatisch anwenden",
4748
prefix: "Präfix",

0 commit comments

Comments
 (0)