From 4d61bfbe7765f033cbf602909186113dac291cdb Mon Sep 17 00:00:00 2001
From: lars <lars@systemausfall.org>
Date: Thu, 14 Dec 2006 01:34:07 +0000
Subject: [PATCH] improved some minor layout stuff

---
 debian/changelog                               | 6 ++++++
 plugins/volume_format_fs/volume_format.cs      | 4 ++--
 plugins/volume_format_fs/volume_format_luks.cs | 3 +--
 src/cryptobox/__init__.py                      | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 78e6633..59c518f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cryptobox (0.2.58-1) unstable; urgency=low
+
+  * fixed small layout bug
+
+ -- Lars Kruse <devel@sumpfralle.de>  Thu, 14 Dec 2006 01:57:05 +0100
+
 cryptobox (0.2.57-1) unstable; urgency=low
 
   * added some documentation
diff --git a/plugins/volume_format_fs/volume_format.cs b/plugins/volume_format_fs/volume_format.cs
index 9796978..30cf993 100644
--- a/plugins/volume_format_fs/volume_format.cs
+++ b/plugins/volume_format_fs/volume_format.cs
@@ -3,8 +3,6 @@
 <?cs call:handle_messages() ?>
 
 <?cs call:show_help(Lang.Plugins.volume_format_fs.Help.Format) ?>
-<?cs call:show_help(Lang.Plugins.volume_format_fs.Help.Filesystem) ?>
-<?cs call:show_help(Lang.Plugins.volume_format_fs.Help.Encryption) ?>
 
 <?cs if:Data.CurrentDisk.active ?>
 	<?cs call:hint("Plugins.volume_format_fs.UnmountBeforeInit") ?>
@@ -13,12 +11,14 @@
 	<?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">
 				<?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">
 			<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>
diff --git a/plugins/volume_format_fs/volume_format_luks.cs b/plugins/volume_format_fs/volume_format_luks.cs
index eefebde..da40121 100644
--- a/plugins/volume_format_fs/volume_format_luks.cs
+++ b/plugins/volume_format_fs/volume_format_luks.cs
@@ -4,8 +4,6 @@
 
 <?cs call:handle_messages() ?>
 
-<?cs call:show_help(Lang.Plugins.volume_format_fs.Help.Password) ?>
-
 <?cs if:Data.CurrentDisk.active ?>
 	<?cs call:hint("Plugins.volume_format_fs.UnmountBeforeInit") ?>
 <?cs else ?>
@@ -18,6 +16,7 @@
 			var:html_escape(Lang.Plugins.volume_format_fs.Text.Yes) ?><?cs else ?><?cs
 			var:html_escape(Lang.Plugins.volume_format_fs.Text.No) ?><?cs /if ?></p>
 
+		<?cs call:show_help(Lang.Plugins.volume_format_fs.Help.Password) ?>
 		<p><label for="crypto_password"><?cs var:html_escape(Lang.Text.EnterNewPassword) ?>: </label> <input type="password" id="crypto_password" name="crypto_password" /></p>
 		<p><label for="crypto_password2"><?cs var:html_escape(Lang.Text.EnterSamePassword) ?>: </label> <input type="password" id="crypto_password2" name="crypto_password2" /></p>
 		<p><input type="hidden" name="device" value="<?cs var:Data.CurrentDisk.device ?>" />
diff --git a/src/cryptobox/__init__.py b/src/cryptobox/__init__.py
index 18feb78..54a6643 100644
--- a/src/cryptobox/__init__.py
+++ b/src/cryptobox/__init__.py
@@ -10,5 +10,5 @@ __all__ = ['core', 'web', 'plugins', 'tests']
 __revision__ = "$Id$"
 
 
-__version__ = "0.2.56"
+__version__ = "0.2.58"