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

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

@ -6,20 +6,16 @@
</ul> </ul>
</topnav> </topnav>
<div class="admin-page"> <div class="page-container">
<h2> <div class="page">
Account Info
</h2> <h2>Account Info</h2>
<div class="gf-box">
<div class="gf-box-body">
<div class="editor-row">
<div class="section">
<form name="accountForm"> <form name="accountForm">
<div> <div>
<div class="tight-form"> <div class="tight-form">
<ul class="tight-form-list"> <ul class="tight-form-list">
<li class="tight-form-item" style="width: 120px"> <li class="tight-form-item" style="width: 100px">
<strong>Account name</strong> <strong>Account name</strong>
</li> </li>
<li> <li>
@ -32,22 +28,15 @@
<br> <br>
<button type="submit" class="pull-right btn btn-success" ng-click="update()">Update</button> <button type="submit" class="pull-right btn btn-success" ng-click="update()">Update</button>
</form> </form>
</div>
</div>
</div>
</div>
<h2> <h2>
API Keys API Keys
</h2> </h2>
<div class="gf-box" ng-controller="ApiKeysCtrl"> <div ng-controller="ApiKeysCtrl">
<div class="gf-box-body">
<div class="editor-row">
<div class="section">
<form name="addTokenrForm" class="form-inline tight-form"> <form name="addTokenrForm" class="form-inline tight-form">
<ul class="tight-form-list"> <ul class="tight-form-list">
<li class="tight-form-item"> <li class="tight-form-item" style="width: 100px">
Add a key Add a key
</li> </li>
<li> <li>
@ -59,17 +48,14 @@
<li> <li>
<select class="input-small tight-form-input" ng-model="token.role" ng-options="r for r in roleTypes"></select> <select class="input-small tight-form-input" ng-model="token.role" ng-options="r for r in roleTypes"></select>
</li> </li>
<li> <li style="float: right">
<button class="btn btn-success tight-form-btn" ng-click="addToken()">Add</button> <button class="btn btn-success tight-form-btn" ng-click="addToken()">Add</button>
</li> </li>
</ul>
<div class="clearfix"></div> <div class="clearfix"></div>
</ul>
</form> </form>
</div> <br>
</div>
<div class="editor-row">
<div class="section">
<table class="grafana-options-table"> <table class="grafana-options-table">
<tr ng-repeat="t in tokens"> <tr ng-repeat="t in tokens">
<td>{{t.name}}</td> <td>{{t.name}}</td>
@ -83,10 +69,8 @@
</tr> </tr>
</table> </table>
</div> </div>
</div>
</div>
</div>
</div>
</div> </div>

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

@ -6,19 +6,10 @@
</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="gf-box-title">
<i class="fa fa-th-large"></i>
Import Dashboards
</div>
</div>
<div class="gf-box-body">
<div class="editor-row">
<div class="section">
<div class="tight-form"> <div class="tight-form">
<ul class="tight-form-list"> <ul class="tight-form-list">
<li class="tight-form-item" style="width: 150px"> <li class="tight-form-item" style="width: 150px">
@ -38,10 +29,8 @@
<li> <li>
<button class="btn btn-success tight-form-btn" ng-click="startImport()">Import</button> <button class="btn btn-success tight-form-btn" ng-click="startImport()">Import</button>
</li> </li>
</ul>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </ul>
</div>
</div> </div>
<div class="editor-row" ng-if="importing"> <div class="editor-row" ng-if="importing">

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

@ -6,13 +6,12 @@
</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">
<div class="section">
<form name="form"> <form name="form">
<div class="tight-form"> <div class="tight-form">
<ul class="tight-form-list"> <ul class="tight-form-list">
@ -32,16 +31,14 @@
<li> <li>
<button class="btn btn-success tight-form-btn" ng-click="addUser()">Add</button> <button class="btn btn-success tight-form-btn" ng-click="addUser()">Add</button>
</li> </li>
</ul>
<div class="clearfix"></div> <div class="clearfix"></div>
</ul>
</div> </div>
</form> </form>
</div>
</div>
<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>
@ -54,7 +51,6 @@
</td> </td>
</tr> </tr>
</table> </table>
</div>
</div> </div>
</div> </div>

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

@ -5,13 +5,10 @@
</ul> </ul>
</topnav> </topnav>
<div class="admin-page"> <div class="page-container">
<div class="page">
<h2>Users</h2> <h2>Users</h2>
<div class="gf-box" style="min-height: 500px">
<div class="gf-box-body">
<div class="editor-row row">
<div class="section span6">
<table class="grafana-options-table"> <table class="grafana-options-table">
<tr> <tr>
<th style="text-align:left">Id</th> <th style="text-align:left">Id</th>
@ -40,7 +37,4 @@
</tr> </tr>
</table> </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;