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

created switch button for org users that can toggle between users and invites

Browse Source
This commit is contained in:
Patrick O'Carroll 2018-09-21 10:25:46 +02:00
parent a6c438c878
commit c1d36f9e48
2 changed files with 66 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
public/app/features/org/partials/orgUsers.html
View File

@ -2,16 +2,25 @@
<div class="page-container page-body">
<div class="page-action-bar">
<label class="gf-form gf-form--grow gf-form--has-input-icon">
<label class="gf-form gf-form--has-input-icon">
<input type="text" class="gf-form-input width-20" ng-model="ctrl.searchQuery" ng-change="ctrl.onQueryUpdated()" placeholder="Filter by username or email" />
<i class="gf-form-input-icon fa fa-search"></i>
</label>
<div class="page-action-bar__spacer"></div>
<div ng-if="ctrl.pendingInvites.length" style="margin-left: 1rem">
<button class="btn toggle-btn-left toggle-btn-left--active" ng-if="!ctrl.showInvites">
Users
</button><button class="btn toggle-btn-right toggle-btn-right--inactive" ng-if="!ctrl.showInvites" ng-click="ctrl.showInvites = true">
Pending Invites ({{ctrl.pendingInvites.length}})
</button>
<button class="btn toggle-btn-left toggle-btn-left--inactive" ng-if="ctrl.showInvites" ng-click="ctrl.showInvites = false">
Users
</button><button class="btn toggle-btn-right toggle-btn-right--active" ng-if="ctrl.showInvites">
Pending Invites ({{ctrl.pendingInvites.length}})
</button>
</div>
<button class="btn btn-inverse" ng-show="ctrl.pendingInvites.length" ng-click="ctrl.showInvites = true">
Pending Invites ({{ctrl.pendingInvites.length}})
</button>
<div class="page-action-bar__spacer"></div>
<a class="btn btn-success" href="org/users/invite" ng-show="ctrl.canInvite">
<i class="fa fa-plus"></i>

52
public/sass/components/_buttons.scss
View File

@ -221,6 +221,58 @@ $btn-service-icon-width: 35px;
}
}
//Toggle button
.toggle-btn {
&-left {
border-radius: 2px 0 0 2px;
border-left: 1px solid #dae0e8;
border-top: 1px solid #dae0e8;
border-bottom: 1px solid #dae0e8;
margin: 0;
box-shadow: $card-shadow;
&--active {
background-color: #fff;
//background-color: $btn-secondary-bg;
//color: #fff;
background-color: lighten($input-label-bg, 5%);
color: $link-color;
&:hover {
cursor: default;
}
}
&--inactive {
//@include buttonBackground($btn-inverse-bg, $btn-inverse-bg-hl, $btn-inverse-text-color, $btn-inverse-text-shadow);
background: $input-label-bg;
color: $text-color-weak;
}
}
&-right {
border-radius: 0 2px 2px 0;
border-right: 1px solid #dae0e8;
border-top: 1px solid #dae0e8;
border-bottom: 1px solid #dae0e8;
margin-left: 0 !important;
box-shadow: $card-shadow;
&--active {
background-color: #fff;
//background-color: $btn-secondary-bg;
//color: #FFF;
background-color: lighten($input-label-bg, 5%);
color: $link-color;
&:hover {
cursor: default;
}
}
&--inactive {
//@include buttonBackground($btn-inverse-bg, $btn-inverse-bg-hl, $btn-inverse-text-color, $btn-inverse-text-shadow);
background: $input-label-bg;
color: $text-color-weak;
}
}
}
//Button animations
.btn-loading span {