diff --git a/plugins/CoreHome/javascripts/dataTable_rowactions.js b/plugins/CoreHome/javascripts/dataTable_rowactions.js index ac8554593ee1f01fce2a7bc96f859f578a862ba5..004e27e3b67694e7da304620e92911baf81e2a85 100644 --- a/plugins/CoreHome/javascripts/dataTable_rowactions.js +++ b/plugins/CoreHome/javascripts/dataTable_rowactions.js @@ -360,7 +360,7 @@ DataTable_RowActions_RowEvolution.prototype.showRowEvolution = function (apiMeth if (self.dataTable !== null) { // remember label for multi row evolution - box.find('a.rowevolution-startmulti').click(function () { + box.find('.rowevolution-startmulti').click(function () { Piwik_Popover.onClose(false); // unbind listener that resets multiEvolutionRows Piwik_Popover.close(); return false; diff --git a/plugins/CoreHome/templates/getMultiRowEvolutionPopover.twig b/plugins/CoreHome/templates/getMultiRowEvolutionPopover.twig index a43d282492933686b0f0caab2072f136304b1272..f6851d976d1bf22098d05187efb9be2961d44bc3 100644 --- a/plugins/CoreHome/templates/getMultiRowEvolutionPopover.twig +++ b/plugins/CoreHome/templates/getMultiRowEvolutionPopover.twig @@ -23,7 +23,7 @@ </tr> {% endfor %} </table> - <a href="#" class="rowevolution-startmulti">» {{ 'RowEvolution_PickAnotherRow'|translate }}</a> + <button type="button" class="rowevolution-startmulti">{{ 'RowEvolution_PickAnotherRow'|translate }}</button> </div> {% if availableMetrics|length > 1 %} <div class="metric-selectbox"> diff --git a/plugins/CoreHome/templates/getRowEvolutionPopover.twig b/plugins/CoreHome/templates/getRowEvolutionPopover.twig index 5a86f7a101bb789329e99c2099e8670484e7e0e1..84f711102086844ad45ef0f5f2c63f0df1bf7c5b 100644 --- a/plugins/CoreHome/templates/getRowEvolutionPopover.twig +++ b/plugins/CoreHome/templates/getRowEvolutionPopover.twig @@ -7,7 +7,7 @@ <div class="metrics-container"> <h2>{{ availableMetricsText|raw }}</h2> - <div class="rowevolution-documentation"> + <div class="alert alert-info"> {{ 'RowEvolution_Documentation'|translate }} </div> <table class="metrics" border="0" cellpadding="0" cellspacing="0" data-thing="{{ seriesColorCount }}"> @@ -31,9 +31,9 @@ <div class="compare-container"> <h2>{{ 'RowEvolution_CompareRows'|translate }}</h2> - <div class="rowevolution-documentation"> + <div class="alert alert-info"> {{ 'RowEvolution_CompareDocumentation'|translate|raw }} </div> - <a href="#" class="rowevolution-startmulti">» {{ 'RowEvolution_PickARow'|translate }}</a> + <button type="button" class="rowevolution-startmulti">{{ 'RowEvolution_PickARow'|translate }}</button> </div> </div> diff --git a/plugins/CoreVisualizations/stylesheets/jqplot.css b/plugins/CoreVisualizations/stylesheets/jqplot.css index 25b6535f5c9a6bb99bd072f6e98e9106dba13421..8c5610c7a8cac721062749710965cbf19b48f39d 100644 --- a/plugins/CoreVisualizations/stylesheets/jqplot.css +++ b/plugins/CoreVisualizations/stylesheets/jqplot.css @@ -185,17 +185,6 @@ padding: 0; } -a.rowevolution-startmulti { - font-size: 12px; - color: #7E7363; - font-weight: bold; - text-decoration: none; -} - -a.rowevolution-startmulti:hover { - color: #444; -} - /** * SERIES PICKER FOR CHARTS */ @@ -258,4 +247,4 @@ a.rowevolution-startmulti:hover { .jqplot-seriespicker-popover p.pickColumn, .jqplot-seriespicker-popover p.pickRow { cursor: pointer; -} \ No newline at end of file +} diff --git a/plugins/Morpheus/stylesheets/general/_typography.less b/plugins/Morpheus/stylesheets/general/_typography.less index 03a6814950ae034914ef86bfebfcdd2e21d4b1c3..7c154787232b1605bc99f981d2af60adc17a9f0e 100644 --- a/plugins/Morpheus/stylesheets/general/_typography.less +++ b/plugins/Morpheus/stylesheets/general/_typography.less @@ -85,10 +85,6 @@ a { color: @theme-color-link; } -a.rowevolution-startmulti { - color: @theme-color-link !important; -} - .Piwik_Popover_Loading_Subject { color: @theme-color-link !important; } diff --git a/tests/UI/specs/RowEvolution_spec.js b/tests/UI/specs/RowEvolution_spec.js index 9214ee69b6c12b966f7f956f5e1aa9f899199248..c6942fd71422757d36ee994868e9a040db9f06dd 100644 --- a/tests/UI/specs/RowEvolution_spec.js +++ b/tests/UI/specs/RowEvolution_spec.js @@ -39,7 +39,7 @@ describe("RowEvolution", function () { it('should load multi-row evolution correctly', function (done) { expect.screenshot('multirow_evolution').to.be.captureSelector('.ui-dialog', function (page) { - page.click('a.rowevolution-startmulti'); + page.click('.rowevolution-startmulti'); page.mouseMove('tbody tr:nth-child(2)'); page.mouseMove('a.actionRowEvolution:visible'); page.click('a.actionRowEvolution:visible'); @@ -62,4 +62,4 @@ describe("RowEvolution", function () { page.click('a.actionRowEvolution:visible'); }, done); }); -}); \ No newline at end of file +});