From ea169ca8b57d6daa6b3e8fbb04fe8829e4cf5c60 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Wed, 24 Jun 2015 15:07:14 +0200
Subject: [PATCH] Fix the buttons in the installation
---
plugins/Installation/Controller.php | 2 +-
plugins/Installation/FormDatabaseSetup.php | 2 +-
plugins/Installation/FormFirstWebsiteSetup.php | 2 +-
plugins/Installation/FormSuperUser.php | 2 +-
tests/UI/specs/Installation_spec.js | 14 +++++++-------
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
index 43a40c7feb..7352a0df6e 100644
--- a/plugins/Installation/Controller.php
+++ b/plugins/Installation/Controller.php
@@ -403,7 +403,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
*/
Piwik::postEvent('Installation.defaultSettingsForm.init', array($form));
- $form->addElement('submit', 'submit', array('value' => Piwik::translate('General_ContinueToPiwik') . ' 禄', 'class' => 'submit'));
+ $form->addElement('submit', 'submit', array('value' => Piwik::translate('General_ContinueToPiwik') . ' 禄', 'class' => 'btn btn-lg'));
if ($form->validate()) {
try {
diff --git a/plugins/Installation/FormDatabaseSetup.php b/plugins/Installation/FormDatabaseSetup.php
index 78b586bd41..b2a4c0cf47 100644
--- a/plugins/Installation/FormDatabaseSetup.php
+++ b/plugins/Installation/FormDatabaseSetup.php
@@ -73,7 +73,7 @@ class FormDatabaseSetup extends QuickForm2
->loadOptions($adapters)
->addRule('required', Piwik::translate('General_Required', Piwik::translate('Installation_DatabaseSetupAdapter')));
- $this->addElement('submit', 'submit', array('value' => Piwik::translate('General_Next') . ' 禄', 'class' => 'submit btn btn-lg'));
+ $this->addElement('submit', 'submit', array('value' => Piwik::translate('General_Next') . ' 禄', 'class' => 'btn btn-lg'));
// default values
$this->addDataSource(new HTML_QuickForm2_DataSource_Array(array(
diff --git a/plugins/Installation/FormFirstWebsiteSetup.php b/plugins/Installation/FormFirstWebsiteSetup.php
index 2705e236fc..a542d6b534 100644
--- a/plugins/Installation/FormFirstWebsiteSetup.php
+++ b/plugins/Installation/FormFirstWebsiteSetup.php
@@ -61,7 +61,7 @@ class FormFirstWebsiteSetup extends QuickForm2
1 => Piwik::translate('SitesManager_EnableEcommerce'),
));
- $this->addElement('submit', 'submit', array('value' => Piwik::translate('General_Next') . ' 禄', 'class' => 'submit btn btn-lg'));
+ $this->addElement('submit', 'submit', array('value' => Piwik::translate('General_Next') . ' 禄', 'class' => 'btn btn-lg'));
// default values
$this->addDataSource(new HTML_QuickForm2_DataSource_Array(array(
diff --git a/plugins/Installation/FormSuperUser.php b/plugins/Installation/FormSuperUser.php
index fa8328ef49..b8c0565299 100644
--- a/plugins/Installation/FormSuperUser.php
+++ b/plugins/Installation/FormSuperUser.php
@@ -65,7 +65,7 @@ class FormSuperUser extends QuickForm2
),
));
- $this->addElement('submit', 'submit', array('value' => Piwik::translate('General_Next') . ' 禄', 'class' => 'submit btn btn-lg'));
+ $this->addElement('submit', 'submit', array('value' => Piwik::translate('General_Next') . ' 禄', 'class' => 'btn btn-lg'));
// default values
$this->addDataSource(new HTML_QuickForm2_DataSource_Array(array(
diff --git a/tests/UI/specs/Installation_spec.js b/tests/UI/specs/Installation_spec.js
index c3681dca65..653852f3cc 100644
--- a/tests/UI/specs/Installation_spec.js
+++ b/tests/UI/specs/Installation_spec.js
@@ -59,7 +59,7 @@ describe("Installation", function () {
it("should fail when the next button is clicked and no database info is entered in the form", function (done) {
expect.screenshot("db_setup_fail").to.be.capture(function (page) {
- page.click('.submit');
+ page.click('.btn');
}, done);
});
@@ -76,7 +76,7 @@ describe("Installation", function () {
}
page.sendKeys('input[name=dbname]', 'newdb');
- page.click('.submit');
+ page.click('.btn');
}, done);
});
@@ -88,7 +88,7 @@ describe("Installation", function () {
it("should fail when incorrect information is entered in the superuser configuration page", function (done) {
expect.screenshot("superuser_fail").to.be.capture(function (page) {
- page.click('.submit');
+ page.click('.btn');
}, done);
});
@@ -98,14 +98,14 @@ describe("Installation", function () {
page.sendKeys('input[name=password]', 'thepassword');
page.sendKeys('input[name=password_bis]', 'thepassword');
page.sendKeys('input[name=email]', 'hello@piwik.org');
- page.click('.submit');
+ page.click('.btn');
page.wait(3000);
}, done);
});
it("should should fail when incorrect information is entered in the setup a website page", function (done) {
expect.screenshot("setup_website_fail").to.be.capture(function (page) {
- page.click('.submit');
+ page.click('.btn');
}, done);
});
@@ -117,7 +117,7 @@ describe("Installation", function () {
$('select[name=timezone]').val('Europe/Paris');
$('select[name=ecommerce]').val('1');
});
- page.click('.submit');
+ page.click('.btn');
page.wait(3000);
}, done);
});
@@ -130,7 +130,7 @@ describe("Installation", function () {
it("should continue to piwik after submitting on the privacy settings form in the congrats page", function (done) {
expect.screenshot('login_form', 'Login').to.be.capture(function (page) {
- page.click('.submit');
+ page.click('.btn');
}, done);
});
});
\ No newline at end of file
--
GitLab