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

Merge remote-tracking branch 'origin/select-wrapper' into develop

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-12-13 18:12:35 +01:00
commit 6254304667
10 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/features/admin/partials/edit_org.html
View File

@ -27,8 +27,12 @@
<td>{{orgUser.login}}</td>
<td>{{orgUser.email}}</td>
<td>
<div class="gf-form">
<span class="gf-form-select-wrapper">
<select type="text" ng-model="orgUser.role" class="gf-form-input max-width-8" ng-options="f for f in ['Viewer', 'Editor', 'Read Only Editor', 'Admin']" ng-change="updateOrgUser(orgUser)">
</select>
</span>
</div>
</td>
<td style="width: 1%">
<a ng-click="removeOrgUser(orgUser)" class="btn btn-danger btn-mini">

6
public/app/features/admin/partials/edit_user.html
View File

@ -60,7 +60,9 @@
</div>
<div class="gf-form">
<span class="gf-form-label">Role</span>
<span class="gf-form-select-wrapper">
<select type="text" ng-model="newOrg.role" class="gf-form-input width-10" ng-options="f for f in ['Viewer', 'Editor', 'Read Only Editor', 'Admin']"></select>
</span>
</div>
<div class="gf-form">
<button class="btn btn-success gf-form-btn" ng-click="addOrgUser()">Add</button>
@ -81,8 +83,12 @@
{{org.name}} <span class="label label-info" ng-show="org.orgId === user.orgId">Current</span>
</td>
<td>
<div class="gf-form">
<span class="gf-form-select-wrapper">
<select type="text" ng-model="org.role" class="gf-form-input max-width-12" ng-options="f for f in ['Viewer', 'Editor', 'Read Only Editor', 'Admin']" ng-change="updateOrgUser(org)">
</select>
</span>
</div>
</td>
<td style="width: 1%">
<a ng-click="removeOrgUser(org)" class="btn btn-danger btn-mini">

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

@ -12,7 +12,9 @@
</div>
<div class="gf-form">
<span class="gf-form-label">Role</span>
<span class="gf-form-select-wrapper">
<select class="gf-form-input gf-size-auto" ng-model="token.role" ng-options="r for r in roleTypes"></select>
</span>
</div>
<div class="gf-form">
<button class="btn gf-form-btn btn-success" ng-click="addToken()">Add</button>

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

@ -51,7 +51,7 @@
<td><span class="ellipsis">{{user.email}}</span></td>
<td>{{user.lastSeenAtAge}}</td>
<td>
<div class="gf-form-select-wrapper width-9">
<div class="gf-form-select-wrapper width-12">
<select type="text" ng-model="user.role" class="gf-form-input" ng-options="f for f in ['Viewer', 'Editor', 'Read Only Editor', 'Admin']" ng-change="ctrl.updateOrgUser(user)">
</select>
</div>

2
public/app/features/plugins/built_in_plugins.ts
View File

@ -18,7 +18,6 @@ import * as heatmapPanel from 'app/plugins/panel/heatmap/module';
import * as tablePanel from 'app/plugins/panel/table/module';
import * as singlestatPanel from 'app/plugins/panel/singlestat/module';
import * as gettingStartedPanel from 'app/plugins/panel/gettingstarted/module';
import * as permissionListPlugin from 'app/plugins/panel/permissionlist/module';
import * as testDataAppPlugin from 'app/plugins/app/testdata/module';
import * as testDataDSPlugin from 'app/plugins/app/testdata/datasource/module';
@ -37,7 +36,6 @@ const builtInPlugins = {
"app/plugins/app/testdata/module": testDataAppPlugin,
"app/plugins/app/testdata/datasource/module": testDataDSPlugin,
"app/plugins/panel/permissionlist/module": permissionListPlugin,
"app/plugins/panel/text/module": textPanel,
"app/plugins/panel/graph/module": graphPanel,
"app/plugins/panel/dashlist/module": dashListPanel,

2
public/app/plugins/datasource/cloudwatch/partials/config.html
View File

@ -1,7 +1,7 @@
<h3 class="page-heading">CloudWatch details</h3>
<div class="gf-form-group max-width-30">
<div class="gf-form">
<div class="gf-form gf-form-select-wrapper">
<label class="gf-form-label width-13">Auth Provider</label>
<select class="gf-form-input gf-max-width-13" ng-model="ctrl.current.jsonData.authType" ng-options="f.value as f.name for f in ctrl.authTypes"></select>
</div>

4
public/app/plugins/datasource/elasticsearch/partials/config.html
View File

@ -12,7 +12,9 @@
<div class="gf-form width-14">
<span class="gf-form-label width-9">Pattern</span>
<span class="gf-form-select-wrapper">
<select class="gf-form-input gf-size-auto" ng-model="ctrl.current.jsonData.interval" ng-options="f.value as f.name for f in ctrl.indexPatternTypes" ng-change="ctrl.indexPatternTypeChanged()" ></select>
</span>
</div>
</div>
@ -23,7 +25,9 @@
<div class="gf-form">
<span class="gf-form-label width-9">Version</span>
<span class="gf-form-select-wrapper">
<select class="gf-form-input gf-size-auto" ng-model="ctrl.current.jsonData.esVersion" ng-options="f.value as f.name for f in ctrl.esVersions"></select>
</span>
</div>
<div class="gf-form max-width-30" ng-if="ctrl.current.jsonData.esVersion>=56">
<span class="gf-form-label width-15">Max concurrent Shard Requests</span>

2
public/app/plugins/datasource/graphite/partials/config.html
View File

@ -13,6 +13,8 @@
This option controls what functions are available in the Graphite query editor.
</info-popover>
</span>
<span class="gf-form-select-wrapper">
<select class="gf-form-input gf-size-auto" ng-model="ctrl.current.jsonData.graphiteVersion" ng-options="f.value as f.name for f in ctrl.graphiteVersions"></select>
</span>
</div>
</div>

8
public/sass/components/_gf-form.scss
View File

@ -53,6 +53,10 @@ $input-border: 1px solid $input-border-color;
flex-direction: row;
flex-wrap: wrap;
align-content: flex-start;
.gf-form + .gf-form {
margin-right: $gf-form-margin;
}
}
.gf-form-button-row {
@ -89,10 +93,6 @@ $input-border: 1px solid $input-border-color;
margin-right: $gf-form-margin;
}
.gf-form + .gf-form {
margin-right: $gf-form-margin;
}
.gf-form-pre {
display: block;
flex-grow: 1;