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

teams: Fixes to edit team page

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-12-13 18:20:49 +01:00
parent 529fcc46c0
commit 26b8483fb0
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/features/org/partials/create_team.html
View File

@ -1,6 +1,7 @@
<div class="modal-body"> <div class="modal-body">
<div class="modal-header"> <div class="modal-header">
<h2 class="modal-header-title"> <h2 class="modal-header-title">
<i class="gicon gicon-team"></i>
<span class="p-l-1">Create Team</span> <span class="p-l-1">Create Team</span>
</h2> </h2>

4
public/app/features/org/partials/team_details.html
View File

@ -1,7 +1,7 @@
<page-header model="ctrl.navModel"></page-header> <page-header model="ctrl.navModel"></page-header>
<div class="page-container page-body"> <div class="page-container page-body">
<h3 class="page-sub-heading">Edit Team</h3> <h3 class="page-sub-heading">Team Details</h3>
<form name="teamDetailsForm" class="gf-form-group gf-form-inline"> <form name="teamDetailsForm" class="gf-form-group gf-form-inline">
<div class="gf-form"> <div class="gf-form">
@ -24,7 +24,7 @@
</div> </div>
</form> </form>
<table class="grafana-options-table" ng-show="ctrl.teamMembers.length > 0"> <table class="filter-table" ng-show="ctrl.teamMembers.length > 0">
<tr> <tr>
<th>Username</th> <th>Username</th>
<th>Email</th> <th>Email</th>

5
public/app/features/org/team_details_ctrl.ts
View File

@ -1,5 +1,3 @@
///<reference path="../../headers/common.d.ts" />
import coreModule from 'app/core/core_module'; import coreModule from 'app/core/core_module';
export default class TeamDetailsCtrl { export default class TeamDetailsCtrl {
@ -28,7 +26,7 @@ export default class TeamDetailsCtrl {
removeTeamMember(teamMember: TeamMember) { removeTeamMember(teamMember: TeamMember) {
this.$scope.appEvent('confirm-modal', { this.$scope.appEvent('confirm-modal', {
title: 'Remove Member', title: 'Remove Member',
text: 'Are you sure you want to remove ' + teamMember.name + ' from this group?', text: 'Are you sure you want to remove ' + teamMember.login + ' from this group?',
yesText: "Remove", yesText: "Remove",
icon: "fa-warning", icon: "fa-warning",
onConfirm: () => { onConfirm: () => {
@ -71,6 +69,7 @@ export interface User {
export interface TeamMember { export interface TeamMember {
userId: number; userId: number;
name: string; name: string;
login: string;
} }
coreModule.controller('TeamDetailsCtrl', TeamDetailsCtrl); coreModule.controller('TeamDetailsCtrl', TeamDetailsCtrl);

5
public/sass/components/_modals.scss
View File

@ -48,6 +48,11 @@
float: left; float: left;
padding-top: $spacer * 0.75; padding-top: $spacer * 0.75;
margin: 0 $spacer*3 0 $spacer*1.5; margin: 0 $spacer*3 0 $spacer*1.5;
.gicon {
position: relative;
top: -2px;
}
} }
.modal-header-close { .modal-header-close {