From 414a6c6e60a1a134d79daa48dda36f0487c7c817 Mon Sep 17 00:00:00 2001
From: age <bagel@systemausfall.org>
Date: Thu, 24 Aug 2006 09:02:10 +0000
Subject: [PATCH] action removed

---
 pythonrewrite/bin2/CryptoBoxWebserverSettings.py |  4 ++--
 pythonrewrite/bin2/CryptoBoxWebserverSites.py    |  2 ++
 pythonrewrite/templates/footer.cs                |  2 +-
 pythonrewrite/templates/form_system.cs           | 13 ++++++-------
 pythonrewrite/templates/header.cs                |  4 ++--
 pythonrewrite/templates/macros.cs                |  2 +-
 pythonrewrite/templates/nav.cs                   | 10 +++++-----
 pythonrewrite/templates/show_status.cs           |  4 ++--
 pythonrewrite/templates/show_volumes.cs          |  2 +-
 9 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/pythonrewrite/bin2/CryptoBoxWebserverSettings.py b/pythonrewrite/bin2/CryptoBoxWebserverSettings.py
index 6caaebf..13c6b18 100644
--- a/pythonrewrite/bin2/CryptoBoxWebserverSettings.py
+++ b/pythonrewrite/bin2/CryptoBoxWebserverSettings.py
@@ -11,8 +11,8 @@ class CryptoBoxWebserverSettings:
 		## put all found Settings values in the dictionary
 		for key in self.cbxPrefs["Settings"].keys():
 			website.settings["Settings."+key] = self.cbxPrefs["Settings"][key]
-		# for the logbook
-		self.log.info(self.cbxPrefs)
+
+		## for reading the logbook, we have to propagate it's # filename
 		website.settings["Settings.Details"] = self.cbxPrefs["Log"]["Details"]
 		#self.log.info(self.settings)
 
diff --git a/pythonrewrite/bin2/CryptoBoxWebserverSites.py b/pythonrewrite/bin2/CryptoBoxWebserverSites.py
index be9f25e..c22e861 100755
--- a/pythonrewrite/bin2/CryptoBoxWebserverSites.py
+++ b/pythonrewrite/bin2/CryptoBoxWebserverSites.py
@@ -41,6 +41,8 @@ class CryptoBoxWebserverSites(CryptoBox.CryptoBoxProps, CryptoBoxWebserverSettin
 		self.__prepare("show_log")
 		import filehandling
 		self.settings["Data.Log"] = filehandling.read_file(self.settings["Settings.Details"])
+		#TODO: give the logs a nice format for displaying as html
+		# sed s/$/<\/br>/
 		return website.render(self)
 
 	def status(self):
diff --git a/pythonrewrite/templates/footer.cs b/pythonrewrite/templates/footer.cs
index a784024..3107ddf 100644
--- a/pythonrewrite/templates/footer.cs
+++ b/pythonrewrite/templates/footer.cs
@@ -1,7 +1,7 @@
 <?cs # $Id$ ?>
 
 	<?cs if:Data.Redirect ?>
-		<p class="warning"><a href="<?cs if:Data.Redirect.URL ?><?cs var:Data.Redirect.URL ?><?cs else ?><?cs call:link('action',Data.Redirect.Action,'','','','') ?><?cs /if ?>"><?cs var:html_escape(Lang.Text.RedirectNote) ?></a></p>
+		<p class="warning"><a href="<?cs if:Data.Redirect.URL ?><?cs var:Data.Redirect.URL ?><?cs else ?><?cs call:link(Data.Redirect.Action,'','','','') ?><?cs /if ?>"><?cs var:html_escape(Lang.Text.RedirectNote) ?></a></p>
 	<?cs /if ?>
 
     </div><!-- end of 'words' -->
diff --git a/pythonrewrite/templates/form_system.cs b/pythonrewrite/templates/form_system.cs
index 4ae64d2..9e0f001 100644
--- a/pythonrewrite/templates/form_system.cs
+++ b/pythonrewrite/templates/form_system.cs
@@ -5,24 +5,23 @@
 <p><ul>
 
 <?cs # poweroff ?>
-<li><a href="<?cs call:link('action','shutdown_do','type','poweroff','','') ?>" title="<?cs
-	var:html_escape(Lang.Button.PowerOff) ?>"><?cs var:html_escape(Lang.Button.PowerOff) ?></a></li>
+<li><a href="<?cs call:link('reboot','','','','') ?>" title="<?cs var:html_escape(Lang.Button.PowerOff) ?>">
+	<?cs var:html_escape(Lang.Button.PowerOff) ?></a></li>
 
 <?cs # reboot ?>
-<li><a href="<?cs call:link('action','shutdown_do','type','reboot','','') ?>" title="<?cs
+<li><a href="<?cs call:link('shutdown_do','type','reboot','','') ?>" title="<?cs
 	var:html_escape(Lang.Button.ReBoot) ?>"><?cs var:html_escape(Lang.Button.ReBoot) ?></a></li>
 
 <?cs # config ?>
-<li><a href="<?cs call:link('action','config_ask','','','','') ?>" title="<?cs
+<li><a href="<?cs call:link('config_ask','','','','') ?>" title="<?cs
 	var:html_escape(Lang.Button.Config) ?>"><?cs var:html_escape(Lang.Button.Config) ?></a></li>
 
 <?cs # initialize ?>
-<li><a href="<?cs call:link('action','init_ask','','','','') ?>" title="<?cs
+<li><a href="<?cs call:link('init_ask','','','','') ?>" title="<?cs
 	var:html_escape(Lang.Button.DoInit) ?>"><?cs var:html_escape(Lang.Button.DoInit) ?></a></li>
 
 <?cs # show log files ?>
-<li><a href="<?cs call:link('action','show_log','','','','') ?>" title="<?cs
-	var:html_escape(Lang.Button.Protocol) ?>"><?cs var:html_escape(Lang.Button.Protocol) ?></a></li>
+<li><a href="/logs" title="<?cs var:html_escape(Lang.Button.Protocol) ?>"><?cs var:html_escape(Lang.Button.Protocol) ?></a></li>
 
 </ul></p>
 
diff --git a/pythonrewrite/templates/header.cs b/pythonrewrite/templates/header.cs
index 8bbf8a7..6b2bf36 100644
--- a/pythonrewrite/templates/header.cs
+++ b/pythonrewrite/templates/header.cs
@@ -12,7 +12,7 @@
 	<link rel="shortcut icon" href="/favicon.ico" />
 	<link rel="stylesheet" media="screen" href="<?cs var:Settings.Stylesheet ?>" type="text/css" />
 	<?cs if:Data.Redirect.URL ?><meta http-equiv="refresh" content="<?cs var:Data.Redirect.Delay ?>;url=<?cs var:Data.Redirect.URL ?>" /><?cs
-	elif:Data.Redirect.Action ?><meta http-equiv="refresh" content="<?cs var:Data.Redirect.Delay ?>;url=<?cs call:link('action',Data.Redirect.Action,'','','','') ?>" /><?cs /if ?>
+	elif:Data.Redirect.Action ?><meta http-equiv="refresh" content="<?cs var:Data.Redirect.Delay ?>;url=<?cs call:link(Data.Redirect.Action,'','','','') ?>" /><?cs /if ?>
 </head>
 <body>
 
@@ -24,7 +24,7 @@
 
 <div id="lang">
 	<?cs each:item = Data.Languages ?>
-		<a href="<?cs call:link('weblang',name(item),'','','','') ?><?cs
+		<a href="<?cs call:link('weblang',name(item),'','','') ?><?cs
 			if:Data.QueryString ?>&<?cs var:Data.QueryString ?><?cs /if ?>"><?cs
 			var:item ?></a><br/>
 	<?cs /each ?>
diff --git a/pythonrewrite/templates/macros.cs b/pythonrewrite/templates/macros.cs
index 332149c..7a180c7 100644
--- a/pythonrewrite/templates/macros.cs
+++ b/pythonrewrite/templates/macros.cs
@@ -77,6 +77,6 @@ def:link(path, attr1, value1, attr2, value2)
 
 def:print_form_header() ?><?cs #
 # the header of a form - including Setting.LinkAttrs
-	?><form action="<?cs call:link("","","","","","") ?>" method="post" enctype="application/x-www-from-urlencoded" accept-charset="utf-8"><?cs
+	?><form action="<?cs call:link("","","","","") ?>" method="post" enctype="application/x-www-from-urlencoded" accept-charset="utf-8"><?cs
 /def ?>
 
diff --git a/pythonrewrite/templates/nav.cs b/pythonrewrite/templates/nav.cs
index c870174..fd7286b 100644
--- a/pythonrewrite/templates/nav.cs
+++ b/pythonrewrite/templates/nav.cs
@@ -5,21 +5,21 @@
 
 <!-- TODO: remove the following lines, as soon as we completely switched to the volume-based user interface
     <?cs if:subcount(Data.Disks.passive) > 0 ?>
-		<a href="<?cs call:link('action','mount_ask','','','','') ?>" title="<?cs var:html_escape(Lang.Text.DoMount) ?>"><?cs var:html_escape(Lang.Button.Mount) ?></a><?cs /if ?>
+		<a href="<?cs call:link('mount_ask','','','','') ?>" title="<?cs var:html_escape(Lang.Text.DoMount) ?>"><?cs var:html_escape(Lang.Button.Mount) ?></a><?cs /if ?>
     <?cs if:subcount(Data.Disks.active) > 0 ?>
-		<a href="<?cs call:link('action','umount_ask','','','','') ?>" title="<?cs var:html_escape(Lang.Text.DoUmount) ?>"><?cs var:html_escape(Lang.Button.Umount) ?></a><?cs /if ?>
+		<a href="<?cs call:link('umount_ask','','','','') ?>" title="<?cs var:html_escape(Lang.Text.DoUmount) ?>"><?cs var:html_escape(Lang.Button.Umount) ?></a><?cs /if ?>
 -->
 
 	<a href="<?cs if:subcount(Data.Disks.available) > 1
-				?><?cs call:link('action','show_status','','','','')
+				?><?cs call:link('show_status','','','','')
 			?><?cs else
-				?><?cs call:link('action','show_volume','device',Data.Disks.available.0.device,'','')
+				?><?cs call:link('show_volume','device',Data.Disks.available.0.device,'','')
 			?><?cs /if
 		?>" title="<?cs var:html_escape(Lang.Button.Status) ?>"><?cs var:html_escape(Lang.Button.Status) ?></a>
 <?cs /if ?>
 
 <?cs # manual ?>
-<!-- <a href="<?cs call:link('action','doc','','','','') ?>" title="<?cs var:html_escape(Lang.Button.Documentation) ?>"><?cs var:html_escape(Lang.Button.Documentation) ?></a>-->
+<!-- <a href="<?cs call:link('doc','','','','') ?>" title="<?cs var:html_escape(Lang.Button.Documentation) ?>"><?cs var:html_escape(Lang.Button.Documentation) ?></a>-->
 
 <a href="/status" title="<?cs var:html_escape(Lang.Button.Status) ?>"><?cs var:html_escape(Lang.Button.Status) ?></a>
 <a href="/doc" title="<?cs var:html_escape(Lang.Button.Documentation) ?>"><?cs var:html_escape(Lang.Button.Documentation) ?></a>
diff --git a/pythonrewrite/templates/show_status.cs b/pythonrewrite/templates/show_status.cs
index 803b281..06efffc 100644
--- a/pythonrewrite/templates/show_status.cs
+++ b/pythonrewrite/templates/show_status.cs
@@ -17,12 +17,12 @@
 	<?cs if:subcount(Data.Disks.active) > 0 ?>
 		<p><?cs var:html_escape(Lang.Text.ActivePartitions) ?>:
 			<ul><?cs each:partition = Data.Disks.active ?>
-				<li><a href="<?cs call:link('action','show_volume','device',partition.device,'','')
+				<li><a href="<?cs call:link('show_volume','device',partition.device,'','')
 					?>"><?cs var:partition.name ?></a></li><?cs /each ?></ul><?cs /if ?>
 	<?cs if:subcount(Data.Disks.passive) > 0 ?>
 		<p><?cs var:html_escape(Lang.Text.PassivePartitions) ?>:
 			<ul><?cs each:partition = Data.Disks.passive ?>
-				<li><a href="<?cs call:link('action','show_volume','device',partition.device,'','')
+				<li><a href="<?cs call:link('show_volume','device',partition.device,'','')
 					?>"><?cs var:partition.name ?></a></li><?cs /each ?></ul><?cs /if ?>
 <?cs /if ?>
 
diff --git a/pythonrewrite/templates/show_volumes.cs b/pythonrewrite/templates/show_volumes.cs
index 7a5d8a8..05df5aa 100644
--- a/pythonrewrite/templates/show_volumes.cs
+++ b/pythonrewrite/templates/show_volumes.cs
@@ -2,7 +2,7 @@
 
 <?cs each:volume = Data.Disks.available ?>
 
-<a href="<?cs call:link('action','show_volume','device',volume.device,'','') ?>" title="<?cs
+<a href="<?cs call:link('show_volume','device',volume.device,'','') ?>" title="<?cs
 		var:volume.name ?>">
 	<?cs # the "div" is the container for the background image ?>
 	<div class="<?cs if:volume.isActive ?>active<?cs else ?>passive<?cs /if ?><?cs