+
{% if include.icon %}
{% include ui/icon.html icon=include.icon %}
{% elsif include.person-id %}
diff --git a/pages/_includes/layout/css.html b/pages/_includes/layout/css.html
index dc681ccf74ecc2d3a6d206dfae96a0ea45524e63..9743cdf14b9ba4901959c66bc4d3ba62a947177a 100644
--- a/pages/_includes/layout/css.html
+++ b/pages/_includes/layout/css.html
@@ -6,8 +6,8 @@
{% endif %}
-
+
-
-
+
+
diff --git a/pages/_includes/layout/homepage.html b/pages/_includes/layout/homepage.html
index 289d9dcf8a847ee7183e47cf3b9b33e5161a0c8d..7c5670502b39a2c9bbacbe1071bfc8777ebe84f4 100644
--- a/pages/_includes/layout/homepage.html
+++ b/pages/_includes/layout/homepage.html
@@ -6,47 +6,11 @@
{% include cards/charts/revenue.html %}
-
-
-
-
New clients
-
- {% include parts/dropdown/days.html %}
-
-
-
-
6,782
-
- 5% {% include ui/icon.html icon="trending-down" class="icon-thin" %}
-
-
-
-
- {% include js/charts.html id="chart-active-users" chart-id="new-clients" %}
-
-
+ {% include cards/charts/new-clients.html %}
-
-
-
-
Active users
-
- {% include parts/dropdown/days.html %}
-
-
-
-
2,986
-
- 4% {% include ui/icon.html icon="trending-up" class="icon-thin" %}
-
-
-
-
- {% include js/charts.html id="chart-active-users2" chart-id="active-users" %}
-
-
+ {% include cards/charts/active-users.html %}
@@ -73,21 +37,26 @@
{% include cards/map.html title="Top users" %}
-
- {% include cards/charts/card.html name="temperature" title="A" height=12 %}
-
-
- {% include cards/charts/card.html name="donut" title="B" height=12 %}
+
+ {% include cards/development-activity.html %}
-
- {% include cards/charts/card.html name="pie" title="C" height=12 %}
+
+
+
+ {% include cards/charts/card.html chart-id="temperature" height=10 %}
+
+
+ {% include cards/charts/card.html chart-id="donut" height=10 %}
+
+
{% comment %}
-
- {% comment %}{% include cards/development-activity.html %}{% endcomment %}
+
+ {% include cards/order-statistics.html %}
+
diff --git a/pages/_includes/layout/js.html b/pages/_includes/layout/js.html
index 928740860aa4c9e80aec1682b3e3d1b2d47f8ee7..aaaddb1cac37888cbe569b4e0a88ae44fba62524 100644
--- a/pages/_includes/layout/js.html
+++ b/pages/_includes/layout/js.html
@@ -16,3 +16,7 @@
+
+{% removeemptylines %}
+{{ site.capture_global.scripts }}
+{% endremoveemptylines %}
diff --git a/pages/_includes/js/charts.html b/pages/_includes/ui/chart.html
similarity index 83%
rename from pages/_includes/js/charts.html
rename to pages/_includes/ui/chart.html
index 56cff6889717fdabec34bea316099fd512fb1b20..f629620bb15e5644d1ac92b27f5b83c3a41beabd 100644
--- a/pages/_includes/js/charts.html
+++ b/pages/_includes/ui/chart.html
@@ -1,14 +1,16 @@
-{% capture_global scripts %}
-{% removeemptylines %}
{% assign data = site.data.charts[include.chart-id] %}
+{% assign id = include.id | default: include.chart-id %}
+{% assign height = include.height %}
{% if data %}
+
+{% capture_global scripts %}
-{% endif %}
-{% endremoveemptylines %}
{% endcapture_global %}
+{% endif %}
diff --git a/pages/_includes/ui/map.html b/pages/_includes/ui/map.html
index e6ad76b9b4f16313989ae5c48b895ff07118f346..cf82165a1e56f4c2e94644764643f51ceb127ede 100644
--- a/pages/_includes/ui/map.html
+++ b/pages/_includes/ui/map.html
@@ -1,4 +1,4 @@
-{% assign id = include.map %}
+{% assign id = include.map-id %}
{% assign height = include.height | default: 20 %}
{% assign data = site.data.maps[id] %}
{% assign color = include.color | default: data.color | default: 'green' %}
@@ -7,8 +7,10 @@
{% capture_global scripts %}