Fixed error in installation

This commit is contained in:
Arturo Gonzalez 2017-03-07 12:07:48 +01:00
parent c50fd249be
commit 121b57650f
2 changed files with 14 additions and 13 deletions

View File

@ -419,7 +419,7 @@ function install_step1_licence() {
echo file_get_contents ("COPYING");
echo "</textarea>";
echo "<p>";
echo "<div style='text-align: right;'><button class='btn_install_next' type='submit'>Yes, I accept licence terms</button></div>";
echo "<div style='text-align: right;'><button id='btn_accept' class='btn_install_next' type='submit'>Yes, I accept licence terms</button></div>";
}
echo "</div>";
@ -490,17 +490,17 @@ function install_step2() {
modules.
</div>
<div style='text-align:right; width:100%;'>
Ignore it. <a href='install.php?step=3' style='font-weight: bolder;'><button class='btn_install_next' type='submit'>Force install Step #3</button></a>
Ignore it. <a id='step3' href='install.php?step=3' style='font-weight: bolder;'><button class='btn_install_next' type='submit'>Force install Step #3</button></a>
</div>";
}
else {
echo "<div style='text-align:right; width:100%;'>";
echo "<a id='step3' href='install.php?step=3'><br>
echo "<a id='step3' href='install.php?step=3'>
<button class='btn_install_next' type='submit'>Next</button></a>";
echo "</div>";
echo "<div style='clear: both;'><!-- --></div>";
}
echo "</div>";
echo "<div style='clear: both;'><!-- --></div>";
echo "
</div>
<div style='clear: both;'><!-- --></div>
@ -636,7 +636,7 @@ function install_step3() {
if (!$error) {
echo "<div style='text-align:right; width:100%;'>";
echo "<a id='step4' href='install.php?step=4'><br>
echo "<a id='step4' href='install.php?step=4'>
<button class='btn_install_next' type='submit'>Next</button></a>";
echo "</div>";
}
@ -896,9 +896,10 @@ function install_step4() {
echo "</table>";
if ($everything_ok == 1) {
echo "<div style='text-align:right; width:100%;'>";
echo "<a id='step5' href='install.php?step=5'>
<button class='btn_install_next' type='submit'>Next</button></a>";
echo "</div>";
echo "<div style='margin-top: 20px;'><a id='step5' href='install.php?step=5'>
<img align='right' src='images/arrow_next.png' border='0' alt=''></a></div>";
}
else {
$info = "<div class='err'><b>There were some problems.
@ -936,7 +937,7 @@ function install_step4() {
}
echo "</div>";
}
echo "</div>";
echo "<div style='clear: both;'></div>";
echo "
</div>

View File

@ -16,17 +16,17 @@ browser.get('http://localhost/pandora_console/install.php')
assert("Pandora FMS - Installation Wizard" in browser.title)
# Accept the license agreement.
browser.find_element_by_xpath("//*[@id='step11']/img").click()
browser.find_element_by_xpath("//*[@id='install_box']/form/div/input").click()
browser.find_element_by_xpath("//*[@id='step11']").click()
browser.find_element_by_xpath("//*[@id='btn_accept']").click()
# Fill-in the configuration form.
browser.find_element_by_xpath("//*[@id='step3']/img").click()
browser.find_element_by_xpath("//*[@id='step3']").click()
browser.find_element_by_name("pass").send_keys("pandora")
browser.find_element_by_id("step4").click()
browser.find_element_by_xpath("//*[@id='step4']").click()
# Complete the installation.
browser.implicitly_wait(300) # The installation is going to take a long time.
browser.find_element_by_xpath("//*[@id='step5']/img").click()
browser.find_element_by_xpath("//*[@id='step5']").click()
browser.implicitly_wait(5)
assert("Installation complete" in browser.page_source)
browser.find_element_by_name("rn_file").click()