diff --git a/install/index.php b/install/index.php index e6f19a8916..083efd4bc6 100644 --- a/install/index.php +++ b/install/index.php @@ -161,7 +161,7 @@ if (isset_request_var('step') && get_filter_request_var('step') > 0) { /* upgrade - if user runs old version send to upgrade-oldversion*/ $step = 9; }else{ - $step = 4; + $step = 7; } break; case '9': @@ -648,6 +648,9 @@ $enabled = '1'; print '
' . __('Note that when upgrading, you only will recieve the Upgrade selection.') . '
'; + print '' . __('You have three Cacti installation options to choose from:') . '
'; print '- -
'; + if ($default_install_type == '3') { + print '+ +
'; + }else{ + print '+ +
'; + } if ($default_install_type == '3') { print '' . __('WARNING - If you are upgrading from a previous version please close all Cacti browser sessions and clear cache before continuing') . '
'; @@ -764,6 +774,7 @@ $enabled = '1'; $('#test').hide(); $('#results').html(''); $('#next').button('enable'); + $('#next').val(''); break; case '2': $('#local_database').show(); @@ -779,6 +790,7 @@ $enabled = '1'; } $('#next').button('disable'); + $('#next').val(''); break; case '3': @@ -787,6 +799,7 @@ $enabled = '1'; $('#test').hide(); $('#results').html(''); $('#next').button('enable'); + $('#next').val(''); break; } }).change(); @@ -1000,7 +1013,9 @@ $enabled = '1'; /* upgrade */ }elseif ($step == '8') { - print '' . __('Upgrade results:') . '
'; + print '' . __('You Cacti database has been upgraded. You can view the results below.') . '
'; $current_version = ''; $upgrade_results = ''; @@ -1082,6 +1097,8 @@ $(function() { $('#next').button('disable'); }else if (step == 1) { $('#next').button('disable'); + }else if (step == 8) { + $('#next').val('Finish'); }else if (step == 5 && install_type == 2) { $('#next').val('Finish'); }else if (step == 6 && install_type == 1) {