Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenaka <diosmosis@users.noreply.github.com>2018-03-22 11:17:22 +0300
committerMatthieu Aubry <mattab@users.noreply.github.com>2018-03-22 11:17:22 +0300
commit4ed366ae6ec2697c525943395499b3dcb51dc2aa (patch)
tree604e0c3fd73d27600a0f57f2baa8c95a2d7c7353 /plugins/Ecommerce
parentf9e283f274ceb0d5a697a7059a13eb7f851277ea (diff)
Recreating #12628: "Use flex for sparkline text instead of block" - @fdellwing (#12633)
* repush #12466 * dont allow the sparkline to shrink * remove unneeded css * Add -ms-flex to sparkline trigger correct display in IE10. * update screenshots
Diffstat (limited to 'plugins/Ecommerce')
-rw-r--r--plugins/Ecommerce/templates/getSparklines.twig19
1 files changed, 17 insertions, 2 deletions
diff --git a/plugins/Ecommerce/templates/getSparklines.twig b/plugins/Ecommerce/templates/getSparklines.twig
index 17e6c880fd..67dc12d006 100644
--- a/plugins/Ecommerce/templates/getSparklines.twig
+++ b/plugins/Ecommerce/templates/getSparklines.twig
@@ -1,6 +1,7 @@
<div class="card"><div class="card-content">
<div id='leftcolumn' style="clear:both;{% if not isWidget %}width:33%;'{% endif %}">
<div class="sparkline">{{ sparkline(urlSparklineConversions) }}
+ <div>
<strong>{{ nb_conversions|number }}</strong>
{{ 'General_EcommerceOrders'|translate }}
<img src='plugins/Morpheus/images/ecommerceOrder.png'>
@@ -8,26 +9,34 @@
{% if goalAllowMultipleConversionsPerVisit is defined and goalAllowMultipleConversionsPerVisit %}
({{ 'General_NVisits'|translate("<strong>"~nb_visits_converted~"</strong>")|raw }})
{% endif %}
+ </div>
</div>
<div class="sparkline">
{{ sparkline(urlSparklineRevenue) }}
+ <div>
{% set revenue=revenue|money(idSite) %}
<strong>{{ revenue|raw }}</strong> {{ 'General_TotalRevenue'|translate }}
+ </div>
</div>
<div class="sparkline">{{ sparkline(urlSparklineAverageOrderValue) }}
+ <div>
<strong>{{ avg_order_revenue|money(idSite)|raw }}</strong>
{{ 'General_AverageOrderValue'|translate }}
+ </div>
</div>
</div>
<div id='leftcolumn' {% if not isWidget %}style='width:33%;'{% endif %}>
<div class="sparkline">{{ sparkline(urlSparklineConversionRate) }}
+ <div>
{% set ecommerceOrdersText %}{{ 'General_EcommerceOrders'|translate }}{% endset %}
{{ 'Goals_ConversionRate'|translate("<strong>"~conversion_rate|percent~"</strong> "~ecommerceOrdersText)|raw }}
+ </div>
</div>
<div class="sparkline">{{ sparkline(urlSparklinePurchasedProducts) }}
- <strong>{{ items|number }}</strong> {{ 'General_PurchasedProducts'|translate }}</div>
+ <div>
+ <strong>{{ items|number }}</strong> {{ 'General_PurchasedProducts'|translate }}</div></div>
</div>
<div id='rightcolumn' {% if not isWidget %}style='width:30%;'{% endif %}>
<div>
@@ -36,23 +45,29 @@
<div class="sparkline">
{{ sparkline(cart_urlSparklineConversions) }}
+ <div>
{% set ecommerceAbandonedCartsText %}{{ 'Goals_AbandonedCart'|translate }}{% endset %}
<strong>{{ cart_nb_conversions|number }}</strong> {{ 'General_VisitsWith'|translate(ecommerceAbandonedCartsText) }}
+ </div>
</div>
<div class="sparkline">
{{ sparkline(cart_urlSparklineRevenue) }}
+ <div>
{% set revenue %}{{ cart_revenue|money(idSite)|raw }}{% endset %}
{% set revenueText %}{{ 'General_ColumnRevenue'|translate }}{% endset %}
<strong>{{ revenue }}</strong> {{ 'Goals_LeftInCart'|translate(revenueText) }}
+ </div>
</div>
<div class="sparkline">
{{ sparkline(cart_urlSparklineConversionRate) }}
+ <div>
<strong>{{ cart_conversion_rate|percent }}</strong>
{{ 'General_VisitsWith'|translate(ecommerceAbandonedCartsText) }}
+ </div>
</div>
</div>
<div style="clear: left;"></div>
{% include "_sparklineFooter.twig" %}
- </div></div> \ No newline at end of file
+ </div></div>