diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2015-10-15 16:43:35 +0300 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2015-10-15 16:43:35 +0300 |
| commit | bb80b8f831e10f037c8d2722c9967943defef95e (patch) | |
| tree | 3ce0a28cb1d15148cd15d48b83a39e0c92bf38b8 /plugins/Goals | |
| parent | 713a124cc2c118697f3f2801679bc0e2bb5c5dc3 (diff) | |
| parent | 1e139be2c8c3c6f974e740dd1c9f905e8f673f98 (diff) | |
Merge branch 'master' into 3.0
Conflicts:
CHANGELOG.md
core/Plugin/Controller.php
core/Version.php
plugins/API/ProcessedReport.php
plugins/CoreHome/CoreHome.php
plugins/CoreHome/javascripts/corehome.js
plugins/CoreHome/javascripts/menu.js
plugins/CoreHome/javascripts/menu_init.js
plugins/CoreHome/lang/en.json
plugins/CoreHome/stylesheets/zen-mode.less
plugins/CoreHome/templates/ReportsByDimension/_reportsByDimension.twig
plugins/CoreHome/templates/_indexContent.twig
plugins/CoreHome/templates/getDefaultIndexView.twig
plugins/Dashboard/Menu.php
plugins/Dashboard/javascripts/dashboard.js
plugins/Dashboard/javascripts/dashboardObject.js
plugins/Goals/templates/_titleAndEvolutionGraph.twig
plugins/Goals/templates/getOverviewView.twig
plugins/Morpheus/javascripts/piwikHelper.js
plugins/Referrers/templates/index.twig
plugins/UserCountry/templates/index.twig
plugins/VisitFrequency/templates/_sparklines.twig
plugins/ZenMode/ZenMode.php
plugins/ZenMode/javascripts/zen-mode.js
tests/PHPUnit/Fixtures/UITestFixture.php
tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
tests/UI/expected-ui-screenshots
tests/UI/specs/Dashboard_spec.js
tests/UI/specs/Menus_spec.js
tests/UI/specs/UIIntegration_spec.js
Diffstat (limited to 'plugins/Goals')
| -rw-r--r-- | plugins/Goals/Categories/GoalsCategory.php | 1 | ||||
| -rw-r--r-- | plugins/Goals/templates/_listTopDimension.twig | 4 | ||||
| -rw-r--r-- | plugins/Goals/templates/manageGoals.twig | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/plugins/Goals/Categories/GoalsCategory.php b/plugins/Goals/Categories/GoalsCategory.php index 7ba4b4df58..043a51fd0b 100644 --- a/plugins/Goals/Categories/GoalsCategory.php +++ b/plugins/Goals/Categories/GoalsCategory.php @@ -14,4 +14,5 @@ class GoalsCategory extends Category { protected $id = 'Goals_Goals'; protected $order = 25; + protected $icon = 'icon-reporting-goal'; } diff --git a/plugins/Goals/templates/_listTopDimension.twig b/plugins/Goals/templates/_listTopDimension.twig index 8de4594f58..2d63e077b5 100644 --- a/plugins/Goals/templates/_listTopDimension.twig +++ b/plugins/Goals/templates/_listTopDimension.twig @@ -1,8 +1,8 @@ {% for element in topDimension %} {% set goal_nb_conversion=element.nb_conversions %} {% set goal_conversion_rate=element.conversion_rate %} - <span class='goalTopElement' title='{{ 'Goals_Conversions'|translate("<b>"~goal_nb_conversion~"</b>")|raw }}, - {{ 'Goals_ConversionRate'|translate("<b>"~goal_conversion_rate~"</b>")|raw }}'> + <span class='goalTopElement' title='{{ 'Goals_Conversions'|translate("<b>"~goal_nb_conversion|number~"</b>")|raw }}, + {{ 'Goals_ConversionRate'|translate("<b>"~goal_conversion_rate|number~"</b>")|raw }}'> {{ element.name }} </span> diff --git a/plugins/Goals/templates/manageGoals.twig b/plugins/Goals/templates/manageGoals.twig index 4e3a4ce855..72124faf72 100644 --- a/plugins/Goals/templates/manageGoals.twig +++ b/plugins/Goals/templates/manageGoals.twig @@ -2,6 +2,10 @@ {% set title %}{{ 'Goals_ManageGoals'|translate }}{% endset %} +{% block topcontrols %} + {% include "@CoreHome/_siteSelectHeader.twig" %} +{% endblock %} + {% block content %} <h2 piwik-enriched-headline> @@ -20,8 +24,6 @@ {{ title }} </h2> - {% include "@CoreHome/_siteSelectHeader.twig" %} - {% include "@Goals/_addEditGoal.twig" %} <style type="text/css"> |