diff options
| author | Fabian Becker <halfdan@xnorfz.de> | 2013-04-29 16:47:52 +0400 |
|---|---|---|
| committer | Fabian Becker <halfdan@xnorfz.de> | 2013-04-29 16:47:52 +0400 |
| commit | b62473e57e1d236bed0a9d4d13f54cf51f55cdc9 (patch) | |
| tree | 09f62f2469305882f742803418605f4c8cb6fa77 /plugins/MultiSites | |
| parent | 7bcfa61a8f5044500c8f20620a4159f6bc7398f5 (diff) | |
| parent | 8af5f6443c82e404b9b7855d5978a299bb13d905 (diff) | |
Merge branch 'master' into 2.x-twig
Conflicts:
core/ReportRenderer/Html.php
plugins/Annotations/templates/annotations.js
plugins/CoreHome/templates/header.tpl
plugins/CoreHome/templates/index_content.tpl
plugins/CoreHome/templates/period_select.tpl
plugins/Goals/templates/list_goal_edit.tpl
plugins/MultiSites/templates/index.tpl
plugins/PDFReports/templates/report_parameters.tpl
Diffstat (limited to 'plugins/MultiSites')
| -rw-r--r-- | plugins/MultiSites/templates/common.js | 2 | ||||
| -rw-r--r-- | plugins/MultiSites/templates/index.twig | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/MultiSites/templates/common.js b/plugins/MultiSites/templates/common.js index 29439401d0..15c8aade97 100644 --- a/plugins/MultiSites/templates/common.js +++ b/plugins/MultiSites/templates/common.js @@ -132,7 +132,7 @@ function switchEvolution(params) { $('.visits').hide(); $('.' + params['evolutionBy']).show(); sitesVisible = params['sitesVisible']; - for (i = 0; i < allSites.length; i++) { + for (var i = 0; i < allSites.length; i++) { $('#sparkline_' + allSites[i].idsite).html(getSparklineImg(allSites[i].idsite, params['evolutionBy'], params)); } } diff --git a/plugins/MultiSites/templates/index.twig b/plugins/MultiSites/templates/index.twig index c46fa2f78a..370aa05176 100644 --- a/plugins/MultiSites/templates/index.twig +++ b/plugins/MultiSites/templates/index.twig @@ -8,8 +8,8 @@ <div id="main"> {% include "@MultiSites/row.twig" with row %} <script type="text/javascript"> - var allSites = new Array(); - var params = new Array(); + var allSites = []; + var params = []; {% for i,site in sitesData %} allSites[{{ i }}] = new setRowData({{ site.idsite }}, {{ site.visits }}, |