Skip to content
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

Various fixes for macroparameterpicker view #8606

Merged
merged 2 commits into from
Aug 31, 2020
Merged

Various fixes for macroparameterpicker view #8606

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7eb7b68
Ensure there is a text fallback in case the localization key has not …
BatJan Aug 6, 2020
1c1716f
Refactor <a> to <button> and move event handlers onto the button and …
BatJan Aug 6, 2020
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
30 changes: 18 additions & 12 deletions ...UI.Client/src/views/common/infiniteeditors/macroparameterpicker/macroparameterpicker.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,18 @@
<h5>{{key}}</h5>
<ul class="umb-card-grid -four-in-row" ng-mouseleave="vm.hideDetailsOverlay()">
<li ng-repeat="parameterEditor in value | orderBy:'name'"
data-element="editor-{{parameterEditor.name}}"
ng-mouseover="vm.showDetailsOverlay(parameterEditor)"
ng-click="vm.pickParameterEditor(parameterEditor)">
<a class="umb-card-grid-item" href="" title="{{parameterEditor.name}}">
data-element="editor-{{parameterEditor.name}}">
<button
type="button"
ng-mouseover="vm.showDetailsOverlay(parameterEditor)"
ng-click="vm.pickParameterEditor(parameterEditor)"
class="btn-reset umb-card-grid-item"
title="{{parameterEditor.name}}">
<span>
<i class="{{parameterEditor.icon}}" ng-class="{'icon-autofill': parameterEditor.icon == null}"></i>
<i class="{{parameterEditor.icon}}" ng-class="{'icon-autofill': parameterEditor.icon == null}" aria-hidden="true"></i>
{{parameterEditor.name}}
</span>
</a>
</button>
</li>
</ul>
</div>
Expand All @@ -55,15 +58,18 @@ <h5>{{key}}</h5>
<div ng-if="result.parameterEditors.length > 0">
<h5>{{result.group}}</h5>
<ul class="umb-card-grid -four-in-row" ng-mouseleave="vm.hideDetailsOverlay()">
<li ng-repeat="parameterEditor in result.parameterEditors | orderBy:'name'"
ng-mouseover="vm.showDetailsOverlay(parameterEditor)"
ng-click="vm.pickParameterEditor(parameterEditor)">
<li ng-repeat="parameterEditor in result.parameterEditors | orderBy:'name'">
<div ng-if="parameterEditor.loading" class="umb-card-grid-item__loading">
<div class="umb-button__progress"></div>
</div>
<a class="umb-card-grid-item" href="" title="{{parameterEditor.name}}">
<button
type="button"
ng-mouseover="vm.showDetailsOverlay(parameterEditor)"
ng-click="vm.pickParameterEditor(parameterEditor)"
class="btn-reset umb-card-grid-item"
title="{{parameterEditor.name}}">
<span>
<i class="{{parameterEditor.icon}}" ng-class="{'icon-autofill': parameterEditor.icon == null}"></i>
<i class="{{parameterEditor.icon}}" ng-class="{'icon-autofill': parameterEditor.icon == null}" aria-hidden="true"></i>
{{parameterEditor.name}}
</span>
</a>
Expand All @@ -74,7 +80,7 @@ <h5>{{result.group}}</h5>
</div>

<umb-empty-state position="center" ng-if="vm.filterResult.totalResults === 0">
<localize key="general_searchNoResult"></localize>
<localize key="general_searchNoResult">Sorry, we can not find what you are looking for.</localize>
</umb-empty-state>
</div>

Expand Down