diff options
| -rwxr-xr-x | drakwizard.pl | 16 | ||||
| -rw-r--r-- | server_wizard/server.wiz | 21 |
2 files changed, 19 insertions, 18 deletions
diff --git a/drakwizard.pl b/drakwizard.pl index 57ca28a5..09c31065 100755 --- a/drakwizard.pl +++ b/drakwizard.pl @@ -103,9 +103,9 @@ sub display { my $valeur; my @liste; my @data = map { - #for ($_->{fillScript}) { - # system("source $lib_script ; $_->{fillScript}"); - # } + for ($_->{fillScript}) { + system("source $lib_script ; $_->{fillScript}"); + } if($_->{main_order} eq 'combo'){ if($_->{fillScript}){ $valeur = `$_->{fillScript}`; @@ -154,18 +154,18 @@ sub navigation { find_page($o, $page->{jumpPage}), $page->{old_page}; } } - elsif ($page->{jumpScript}) { + elsif($page->{jumpScript}) { system("source $lib_script ; $page->{jumpScript}"); if ($page->{Target}->{jumpIndex}) { $? = $? >> 8; find_page($o, $page->{Target}->{jumpIndex}->{$?}), $page; - } - elsif ($page->{jumpPage}) { - find_page($o, $page->{jumpPage}), $page->{old_page}; + } + else { + $page->{next_page}, $page->{old_page}; } } else { - $page->{next_page}, $page->{old_page}; + $page->{next_page}, $page; } }; navigation($o, $next, $prev); diff --git a/server_wizard/server.wiz b/server_wizard/server.wiz index d497aa4f..fda3ccd3 100644 --- a/server_wizard/server.wiz +++ b/server_wizard/server.wiz @@ -115,7 +115,7 @@ <Target targetName="Warning" - jumpIndex="10" + jumpIndex="0" > </Target> @@ -178,6 +178,7 @@ helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-basics.html" executionLevel="NORMAL" nextFinish="false" + jumpPage="Note" canBack="true" canCancel="true" > @@ -261,7 +262,7 @@ <Page name="Note" helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-basics.html" - jumpScript="__WIZ_HOME__/server_wizard/check_config.sh" + jumpScript="__WIZ_HOME__/server_wizard/scripts/check_config.sh" executionLevel="NORMAL" nextFinish="false" canBack="true" @@ -398,7 +399,7 @@ <Page name="ask_hostname" helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-basics.html" - jumpScript="__WIZ_HOME__/server_wizard/check_domain.sh" + jumpScript="__WIZ_HOME__/server_wizard/scripts/check_domain.sh" executionLevel="NORMAL" nextFinish="false" canBack="true" @@ -581,7 +582,7 @@ <Page name="choose_net_device" helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-basics.html" - jumpScript="__WIZ_HOME__/server_wizard/set_ip.sh" + jumpScript="__WIZ_HOME__/server_wizard/scripts/set_ip.sh" executionLevel="NORMAL" nextFinish="false" canBack="true" @@ -656,7 +657,7 @@ name="deviceChooser" variableName="net_device" alignement="Fill" - fillScript="__WIZ_HOME__/server_wizard/liste_device.sh" + fillScript="__WIZ_HOME__/server_wizard/scripts/liste_device.sh" helpText="Device:" helpFontName="Default" helpFontStyle="plain" @@ -745,7 +746,7 @@ name="domainnameField" variableName="domainname" alignement="Fill" - fillScript="__WIZ_HOME__/server_wizard/compute_domain.sh" + fillScript="__WIZ_HOME__/server_wizard/scripts/compute_domain.sh" helpText="Computed domain Name" guiType="textfield" inputType="any" @@ -790,7 +791,7 @@ <Page name="ask_network_address" helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-basics.html" - jumpScript="__WIZ_HOME__/server_wizard/check_network.sh" + jumpScript="__WIZ_HOME__/server_wizard/scripts/check_network.sh" executionLevel="NORMAL" nextFinish="false" canBack="true" @@ -888,7 +889,7 @@ name="freetext2" variableName="network_address" alignement="Fill" - fillScript="__WIZ_HOME__/server_wizard/compute_ipnet.sh" + fillScript="__WIZ_HOME__/server_wizard/scripts/compute_ipnet.sh" helpText="IP net address:" guiType="textfield" inputType="ip" @@ -982,7 +983,7 @@ name="freetext3" variableName="server_address" alignement="Fill" - fillScript="__WIZ_HOME__/server_wizard/compute_server_ip.sh" + fillScript="__WIZ_HOME__/server_wizard/scripts/compute_server_ip.sh" guiType="textfield" inputType="any" editable="false" @@ -1053,7 +1054,7 @@ <Page name="ask_server_address" helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-basics.html" - jumpScript="__WIZ_HOME__/server_wizard/check_server_ip.sh" + jumpScript="__WIZ_HOME__/server_wizard/scripts/check_server_ip.sh" executionLevel="NORMAL" nextFinish="false" canBack="true" |