Skip to content

Commit 13cc78b

Browse files
bryliebrylie
committed
Merge pull request #320 from apinf/feature/chart-markup
Feature/chart markup
2 parents 3932dfa + 4fd2faa commit 13cc78b

File tree

4 files changed

+73
-48
lines changed

4 files changed

+73
-48
lines changed

‎client/views/dashboard/charts/bar/bar.html‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
<template name="barChart">
2-
<div id="bar-chart">
2+
<div class="box box-primary">
3+
<div class="box-header with-border">
4+
<h3 class="box-title">Bar Chart</h3>
5+
</div>
6+
<div class="box-body">
7+
<div id="bar-chart">
8+
</div>
9+
</div>
310
</div>
411
</template>

‎client/views/dashboard/charts/filter/filter.html‎

Lines changed: 41 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,46 @@
11
<template name="filterData">
2-
<h3>Filter by:</h3>
3-
<form id="filteringForm">
4-
Month:
5-
<select name="month" >
6-
<option value="00">-</option>
7-
<option value="01">January</option>
8-
<option value="02">February</option>
9-
<option value="03">March</option>
10-
<option value="04">April</option>
11-
<option value="05">May</option>
12-
<option value="06">June</option>
13-
<option value="07">July</option>
14-
<option value="08">August</option>
15-
<option value="09">September</option>
16-
<option value="10">October</option>
17-
<option value="11">November</option>
18-
<option value="12">December</option>
19-
</select>
20-
Year:
21-
<select name="year">
22-
<option value="0000">-</option>
23-
<option value="2014">2014</option>
24-
<option value="2015">2015</option>
25-
</select>
26-
Limit:
27-
<input name="limit" type="text" value="10000" />
2+
<div class="box box-primary">
3+
<div class="box-header with-border">
4+
<h3 class="box-title">Filter</h3>
5+
</div>
6+
<div class="box-body">
7+
<form id="filteringForm">
8+
Month:
9+
<select name="month" >
10+
<option value="00">-</option>
11+
<option value="01">January</option>
12+
<option value="02">February</option>
13+
<option value="03">March</option>
14+
<option value="04">April</option>
15+
<option value="05">May</option>
16+
<option value="06">June</option>
17+
<option value="07">July</option>
18+
<option value="08">August</option>
19+
<option value="09">September</option>
20+
<option value="10">October</option>
21+
<option value="11">November</option>
22+
<option value="12">December</option>
23+
</select>
24+
Year:
25+
<select name="year">
26+
<option value="0000">-</option>
27+
<option value="2014">2014</option>
28+
<option value="2015">2015</option>
29+
</select>
30+
Limit:
31+
<input name="limit" type="text" value="10000" />
2832

29-
<span class="dc-data-count dc-chart" id="row-selection" style="margin:0">
30-
<span class="filter-count">_</span> selected out of <span class="total-count">_</span> records
31-
<span>
32-
<a href='javascript:dc.filterAll();dc.redrawAll();'>Reset All</a>
33-
</span>
34-
</span>
35-
<span id="loadingState">
33+
<span class="dc-data-count dc-chart" id="row-selection" style="margin:0">
34+
<span class="filter-count">_</span> selected out of <span class="total-count">_</span> records
35+
<span>
36+
<a href='javascript:dc.filterAll();dc.redrawAll();'>Reset All</a>
37+
</span>
38+
</span>
39+
<span id="loadingState">
3640

37-
</span>
41+
</span>
3842

39-
</form>
43+
</form>
44+
</div>
45+
</div>
4046
</template>

‎client/views/dashboard/charts/line/line.html‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
<template name="lineChart">
2-
<div id="line-chart">
2+
<div class="box box-primary">
3+
<div class="box-header with-border">
4+
<h3 class="box-title">Line Chart</h3>
5+
</div>
6+
<div class="box-body">
7+
<div id="line-chart">
8+
</div>
9+
</div>
310
</div>
411
</template>

‎client/views/dashboard/charts/table/table.html‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
<template name="dataTable">
2-
<table class='table table-hover' id='dc-data-table'>
3-
<thead>
4-
<tr>
5-
<th data-dynatable-column="time" >Time stamp</th>
6-
<th data-dynatable-column="country" >Request country</th>
7-
<th data-dynatable-column="ip">Request IP</th>
8-
<th data-dynatable-column="path">Request path</th>
9-
<th data-dynatable-column="response">Response time</th>
10-
</tr>
11-
</thead>
12-
</table>
2+
<div class="box box-primary">
3+
<div class="box-header with-border">
4+
<h3 class="box-title">Table</h3>
5+
</div>
6+
<table class='table table-hover' id='dc-data-table'>
7+
<thead>
8+
<tr>
9+
<th data-dynatable-column="time" >Time stamp</th>
10+
<th data-dynatable-column="country" >Request country</th>
11+
<th data-dynatable-column="ip">Request IP</th>
12+
<th data-dynatable-column="path">Request path</th>
13+
<th data-dynatable-column="response">Response time</th>
14+
</tr>
15+
</thead>
16+
</table>
17+
</div>
1318
</template>

0 commit comments

Comments
 (0)