diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2014-10-09 07:18:32 +0400 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2014-10-09 07:18:32 +0400 |
| commit | c89189697b9cd17a5c2df0f3794b12f5cb681655 (patch) | |
| tree | 083f6375b6a2005531effb42e053693d08c04f2f /plugins/CoreVisualizations | |
| parent | afb1cb7b7ec20bf3c0213e2fcd8680a85686c6ff (diff) | |
| parent | cf2f71f36ffa139aec60a219aeb3748af66f477e (diff) | |
Merge branch 'master' into 5940_testRenamingAndCorrectFolders
Conflicts:
tests/PHPUnit/phpunit.xml.dist
Diffstat (limited to 'plugins/CoreVisualizations')
| -rw-r--r-- | plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig index 13c153f89c..f6fe938c6a 100644 --- a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig +++ b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig @@ -18,7 +18,8 @@ {% else %} {%- for rowId, row in dataTable.getRows() -%} {%- set rowHasSubtable = not subtablesAreDisabled and row.getIdSubDataTable() and properties.subtable_controller_action is not null -%} - {%- set shouldHighlightRow = rowId == constant('Piwik\\DataTable::ID_SUMMARY_ROW') and properties.highlight_summary_row -%} + {%- set isSummaryRow = rowId == constant('Piwik\\DataTable::ID_SUMMARY_ROW') -%} + {%- set shouldHighlightRow = isSummaryRow and properties.highlight_summary_row -%} {# display this row if it doesn't have a subtable or if we don't replace the row with the subtable #} {%- set showRow = subtablesAreDisabled @@ -28,7 +29,7 @@ {% if showRow %} <tr {% if rowHasSubtable %}id="{{ row.getIdSubDataTable() }}"{% endif %} - class="{{ row.getMetadata('css_class') }} {% if rowHasSubtable %}subDataTable{% endif %}{% if shouldHighlightRow %} highlight{% endif %}" + class="{{ row.getMetadata('css_class') }} {% if rowHasSubtable %}subDataTable{% endif %}{% if shouldHighlightRow %} highlight{% endif %}{% if isSummaryRow %} summaryRow{% endif %}" {% if rowHasSubtable %}title="{{ 'CoreHome_ClickRowToExpandOrContract'|translate }}"{% endif %}> {% for column in properties.columns_to_display %} <td> |