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 branch 'master' into panel_repeat

Browse Source 
Conflicts:
	public/app/features/dashboard/dashboardCtrl.js
	public/app/partials/submenu.html
	public/css/less/submenu.less
	public/test/specs/templateSrv-specs.js
	src/app/partials/roweditor.html
This commit is contained in:
Torkel Ödegaard
2015-04-27 13:53:02 +02:00
parent c658189c85 8a986ec340
commit bf6f0f1a65
686 changed files with 69990 additions and 12483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
public/app/partials/panelgeneral.html Normal file
View File

@@ -0,0 +1,26 @@
<div class="editor-row">
<div class="section">
<h5>General options</h5>
<div class="editor-option">
<label class="small">Title</label><input type="text" class="input-medium" ng-model='panel.title'></input>
</div>
<div class="editor-option">
<label class="small">Span</label> <select class="input-mini" ng-model="panel.span" ng-options="f for f in [0,1,2,3,4,5,6,7,8,9,10,11,12]"></select>
</div>
<div class="editor-option">
<label class="small">Height</label><input type="text" class="input-small" ng-model='panel.height'></select>
</div>
<editor-opt-bool text="Transparent" model="panel.transparent"></editor-opt-bool>
</div>
<div class="section">
<h5>Templating options</h5>
<div class="editor-option">
<label class="small">Repeat Panel</label>
<input type="text" class="input-medium" ng-model='panel.repeat'></input>
</div>
</div>
</div>
<panel-link-editor panel="panel"></panel-link-editor>