wiz update, nfs fixed

2 files changed, 2 insertions, 80 deletions

diff --git a/time_wizard/scripts/NTPConf.pm b/time_wizard/scripts/NTPConf.pm
index 77a5576c..fb37b8a6 100644
--- a/time_wizard/scripts/NTPConf.pm
+++ b/time_wizard/scripts/NTPConf.pm
@@ -25,14 +25,6 @@ use MDK::Common;
 use strict;
 use standalone;
 
-sub	chooser {
-    if ($ENV{chooser1} eq "local") {
-	do_it();
-	return 1;
-    }
-    2;
-}
-
 sub	chooser4 {
     if ($ENV{chooser4} eq "save_quit") {
 	do_it();
diff --git a/time_wizard/time.wiz b/time_wizard/time.wiz
index 889e0b29..65a3e05a 100644
--- a/time_wizard/time.wiz
+++ b/time_wizard/time.wiz
@@ -9,6 +9,7 @@
 	defaultImage="__WIZ_HOME__/time_wizard/images/Time"
 	perlModule="__WIZ_HOME__/time_wizard/scripts/NTPConf.pm"
 	rpm="ntp"
+	summaryFunc="do_it"
 >
 
 	<Variable
@@ -55,13 +56,12 @@
 		name="welcome"
 		executionLevel="NORMAL"
 		nextFinish="false"
-		jumpPage="choice_setting"
 		canBack="true"
 		canCancel="true"
 	>
 
 		<Info
-			helpText="This wizard will help you to set the time of your server, either locally or synchronized with an external time server."
+			helpText="This wizard will help you to set the time of your server synchronized with an external time server."
 		>
 		</Info>
 
@@ -78,72 +78,6 @@
 
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-time.html"
-		name="choice_setting"
-		func="chooser"
-		executionLevel="NORMAL"
-		nextFinish="false"
-		canBack="true"
-		canCancel="true"
-	>
-		<Target
-			targetName="ciao"
-			jumpIndex="1"
-		>
-		</Target>
-
-		<Target
-			targetName="choose_server"
-			jumpIndex="2"
-		>
-		</Target>
-
-		<Info
-			helpText="Type of setting"
-		>
-		</Info>
-
-
-		<Info
-			helpText="You can set the time of your machine in two ways: Locally means that the setting will simply set the system clock, without synchronizing with the external world."
-		>
-		</Info>
-
-		<Info
-			helpText="If you use a time server, your machine will ask from that server the correct time."
-		>
-		</Info>
-
-
-		<Info
-			helpText="Which kind of setting would you like to do?"
-		>
-		</Info>
-
-
-		<Chooser
-			name="chooser1"
-			variableName="chooser1"
-			helpFontName="Default"
-			helpFontStyle="bold"
-			helpFontSize="14"
-			editable="false"
-		>
-
-			<Option
-				value="local"
-				description="Local time setting"
-			>
-			</Option>
-
-			<Option
-				value="internet"
-				description="Internet time setting (external time server)"
-			>
-			</Option>
-		</Chooser>
-	</Page>
-	<Page
-		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-time.html"
 		name="choose_server"
 		executionLevel="NORMAL"
 		nextFinish="false"
@@ -172,12 +106,8 @@
 			name="chooserserver1"
 			variableName="varserver1"
 			helpText="Primary Time Server:"
-			helpFontName="Default"
-			helpFontStyle="plain"
-			helpFontSize="12"
 			editable="true"
 		>
-
 			<Option
 				value="bernina.ethz.ch"
 				description="Swiss Fed. Inst. of Technology"