Skip to content

Commit 4f61fcd

Browse files
committed
Merge pull request #126 from cloudspace/67552316_revise_component_layout
Revise component layout
2 parents bff36b2 + 66800d8 commit 4f61fcd

File tree

1 file changed

+27
-27
lines changed

1 file changed

+27
-27
lines changed

app/views/main.tpl.html

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,6 @@
3232
></div>
3333
</div>
3434

35-
<div>
36-
<div d3-area
37-
chart-title="Investments"
38-
data="ComponentData.dataSets.fundingRoundCount"
39-
selected="fundingActivity"
40-
extent="1/2000"
41-
ranges="true"
42-
filter-property="fundingActivity"
43-
></div>
44-
</div>
45-
4635
<div>
4736
<div list-select
4837
class="special"
@@ -67,12 +56,22 @@
6756

6857
<div>
6958
<div list-select
70-
chart-title="Categories"
71-
items="ComponentData.dataSets.categoryListData"
72-
selected="categoryIds"
73-
total="categories.count()"
74-
count="true"
75-
filter-property="categoryIds"
59+
chart-title="Funding: Round Name"
60+
items="ComponentData.dataSets.roundCodeListData"
61+
selected="roundCodes"
62+
total="fundingRounds.fundingSeries.length"
63+
filter-property="roundCodes"
64+
></div>
65+
</div>
66+
67+
<div>
68+
<div d3-area
69+
chart-title="Investments"
70+
data="ComponentData.dataSets.fundingRoundCount"
71+
selected="fundingActivity"
72+
extent="1/2000"
73+
ranges="true"
74+
filter-property="fundingActivity"
7675
></div>
7776
</div>
7877

@@ -106,6 +105,17 @@
106105
></div>
107106
</div>
108107

108+
<div>
109+
<div list-select
110+
chart-title="Categories"
111+
items="ComponentData.dataSets.categoryListData"
112+
selected="categoryIds"
113+
total="categories.count()"
114+
count="true"
115+
filter-property="categoryIds"
116+
></div>
117+
</div>
118+
109119
<div>
110120
<div d3-area
111121
chart-title="Acquisition Date"
@@ -127,16 +137,6 @@
127137
></div>
128138
</div>
129139

130-
<div>
131-
<div list-select
132-
chart-title="Funding: Round Name"
133-
items="ComponentData.dataSets.roundCodeListData"
134-
selected="roundCodes"
135-
total="fundingRounds.fundingSeries.length"
136-
filter-property="roundCodes"
137-
></div>
138-
</div>
139-
140140
<div>
141141
<div d3-area
142142
chart-title="Founding Date"

0 commit comments

Comments
 (0)