Skip to content

N
nexpie-grafana-theme
Commit 41662b85 by Torkel Ödegaard
Options

dashboard_folders: updated

parent 222a938c
Showing with 16 additions and 19 deletions
public/app/core/components/user_group_picker.ts
...@@ -24,7 +24,7 @@ export class UserGroupPickerCtrl { ...@@ -24,7 +24,7 @@ export class UserGroupPickerCtrl {
this.userGroupId = null; this.userGroupId = null;
const userGroupSegment = this.uiSegmentSrv.newSegment({ const userGroupSegment = this.uiSegmentSrv.newSegment({
value: 'Choose User Group', value: 'Choose',
selectMode: true, selectMode: true,
fake: true, fake: true,
cssClass: 'gf-size-auto' cssClass: 'gf-size-auto'
......
public/app/core/components/user_picker.ts
...@@ -24,7 +24,7 @@ export class UserPickerCtrl { ...@@ -24,7 +24,7 @@ export class UserPickerCtrl {
resetUserSegment() { resetUserSegment() {
this.userId = null; this.userId = null;
const userSegment = this.uiSegmentSrv.newSegment({ const userSegment = this.uiSegmentSrv.newSegment({
value: 'Choose User', value: 'Choose',
selectMode: true, selectMode: true,
fake: true, fake: true,
cssClass: 'gf-size-auto' cssClass: 'gf-size-auto'
......
public/app/features/dashboard/acl/acl.html
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<user-group-picker user-group-id="ctrl.userGroupId"></user-group-picker> <user-group-picker user-group-id="ctrl.userGroupId"></user-group-picker>
</div> </div>
<div class="gf-form"> <div class="gf-form">
<span class="gf-form-label">Role</span> <span class="gf-form-label">Permission</span>
<select class="gf-form-input gf-size-auto" ng-model="ctrl.permission" ng-options="p.value as p.text for p in ctrl.permissionTypeOptions"></select> <select class="gf-form-input gf-size-auto" ng-model="ctrl.permission" ng-options="p.value as p.text for p in ctrl.permissionTypeOptions"></select>
</div> </div>
<div class="gf-form"> <div class="gf-form">
......
public/app/features/org/partials/create_user_group.html
...@@ -6,21 +6,18 @@ ...@@ -6,21 +6,18 @@
<a class="modal-header-close" ng-click="dismiss();"> <a class="modal-header-close" ng-click="dismiss();">
<i class="fa fa-remove"></i> <i class="fa fa-remove"></i>
</a> </a>
</div>
<div class="modal-content"> <div class="modal-content">
<div class="modal-tagline p-b-2"> <form name="createUserGroupForm" class="gf-form-group">
Create User Group <div class="gf-form-inline">
</div> <div class="gf-form max-width-21">
<form name="createUserGroupForm" class="gf-form-group"> <input type="text" class="gf-form-input" ng-model='ctrl.userGroupName' placeholder="Name"></input>
<div class="gf-form-inline"> </div>
<div class="gf-form max-width-21"> <div class="gf-form">
<input type="text" class="gf-form-input" ng-model='ctrl.userGroupName' placeholder="Name"></input> <button class="btn gf-form-btn btn-success" ng-click="ctrl.createUserGroup();dismiss();">Create</button>
</div> </div>
<div class="gf-form"> </div>
<button class="btn gf-form-btn btn-success" ng-click="ctrl.createUserGroup();dismiss();">Create</button> </form>
</div>
</div>
</form>
</div>
</div> </div>
</div> </div>
public/app/features/org/user_groups_ctrl.ts
...@@ -71,7 +71,7 @@ export class UserGroupsCtrl { ...@@ -71,7 +71,7 @@ export class UserGroupsCtrl {
this.$scope.appEvent('show-modal', { this.$scope.appEvent('show-modal', {
src: 'public/app/features/org/partials/create_user_group.html', src: 'public/app/features/org/partials/create_user_group.html',
modalClass: 'user-group-modal', modalClass: 'modal--narrow',
scope: modalScope scope: modalScope
}); });
} }
......
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