yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

using umb-mini-search instead of custom impl.

Browse Source
This commit is contained in:
Niels Lyngsø
2020-01-08 10:44:28 +01:00
parent f5bd0f6d83
commit 96a35859b6
4 changed files with 15 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js
View File

@@ -15,6 +15,8 @@
vm.selectUserGroup = selectUserGroup;
vm.deleteUserGroups = deleteUserGroups;
vm.filter = null;
var currentUser = null;
function onInit() {

18
src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.html
View File

@@ -8,7 +8,7 @@
<umb-editor-sub-header-content-left ng-if="vm.selection.length === 0">
<umb-button
type="button"
button-style="action"
button-style="outline"
action="vm.createUserGroup()"
label="Create Group"
label-key="actions_createGroup">
@@ -18,18 +18,10 @@
<umb-editor-sub-header-content-right ng-if="vm.selection.length === 0">
<umb-editor-sub-header-section>
<div class="form-search -no-margin-bottom pull-right">
<div class="inner-addon left-addon">
<i class="icon icon-search"></i>
<input class="form-control search-input"
type="text"
localize="placeholder"
placeholder="@placeholders_filter"
ng-model="vm.filter"
prevent-enter-submit
no-dirty-check>
</div>
</div>
<umb-mini-search model="vm.filter">
</umb-mini-search>
</umb-editor-sub-header-section>
</umb-editor-sub-header-content-right>

2
src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
View File

@@ -14,7 +14,7 @@
vm.userStates = [];
vm.selection = [];
vm.newUser = {};
vm.usersOptions = {};
vm.usersOptions = {filter:null};
vm.userSortData = [
{ label: "Name (A-Z)", key: "Name", direction: "Ascending" },
{ label: "Name (Z-A)", key: "Name", direction: "Descending" },

22
src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
View File

@@ -11,7 +11,7 @@
<umb-editor-sub-header-content-left ng-if="vm.selection.length === 0">
<umb-button-group
ng-if="vm.defaultButton"
button-style="action"
button-style="outline"
default-button="vm.defaultButton"
sub-buttons="vm.subButtons">
</umb-button-group>
@@ -27,18 +27,10 @@
</umb-layout-selector>
</umb-editor-sub-header-section>
<umb-editor-sub-header-section>
<div class="form-search -no-margin-bottom pull-right">
<div class="inner-addon left-addon">
<i class="icon icon-search"></i>
<input class="form-control search-input"
type="text" localize="placeholder"
placeholder="@general_typeToSearch"
ng-model="vm.usersOptions.filter"
ng-change="vm.searchUsers()"
prevent-enter-submit
no-dirty-check>
</div>
</div>
<umb-mini-search model="vm.usersOptions.filter" on-search="vm.searchUsers()" on-start-typing="vm.searchUsers()">
</umb-mini-search>
</umb-editor-sub-header-section>
</umb-editor-sub-header-content-right>
@@ -180,7 +172,7 @@
<!-- Layout: Cards -->
<div class="umb-user-cards" ng-if="vm.activeLayout.path === '1' && vm.loading === false">
<div class="umb-user-card" ng-class="{'-selected': user.selected, '-selectable': vm.isSelectable(user)}" ng-repeat="user in vm.users track by user.key" ng-click="vm.selectUser(user, $event)">
<div class="umb-user-card umb-outline umb-outline--surrounding" ng-class="{'-selected': user.selected, '-selectable': vm.isSelectable(user)}" ng-repeat="user in vm.users track by user.key" ng-click="vm.selectUser(user, $event)">
<div class="umb-user-card__content">
<umb-badge class="umb-user-card__badge" size="xs" ng-if="user.userDisplayState.key !== 'Active'" color="{{user.userDisplayState.color}}">
{{ user.userDisplayState.name }}
@@ -233,7 +225,7 @@
<div ng-repeat="user in vm.users track by user.key"
ng-click="vm.selectUser(user, vm.selection, $event)"
ng-class="{'-selected': user.selected, '-selectable': vm.isSelectable(user)}"
class="umb-table-row umb-user-table-row">
class="umb-table-row umb-user-table-row umb-outline umb-outline--surrounding">
<div class="umb-table-cell umb-user-table-col-avatar not-fixed" scope="row" style="width: 70px; padding:10px 15px;">
<a ng-click="vm.clickUser(user, $event)" ng-href="#{{::vm.getEditPath(user)}}">
<umb-avatar