Skip to content

Commit 60509d3

Browse files
committed
Minor entity picker improvements
1 parent ecdff57 commit 60509d3

3 files changed

Lines changed: 11 additions & 6 deletions

File tree

src/Presentation/SmartStore.Web/Content/smartstore.entitypicker.css

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
max-height: 54px;
1414
padding: 3px 4px;
1515
margin: 2px 0 1px 0;
16-
border-radius: 8px;
16+
border-radius: 3px;
1717
border: #d4d4d4 solid 1px;
1818
background-image: linear-gradient(to bottom, #fcfcfc, #e3e3e3);
1919
background-color: #FCF8F0;
@@ -43,6 +43,11 @@
4343
max-width: 52px;
4444
max-height: 52px;
4545
}
46+
.entity-picker-list .label {
47+
display: inline-block;
48+
float: left;
49+
margin-right: 5px;
50+
}
4651
.entity-picker-list .highlight {
4752
color: #f00;
4853
background-color: transparent;

src/Presentation/SmartStore.Web/Scripts/smartstore.entityPicker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@
233233
});
234234

235235
if (!_.isEmpty(data.returnSelector)) {
236-
$(data.returnSelector).val(result);
236+
$(data.returnSelector).val(result).focus().blur();
237237
}
238238

239239
if (_.isFunction(data.onOkClicked)) {

src/Presentation/SmartStore.Web/Views/Common/EntityPickerList.cshtml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
</div>
2222
}
2323
<div class="data">
24+
@if (item.LabelText.HasValue())
25+
{
26+
<div class="label @item.LabelClassName">@item.LabelText</div>
27+
}
2428
<div class="title ellipsis" title="@item.Title">
25-
@if (item.LabelText.HasValue())
26-
{
27-
<span class="label label-smnet @item.LabelClassName">@item.LabelText</span>
28-
}
2929
<span>@HighlightSearchTermInTitle(item)</span>
3030
</div>
3131
<div class="summary muted" title="@item.SummaryTitle">@item.Summary</div>

0 commit comments

Comments
 (0)