Commit 02bb92a1 by Torkel Ödegaard

Merge branch 'develop-ux-wip' of github.com:grafana/grafana into develop-newgrid-rows

parents 7ed2ed71 e79dbc7c
......@@ -9,7 +9,7 @@
Create User Group
</a>
</div>
<div class="gf-form pull-right width-15 gf-form-group">
<div class="gf-form width-15 gf-form-group">
<span style="position: relative;">
<input type="text" class="gf-form-input" placeholder="Find User Group by name" tabindex="1" give-focus="true"
ng-model="ctrl.query" ng-model-options="{ debounce: 500 }" spellcheck='false' ng-change="ctrl.get()" />
......@@ -19,15 +19,17 @@
<table class="filter-table form-inline" ng-show="ctrl.userGroups.length > 0">
<thead>
<tr>
<th>Id</th>
<th>Name</th>
<th>Members</th>
<th></th>
</tr>
</thead>
<tbody>
<tr ng-repeat="userGroup in ctrl.userGroups">
<td>{{userGroup.id}}</td>
<td>{{userGroup.name}}</td>
<td>
<a href="org/user-groups/edit/{{userGroup.id}}">{{userGroup.name}}</a>
</td>
<td>#Count</td>
<td class="text-right">
<a href="org/user-groups/edit/{{userGroup.id}}" class="btn btn-inverse btn-small">
<i class="fa fa-edit"></i>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment