Skip to content
Extraits de code Groupes Projets
Valider 3feca422 rédigé par Matthieu Napoli's avatar Matthieu Napoli
Parcourir les fichiers

Use standard buttons and alerts instead of and old icons and custom CSS

parent a9cf57ac
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -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;
......
......@@ -23,7 +23,7 @@
</tr>
{% endfor %}
</table>
<a href="#" class="rowevolution-startmulti">&raquo; {{ 'RowEvolution_PickAnotherRow'|translate }}</a>
<button type="button" class="rowevolution-startmulti">{{ 'RowEvolution_PickAnotherRow'|translate }}</button>
</div>
{% if availableMetrics|length > 1 %}
<div class="metric-selectbox">
......
......@@ -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">&raquo; {{ 'RowEvolution_PickARow'|translate }}</a>
<button type="button" class="rowevolution-startmulti">{{ 'RowEvolution_PickARow'|translate }}</button>
</div>
</div>
......@@ -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
}
......@@ -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;
}
......
......@@ -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
});
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter