changed image path

1 files changed, 1 insertions, 265 deletions

diff --git a/firewall_wizard/firewall.wiz b/firewall_wizard/firewall.wiz
index 077fe54b..ba689abd 100644
--- a/firewall_wizard/firewall.wiz
+++ b/firewall_wizard/firewall.wiz
@@ -6,14 +6,7 @@
 	libScript="__WIZ_HOME__/common/scripts/functions.sh"
 	wizardTitle="Firewall wizard"
 	imagePosition="top"
-	defaultImage="images/firewall.jpg"
-	height="400"
-	width="525"
-	hasDb="true"
-	dbPositions="2"
-	dbFilename="/var/log/wizards/firewall.wdb"
-	referenceLength="425"
-	referenceHeight="13"
+	defaultImage="__WIZ_HOME__/firewall_wizard/images/firewall"
 	perlModule="__WIZ_HOME__/firewall_wizard/scripts/FWconf.pm"
 >
 
@@ -22,9 +15,6 @@
 		comment="The firewall protection  level"
 		shellVariable="wiz_firewall_level"
 		defaultValue="1"
-		persistent="true"
-		dbPosition="0"
-		key="false"
 	>
 	</Variable>
 
@@ -33,9 +23,6 @@
 		comment="The device for the firewall connection"
 		shellVariable="wiz_ext_device"
 		defaultValue="eth0"
-		persistent="true"
-		dbPosition="1"
-		key="false"
 	>
 	</Variable>
 
@@ -68,45 +55,18 @@
 		</Target>
 
 		<Info
-			name="welcomeTitle"
-			alignement="Center"
 			helpText="Firewall Configuration Wizard"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info7"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info1"
-			alignement="Center"
 			helpText="The firewall protects your internal network from unauthorized accesses from the Internet."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info3"
-			alignement="Center"
 			helpText="This wizard will help you configuring your server firewall."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -123,16 +83,8 @@
 		<Freetext
 			name="freetext2"
 			variableName="protectionLevel"
-			alignement="Center"
 			fillScript="get_var wiz_firewall_level"
-			guiType="textfield"
 			editable="true"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 	</Page>
@@ -147,62 +99,25 @@
 	>
 
 		<Info
-			name="hostnameTitile"
-			alignement="Center"
 			helpText="Protection Level"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info8"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info9"
-			alignement="East"
 			helpText="The firewall can be configured to offer different levels of protection; choose the level that corresponds to your needs.  If you don't know, the Medium level is usually the most appropriate."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info4"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Chooser
 			name="chooser1"
 			variableName="protectionLevel"
-			alignement="Center"
 			defaultOptionScript="echo $wiz_firewall_level"
 			helpFontName="Default"
 			helpFontStyle="plain"
 			helpFontSize="12"
 			editable="false"
-			guiType="checkbox"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
 		>
 
 			<Option
@@ -254,51 +169,20 @@
 		</Target>
 
 		<Info
-			name="deviceLabel"
-			alignement="Center"
 			helpText="Firewall Network Device"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info11"
-			alignement="East"
 			helpText="The firewall need to know how your server is connected to Internet; choose the device you are using for the external connection."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info12"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Chooser
 			name="deviceChooser"
 			variableName="firewallDevice"
-			alignement="Fill"
 			defaultOptionScript="__WIZ_HOME__/firewall_wizard/compute_ext_device.sh"
 			fillScript="__WIZ_HOME__/firewall_wizard/liste_ext_device.sh"
 			helpText="Device"
@@ -306,12 +190,6 @@
 			helpFontStyle="plain"
 			helpFontSize="12"
 			editable="true"
-			guiType="list"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
 		>
 		</Chooser>
 	</Page>
@@ -328,13 +206,7 @@
 	>
 
 		<Info
-			name="deviceErrorMessage"
-			alignement="Center"
 			helpText="The device name is not correct"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -363,98 +235,37 @@
 		</Target>
 
 		<Info
-			name="doitTitle"
-			alignement="Center"
 			helpText="Configuring the Firewall"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info14"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="doneLabel"
-			alignement="East"
 			helpText="The wizard collected the following parameters
 needed to configure your firewall:"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="cancelLabel"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Freetext
 			name="freetext"
-			alignement="Fill"
 			fillScript="__WIZ_HOME__/firewall_wizard/compute_level_name.sh"
 			helpText="Protection Level:"
-			guiType="textfield"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
 		<Freetext
 			name="freetext1"
 			variableName="firewallDevice"
-			alignement="Fill"
 			helpText="Internet Network Device:"
-			guiType="textfield"
 			editable="false"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="11"
-			proportional="2"
-			ratio="30"
-			length="40"
 		>
 		</Freetext>
 
-		<Info
-			name="info17"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info18"
-			alignement="East"
 			helpText="To accept these values, and configure your server, click on \qConfigure\q or use the Back button to correct them."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -470,34 +281,13 @@ needed to configure your firewall:"
 	>
 
 		<Info
-			name="doneTitile"
-			alignement="Center"
 			helpText="Congratulations"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info16"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="successLabel"
-			alignement="Center"
 			helpText="The wizard successfully configured your server firewall."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
@@ -514,13 +304,7 @@ needed to configure your firewall:"
 	>
 
 		<Info
-			name="catastrophe_text"
-			alignement="Center"
 			helpText="Something terrible happened"
-			guiType="label"
-			fontName="Default"
-			fontStyle="italic"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -537,13 +321,7 @@ needed to configure your firewall:"
 	>
 
 		<Info
-			name="root_error_message"
-			alignement="Center"
 			helpText="This Wizard need to run as root"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 	</Page>
@@ -559,66 +337,24 @@ needed to configure your firewall:"
 	>
 
 		<Info
-			name="errorLabel"
-			alignement="Center"
 			helpText="Network not configured yet"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
 
-		<Info
-			name="info23"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
-		>
-		</Info>
 
 		<Info
-			name="info22"
-			alignement="Center"
 			helpText="You have to configure the basic network parameters before launch this wizard."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
 		<Info
-			name="info25"
-			alignement="Center"
 			helpText="Press next to configure these parameters now, or Cancel to exit this wizard."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 
-		<Info
-			name="info26"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
 
 		<Info
-			name="info24"
-			alignement="Center"
 			helpText="If you choose to configure now, you will automatically continue with the DNS configuration"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>