IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

dashboard_folders: updated

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-06-14 12:55:21 -04:00
parent 222a938cdf
commit 41662b8540
5 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/core/components/user_group_picker.ts
View File

@ -24,7 +24,7 @@ export class UserGroupPickerCtrl {
this.userGroupId = null;
const userGroupSegment = this.uiSegmentSrv.newSegment({
value: 'Choose User Group',
value: 'Choose',
selectMode: true,
fake: true,
cssClass: 'gf-size-auto'

2
public/app/core/components/user_picker.ts
View File

@ -24,7 +24,7 @@ export class UserPickerCtrl {
resetUserSegment() {
this.userId = null;
const userSegment = this.uiSegmentSrv.newSegment({
value: 'Choose User',
value: 'Choose',
selectMode: true,
fake: true,
cssClass: 'gf-size-auto'

2
public/app/features/dashboard/acl/acl.html
View File

@ -15,7 +15,7 @@
<user-group-picker user-group-id="ctrl.userGroupId"></user-group-picker>
</div>
<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>
</div>
<div class="gf-form">

27
public/app/features/org/partials/create_user_group.html
View File

@ -6,21 +6,18 @@
<a class="modal-header-close" ng-click="dismiss();">
<i class="fa fa-remove"></i>
</a>
</div>
<div class="modal-content">
<div class="modal-tagline p-b-2">
Create User Group
</div>
<form name="createUserGroupForm" class="gf-form-group">
<div class="gf-form-inline">
<div class="gf-form max-width-21">
<input type="text" class="gf-form-input" ng-model='ctrl.userGroupName' placeholder="Name"></input>
</div>
<div class="gf-form">
<button class="btn gf-form-btn btn-success" ng-click="ctrl.createUserGroup();dismiss();">Create</button>
</div>
</div>
</form>
</div>
<div class="modal-content">
<form name="createUserGroupForm" class="gf-form-group">
<div class="gf-form-inline">
<div class="gf-form max-width-21">
<input type="text" class="gf-form-input" ng-model='ctrl.userGroupName' placeholder="Name"></input>
</div>
<div class="gf-form">
<button class="btn gf-form-btn btn-success" ng-click="ctrl.createUserGroup();dismiss();">Create</button>
</div>
</div>
</form>
</div>
</div>

2
public/app/features/org/user_groups_ctrl.ts
View File

@ -71,7 +71,7 @@ export class UserGroupsCtrl {
this.$scope.appEvent('show-modal', {
src: 'public/app/features/org/partials/create_user_group.html',
modalClass: 'user-group-modal',
modalClass: 'modal--narrow',
scope: modalScope
});
}