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

removed filters and actions for now

Browse Source
This commit is contained in:
Nick Christus
2015-12-03 20:20:54 -06:00
parent 09ff042986
commit c9bd45ba13
6 changed files with 9 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
public/app/features/admin/partials/orgs.html
View File

@@ -9,68 +9,19 @@
<h2> <h2>
Organizations Organizations
</h2> </h2>
<div class="filter-controls-filters">
<div class="tight-form last">
<ul class="tight-form-list">
<li class="tight-form-item">Filters:</li>
<li class="tight-form-item">Id</li>
<li><!-- <value-select-dropdown></value-select-dropdown> --></li>
<li class="tight-form-item">Name</li>
<li><!-- <value-select-dropdown></value-select-dropdown> --></li>
<li class="tight-form-item">
<a class="pointer">
<i class="fa fa-pencil"></i>
</a>
</li>
</ul>
<div class="clearfix"></div>
</div>
</div>
<ul class="filter-controls-actions">
<li>
<div class="dropdown">
<button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown">
<input class="cr1" id="state-enabled" type="checkbox">
<label for="state-enabled" class="cr1"></label> <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
<li><a>All</a></li>
</ul>
</div>
</li>
<li>
<div class="dropdown">
<button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown">
Bulk Actions &nbsp; <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
<li><a>Update notifications</a></li>
</ul>
</div>
</li>
<li>
<span class="filter-controls-actions-selected">0 selected, showing 1 of 1 total</span>
</li>
</ul>
<table class="filter-table form-inline"> <table class="filter-table form-inline">
<thead> <thead>
<tr> <tr>
<th style="width: 48px;"></th>
<th>Id</th> <th>Id</th>
<th>Name</th> <th>Name</th>
<th></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="org in orgs"> <tr ng-repeat="org in orgs">
<td> <td>{{org.id}}</td>
<input class="cr1" id="alert1" type="checkbox">
<label for="alert1" class="cr1"></label>
</td>
<td>{{org.name}}</td> <td>{{org.name}}</td>
<td> <td class="text-right">
<a href="admin/orgs/edit/{{org.id}}" class="btn btn-inverse btn-small"> <a href="admin/orgs/edit/{{org.id}}" class="btn btn-inverse btn-small">
<i class="fa fa-edit"></i> <i class="fa fa-edit"></i>
Edit Edit

50
public/app/features/admin/partials/users.html
View File

@@ -11,55 +11,9 @@
Users Users
</h2> </h2>
<div class="filter-controls-filters">
<div class="tight-form last">
<ul class="tight-form-list">
<li class="tight-form-item">Filters:</li>
<li class="tight-form-item">Id</li>
<li><!-- <value-select-dropdown></value-select-dropdown> --></li>
<li class="tight-form-item">Name</li>
<li><!-- <value-select-dropdown></value-select-dropdown> --></li>
<li class="tight-form-item">
<a class="pointer">
<i class="fa fa-pencil"></i>
</a>
</li>
</ul>
<div class="clearfix"></div>
</div>
</div>
<ul class="filter-controls-actions">
<li>
<div class="dropdown">
<button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown">
<input class="cr1" id="state-enabled" type="checkbox">
<label for="state-enabled" class="cr1"></label> <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
<li><a>All</a></li>
</ul>
</div>
</li>
<li>
<div class="dropdown">
<button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown">
Bulk Actions &nbsp; <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
<li><a>Update notifications</a></li>
</ul>
</div>
</li>
<li>
<span class="filter-controls-actions-selected">0 selected, showing 1 of 1 total</span>
</li>
</ul>
<table class="filter-table form-inline"> <table class="filter-table form-inline">
<thead> <thead>
<tr> <tr>
<th style="width: 48px;"></th>
<th>Id</th> <th>Id</th>
<th>Name</th> <th>Name</th>
<th>Login</th> <th>Login</th>
@@ -70,10 +24,6 @@
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="user in users"> <tr ng-repeat="user in users">
<td>
<input class="cr1" id="alert1" type="checkbox">
<label for="alert1" class="cr1"></label>
</td>
<td>{{user.id}}</td> <td>{{user.id}}</td>
<td>{{user.name}}</td> <td>{{user.name}}</td>
<td>{{user.login}}</td> <td>{{user.login}}</td>

11
public/app/features/org/partials/datasources.html
View File

@@ -9,14 +9,15 @@
<div class="page-wide"> <div class="page-wide">
<h2>Data sources</h2> <h2>Data sources</h2>
<!--
<div class="filter-controls-filters"> <div class="filter-controls-filters">
<div class="tight-form last"> <div class="tight-form last">
<ul class="tight-form-list"> <ul class="tight-form-list">
<li class="tight-form-item">Filters:</li> <li class="tight-form-item">Filters:</li>
<li class="tight-form-item">Name</li> <li class="tight-form-item">Name</li>
<li><!-- <value-select-dropdown></value-select-dropdown> --></li> <li><value-select-dropdown></value-select-dropdown></li>
<li class="tight-form-item">URL</li> <li class="tight-form-item">URL</li>
<li><!-- <value-select-dropdown></value-select-dropdown> --></li> <li><value-select-dropdown></value-select-dropdown></li>
<li class="tight-form-item"> <li class="tight-form-item">
<a class="pointer"> <a class="pointer">
<i class="fa fa-pencil"></i> <i class="fa fa-pencil"></i>
@@ -53,6 +54,7 @@
<span class="filter-controls-actions-selected">0 selected, showing 2 of 2 total</span> <span class="filter-controls-actions-selected">0 selected, showing 2 of 2 total</span>
</li> </li>
</ul> </ul>
-->
<div ng-if="datasources.length === 0"> <div ng-if="datasources.length === 0">
<em>No datasources defined</em> <em>No datasources defined</em>
@@ -61,7 +63,6 @@
<table class="filter-table" ng-if="datasources.length > 0"> <table class="filter-table" ng-if="datasources.length > 0">
<thead> <thead>
<tr> <tr>
<th style="width: 48px;"></th>
<th><strong>Name</strong></th> <th><strong>Name</strong></th>
<th><strong>Url</strong></th> <th><strong>Url</strong></th>
<th style="width: 60px;"></th> <th style="width: 60px;"></th>
@@ -71,10 +72,6 @@
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="ds in datasources"> <tr ng-repeat="ds in datasources">
<td>
<input class="cr1" id="alert1" type="checkbox">
<label for="alert1" class="cr1"></label>
</td>
<td> <td>
<i class="fa fa-database"></i> &nbsp; {{ds.name}} <i class="fa fa-database"></i> &nbsp; {{ds.name}}
</td> </td>

50
public/app/features/org/partials/orgApiKeys.html
View File

@@ -31,55 +31,9 @@
</ul> </ul>
</form> </form>
<div class="filter-controls-filters">
<div class="tight-form last">
<ul class="tight-form-list">
<li class="tight-form-item">Filters:</li>
<li class="tight-form-item">Name</li>
<li><!-- <value-select-dropdown></value-select-dropdown> --></li>
<li class="tight-form-item">Role</li>
<li><!-- <value-select-dropdown></value-select-dropdown> --></li>
<li class="tight-form-item">
<a class="pointer">
<i class="fa fa-pencil"></i>
</a>
</li>
</ul>
<div class="clearfix"></div>
</div>
</div>
<ul class="filter-controls-actions">
<li>
<div class="dropdown">
<button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown">
<input class="cr1" id="state-enabled" type="checkbox">
<label for="state-enabled" class="cr1"></label> <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
<li><a>All</a></li>
</ul>
</div>
</li>
<li>
<div class="dropdown">
<button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown">
Bulk Actions &nbsp; <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
<li><a>Update notifications</a></li>
</ul>
</div>
</li>
<li>
<span class="filter-controls-actions-selected">0 selected, showing 2 of 2 total</span>
</li>
</ul>
<table class="filter-table"> <table class="filter-table">
<thead> <thead>
<tr> <tr>
<th style="width: 48px;"></th>
<th>Name</th> <th>Name</th>
<th>Role</th> <th>Role</th>
<th style="width: 34px;"></th> <th style="width: 34px;"></th>
@@ -87,10 +41,6 @@
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="t in tokens"> <tr ng-repeat="t in tokens">
<td>
<input class="cr1" id="alert1" type="checkbox">
<label for="alert1" class="cr1"></label>
</td>
<td>{{t.name}}</td> <td>{{t.name}}</td>
<td>{{t.role}}</td> <td>{{t.role}}</td>
<td> <td>

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

@@ -18,56 +18,9 @@
<tabset> <tabset>
<tab heading="Users ({{users.length}})"> <tab heading="Users ({{users.length}})">
<div class="filter-controls-filters">
<div class="tight-form last">
<ul class="tight-form-list">
<li class="tight-form-item">Filters:</li>
<li class="tight-form-item">Login</li>
<li><!-- <value-select-dropdown></value-select-dropdown> --></li>
<li class="tight-form-item">Role</li>
<li><!-- <value-select-dropdown></value-select-dropdown> --></li>
<li class="tight-form-item">
<a class="pointer">
<i class="fa fa-pencil"></i>
</a>
</li>
</ul>
<div class="clearfix"></div>
</div>
</div>
<ul class="filter-controls-actions">
<li>
<div class="dropdown">
<button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown">
<input class="cr1" id="state-enabled" type="checkbox">
<label for="state-enabled" class="cr1"></label> <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
<li><a>All</a></li>
</ul>
</div>
</li>
<li>
<div class="dropdown">
<button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown">
Bulk Actions &nbsp; <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
<li><a>Update notifications</a></li>
</ul>
</div>
</li>
<li>
<span class="filter-controls-actions-selected">0 selected, showing 1 of 1 total</span>
</li>
</ul>
<table class="filter-table form-inline"> <table class="filter-table form-inline">
<thead> <thead>
<tr> <tr>
<th style="width: 48px;"></th>
<th>Login</th> <th>Login</th>
<th>Email</th> <th>Email</th>
<th>Role</th> <th>Role</th>
@@ -75,10 +28,6 @@
</tr> </tr>
</thead> </thead>
<tr ng-repeat="user in users"> <tr ng-repeat="user in users">
<td>
<input class="cr1" id="alert1" type="checkbox">
<label for="alert1" class="cr1"></label>
</td>
<td>{{user.login}}</td> <td>{{user.login}}</td>
<td><span class="ellipsis">{{user.email}}</span></td> <td><span class="ellipsis">{{user.email}}</span></td>
<td> <td>
@@ -94,56 +43,9 @@
</table> </table>
</tab> </tab>
<tab heading="Pending Invitations ({{pendingInvites.length}})"> <tab heading="Pending Invitations ({{pendingInvites.length}})">
<div class="filter-controls-filters">
<div class="tight-form last">
<ul class="tight-form-list">
<li class="tight-form-item">Filters:</li>
<li class="tight-form-item">Email</li>
<li><!-- <value-select-dropdown></value-select-dropdown> --></li>
<li class="tight-form-item">Name</li>
<li><!-- <value-select-dropdown></value-select-dropdown> --></li>
<li class="tight-form-item">
<a class="pointer">
<i class="fa fa-pencil"></i>
</a>
</li>
</ul>
<div class="clearfix"></div>
</div>
</div>
<ul class="filter-controls-actions">
<li>
<div class="dropdown">
<button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown">
<input class="cr1" id="state-enabled" type="checkbox">
<label for="state-enabled" class="cr1"></label> <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
<li><a>All</a></li>
</ul>
</div>
</li>
<li>
<div class="dropdown">
<button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown">
Bulk Actions &nbsp; <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
<li><a>Update notifications</a></li>
</ul>
</div>
</li>
<li>
<span class="filter-controls-actions-selected">0 selected, showing 1 of 1 total</span>
</li>
</ul>
<table class="filter-table form-inline"> <table class="filter-table form-inline">
<thead> <thead>
<tr> <tr>
<th style="width: 48px;"></th>
<th>Email</th> <th>Email</th>
<th>Name</th> <th>Name</th>
<th></th> <th></th>
@@ -151,14 +53,10 @@
</thead> </thead>
<tbody ng-repeat="invite in pendingInvites"> <tbody ng-repeat="invite in pendingInvites">
<tr ng-click="invite.expanded = !invite.expanded" ng-class="{'expanded': invite.expanded}"> <tr ng-click="invite.expanded = !invite.expanded" ng-class="{'expanded': invite.expanded}">
<td>
<input class="cr1" id="alert1" type="checkbox">
<label for="alert1" class="cr1"></label>
</td>
<td>{{invite.email}}</td> <td>{{invite.email}}</td>
<td ng-show="invite.name">{{invite.name}}</td> <td ng-show="invite.name">{{invite.name}}</td>
<td class="text-right"> <td class="text-right">
<button class="btn btn-inverse btn-mini " data-clipboard-text="{{invite.url}}" clipboard-button ng-click="copyInviteToClipboard($event)" <button class="btn btn-inverse btn-mini " data-clipboard-text="{{invite.url}}" clipboard-button ng-click="copyInviteToClipboard($event)">
<i class="fa fa-clipboard"></i> Copy Invite <i class="fa fa-clipboard"></i> Copy Invite
</button> </button>
&nbsp; &nbsp;

2
public/less/filter-table.less
View File

@@ -14,7 +14,7 @@
.filter-table { .filter-table {
width: 100%; width: 100%;
border-collapse: collapse; border-collapse: collapse;
table-layout: fixed; // table-layout: fixed;
} }
.filter-table tr { .filter-table tr {