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:
authorThomas Steur <tsteur@users.noreply.github.com>2022-03-08 21:32:22 +0300
committerGitHub <noreply@github.com>2022-03-08 21:32:22 +0300
commit05397a2a7a3c0cb5ae73e64ca2f5f8cc0ff7cbdc (patch)
tree95747cc432b5462170e9e75bc632e72e59196ba2 /plugins/Live/templates
parent7237107cd8dae5595dc6caa5abd8f52512a988c0 (diff)
Apply max execution query time to Live.getCounters API and queryAdjacentVisitorId method (#18852)
Diffstat (limited to 'plugins/Live/templates')
-rw-r--r--plugins/Live/templates/_totalVisitors.twig8
-rw-r--r--plugins/Live/templates/getSimpleLastVisitCount.twig3
2 files changed, 6 insertions, 5 deletions
diff --git a/plugins/Live/templates/_totalVisitors.twig b/plugins/Live/templates/_totalVisitors.twig
index 665617e926..70e37b3c77 100644
--- a/plugins/Live/templates/_totalVisitors.twig
+++ b/plugins/Live/templates/_totalVisitors.twig
@@ -16,13 +16,13 @@
<tbody>
<tr class="">
<td class="label column">{{ 'Live_LastHours'|translate(24) }}</td>
- <td class="column">{{ visitorsCountToday|number }}</td>
- <td class="column">{{ pisToday|number }}</td>
+ <td class="column" {% if countErrorToday %}title="{{ countErrorToday|e('html_attr') }}"{% endif %}>{{ visitorsCountToday|number }}</td>
+ <td class="column" {% if countErrorToday %}title="{{ countErrorToday|e('html_attr') }}"{% endif %}>{{ pisToday|number }}</td>
</tr>
<tr class="">
<td class="label column">{{ 'Live_LastMinutes'|translate(30) }}</td>
- <td class="column">{{ visitorsCountHalfHour|number }}</td>
- <td class="column">{{ pisHalfhour|number }}</td>
+ <td class="column" {% if countErrorHalfHour %}title="{{ countErrorHalfHour|e('html_attr') }}"{% endif %}>{{ visitorsCountHalfHour|number }}</td>
+ <td class="column" {% if countErrorHalfHour %}title="{{ countErrorHalfHour|e('html_attr') }}"{% endif %}>{{ pisHalfhour|number }}</td>
</tr>
</tbody>
</table>
diff --git a/plugins/Live/templates/getSimpleLastVisitCount.twig b/plugins/Live/templates/getSimpleLastVisitCount.twig
index 8f167544eb..3d4fd53600 100644
--- a/plugins/Live/templates/getSimpleLastVisitCount.twig
+++ b/plugins/Live/templates/getSimpleLastVisitCount.twig
@@ -3,6 +3,7 @@
<div>{{ visitors }}</div>
</div>
<br/>
+ {% if error is not empty %}<div class="alert alert-danger">{{ error }}</div>{% endif %}
<div class='simple-realtime-elaboration'>
{% set visitsMessage %}
@@ -18,4 +19,4 @@
{{ 'Live_SimpleRealTimeWidget_Message'|translate(visitsMessage,actionsMessage,minutesMessage) | raw }}
</div>
</div>
-<script type="text/javascript">$(document).ready(function () {require('piwik/Live').initSimpleRealtimeVisitorWidget();});</script> \ No newline at end of file
+<script type="text/javascript">$(document).ready(function () {require('piwik/Live').initSimpleRealtimeVisitorWidget();});</script>