Skip to content

N
nexpie-grafana-theme
Commit 41b77556 by Torkel Ödegaard
Options

ux(): datasource form tweaks

parent 262a0366
Showing with 48 additions and 76 deletions
public/app/features/datasources/partials/http_settings.html
<h3>Http settings</h3>
<div class="gf-form-group"> <div class="gf-form-group">
<h3>Http settings</h3>
<div class="gf-form"> <div class="gf-form">
<span class="gf-form-label gf-size-xs">Url</span> <span class="gf-form-label gf-size-xs">Url</span>
<input class="gf-form-input gf-size-max-xxl" type="text" ng-model='current.url' placeholder="http://my.server.com:8080" ng-pattern="/^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/" required></input> <input class="gf-form-input gf-size-max-xxl" type="text" ng-model='current.url' placeholder="http://my.server.com:8080" ng-pattern="/^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/" required></input>
...@@ -13,7 +14,6 @@ ...@@ -13,7 +14,6 @@
</span> </span>
<select class="gf-form-input gf-size-auto" ng-model="current.access" ng-options="f for f in ['direct', 'proxy']"></select> <select class="gf-form-input gf-size-auto" ng-model="current.access" ng-options="f for f in ['direct', 'proxy']"></select>
</div> </div>
<br>
<div class="gf-form"> <div class="gf-form">
<span class="gf-form-label gf-size-xs"> <span class="gf-form-label gf-size-xs">
......
public/app/features/profile/partials/password.html
...@@ -2,27 +2,25 @@ ...@@ -2,27 +2,25 @@
</navbar> </navbar>
<div class="page-container"> <div class="page-container">
<div class="page-header">
<h1>Change password</h1> <h1>Change password</h1>
</div>
<form name="userForm" class="gf-form-group"> <form name="userForm" class="gf-form-group">
<div class="gf-form"> <div class="gf-form">
<span class="gf-form-label gf-size-m">Old Password</span> <span class="gf-form-label gf-size-md">Old Password</span>
<input class="gf-form-input gf-size-xxl" type="text" required ng-model="command.oldPassword"> <input class="gf-form-input gf-size-max-xxl" type="text" required ng-model="command.oldPassword">
</div> </div>
<br>
<div class="gf-form"> <div class="gf-form">
<span class="gf-form-label gf-size-m">New Password</span> <span class="gf-form-label gf-size-md">New Password</span>
<input class="gf-form-input gf-size-xxl" type="text" required ng-minlength="4" ng-model="command.newPassword"> <input class="gf-form-input gf-size-max-xxl" type="text" required ng-minlength="4" ng-model="command.newPassword">
</div> </div>
<br>
<div class="gf-form"> <div class="gf-form">
<span class="gf-form-label gf-size-m">Confirm Password</span> <span class="gf-form-label gf-size-md">Confirm Password</span>
<input class="gf-form-input gf-size-xxl" type="text" required ng-minlength="4" ng-model="command.confirmNew"> <input class="gf-form-input gf-size-max-xxl" type="text" required ng-minlength="4" ng-model="command.confirmNew">
</div> </div>
<br>
<div class="gf-form-button-row"> <div class="gf-form-button-row">
<button type="submit" class="btn btn-success" ng-click="changePassword()">Change Password</button> <button type="submit" class="btn btn-success" ng-click="changePassword()">Change Password</button>
......
public/app/plugins/datasource/elasticsearch/partials/config.html
<datasource-http-settings current="ctrl.current"> <datasource-http-settings current="ctrl.current">
</datasource-http-settings> </datasource-http-settings>
<h4>Elasticsearch details</h4> <div class="gf-form-group">
<h3>Elasticsearch details</h3>
<div class="tight-form"> <div class="gf-form-inline">
<ul class="tight-form-list"> <div class="gf-form gf-size-max-xxxl">
<li class="tight-form-item" style="width: 144px"> <span class="gf-form-label gf-size-md">Index name</span>
Index name <input class="gf-form-input" type="text" ng-model='ctrl.current.database' placeholder="" required></input>
</li> </div>
<li>
<input type="text" class="tight-form-input input-xlarge" ng-model='ctrl.current.database' placeholder="" required></input> <div class="gf-form gf-size-xl">
</li> <span class="gf-form-label gf-size-md">Pattern</span>
<li class="tight-form-item"> <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>
Pattern </div>
</li> </div>
<li>
<select class="input-medium tight-form-input" ng-model="ctrl.current.jsonData.interval" ng-options="f.value as f.name for f in ctrl.indexPatternTypes" ng-change="ctrl.indexPatternTypeChanged()" ></select>
</li>
</ul>
<div class="clearfix"></div>
</div>
<div class="tight-form">
<ul class="tight-form-list">
<li class="tight-form-item" style="width: 144px">
Time field name
</li>
<li>
<input type="text" class="tight-form-input input-xlarge" ng-model='ctrl.current.jsonData.timeField' placeholder="" required ng-init=""></input>
</li>
</ul>
<div class="clearfix"></div>
</div>
<div class="tight-form last">
<ul class="tight-form-list">
<li class="tight-form-item" style="width: 144px">
Version
</li>
<li>
<select class="input-medium tight-form-input" ng-model="ctrl.current.jsonData.esVersion" ng-options="f.value as f.name for f in ctrl.esVersions"></select>
</li>
</ul>
<div class="clearfix"></div>
</div>
<br> <div class="gf-form gf-size-max-xxxl">
<span class="gf-form-label gf-size-md">Time field name</span>
<input class="gf-form-input" type="text" ng-model='ctrl.current.jsonData.timeField' placeholder="" required ng-init=""></input>
</div>
<div class="gf-form">
<span class="gf-form-label gf-size-md">Version</span>
<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>
</div>
</div>
<h4>Default query settings</h4> <div class="gf-form-group">
<h4>Default query settings</h4>
<div class="tight-form last"> <div class="gf-form">
<ul class="tight-form-list"> <span class="gf-form-label">Group by time interval</span>
<li class="tight-form-item" style="width: 200px"> <input class="gf-form-input gf-size-max-md" type="text" ng-model="ctrl.current.jsonData.timeInterval" spellcheck='false' placeholder="example: >10s">
Group by time interval </div>
</li>
<li>
<input type="text" class="input-medium tight-form-input input-xlarge" ng-model="ctrl.current.jsonData.timeInterval"
spellcheck='false' placeholder="example: >10s">
</li>
<li class="tight-form-item">
<i class="fa fa-question-circle" bs-tooltip="'Set a low limit by having a greater sign: example: >10s'" data-placement="right"></i>
</li>
</ul>
<div class="clearfix"></div>
</div> </div>
public/sass/_grafana.scss
@import "grid-variables";
// MIXINS // MIXINS
@import "mixins/mixins"; @import "mixins/mixins";
@import "mixins/buttons"; @import "mixins/buttons";
......
public/sass/_variables.dark.scss
...@@ -34,7 +34,7 @@ $critical: #ed2e18; ...@@ -34,7 +34,7 @@ $critical: #ed2e18;
// grafana Variables // grafana Variables
// ------------------------- // -------------------------
$grafanaPanelBackground: $grayDarker; $grafanaPanelBackground: $grayDarker;
$grafanaPanelBorder: solid 1px $grayDark; $grafanaPanelBorder: solid 1px $grayDark;
$grafanaTriggerBorder: solid 1px #555; $grafanaTriggerBorder: solid 1px #555;
// Graphite Target Editor // Graphite Target Editor
......
public/sass/grafana.dark.scss
@import "_variables.dark.scss"; @import "variables";
@import "_grafana.scss"; @import "variables.dark";
@import "grafana";
public/sass/grafana.light.scss
@import "_variables.light.scss"; @import "variables";
@import "_grafana.scss"; @import "variables.light";
@import "grafana";
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment