Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
c1d36f9e
Commit
c1d36f9e
authored
Sep 21, 2018
by
Patrick O'Carroll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
created switch button for org users that can toggle between users and invites
parent
a6c438c8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
66 additions
and
5 deletions
+66
-5
public/app/features/org/partials/orgUsers.html
+14
-5
public/sass/components/_buttons.scss
+52
-0
No files found.
public/app/features/org/partials/orgUsers.html
View file @
c1d36f9e
...
...
@@ -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>
...
...
public/sass/components/_buttons.scss
View file @
c1d36f9e
...
...
@@ -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
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment