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

Updates to account and admin views

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-02-08 10:23:35 +01:00
parent b1a95cacff
commit 2c5828528f
5 changed files with 157 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
src/app/features/account/partials/account.html
View File

@ -6,87 +6,71 @@
</ul> </ul>
</topnav> </topnav>
<div class="admin-page"> <div class="page-container">
<h2> <div class="page">
Account Info
</h2>
<div class="gf-box"> <h2>Account Info</h2>
<div class="gf-box-body">
<div class="editor-row"> <form name="accountForm">
<div class="section"> <div>
<form name="accountForm"> <div class="tight-form">
<div> <ul class="tight-form-list">
<div class="tight-form"> <li class="tight-form-item" style="width: 100px">
<ul class="tight-form-list"> <strong>Account name</strong>
<li class="tight-form-item" style="width: 120px"> </li>
<strong>Account name</strong> <li>
</li> <input type="text" required ng-model="account.name" class="input-xxlarge tight-form-input last" >
<li> </li>
<input type="text" required ng-model="account.name" class="input-xxlarge tight-form-input last" > </ul>
</li> <div class="clearfix"></div>
</ul>
<div class="clearfix"></div>
</div>
</div> </div>
<br> </div>
<button type="submit" class="pull-right btn btn-success" ng-click="update()">Update</button> <br>
<button type="submit" class="pull-right btn btn-success" ng-click="update()">Update</button>
</form>
<h2>
API Keys
</h2>
<div ng-controller="ApiKeysCtrl">
<form name="addTokenrForm" class="form-inline tight-form">
<ul class="tight-form-list">
<li class="tight-form-item" style="width: 100px">
Add a key
</li>
<li>
<input type="text" class="input-xlarge tight-form-input" ng-model='token.name' placeholder="Name"></input>
</li>
<li class="tight-form-item">
Role
</li>
<li>
<select class="input-small tight-form-input" ng-model="token.role" ng-options="r for r in roleTypes"></select>
</li>
<li style="float: right">
<button class="btn btn-success tight-form-btn" ng-click="addToken()">Add</button>
</li>
<div class="clearfix"></div>
</ul>
</form> </form>
</div> <br>
</div>
</div> <table class="grafana-options-table">
<tr ng-repeat="t in tokens">
<td>{{t.name}}</td>
<td>{{t.role}}</td>
<td>{{t.key}}</td>
<td style="width: 1%">
<a ng-click="removeToken(t.id)" class="btn btn-danger btn-mini">
<i class="fa fa-remove"></i>
</a>
</td>
</tr>
</table>
</div> </div>
<h2>
API Keys
</h2>
<div class="gf-box" ng-controller="ApiKeysCtrl">
<div class="gf-box-body">
<div class="editor-row">
<div class="section">
<form name="addTokenrForm" class="form-inline tight-form">
<ul class="tight-form-list">
<li class="tight-form-item">
Add a key
</li>
<li>
<input type="text" class="input-xlarge tight-form-input" ng-model='token.name' placeholder="Name"></input>
</li>
<li class="tight-form-item">
Role
</li>
<li>
<select class="input-small tight-form-input" ng-model="token.role" ng-options="r for r in roleTypes"></select>
</li>
<li>
<button class="btn btn-success tight-form-btn" ng-click="addToken()">Add</button>
</li>
</ul>
<div class="clearfix"></div>
</form>
</div>
</div>
<div class="editor-row">
<div class="section">
<table class="grafana-options-table">
<tr ng-repeat="t in tokens">
<td>{{t.name}}</td>
<td>{{t.role}}</td>
<td>{{t.key}}</td>
<td style="width: 1%">
<a ng-click="removeToken(t.id)" class="btn btn-danger btn-mini">
<i class="fa fa-remove"></i>
</a>
</td>
</tr>
</table>
</div>
</div>
</div>
</div> </div>
</div> </div>

59
src/app/features/account/partials/import.html
View File

@ -6,42 +6,31 @@
</ul> </ul>
</topnav> </topnav>
<div class="gf-box" style="min-height: 500px"> <div class="page-container">
<div class="page">
<h2>Import dashboards</h2>
<div class="gf-box-header"> <div class="tight-form">
<div class="gf-box-title"> <ul class="tight-form-list">
<i class="fa fa-th-large"></i> <li class="tight-form-item" style="width: 150px">
Import Dashboards <strong>Dashboard source</strong>
</div> </li>
</div> <li>
<select type="text" ng-model="sourceName" class="input-medium tight-form-input" ng-options="f for f in datasources">
<div class="gf-box-body"> </select>
</li>
<div class="editor-row"> <li class="tight-form-item">
<div class="section"> <strong>Destination</strong>
<div class="tight-form"> </li>
<ul class="tight-form-list"> <li>
<li class="tight-form-item" style="width: 150px"> <select type="text" ng-model="destName" class="input-medium tight-form-input" ng-options="f for f in datasources">
<strong>Dashboard source</strong> </select>
</li> </li>
<li> <li>
<select type="text" ng-model="sourceName" class="input-medium tight-form-input" ng-options="f for f in datasources"> <button class="btn btn-success tight-form-btn" ng-click="startImport()">Import</button>
</select> </li>
</li> <div class="clearfix"></div>
<li class="tight-form-item"> </ul>
<strong>Destination</strong>
</li>
<li>
<select type="text" ng-model="destName" class="input-medium tight-form-input" ng-options="f for f in datasources">
</select>
</li>
<li>
<button class="btn btn-success tight-form-btn" ng-click="startImport()">Import</button>
</li>
</ul>
<div class="clearfix"></div>
</div>
</div>
</div> </div>
<div class="editor-row" ng-if="importing"> <div class="editor-row" ng-if="importing">

82
src/app/features/account/partials/users.html
View File

@ -6,55 +6,51 @@
</ul> </ul>
</topnav> </topnav>
<div class="page-container">
<div class="page">
<div class="gf-box" style="min-height: 500px"> <h2>Account users</h2>
<div class="gf-box-body">
<div class="editor-row"> <form name="form">
<div class="section"> <div class="tight-form">
<form name="form"> <ul class="tight-form-list">
<div class="tight-form"> <li class="tight-form-item" style="width: 160px">
<ul class="tight-form-list"> <strong>Username or Email</strong>
<li class="tight-form-item" style="width: 160px"> </li>
<strong>Username or Email</strong> <li>
</li> <input type="text" ng-model="user.loginOrEmail" required class="input-xlarge tight-form-input" placeholder="user@email.com or username">
<li> </li>
<input type="text" ng-model="user.loginOrEmail" required class="input-xlarge tight-form-input" placeholder="user@email.com or username"> <li class="tight-form-item">
</li> role
<li class="tight-form-item"> </li>
role <li>
</li> <select type="text" ng-model="user.role" class="input-small tight-form-input" ng-options="f for f in ['Viewer', 'Editor', 'Admin']">
<li> </select>
<select type="text" ng-model="user.role" class="input-small tight-form-input" ng-options="f for f in ['Viewer', 'Editor', 'Admin']"> </li>
</select> <li>
</li> <button class="btn btn-success tight-form-btn" ng-click="addUser()">Add</button>
<li> </li>
<button class="btn btn-success tight-form-btn" ng-click="addUser()">Add</button> <div class="clearfix"></div>
</li> </ul>
</ul>
<div class="clearfix"></div>
</div>
</form>
</div> </div>
</div> </form>
<br>
<div class="editor-row row"> <table class="grafana-options-table">
<table class="grafana-options-table span5"> <tr ng-repeat="user in users">
<tr ng-repeat="user in users"> <td>{{user.email}}</td>
<td>{{user.email}}</td> <td>
<td> {{user.role}}
{{user.role}} </td>
</td> <td style="width: 1%">
<td style="width: 1%"> <a ng-click="removeUser(user)" class="btn btn-danger btn-mini">
<a ng-click="removeUser(user)" class="btn btn-danger btn-mini"> <i class="fa fa-remove"></i>
<i class="fa fa-remove"></i> </a>
</a> </td>
</td> </tr>
</tr> </table>
</table>
</div>
</div> </div>
</div> </div>

66
src/app/features/admin/partials/users.html
View File

@ -5,42 +5,36 @@
</ul> </ul>
</topnav> </topnav>
<div class="admin-page"> <div class="page-container">
<h2>Users</h2> <div class="page">
<div class="gf-box" style="min-height: 500px"> <h2>Users</h2>
<div class="gf-box-body"> <table class="grafana-options-table">
<div class="editor-row row"> <tr>
<div class="section span6"> <th style="text-align:left">Id</th>
<table class="grafana-options-table"> <th>Login</th>
<tr> <th>Email</th>
<th style="text-align:left">Id</th> <th>Name</th>
<th>Login</th> <th>Admin</th>
<th>Email</th> <th></th>
<th>Name</th> </tr>
<th>Admin</th> <tr ng-repeat="user in users">
<th></th> <td>{{user.id}}</td>
</tr> <td>{{user.login}}</td>
<tr ng-repeat="user in users"> <td>{{user.email}}</td>
<td>{{user.id}}</td> <td>{{user.name}}</td>
<td>{{user.login}}</td> <td>{{user.isAdmin}}</td>
<td>{{user.email}}</td> <td style="width: 1%">
<td>{{user.name}}</td> <a ng-click="edit(variable)" class="btn btn-success btn-small">
<td>{{user.isAdmin}}</td> <i class="fa fa-edit"></i>
<td style="width: 1%"> Edit
<a ng-click="edit(variable)" class="btn btn-success btn-small"> </a>
<i class="fa fa-edit"></i> &nbsp;&nbsp;
Edit <a ng-click="delete(variable)" class="btn btn-danger btn-small">
</a> <i class="fa fa-remove"></i>
&nbsp;&nbsp; </a>
<a ng-click="delete(variable)" class="btn btn-danger btn-small"> </td>
<i class="fa fa-remove"></i> </tr>
</a> </table>
</td>
</tr>
</table>
</div>
</div>
</div>
</div> </div>
</div> </div>

5
src/css/less/tables_lists.less
View File

@ -1,6 +1,11 @@
.grafana-options-table { .grafana-options-table {
width: 100%; width: 100%;
th {
padding: 5px 10px;
border-bottom: 4px solid @grafanaPanelBackground;
}
tr td { tr td {
background-color: @grafanaListBackground; background-color: @grafanaListBackground;
padding: 5px 10px; padding: 5px 10px;