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

ux(): updated http settings view with new checkboxes

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-03-21 21:36:30 +01:00
parent 98206ab49f
commit 64312ceded
3 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
public/app/features/dashboard/partials/settings.html
View File

@ -41,15 +41,9 @@
<h5 class="section-heading">On/Off Toggles</h5> <h5 class="section-heading">On/Off Toggles</h5>
<div class="gf-form-group"> <div class="gf-form-group">
<div class="gf-form-inline"> <div class="gf-form-inline">
<div class="gf-form"> <gf-form-switch class="gf-form" label="Editable" checked="dashboard.editable" switch-class="max-width-6"></gf-form-switch>
<editor-checkbox text="Editable" model="dashboard.editable"></editor-checkbox> <gf-form-switch class="gf-form" label="Hide Controls (CTRL+H)" checked="dashboard.hideControls" switch-class="max-width-6"></gf-form-switch>
</div> <gf-form-switch class="gf-form" label="Shared Crosshair (CTRL+O)" checked="dashboard.sharedCrosshair" switch-class="max-width-6"></gf-form-switch>
<div class="gf-form">
<editor-checkbox text="Hide Controls (CTRL+H)" model="dashboard.hideControls"></editor-checkbox>
</div>
<div class="gf-form">
<editor-checkbox text="Shared Crosshair (CTRL+O)" model="dashboard.sharedCrosshair"></editor-checkbox>
</div>
</div> </div>
</div> </div>
</div> </div>

16
public/app/features/plugins/partials/ds_http_settings.html
View File

@ -29,12 +29,18 @@
</div> </div>
</div> </div>
<div class="gf-form-inline">
<div class="gf-form"> <div class="gf-form">
<span class="gf-form-label width-7"> <label class="gf-form-label width-7">Http Auth</label>
Http Auth </div>
</span> <gf-form-switch class="gf-form"
<editor-checkbox text="Basic Auth" model="current.basicAuth"></editor-checkbox> label="Basic Auth"
<editor-checkbox text="With Credentials" model="current.withCredentials"></editor-checkbox><tip>Tip for with credentials</tip> checked="current.basicAuth" switch-class="max-width-6">
</gf-form-switch>
<gf-form-switch class="gf-form"
label="With Credentials"
checked="current.withCredentials" switch-class="max-width-6">
</gf-form-switch>
</div> </div>
<div class="gf-form" ng-if="current.basicAuth"> <div class="gf-form" ng-if="current.basicAuth">

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

@ -48,10 +48,6 @@ $gf-form-margin: 0.25rem;
@include border-radius($label-border-radius-sm); @include border-radius($label-border-radius-sm);
} }
.gf-form-switch-wrapper {
margin-right: $gf-form-margin;
}
.gf-form-checkbox { .gf-form-checkbox {
flex-shrink: 0; flex-shrink: 0;
padding: $input-padding-y $input-padding-x; padding: $input-padding-y $input-padding-x;
@ -150,4 +146,7 @@ $gf-form-margin: 0.25rem;
flex-grow: 0; flex-grow: 0;
} }
.gf-form-switch {
margin-right: $gf-form-margin;
}