From a5e6e03351722149469971a19fc45d34072a09ea Mon Sep 17 00:00:00 2001
From: age <bagel@systemausfall.org>
Date: Fri, 26 Jan 2007 08:42:32 +0000
Subject: [PATCH] * unified the mount layout * small text enhancements; typo

---
 plugins/encrypted_webinterface/language.hdf |  2 +-
 plugins/volume_mount/language.hdf           | 15 +++++---
 plugins/volume_mount/volume_mount.cs        | 41 +++++++++++++++------
 plugins/volume_mount/volume_umount.cs       | 14 +++++--
 plugins/volume_rename/volume_rename.cs      | 20 +++++++---
 5 files changed, 64 insertions(+), 28 deletions(-)

diff --git a/plugins/encrypted_webinterface/language.hdf b/plugins/encrypted_webinterface/language.hdf
index 32c4452..5f62bf7 100644
--- a/plugins/encrypted_webinterface/language.hdf
+++ b/plugins/encrypted_webinterface/language.hdf
@@ -20,7 +20,7 @@ EnvironmentWarning {
 
 	MissingProgramStunnel {
 		Title	= Missing program
-		Text	= The program 'stunnel' is not installed. Please ask the administrator tof the CryptoBox server to configure it properly.
+		Text	= The program 'stunnel' is not installed. Please ask the administrator of the CryptoBox server to configure it properly.
 	}
 }
 
diff --git a/plugins/volume_mount/language.hdf b/plugins/volume_mount/language.hdf
index b6e91ff..44b2917 100644
--- a/plugins/volume_mount/language.hdf
+++ b/plugins/volume_mount/language.hdf
@@ -3,20 +3,23 @@ Link	= Activation
 
 
 Title {
-	Mount	= Opening a volume
-	Umount	= Closing a volume
+	Mount	= Activation	
+	Umount	= Deactivation
 }
 
+Text {
+	EnterCurrentPassword = Volume's encryption password
+}
 
 Button {
-	Mount	= Open volume
-	Umount	= Close volume
+	Mount	= Open this volume
+	Umount	= Close this volume
 }
 
 
 Help {
-	Open	= The volume is currently closed. If you open the volume, then you will be able to access the data of this volume. Just search in your network environment for the server and browse through its shares.
-	Close	= Currently the volume is open. All files are accessible for everyone who has access to your local network. Just search in your network environment for the server and browse through its shares. Before you close the volume you should quit all programs with open files on it.
+	Open	= This volume is currently closed. If you open the volume, then you will be able to access the data of this volume. Just search in your network environment for the server and browse through its shares. In case the volume is encrypted you have to enter the corresponding password first.
+	Close	= This volume is currently open. All files are accessible for everyone who has access to your local network. Just search in your network environment for the server and browse through its shares. Before you close the volume you should quit all programs with open files on it.
 }
 
 
diff --git a/plugins/volume_mount/volume_mount.cs b/plugins/volume_mount/volume_mount.cs
index a7f8547..42d3969 100644
--- a/plugins/volume_mount/volume_mount.cs
+++ b/plugins/volume_mount/volume_mount.cs
@@ -1,20 +1,37 @@
-<<?cs var:plugin_heading ?>><?cs var:html_escape(Lang.Plugins.volume_mount.Title.Mount) ?></<?cs var:plugin_heading ?>>
+<!-- <<?cs var:plugin_heading ?>>
+<?cs var:html_escape(Lang.Plugins.volume_mount.Title.Mount) ?> 
+</<?cs var:plugin_heading ?>> -->
 
 <?cs call:handle_messages() ?>
 
 <?cs call:show_help(Lang.Plugins.volume_mount.Help.Open) ?>
 
+<fieldset>
+<legend><?cs var:html_escape(Lang.Plugins.volume_mount.Title.Mount) ?>
+
+</legend>
 <?cs call:print_form_header("mount", "volume_mount") ?><p>
-	<input type="hidden" name="device" value="<?cs var:html_escape(Data.CurrentDisk.device) ?>" />
-	<?cs if:Data.CurrentDisk.encryption ?>
-		<input type="hidden" name="action" value="mount_luks" />
-	<?cs else ?>
-		<input type="hidden" name="action" value="mount_plain" />
-	<?cs /if ?>
-	<?cs if:Data.CurrentDisk.encryption ?>
-		<label for="pw"><?cs var:html_escape(Lang.Text.EnterCurrentPassword) ?>: </label>
-		<input type="password" tabindex="1" id="pw" name="pw" size="20" maxlength="60" />
-	<?cs /if ?>
-	<button type="submit" tabindex="2"><?cs var:html_escape(Lang.Plugins.volume_mount.Button.Mount) ?></button>
+	<table>
+		<tr>
+			<td>
+				<input type="hidden" name="device" value="<?cs var:html_escape(Data.CurrentDisk.device) ?>" />
+				<?cs if:Data.CurrentDisk.encryption ?>
+					<input type="hidden" name="action" value="mount_luks" />
+				<?cs else ?>
+					<input type="hidden" name="action" value="mount_plain" />
+				<?cs /if ?>
+			</td>
+			<?cs if:Data.CurrentDisk.encryption ?>
+			<td>
+				<label for="pw"><?cs var:html_escape(Lang.Plugins.volume_mount.Text.EnterCurrentPassword) ?>: </label>
+			</td><td>	
+				<input type="password" tabindex="1" id="pw" name="pw" size="20" maxlength="60" />
+			</td>
+			<?cs /if ?>
+			<td>
+				<button type="submit" tabindex="2"><?cs var:html_escape(Lang.Plugins.volume_mount.Button.Mount) ?></button>
+			</td>
+		</tr>
+	</table>
 </p></form>
 
diff --git a/plugins/volume_mount/volume_umount.cs b/plugins/volume_mount/volume_umount.cs
index dd11792..4c41a04 100644
--- a/plugins/volume_mount/volume_umount.cs
+++ b/plugins/volume_mount/volume_umount.cs
@@ -1,12 +1,18 @@
-<<?cs var:plugin_heading ?>><?cs var:html_escape(Lang.Plugins.volume_mount.Title.Umount) ?></<?cs var:plugin_heading ?>>
+<!-- <<?cs var:plugin_heading ?>><?cs var:html_escape(Lang.Plugins.volume_mount.Title.Umount) ?></<?cs var:plugin_heading ?>> -->
 
+<fieldset>
+<legend><?cs var:html_escape(Lang.Plugins.volume_mount.Title.Umount) ?>
+
+</legend>
 <?cs call:handle_messages() ?>
 
 <?cs call:show_help(Lang.Plugins.volume_mount.Help.Close) ?>
 
 <?cs call:print_form_header("umount", "volume_mount") ?>
-	<p><input type="hidden" name="device" value="<?cs var:html_escape(Data.CurrentDisk.device) ?>" />
+	<p><table><tr><td>
+		<input type="hidden" name="device" value="<?cs var:html_escape(Data.CurrentDisk.device) ?>" />
 	   <input type="hidden" name="action" value="umount" />
-	<button type="submit" tabindex="2"><?cs var:html_escape(Lang.Plugins.volume_mount.Button.Umount) ?></button></p>
+	<button type="submit" tabindex="2"><?cs var:html_escape(Lang.Plugins.volume_mount.Button.Umount) ?></button>
+	</td></tr></table></p>
 </form>
-
+</fieldset>
diff --git a/plugins/volume_rename/volume_rename.cs b/plugins/volume_rename/volume_rename.cs
index fb1d6c7..c0f9600 100644
--- a/plugins/volume_rename/volume_rename.cs
+++ b/plugins/volume_rename/volume_rename.cs
@@ -10,11 +10,21 @@
 	<?cs call:hint("Plugins.volume_rename.NoRenameIfActive") ?>
 <?cs else ?>
 	<?cs call:print_form_header("set_name", "volume_rename") ?>
-			<p><label for="vol_name"><?cs var:html_escape(Lang.Text.ContainerName) ?>: </label>
-			<input type="text" name="vol_name" tabindex="10" size="15" id="vol_name" value="<?cs var:html_escape(Data.CurrentDisk.name) ?>" />
-			<input type="hidden" name="device" value="<?cs var:html_escape(Data.CurrentDisk.device) ?>" />
-			<input type="hidden" name="store" value="set_name" />
-			<button type="submit" tabindex="11"><?cs var:html_escape(Lang.Plugins.volume_rename.Button.ContainerNameSet) ?></button></p>
+		<table>
+			<tr>
+				<td>
+					<label for="vol_name"><?cs var:html_escape(Lang.Text.ContainerName) ?>: </label>
+				<input type="text" name="vol_name" tabindex="10" size="15" id="vol_name" value="<?cs var:html_escape(Data.CurrentDisk.name) ?>" />
+				</td>
+				<td>
+					<input type="hidden" name="device" value="<?cs var:html_escape(Data.CurrentDisk.device) ?>" />
+					<input type="hidden" name="store" value="set_name" />
+				</td>
+				<td>
+					<button type="submit" tabindex="11"><?cs var:html_escape(Lang.Plugins.volume_rename.Button.ContainerNameSet) ?></button>
+				</td>
+			</tr>
+		</table>
 	</form>
 <?cs /if ?>