From 8746a535217bb87758d8186fb83b5dfc81931420 Mon Sep 17 00:00:00 2001
From: lars <lars@systemausfall.org>
Date: Wed, 15 Nov 2006 11:47:28 +0000
Subject: [PATCH] suppress warning if handle_messages was called twice added
 link to the volume icon moved to table based layout

---
 templates/footer.cs             | 13 +++++++++++--
 templates/header.cs             | 19 +++++++++++++------
 templates/macros.cs             | 17 +++++++++--------
 templates/main.cs               |  2 --
 templates/show_volume_header.cs | 12 ++++++------
 templates/volume_plugins.cs     |  2 +-
 6 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/templates/footer.cs b/templates/footer.cs
index 73cd314..075dcc3 100644
--- a/templates/footer.cs
+++ b/templates/footer.cs
@@ -6,10 +6,19 @@
 
     </div><!-- end of 'words' -->
 
-    <div id="footer">
+	<?cs # ugly way of getting a 'min-height' for IE6 ?>
+	</td><td id="pane_right"><p style="height:260px;" /></tr>
+
+
+	<tr><td/><td><div id="footer">
 		<?cs var:Data.Version ?>&nbsp;&nbsp;
 		<a href="http://cryptobox.org" title="<?cs var:html_escape(Lang.Text.ProjectHomePage) ?>">CryptoBox-Home</a>&nbsp;&nbsp;&nbsp;<?cs var:html_escape(Lang.Text.ProjectNote) ?>&nbsp;<a href="http://senselab.org/" title="systemausfall.org">sense.lab</a>
-    </div>
+	</div></td><td/></tr>
+	<?cs # ugly way of getting a 'min-width' for IE6 ?>
+	<tr><td/><td><p style="width:600px;" /><td/></tr>
+
+</table>
+
 
 </div><!-- end of 'main' -->
 
diff --git a/templates/header.cs b/templates/header.cs
index f144e4c..a5bf50d 100644
--- a/templates/header.cs
+++ b/templates/header.cs
@@ -55,11 +55,14 @@
 
 <div id="main">
 
-	<?cs if:?Data.EnvironmentWarning
-		?><div id="EnvironmentWarning"><?cs
-			call:environment_warning(Data.EnvironmentWarning) ?></div><?cs /if ?>
+<table id="pane">
 
-	<div id="head">
+	<?cs if:?Data.EnvironmentWarning
+		?><tr><td colspan="3"><div id="EnvironmentWarning"><?cs
+			call:environment_warning(Data.EnvironmentWarning) ?></div></td></tr>
+		<?cs /if ?>
+
+	<tr><td colspan="3"><div id="head">
 		<table>
 		<tr><td>
 			<h1><?cs var:html_escape(Lang.Title.Top) ?></h1>
@@ -73,7 +76,11 @@
 			/if ?>
 			<img src="/cryptobox-misc/<?cs var:logoFile ?>" alt="icon: logo" />
 		</td></tr></table>
-	</div>
+	</div></td></tr>
+
+
+		<tr><td id="pane_left_top" /><td id="pane_top" /><td id="pane_right_top" /></tr>
+		<tr><td id="pane_left" />
+			<td id="pane_content">
 
     <div id="words">
-
diff --git a/templates/macros.cs b/templates/macros.cs
index 91daeae..37bf2bc 100644
--- a/templates/macros.cs
+++ b/templates/macros.cs
@@ -116,8 +116,8 @@ def:print_form_header(form_name, action) ?><?cs #
 
 
 def:show_volume_icon(volume) ?><?cs
-# show the appropriate icon for the current state of the volume ?>
-	<?cs if:volume.active ?><?cs
+# show the appropriate icon for the current state of the volume ?><?cs
+	if:volume.active ?><?cs
 		if:volume.encryption ?><?cs
 			set:filename='volume_active_crypto.gif' ?><?cs
 		else ?><?cs
@@ -129,8 +129,7 @@ def:show_volume_icon(volume) ?><?cs
 		else ?><?cs
 			set:filename='volume_passive_plain.gif' ?><?cs
 		/if ?><?cs
-	/if ?>
-	<img src="<?cs call:link('cryptobox-misc/' + filename,'','','','') ?>" alt="icon: volume" /><?cs
+	/if ?><img src="<?cs call:link('cryptobox-misc/' + filename,'','','','') ?>" alt="icon: volume" /><?cs
 /def ?><?cs
 
 
@@ -156,9 +155,11 @@ def:help_link(pagename) ?><?cs
 
 def:handle_messages() ?><?cs
 # call this function once for every page - otherwise your risk to loose messages
-	?><?cs if:messages_are_handled ?>HANDLE_MESSAGE CALLED TWICE - PLEASE FIX THIS<?cs /if
-	?><?cs if:Data.Warning ?><?cs call:warning(Data.Warning) ?><?cs /if
-	?><?cs if:Data.Success ?><?cs call:success(Data.Success) ?><?cs /if
-	?><?cs set:messages_are_handled = 1 ?><?cs
+# if it gets called twice somehow, then we just ignore it
+	?><?cs if:!messages_are_handled
+		?><?cs if:Data.Warning ?><?cs call:warning(Data.Warning) ?><?cs /if
+		?><?cs if:Data.Success ?><?cs call:success(Data.Success) ?><?cs /if
+		?><?cs set:messages_are_handled = 1
+	?><?cs /if ?><?cs
 /def ?>
 
diff --git a/templates/main.cs b/templates/main.cs
index 2f88404..0c5e3d9 100644
--- a/templates/main.cs
+++ b/templates/main.cs
@@ -7,11 +7,9 @@
 
 <?cs if:Data.ActivePlugin && (Settings.PluginList[Data.ActivePlugin].Types.volume) ?>
 	<?cs include:Settings.TemplateDir + '/show_volume_header.cs' ?>
-	<?cs call:handle_messages() ?>
 	<?cs include:Settings.TemplateFile ?>
 	<?cs include:Settings.TemplateDir + '/show_volume_footer.cs' ?>
 <?cs else ?>
-	<?cs call:handle_messages() ?>
 	<?cs include:Settings.TemplateFile ?>
 <?cs /if ?>
 
diff --git a/templates/show_volume_header.cs b/templates/show_volume_header.cs
index f29dc19..939c0df 100644
--- a/templates/show_volume_header.cs
+++ b/templates/show_volume_header.cs
@@ -1,12 +1,12 @@
 <?cs # $Id$ ?>
 
-<div id="volume_name">
-	<table><tr><td>
+<table id="volume_name"><tr><td>
 		<h1><?cs var:html_escape(Lang.Title.Volume) ?> <i><?cs var:html_escape(Data.CurrentDisk.name) ?></i></h1>
 	</td><td>
-		<?cs call:show_volume_icon(Data.CurrentDisk) ?>
-	</td></tr></table>
-</div>
+		<a href="<?cs call:link("volume_mount","device",Data.CurrentDisk.device,"","") ?>"><?cs call:show_volume_icon(Data.CurrentDisk) ?></a>
+	</td></tr>
+</table>
+
 
 <table id="volume_area">
 	<tr>
@@ -15,5 +15,5 @@
 	</tr>
 </table>
 
-<div id="volume_area_inner">
+<div id="volume_content">
 
diff --git a/templates/volume_plugins.cs b/templates/volume_plugins.cs
index 4b5054c..e54aa17 100644
--- a/templates/volume_plugins.cs
+++ b/templates/volume_plugins.cs
@@ -28,7 +28,7 @@
 				<td <?cs if:markPlugin == name(x)
 						?>class="volume_plugin_active"<?cs
 					else ?>class="volume_plugin_passive"<?cs
-				/if ?>><a href="<?cs call:link(name(x),'device',Data.CurrentDisk.device,'','') ?>" title="<?cs var:html_escape(x.Link) ?>"><img src="<?cs call:link("icons/" + name(x),'','','','') ?>" alt="icon: <?cs var:html_escape(name(x)) ?>" />&nbsp;<?cs var:html_escape(x.Link) ?></a></td><?cs
+				/if ?>><a href="<?cs call:link(name(x),'device',Data.CurrentDisk.device,'','') ?>" title="<?cs var:html_escape(x.Link) ?>"><img src="<?cs call:link("icons/" + name(x),'','','','') ?>" alt="icon: <?cs var:html_escape(name(x)) ?>" />&nbsp;<?cs var:html_escape(x.Link) ?></a></td><!-- add some space --><td>&nbsp;</td><?cs
 				/if ?><?cs
 		/each ?><?cs
 	/loop ?>