From b85051a44df416fe54c24282c97e80bce4c86f00 Mon Sep 17 00:00:00 2001
From: age <bagel@systemausfall.org>
Date: Fri, 26 Jan 2007 22:23:02 +0000
Subject: [PATCH] * more fieldsets + corresponding lang/help changes *
 partition ui is still missing

---
 plugins/volume_details/language.hdf           |  2 +
 plugins/volume_details/volume_details.cs      | 12 +++-
 plugins/volume_format_fs/language.hdf         |  2 +
 plugins/volume_format_fs/volume_format.cs     | 58 ++++++++++++++-----
 .../volume_format_fs/volume_format_luks.cs    | 11 +++-
 5 files changed, 64 insertions(+), 21 deletions(-)

diff --git a/plugins/volume_details/language.hdf b/plugins/volume_details/language.hdf
index 7d08b4b..cd78a80 100644
--- a/plugins/volume_details/language.hdf
+++ b/plugins/volume_details/language.hdf
@@ -3,6 +3,8 @@ Link	= Details
 
 Title.Details	= Technical details
 
+Help.Details = Here are some deep technical details. You'll mostly need them in case you are confused with your volumes.
+
 Text {
 	DeviceName	= Name of device
 	Status	= Status
diff --git a/plugins/volume_details/volume_details.cs b/plugins/volume_details/volume_details.cs
index 49b621b..4bb2a1a 100644
--- a/plugins/volume_details/volume_details.cs
+++ b/plugins/volume_details/volume_details.cs
@@ -1,9 +1,13 @@
-<?cs # $Id$ ?>
-
-<<?cs var:plugin_heading ?>><?cs var:html_escape(Lang.Plugins.volume_details.Title.Details) ?></<?cs var:plugin_heading ?>>
+<!-- <?cs # $Id$ ?>
+<<?cs var:plugin_heading ?>><?cs var:html_escape(Lang.Plugins.volume_details.Title.Details) ?></<?cs var:plugin_heading ?>> -->
 
 <?cs call:handle_messages() ?>
 
+<fieldset>
+<legend><?cs var:html_escape(Lang.Plugins.volume_details.Title.Details) ?> </legend>
+
+<?cs call:show_help(Lang.Plugins.volume_details.Help.Details) ?>
+
 <ul>
 	<li><?cs var:html_escape(Lang.Text.ContainerName) ?>: <?cs var:html_escape(Data.CurrentDisk.name) ?></li>
 	<li><?cs var:html_escape(Lang.Plugins.volume_details.Text.DeviceName) ?>: <?cs var:html_escape(Data.CurrentDisk.device) ?></li>
@@ -16,3 +20,5 @@
 	<?cs /if ?>
 </ul>
 
+</fieldset>
+
diff --git a/plugins/volume_format_fs/language.hdf b/plugins/volume_format_fs/language.hdf
index df74277..3d27ca1 100644
--- a/plugins/volume_format_fs/language.hdf
+++ b/plugins/volume_format_fs/language.hdf
@@ -16,9 +16,11 @@ Text {
 
 Help {
 	Format	= Usually you will only have to format a volume if you want to turn encryption on or off. Be aware, that you will erase all data from this volume.
+	LuksFormat = In the last step you have choosen encryption for this volume. Now you have to enter a corresponding password.
 	Filesystem	= Use a filesystem of your choice. The linux filesystem (ext3) should be a good choice. The windows filesystem (Fat32) is only useful, if you plan to connect your harddisk directly to a computer running the windows operating system.
 	Encryption	= Enable encryption if you want to keep your data private. You have to enter the password to open an encrypted container. Be aware that your encrypted data is accessible for your local network. Close it, whenever you do not need it anymore.
 	Password	= Please choose a very good password consisting of letters, digits and special characters. There is no minimal length required, but you should not use less than ten characters. Twenty or more are recommended.
+	Confirm = Don't forget to confirm your action with this checkbox. Nothing happens otherwise.
 }
 
 
diff --git a/plugins/volume_format_fs/volume_format.cs b/plugins/volume_format_fs/volume_format.cs
index 30cf993..bda6d19 100644
--- a/plugins/volume_format_fs/volume_format.cs
+++ b/plugins/volume_format_fs/volume_format.cs
@@ -1,7 +1,10 @@
-<<?cs var:plugin_heading ?>><?cs var:html_escape(Lang.Plugins.volume_format_fs.Title.Format) ?></<?cs var:plugin_heading ?>>
+<!-- <<?cs var:plugin_heading ?>><?cs var:html_escape(Lang.Plugins.volume_format_fs.Title.Format) ?></<?cs var:plugin_heading ?>> -->
 
 <?cs call:handle_messages() ?>
 
+<fieldset>
+<legend><?cs var:html_escape(Lang.Plugins.volume_format_fs.Title.Format) ?> </legend>
+
 <?cs call:show_help(Lang.Plugins.volume_format_fs.Help.Format) ?>
 
 <?cs if:Data.CurrentDisk.active ?>
@@ -11,26 +14,49 @@
 	<?cs call:hint("Plugins.volume_format_fs.FormatWarning") ?>
 
 	<?cs call:print_form_header("set_type", "volume_format_fs") ?>
-		<?cs call:show_help(Lang.Plugins.volume_format_fs.Help.Filesystem) ?>
-		<p><label for="fs_type"><?cs var:html_escape(Lang.Plugins.volume_format_fs.Text.FSType)
-			?>: </label><select name="fs_type" id="fs_type" size="0">
+	<table border="0">
+	<tr>
+	</tr><tr>
+		<td>
+			<label for="fs_type"><?cs var:html_escape(Lang.Plugins.volume_format_fs.Text.FSType)
+			?>: </label>
+		</td>
+		<td>
+			<select name="fs_type" id="fs_type" size="0">
 				<?cs each:x = Data.Plugins.volume_format_fs.fs_types ?>
 					<option <?cs if:x == "windows" ?>selected="selected"<?cs /if ?>><?cs var:html_escape(x) ?></option><?cs /each ?>
-				</select></p>
-
-		<?cs call:show_help(Lang.Plugins.volume_format_fs.Help.Encryption) ?>
-		<p><label for="container_type"><?cs var:html_escape(Lang.Plugins.volume_format_fs.Text.IsEncrypted)
-		?>: </label><select name="container_type" id="container_type">
+				</select>
+		</td>
+		<td><?cs call:show_help(Lang.Plugins.volume_format_fs.Help.Filesystem) ?></td>
+	</tr>
+	<tr>
+	</tr><tr>
+		<td>
+			<p><label for="container_type"><?cs var:html_escape(Lang.Plugins.volume_format_fs.Text.IsEncrypted)
+		?>: </label>
+		</td>
+		<td>
+			<select name="container_type" id="container_type">
 			<option value="luks" <?cs if:Data.Plugins.volume_format_fs.container_type != "plain" ?>selected="selected"<?cs /if ?>><?cs var:html_escape(Lang.Plugins.volume_format_fs.Text.Yes) ?></option>
 			<option value="plain" <?cs if:Data.Plugins.volume_format_fs.container_type == "plain" ?>selected="selected"<?cs /if ?>><?cs var:html_escape(Lang.Plugins.volume_format_fs.Text.No) ?></option>
-		</select></p>
-
-		<p><input type="checkbox" name="confirm" value="1" id="confirm" /><label for="confirm"><?cs var:html_escape(Lang.Plugins.volume_format_fs.Text.Confirm) ?></label></p>
-
-		<p><input type="hidden" name="device" value="<?cs var:Data.CurrentDisk.device ?>" />
-		<input type="hidden" name="store" value="step1" />
-		<button type="submit"><?cs var:html_escape(Lang.Plugins.volume_format_fs.Button.Format) ?></button></p>
+			</select>
+		</td>
+		<td><?cs call:show_help(Lang.Plugins.volume_format_fs.Help.Encryption) ?></td>
+	</tr><tr>
+		<td colspan="2">
+			<input type="checkbox" name="confirm" value="1" id="confirm" /><label for="confirm"><?cs var:html_escape(Lang.Plugins.volume_format_fs.Text.Confirm) ?></label>
+			<input type="hidden" name="device" value="<?cs var:Data.CurrentDisk.device ?>" />
+			<input type="hidden" name="store" value="step1" />
+		</td>
+		<td><?cs call:show_help(Lang.Plugins.volume_format_fs.Help.Confirm) ?></td>
+	</tr><tr>
+		<td colspan="3">	
+			<button type="submit"><?cs var:html_escape(Lang.Plugins.volume_format_fs.Button.Format) ?></button>
+		</td>
+	</tr>
 	</form>
+	</table>
 
 <?cs /if ?>
+</fieldset>
 
diff --git a/plugins/volume_format_fs/volume_format_luks.cs b/plugins/volume_format_fs/volume_format_luks.cs
index da40121..ac7a6dd 100644
--- a/plugins/volume_format_fs/volume_format_luks.cs
+++ b/plugins/volume_format_fs/volume_format_luks.cs
@@ -1,9 +1,15 @@
-<?cs # $Id$ ?>
+<!-- <?cs # $Id$ ?>
 
-<<?cs var:plugin_heading ?>><?cs var:html_escape(Lang.Plugins.volume_format_fs.Title.Format) ?></<?cs var:plugin_heading ?>>
+	<<?cs var:plugin_heading ?>><?cs var:html_escape(Lang.Plugins.volume_format_fs.Title.Format) ?></<?cs var:plugin_heading ?>> -->
 
 <?cs call:handle_messages() ?>
 
+<fieldset>
+<legend><?cs var:html_escape(Lang.Plugins.volume_format_fs.Title.Format) ?> </legend>
+
+<?cs call:show_help(Lang.Plugins.volume_format_fs.Help.LuksFormat) ?>
+
+
 <?cs if:Data.CurrentDisk.active ?>
 	<?cs call:hint("Plugins.volume_format_fs.UnmountBeforeInit") ?>
 <?cs else ?>
@@ -27,4 +33,5 @@
 	</form>
 
 <?cs /if ?>
+</fieldset>