diff options
| author | Thomas Steur <tsteur@users.noreply.github.com> | 2016-11-27 22:17:55 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-27 22:17:55 +0300 |
| commit | f6a67af29558eb32b500ede0bbcbeb8b139c53b2 (patch) | |
| tree | 18484e791374024cf2da0bf3d61fd5e8cd71ce07 /plugins/CoreVisualizations/templates | |
| parent | 5a2a0e4dd41f64a01e3427739d7594881d7ac2d7 (diff) | |
Minor tweaks and events in Goals UI (#10903)
* added some goal events
* add new method to be able to add post params
* post events via angular
* make sure promo message is always shown at the end
* .travis.yml file is out of date, auto-updating .travis.yml file.
* improve sparklines view and make goals page hookable
* .travis.yml file is out of date, auto-updating .travis.yml file.
* .travis.yml file is out of date, auto-updating .travis.yml file.
* fix system tests
* make sure each goal has an id in the table so we can target them
Diffstat (limited to 'plugins/CoreVisualizations/templates')
| -rw-r--r-- | plugins/CoreVisualizations/templates/_dataTableViz_sparklines.twig | 12 | ||||
| -rw-r--r-- | plugins/CoreVisualizations/templates/macros.twig | 5 |
2 files changed, 12 insertions, 5 deletions
diff --git a/plugins/CoreVisualizations/templates/_dataTableViz_sparklines.twig b/plugins/CoreVisualizations/templates/_dataTableViz_sparklines.twig index b0e29cc26a..5c8390d914 100644 --- a/plugins/CoreVisualizations/templates/_dataTableViz_sparklines.twig +++ b/plugins/CoreVisualizations/templates/_dataTableViz_sparklines.twig @@ -13,7 +13,7 @@ {% for key, sparkline in sparklines %} {% if key is even %} - {{ macros.singleSparkline(sparkline, allMetricsDocumentation) }} + {{ macros.singleSparkline(sparkline, allMetricsDocumentation, areSparklinesLinkable) }} {% endif %} {% endfor %} @@ -25,7 +25,7 @@ {% for key, sparkline in sparklines %} {% if key is odd %} - {{ macros.singleSparkline(sparkline, allMetricsDocumentation) }} + {{ macros.singleSparkline(sparkline, allMetricsDocumentation, areSparklinesLinkable) }} {% endif %} {% endfor %} @@ -36,7 +36,13 @@ </div> {% endif %} - {% include "_sparklineFooter.twig" %} + {% if areSparklinesLinkable %} + {% include "_sparklineFooter.twig" %} + {% endif %} + + {% if footerMessage is not empty %} + <div class='datatableFooterMessage'>{{ footerMessage | raw }}</div> + {% endif %} {% if not isWidget %} </div></div> {% endif %}
\ No newline at end of file diff --git a/plugins/CoreVisualizations/templates/macros.twig b/plugins/CoreVisualizations/templates/macros.twig index 43d8c2158e..ad9212978a 100644 --- a/plugins/CoreVisualizations/templates/macros.twig +++ b/plugins/CoreVisualizations/templates/macros.twig @@ -1,5 +1,6 @@ -{% macro singleSparkline(sparkline, allMetricsDocumentation) %} - <div class="sparkline"> +{% macro singleSparkline(sparkline, allMetricsDocumentation, areSparklinesLinkable) %} + + <div class="sparkline {% if areSparklinesLinkable is defined and not areSparklinesLinkable %}notLinkable{% endif %}"> {% if sparkline.url %}{{ sparkline(sparkline.url)|raw }}{% endif %} {% for metric in sparkline.metrics %} <span {% if allMetricsDocumentation[metric.column] is defined and allMetricsDocumentation[metric.column] %}title="{{ allMetricsDocumentation[metric.column] }}"{% endif %}> |