Changed required to make it work on luonnotar (not yet supported though)

diff --git a/src/InfoCon/shop/customer.wml b/src/InfoCon/shop/customer.wml
index aeb93e6..cb80cdd 100644 (file)
--- a/src/InfoCon/shop/customer.wml
+++ b/src/InfoCon/shop/customer.wml
@@ -1,9 +1,7 @@
 #include <infocon.style>
 #include "shop.inc"
 
-<page title="Online Shop">
-
-<headline "Online Shop">
+<page func=InfoCon title="Online Shop">
 
 <table width=100% border=0 cellpadding=0 cellspacing=0>
 

diff --git a/src/InfoCon/shop/dispatchlist.wml b/src/InfoCon/shop/dispatchlist.wml
index 4a718ba..ba348d2 100644 (file)
--- a/src/InfoCon/shop/dispatchlist.wml
+++ b/src/InfoCon/shop/dispatchlist.wml
@@ -1,9 +1,7 @@
 #include <infocon.style>
 #include "shop.inc"
 
-<page title="Online Shop">
-
-<headline "Online Shop / Aufträge">
+<page func=InfoCon title="Online Shop">
 
 <table width=100% border=0 cellpadding=0 cellspacing=0>
 <tr bgcolor="<colh>">

diff --git a/src/InfoCon/shop/index.wml b/src/InfoCon/shop/index.wml
index 2d5e04c..bbb1763 100644 (file)
--- a/src/InfoCon/shop/index.wml
+++ b/src/InfoCon/shop/index.wml
@@ -1,9 +1,7 @@
 #include <infocon.style>
 #include "shop.inc"
 
-<page title="Online Shop">
-
-<headline "Online Shop">
+<page func=InfoCon title="Online Shop">
 
 <h3><font face="Helvetica,Arial">Offene Aufträge</font></h3>
 <table width=100% border=0 cellpadding=0 cellspacing=0>

diff --git a/src/InfoCon/shop/shop.inc b/src/InfoCon/shop/shop.inc
index b704229..04365ed 100644 (file)
--- a/src/InfoCon/shop/shop.inc
+++ b/src/InfoCon/shop/shop.inc
@@ -32,7 +32,7 @@
 <?
   function dbconnect ()
   {
-    $dbh = pg_pconnect ("<dbhost>", "<dbport>", "<db>")
+    $dbh = pg_pconnect ("<dbhost>", "<dbport>", "<dbname>")
           or die("Unable to connect to SQL server");
 
     pg_exec ($dbh, "SET DateStyle = 'ISO'"); //no-error-checking or die("Unable to issue query!");

diff --git a/src/InfoCon/shop/submenu.inc b/src/InfoCon/shop/submenu.inc
index dcd60f9..ca08e1f 100644 (file)
--- a/src/InfoCon/shop/submenu.inc
+++ b/src/InfoCon/shop/submenu.inc
@@ -1,27 +1,12 @@
-<a href="<root_prefix>InfoCon/">InfoCon</a><br>
+<strong>Menu</strong><br>
 
-<a href="../account/">Konto</a><br>
+&nbsp;<menu-item base=index text=Shop href=index.php3><br>
+&nbsp;<menu-item base=dispatchlist text=Aufträge href=dispatchlist.php3><br>
+&nbsp;<menu-item base=customer text=Kunden href=customer.php3><br>
 
-<a href="../buch/">Buchhaltung</a><br>
+<p><line height=2>
 
-<ifneq <get-var WML_SRC_BASENAME> "index"
-  <a href="../shop/">Shop</a>
-  Shop
-><br>
-
-<hr>
-
-<ifneq <get-var WML_SRC_BASENAME> "dispatchlist"
-  <a href="dispatchlist.php3">Aufträge</a>
-  Aufträge
-><br>
-
-<ifneq <get-var WML_SRC_BASENAME> "customerlist"
-  <a href="customerlist.php3">Kunden</a>
-  Kunden
-><br>
-
-#<a href="../download/">Download</a><br>
+#include "../functions.inc" prefix="../"
 
 # Local variables:
 # mode: indented-text