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

fix(annotations): rearrange missplaced save button

Browse Source
This commit is contained in:
bergquist 2016-02-22 10:21:22 +01:00
parent f225bb0032
commit 6c617ba28c
1 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
public/app/features/annotations/partials/editor.html
View File

@ -64,32 +64,34 @@
</div> </div>
</div> </div>
<div class="gf-form-group annotations-basic-settings" ng-if="mode === 'edit' || mode === 'new'"> <div class="annotations-basic-settings" ng-if="mode === 'edit' || mode === 'new'">
<div class="gf-form-inline"> <div class="gf-form-group">
<div class="gf-form gf-size-max-xxl"> <div class="gf-form-inline">
<span class="gf-form-label width-10">Name</span> <div class="gf-form gf-size-max-xxl">
<input type="text" class="gf-form-input" ng-model='currentAnnotation.name' placeholder="name"></input> <span class="gf-form-label width-10">Name</span>
<input type="text" class="gf-form-input" ng-model='currentAnnotation.name' placeholder="name"></input>
</div>
<div class="gf-form">
<span class="gf-form-label max-width-10">Datasource</span>
<select class="gf-form-input gf-size-auto" ng-model="currentAnnotation.datasource" ng-options="f.name as f.name for f in datasources" ng-change="datasourceChanged()"></select>
</div>
</div> </div>
<div class="gf-form"> <div class="gf-form-inline last-row">
<span class="gf-form-label max-width-10">Datasource</span> <div class="gf-form gf-size-max-xl">
<select class="gf-form-input gf-size-auto" ng-model="currentAnnotation.datasource" ng-options="f.name as f.name for f in datasources" ng-change="datasourceChanged()"></select> <span class="gf-form-label width-10">Icon size</span>
</div> <select class="gf-form-input gf-size-md" ng-model="currentAnnotation.iconSize" ng-options="f for f in [7,8,9,10,13,15,17,20,25,30]"></select>
</div> </div>
<div class="gf-form-inline last-row"> <div class="gf-form max-width-10">
<div class="gf-form gf-size-max-xl"> <spectrum-picker ng-model="currentAnnotation.iconColor"></spectrum-picker>
<span class="gf-form-label width-10">Icon size</span> <span class="checkbox-label">Icon color</span>
<select class="gf-form-input gf-size-md" ng-model="currentAnnotation.iconSize" ng-options="f for f in [7,8,9,10,13,15,17,20,25,30]"></select> </div>
</div> <div class="gf-form max-width-10">
<div class="gf-form max-width-10"> <editor-checkbox text="Grid line" model="currentAnnotation.showLine"></editor-checkbox>
<spectrum-picker ng-model="currentAnnotation.iconColor"></spectrum-picker> </div>
<span class="checkbox-label">Icon color</span> <div class="gf-form max-width-10">
</div> <spectrum-picker ng-model="currentAnnotation.lineColor"></spectrum-picker>
<div class="gf-form max-width-10"> <span class="checkbox-label">Line color</span>
<editor-checkbox text="Grid line" model="currentAnnotation.showLine"></editor-checkbox> </div>
</div>
<div class="gf-form max-width-10">
<spectrum-picker ng-model="currentAnnotation.lineColor"></spectrum-picker>
<span class="checkbox-label">Line color</span>
</div> </div>
</div> </div>
@ -98,9 +100,11 @@
</plugin-component> </plugin-component>
</rebuild-on-change> </rebuild-on-change>
<div class="gf-button-group"> <div class="gf-form">
<button ng-show="mode === 'new'" type="button" class="btn btn-success" ng-click="add()">Add</button> <div class="gf-form-button-row">
<button ng-show="mode === 'edit'" type="button" class="btn btn-success pull-left" ng-click="update();">Update</button> <button ng-show="mode === 'new'" type="button" class="btn gf-form-button btn-success" ng-click="add()">Add</button>
<button ng-show="mode === 'edit'" type="button" class="btn btn-success pull-left" ng-click="update();">Update</button>
</div>
</div> </div>
</div> </div>
</div> </div>