Merge branch 'series-grid' into vnext

Conflicts:
	UI/Config.js
This commit is contained in:
Mark McDowall
2013-04-09 20:17:41 -07:00
parent d81e0885c3
commit 35e2e83595
12 changed files with 157 additions and 19 deletions
+15 -2
View File
@@ -1,4 +1,17 @@
<table class="table table-hover x-series-table">
<div class="row">
<div class="span10"></div>
<div class="span2">
<div class="pull-right">
<div class="btn-toolbar">
<div class="btn-group">
<a class="btn x-series-change-view x-series-show-table active" href="#" title="table"><i class="icon-table"></i></a>
<a class="btn x-series-change-view x-series-show-grid" href="#" title="grid"><i class="icon-list"></i></a>
</div>
</div>
</div>
</div>
</div>
<table class="table table-hover x-series-table">
<thead>
<tr>
<th title="Status"></th>
@@ -11,5 +24,5 @@
<th></th>
</tr>
</thead>
<tbody></tbody>
<tbody id="x-series"></tbody>
</table>