0.02_20 commit r0_11_20
authorTony Cook <tony@develop-help.com>
Thu, 11 Jul 2002 05:52:06 +0000 (05:52 +0000)
committertony <tony@45cb6cf1-00bc-42d2-bb5a-07f51df49f94>
Thu, 11 Jul 2002 05:52:06 +0000 (05:52 +0000)
46 files changed:
MANIFEST
MANIFEST.SKIP
Makefile
schema/bse.sql
site/cgi-bin/modules/BSE/Util/Shop.pm [deleted file]
site/cgi-bin/modules/DatabaseHandle.pm [deleted file]
site/docs/bse.pod
site/docs/config.pod
site/htdocs/admin/help/catalog.html [new file with mode: 0644]
site/htdocs/admin/help/edit.html
site/htdocs/admin/help/file.html
site/htdocs/admin/help/product.html [new file with mode: 0644]
site/htdocs/css/admin.css
site/htdocs/css/admin.css_natural [new file with mode: 0644]
site/templates/1/shop_multicat.tmpl
site/templates/admin/add_product.tmpl
site/templates/admin/article_img.tmpl
site/templates/admin/catalog.tmpl
site/templates/admin/edit_0.tmpl
site/templates/admin/edit_1.tmpl
site/templates/admin/edit_2.tmpl
site/templates/admin/edit_catalog.tmpl
site/templates/admin/edit_product.tmpl
site/templates/admin/edit_steps.tmpl
site/templates/admin/filelist.tmpl
site/templates/admin/order_detail.tmpl
site/templates/admin/order_list.tmpl
site/templates/admin/order_list_filled.tmpl
site/templates/admin/order_list_unfilled.tmpl
site/templates/admin/product_detail.tmpl
site/templates/admin/product_list.tmpl
site/templates/admin/subs/add.tmpl
site/templates/admin/subs/edit.tmpl
site/templates/admin/subs/list.tmpl
site/templates/admin/subs/send_form.tmpl
site/templates/common/default.tmpl
site/templates/common/defsteps.tmpl
site/templates/common/news_item.tmpl
site/templates/common/sidebar.tmpl
site/templates/htmlemail/basic.tmpl
site/templates/interest/askagain_base.tmpl
site/templates/interest/confirm_base.tmpl
site/templates/interest/error_base.tmpl
site/templates/printable/justkids.tmpl [deleted file]
site/templates/user/options_base.tmpl
site/templates/user/userpage_base.tmpl

index ba988be..6ccbf97 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -11,6 +11,7 @@ localinst.perl  # simple test installer
 schema/article.txt
 schema/bse.sql
 schema/mssql.sql
+schema/mysql_build.pl   # builds site/util/mysql.str
 site/cgi-bin/admin/add.pl
 site/cgi-bin/admin/admin.pl
 site/cgi-bin/admin/datadump.pl
@@ -108,6 +109,7 @@ site/docs/config.html
 site/docs/config.pod
 site/docs/gen.html
 site/docs/makedocs
+site/docs/makedocs.html
 site/docs/search.html
 site/docs/secure.html
 site/docs/secure.pod
@@ -119,12 +121,15 @@ site/docs/upgrade_mysql.html
 site/htdocs/a/.htaccess
 site/htdocs/admin/advanced.html
 site/htdocs/admin/help/body.html
+site/htdocs/admin/help/catalog.html
 site/htdocs/admin/help/edit.html
 site/htdocs/admin/help/file.html
+site/htdocs/admin/help/product.html
 site/htdocs/admin/help/subs.html
 site/htdocs/admin/help/subssend.html
 site/htdocs/admin/index.html
 site/htdocs/css/admin.css
+site/htdocs/css/admin.css_natural
 site/htdocs/css/style-main.css
 site/htdocs/images/admin/error.gif
 site/htdocs/images/admin/help.gif
index 1098886..ee099cc 100644 (file)
@@ -1,2 +1,11 @@
 .*,v
 .*~
+\bCVS\b
+\.cvsignore$
+^test\.cfg$
+^test-.*cfg$
+^nswfitc\.cfg$
+^site/htdocs/images/admin/help\.png$
+^install.perl$
+^schema/data/article\.txt$
+^schema/data/demoload\.pl$
index dc2baab..c80908b 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=0.11_19
+VERSION=0.11_20
 DISTNAME=bse-$(VERSION)
 DISTBUILD=$(DISTNAME)
 DISTTAR=../$(DISTNAME).tar
@@ -94,3 +94,9 @@ testfiles: distdir
 
 test: testinst
        perl -MTest::Harness=runtests -It -e 'runtests glob q!t/*.t!'
+
+manicheck:
+       perl -MExtUtils::Manifest=manicheck -e 'manicheck()'
+
+filecheck:
+       perl -MExtUtils::Manifest=filecheck -e 'filecheck()'
index f0a6879..8d2b667 100644 (file)
@@ -353,7 +353,7 @@ create table site_users (
 
   userId varchar(40) not null,
   password varchar(40) not null,
-  email varchar(40) not null,
+  email varchar(255) not null,
 
   keepAddress integer not null default 1,
   whenRegistered datetime not null,
@@ -388,7 +388,7 @@ create table site_users (
 
   textOnlyMail integer not null,
 
-  title varchar(10),
+  title varchar(127),
   organization varchar(127),
   
   referral integer,
diff --git a/site/cgi-bin/modules/BSE/Util/Shop.pm b/site/cgi-bin/modules/BSE/Util/Shop.pm
deleted file mode 100644 (file)
index ec65c95..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-package BSE::Util::Shop;
-
-1;
-
-=head1 NAME
-
-  BSE::Util::Shop - tools used by the shop
-
-=head1 SYNOPSIS
-
-  use BSE::Util::Shop ':options';
-
diff --git a/site/cgi-bin/modules/DatabaseHandle.pm b/site/cgi-bin/modules/DatabaseHandle.pm
deleted file mode 100644 (file)
index 161c5e1..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-package DatabaseHandle;
-require 5.005;
-
-$DatabaseHandle::VERSION = '0.1';
-
-use Constants 0.1 qw/$DBD $DB $UN $PW/;
-
-use DBI;
-
-my $self = undef;
-
-sub single
-{
-       my $class = shift;
-       warn "Incorrect number of parameters passed to DatabaseHandle::single\n" unless @_ == 0;
-
-       unless ( defined $self )
-       {
-               my $dbh = DBI->connect( "DBI:$DBD:database=$DB", $UN, $PW)
-                   or die "Cannot connect to database: $DBI::errstr";
-
-               $self = bless { dbh => $dbh,
-                               Articles => $dbh->prepare('select * from article'),
-                               Images => $dbh->prepare('select * from image'),
-                               
-                               replaceArticle    => $dbh->prepare( 'replace article    values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)'),
-                               replaceImage => $dbh->prepare('replace image values (?,?,?,?,?,?)'),
-
-                               addArticle    => $dbh->prepare( 'insert article values (null, ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)'),
-                               addImage => $dbh->prepare('insert image values(null, ?, ?, ?, ?, ?)'),
-
-                               deleteArticle => $dbh->prepare( 'delete from article where id = ?'),
-                               deleteImage => $dbh->prepare('delete from image where id = ?'),
-
-                               getImageByArticleId => $dbh->prepare('select * from image where articleId = ?'),
-
-                               getArticleByPkey => $dbh->prepare('select * from article where id = ?'),
-
-                               getArticleByLevel => $dbh->prepare('select * from article where level = ?'),
-                               getArticleByParentid => $dbh->prepare('select * from article where parentid = ?'),
-                               dropIndex => $dbh->prepare('delete from searchindex'),
-                               insertIndex => $dbh->prepare('insert searchindex values(?, ?, ?, ?)'),
-                               searchIndex => $dbh->prepare('select * from searchindex where id = ?'),
-                               searchIndexWC => $dbh->prepare('select * from searchindex where id like ?'),
-
-                               Products=> $dbh->prepare('select article.*, product.* from article, product where id = articleId'),
-                               addProduct => $dbh->prepare('insert product values(?,?,?,?,?,?,?)'),
-                               getProductByPkey => $dbh->prepare('select article.*, product.* from article, product where id=? and articleId = id'),
-                               replaceProduct => $dbh->prepare('replace product values(?,?,?,?,?,?,?)'),
-
-                               Orders => $dbh->prepare('select * from orders'),
-                               getOrderByPkey => $dbh->prepare('select * from orders where id = ?'),
-                               getOrderItemByOrderId => $dbh->prepare('select * from order_item where orderId = ?'),
-                               addOrder => $dbh->prepare('insert orders values(null,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)'),
-                               addOrderItem => $dbh->prepare('insert order_item values(null,?,?,?,?,?,?,?)'),
-
-                             }, $class;
-       }
-       $self;
-}
-
-# gotta love this
-sub DESTROY
-{
-  # this is wierd - we only need to reset this on 5.6.x (for x == 0 so
-  # far)
-  # Works fine without the reset for 5.005_03
-  if ($dbh) {
-    $dbh->disconnect;
-    undef $dbh;
-  }
-}
-
-1;
index deabf04..61786a8 100644 (file)
@@ -10,13 +10,28 @@ Maybe I'll add some other bits here.
 
 =head1 CHANGES
 
+=head2 0.11_20
+
+=over
+
+=item *
+
+another set of new templates from Adrian
+
+=item *
+
+extended title and email fields of site_user to 127 and 255 characters
+respectively
+
+=back
+
 =head2 0.11_19
 
 =over
 
 =item *
 
-remove debugging code from Generate::excerpt() (#142) (TEST!)
+remove debugging code from Generate::excerpt() (#142)
 
 =item *
 
index 35b013e..5fc1104 100644 (file)
@@ -152,7 +152,7 @@ security threat.  Default: True.
 
 =head2 [mail]
 
-This section controls how BSE send email.
+This section controls how BSE sends email.
 
 =over
 
diff --git a/site/htdocs/admin/help/catalog.html b/site/htdocs/admin/help/catalog.html
new file mode 100644 (file)
index 0000000..e056ca6
--- /dev/null
@@ -0,0 +1,105 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+    <title>Catalog Editor - BSE</title>
+    <link rel="stylesheet" href="/css/admin.css">
+  </head>
+<body>
+<h1>Catalog Editor</h1>
+<div>
+  <h2><a name="section">Parent</h2>
+
+  <p>The parent this article will be placed under..</p>
+
+</div>
+
+<div>
+  <h2><a name="title">Catalog title</h2>
+
+  <p>The title of the catalog.</p>
+
+</div>
+
+<div>
+<h2><a name="template">Template</h2>
+
+  <p>The template used to present this catalog.</p>
+
+</div>
+<div>
+<h2><a name="body">Body</h2>
+
+  <p>The content of your catalog. There are a number of <a
+href="body.html">tags</a> you can use to markup your article text.</p>
+
+</div>
+
+<div>
+  <h2><a name="release">Release date</h2>
+
+  <p>The date that your catalog is released to the world. Your article will only 
+    appear in menus after this date and before the expiry date. If you don't enter 
+    a release date it will default to the current date.</p>  <p><b>Note</b>: Unreleased catalogs can be accessed via a direct URL to the 
+    catalog.</p>
+
+</div>
+
+<div>
+  <h2><a name="expire">Expiry date</h2>
+
+  <p>The date from which you don't want the catalog to appear on your site.</p>
+
+  <p><b>Note:</b> Expired catalogs can be found through the search engine.</p>
+
+</div>
+
+<div>
+<h2><a name="summary">Summary length</h2>
+
+  <p>The length of the summary displayed for sub catalogs by the &lt;:summary:&gt; 
+    tag.</p>
+
+</div>
+
+<div>
+  <h2><a name="threshold">Display threshold</h2>
+
+  <p>This is used by the &lt;:if UnderThreshold :&gt; conditional tag. If the 
+    number of sub-catalogs is less than this value the condition is true.</p>
+  <p>Typically your templates will embed sub-catalogs if there are fewer than 
+    this number of sub-catalogs, otherwise a menu of sub-catalogs will be displayed.</p>
+
+</div>
+
+<div>
+<h2><a name="keywords">Keywords</h2>
+
+<p>This is a comma-separated list of extra keywords used by the search
+engine.</p>
+
+</div>
+
+<div>
+  <h2><a name="listed">List article</h2>
+
+  <p>Choose how the catalog is listed in the sidebar menus, or in lists of sub-catalogs 
+    in the parent.</p>
+
+</div>
+
+<div>
+  <h2><a name="thumb">Thumbnail image</h2>
+
+  <p>An image that can be used with the &lt;:thumbnail:&gt; tag to display a small 
+    image for the catalog in menus.</p>
+
+</div>
+
+<div>
+  <h2><a name="images">Uploaded images</h2>
+
+  <p>Images attached to the catalog.</p>
+
+</div>
+
+</body></html>
\ No newline at end of file
index d23eead..a19801a 100644 (file)
@@ -35,12 +35,11 @@ href="body.html">tags</a> you can use to markup your article text.</p>
 </div>
 
 <div>
-<h2><a name="release">Release Date</h2>
+  <h2><a name="release">Release date</h2>
 
-<p>The date that your article is release to the world.  Your article
-will only appear in menus after this date and before the expiry date.
-If you don't enter a release date it will default to the current
-date.</p>
+  <p>The date that your article is released to the world. Your article will only 
+    appear in menus after this date and before the expiry date. If you don't enter 
+    a release date it will default to the current date.</p>
 
 <p><b>Note</b>: Unreleased articles can be accessed via a direct URL to
 the article.</p>
@@ -48,7 +47,7 @@ the article.</p>
 </div>
 
 <div>
-<h2><a name="expire">Expire Date</h2>
+  <h2><a name="expire">Expire date</h2>
 
 <p>The date from which you don't want the article to appear on your site.</p>
 
@@ -57,7 +56,7 @@ the article.</p>
 </div>
 
 <div>
-<h2><a name="summaryLength">Summary length</h2>
+<h2><a name="summary">Summary length</h2>
 
 <p>The length of the summary displayed for child articles by the
 &lt;:summary:&gt; tag.</p>
@@ -65,7 +64,7 @@ the article.</p>
 </div>
 
 <div>
-<h2><a name="threshold">Display Threshold</h2>
+  <h2><a name="threshold">Display threshold</h2>
 
 <p>This is used by the &lt;:if UnderThreshold :&gt; conditional tag.
 If the number of children is less than this value the condition is
@@ -86,7 +85,7 @@ engine.</p>
 </div>
 
 <div>
-<h2><a name="listed">List Article</h2>
+  <h2><a name="listed">List article</h2>
 
 <p>Choose how the article is listed in the sidebar menus, or in lists
 of child articles in the parent.</p>
@@ -94,10 +93,10 @@ of child articles in the parent.</p>
 </div>
 
 <div>
-<h2><a name="thumb">Thumbnail</h2>
+  <h2><a name="thumb">Thumbnail image</h2>
 
-<p>An image that can be used with the &lt;:thumbnail:&gt; tag to
-display a small image for the article in menus2.</p>
+  <p>An image that can be used with the &lt;:thumbnail:&gt; tag to display a small 
+    image for the article in menus.</p>
 
 </div>
 
@@ -110,7 +109,7 @@ article has been created.</p>
 </div>
 
 <div>
-<h2><a name="images">Uploaded Images</h2>
+  <h2><a name="images">Uploaded images</h2>
 
 <p>Images attached to the article.</p>
 
index bf8554c..16eb471 100644 (file)
@@ -26,7 +26,7 @@ assuming you have a perfect ISP.</p>
 
 </div>
 <div>
-<h2><a name="content_type">Content Type</h2>
+  <h2><a name="content_type">Content type</h2>
 <p>This is the format that the users browser will open the file as.
 BSE understands common types such as PDF, text and HTML, and more can
 be configured.</p>
@@ -61,7 +61,7 @@ product is attached to is included in an order the user made.</p>
 </div>
 
 <div>
-<h2><a name="requireUser">Require user</h2>
+  <h2><a name="requireUser">Require login</h2>
 
 <p>The user must be registered and logged in before they can download
 the file.</p>
diff --git a/site/htdocs/admin/help/product.html b/site/htdocs/admin/help/product.html
new file mode 100644 (file)
index 0000000..5693435
--- /dev/null
@@ -0,0 +1,140 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+    <title>Product Editor - BSE</title>
+    <link rel="stylesheet" href="/css/admin.css">
+  </head>
+<body>
+<h1>Product Editor</h1>
+<div>
+  <h2><a name="title">Title</h2>
+
+  <p>The name of the product (NB: the title cannot be changed once an order has 
+    been placed that includes this product).</p>
+
+</div>
+
+<div>
+  <h2><a name="summary">Summary</h2>
+  <p>The extended name of the product (NB: the summary cannot be changed once 
+    an order has been placed that includes this product).</p>
+
+</div>
+
+<div>
+  <h2><a name="catalog">Catalog</h2>
+
+  <p>The catalog in which this product should be listed.</p>
+
+</div>
+<div>
+<h2><a name="body">Body</h2>
+
+<p>The content of your article.  There are a number of <a
+href="body.html">tags</a> you can use to markup your article text.</p>
+
+</div>
+
+<div>
+<h2><a name="leadtime">Lead time</h2>
+
+<p>The time required to prepare this product for shipping.</p>
+
+</div>
+
+<div>
+<h2><a name="retail">Retail price</h2>
+
+<p>The total cost of the product to the customer.</p>
+
+</div>
+
+<div>
+<h2><a name="wholesale">Wholesale price</h2>
+
+<p>The price this product costs to wholesalers.</p>
+
+</div>
+
+<div>
+<h2><a name="gst">GST</h2>
+
+<p>The Goods and Services Tax on this product (in dollars).</p>
+
+</div>
+
+<div>
+  <h2><a name="release">Release date</h2>
+
+  <p>The date that your product is released to the world. Your product will only 
+    appear in menus after this date and before the expiry date. If you don't enter 
+    a release date it will default to the current date.</p>
+  <p><b>Note</b>: Unreleased products can be accessed via a direct URL to the 
+    product.</p>
+
+</div>
+
+<div>
+  <h2><a name="expire">Expiry date</h2>
+
+  <p>The date from which you don't want the product to appear on your site.</p>
+
+  <p><b>Note:</b> Expired products can be found through the search engine.</p>
+
+</div>
+
+<div>
+<h2><a name="summary">Summary length</h2>
+
+  <p>The length of the summary displayed for products by the &lt;:summary:&gt; 
+    tag (typically this is only seen when the product is a stepkid of a non-shop 
+    section).</p>
+
+</div>
+
+<div>
+  <h2><a name="threshold">Display threshold</h2>
+
+<p>This is used by the &lt;:if UnderThreshold :&gt; conditional tag.
+If the number of children is less than this value the condition is
+true.</p>
+
+  <p>Typically your templates will embed child articles if there are fewer than 
+    this number of child articles, otherwise a menu of child articles will be 
+    displayed (typically this is only seen when the product is a stepkid of a 
+    non-shop section.</p>
+
+</div>
+
+<div>
+<h2><a name="options">Options</h2>
+
+  <p>Options available with this product, like sizes and colors (the options are 
+    set in Constants.pm).</p>
+
+</div>
+
+<div>
+  <h2><a name="thumb">Thumbnail image</h2>
+
+  <p>An image that can be used with the &lt;:thumbnail:&gt; tag to display a small 
+    image for the product in menus.</p>
+
+</div>
+
+<div>
+<h2><a name="files">Files</h2>
+
+  <p>Files attached to the product. This isn't available until the product has 
+    been created.</p>
+
+</div>
+
+<div>
+  <h2><a name="images">Uploaded images</h2>
+
+  <p>Images attached to the product.</p>
+
+</div>
+
+</body></html>
\ No newline at end of file
index 379944e..483aea1 100644 (file)
@@ -3,15 +3,18 @@ a:hover {  color: #6666CC}
 a:visited {  color: #333366}
 li {  font: 10px Verdana, Arial, Helvetica, sans-serif}
 h1 {  font-size: 18px; margin-left: -1.5em}
-h2 {  font-size: 12px; margin-left: -1em; padding-top: 1em}
+h2 {  font-size: 16px; margin-left: -1em; padding-top: 1em; color: #333333; font-family: Arial, Helvetica, sans-serif; font-weight: bold}
 form {  display: inline}
 li {  padding-bottom: 10px;}
 td.sep {  background: #339; font-size: 0.1em}
 input.float { position: absolute; right: 1em}
-body {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; margin-left: 4em; background-color: #FFFFFF}
+body {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; margin-left: 4em; background-color: #CCCCCC}
 td {  font: 10px Verdana, Arial, Helvetica, sans-serif}
 p {  font: 10px Verdana, Arial, Helvetica, sans-serif}
 select {  font-family: "MS Sans Serif", Verdana, sans-serif; font-size: 12px}
 input {  font-family: "MS Sans Serif", Verdana, sans-serif; font-size: 12px}
 textarea {  font-family: "MS Sans Serif", Verdana, sans-serif; font-size: 12px}
 th {  font-size: 10px; font-weight: bold; background-color: #999999; color: #FFFFFF}
+.table {  background-color: #666666}
+h3 {  font-size: 14px}
+h4 {  font-size: 12px}
diff --git a/site/htdocs/css/admin.css_natural b/site/htdocs/css/admin.css_natural
new file mode 100644 (file)
index 0000000..e23ad3f
--- /dev/null
@@ -0,0 +1,20 @@
+a {  color: #333366; font-weight: bold}
+a:hover {  color: #6666CC}
+a:visited {  color: #333366}
+li {  font: 10px Verdana, Arial, Helvetica, sans-serif}
+h1 {  font-size: 18px; margin-left: -1.5em}
+h2 {  font-size: 16px; margin-left: -1em; padding-top: 1em; color: #333333; font-family: Arial, Helvetica, sans-serif; font-weight: bold}
+form {  display: inline}
+li {  padding-bottom: 10px;}
+td.sep {  background: #339; font-size: 0.1em}
+input.float { position: absolute; right: 1em}
+body {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10px; margin-left: 4em; background-color: #CCCC99}
+td {  font: 10px Verdana, Arial, Helvetica, sans-serif}
+p {  font: 10px Verdana, Arial, Helvetica, sans-serif}
+select {  font-family: "MS Sans Serif", Verdana, sans-serif; font-size: 12px}
+input {  font-family: "MS Sans Serif", Verdana, sans-serif; font-size: 12px}
+textarea {  font-family: "MS Sans Serif", Verdana, sans-serif; font-size: 12px}
+th {  font-size: 10px; font-weight: bold; background-color: #999966; color: #FFFFFF}
+.table {  background-color: #666633}
+h3 {  font-size: 14px}
+h4 {  font-size: 12px}
index a510f99..fb3a500 100644 (file)
 <:admin:>
 <p><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><:body:></font></p> 
   
-<:iterator begin children:> 
-<p><a href="<:url child:>"><b><font face="Verdana, Arial, Helvetica, sans-serif" size="3"><:child 
-  title:></font></b></a><:moveDown:><:moveUp:><br>
-  <:if Child summaryLength:><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><:summary:></font><:or 
-  Child:><:eif Child:></p>
-<:iterator separator children:><:iterator end children:> 
+<p><font face="Verdana, Arial, Helvetica, sans-serif" size="2">Reorder child articles: 
+  <a href="/cgi-bin/admin/reorder.pl?stepparent=<:article id:>&sort=title&refreshto=/cgi-bin/admin/admin.pl?id=<:article id:>">by 
+  title</a> | <a href="/cgi-bin/admin/reorder.pl?stepparent=<:article id:>&sort=date&refreshto=/cgi-bin/admin/admin.pl?id=<:article id:>">by 
+  date</a> | <a href="/cgi-bin/admin/reorder.pl?stepparent=<:article id:>&reverse=1&refreshto=/cgi-bin/admin/admin.pl?id=<:article id:>">reverse 
+  order</a></font></p>
+<:iterator begin allkids:> 
+<p><:thumbnail allkid:> <a href="<:url allkid:>"><b><font face="Verdana, Arial, Helvetica, sans-serif" size="3"><:allkid 
+  title:></font></b></a> <:movestepkid:><br>
+  <:if Allkid summaryLength:><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><:summary 
+  allkid:></font><:or Allkid:><:eif Allkid:></p>
+<:iterator separator allkids:><:iterator end allkids:> 
 <p><font face="Verdana, Arial, Helvetica, sans-serif" size="2">We want to make 
   sure you have complete confidence when you make on-line purchases in our store.</font></p>
 <p><font face="Verdana, Arial, Helvetica, sans-serif" size="2">We use sophisticated 
index 9f9591b..2005c47 100644 (file)
@@ -3,17 +3,19 @@
 </head>
 <body>
 <h1>Shop Administration</h1>
-<h2><:action:> Product</h2>
-<:ifMessage:>
+<:ifMessage:> 
 <p><b><:message:> </b></p>
 <:or:><:eif:> 
-<p>| <a href="/admin/">Admin menu</a> | <a href="<:script:>">Manage store</a> 
+<p>| <a href="/admin/">Admin menu</a> | <a href="<:script:>">Manage catalogs</a> 
   | </p>
-
-<form action="<:script:>" enctype="multipart/form-data" method=POST><p><input type=submit name=showimages value="Image Wizard"></p>
-
-<input type="hidden" name="id" value="<:product id:>">
-  <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000">
+<h2>Manage Images</h2>
+<form action="<:script:>" enctype="multipart/form-data" method=POST>
+  <p>
+    <input type=submit name=showimages value="Image Wizard">
+  </p>
+  <h2><:action:> Product</h2>
+  <input type="hidden" name="id" value="<:product id:>">
+  <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
     <tr>
       <td>
         <table border=0 cellspacing="1" cellpadding="6">
             <td nowrap bgcolor="#FFFFFF"> 
               <input type="text" name="title" value="<:product title:>" size=60>
             </td>
+            <td nowrap bgcolor="#FFFFFF"><:help product title:></td>
           </tr>
           <tr> 
             <th nowrap align="left" bgcolor="#FFFFFF">Summary*:</th>
             <td nowrap bgcolor="#FFFFFF"> 
               <input type="text" name="summary" value="<:product summary:>" size=60>
             </td>
+            <td nowrap bgcolor="#FFFFFF"><:help product summary:></td>
           </tr>
           <tr> 
             <th nowrap align="left" bgcolor="#FFFFFF">Catalog:</th>
-            <td nowrap bgcolor="#FFFFFF"> 
-              <:catalogs:>
-            </td>
+            <td nowrap bgcolor="#FFFFFF"> <:catalogs:> </td>
+            <td nowrap bgcolor="#FFFFFF"><:help product catalog:></td>
           </tr>
           <tr> 
-            <th nowrap align="left" bgcolor="#FFFFFF" valign="top">Body:<:help 
-              body body:></th>
+            <th nowrap align="left" bgcolor="#FFFFFF" valign="top"> Body:</th>
             <td nowrap bgcolor="#FFFFFF"> 
               <textarea name="body" rows=15 cols=60 wrap=virtual><:product body:></textarea>
             </td>
+            <td nowrap bgcolor="#FFFFFF" valign="top"><:help body body:></td>
           </tr>
           <tr> 
             <th nowrap align="left" bgcolor="#FFFFFF">Lead time:</th>
             <td nowrap bgcolor="#FFFFFF"> 
               <input type="text" name="leadTime" value="<:product leadTime:>" size=5>
               days</td>
+            <td nowrap bgcolor="#FFFFFF"><:help product leadtime:></td>
           </tr>
           <tr> 
             <th nowrap align="left" bgcolor="#FFFFFF">Retail price:</th>
             <td nowrap bgcolor="#FFFFFF">$ 
               <input type="text" name="retailPrice" value="<:money retailPrice:>" size=7>
               (0.00)</td>
+            <td nowrap bgcolor="#FFFFFF"><:help product retail:></td>
           </tr>
           <tr> 
             <th nowrap align="left" bgcolor="#FFFFFF">Wholesale price:</th>
             <td nowrap bgcolor="#FFFFFF">$ 
               <input type="text" name="wholesalePrice" value="<:money wholesalePrice:>" size=7>
               (0.00)</td>
+            <td nowrap bgcolor="#FFFFFF"><:help product wholesale:></td>
           </tr>
           <tr> 
             <th nowrap align="left" bgcolor="#FFFFFF">GST:</th>
             <td nowrap bgcolor="#FFFFFF">$ 
               <input type="text" name="gst" value="<:money gst:>" size=7>
               (0.00)</td>
+            <td nowrap bgcolor="#FFFFFF"><:help product gst:></td>
           </tr>
           <tr> 
             <th nowrap align="left" bgcolor="#FFFFFF">Release date:</th>
             <td nowrap bgcolor="#FFFFFF"> 
               <input type="text" name="release" value="<:date product release:>" size=11>
               (dd/mm/yyyy)</td>
+            <td nowrap bgcolor="#FFFFFF"><:help product release:></td>
           </tr>
           <tr> 
             <th nowrap align="left" bgcolor="#FFFFFF">Expiry date:</th>
             <td nowrap bgcolor="#FFFFFF"> 
               <input type="text" name="expire" value="<:date product expire:>" size=11>
               (dd/mm/yyyy)</td>
+            <td nowrap bgcolor="#FFFFFF"><:help product expire:></td>
           </tr>
           <tr> 
             <th nowrap align="left" bgcolor="#FFFFFF">Summary length:</th>
             <td nowrap bgcolor="#FFFFFF"> 
               <input type="text" name="summaryLength" size="10" maxlength="10" value="<:product summaryLength:>">
             </td>
+            <td nowrap bgcolor="#FFFFFF"><:help product summary:></td>
           </tr>
           <tr> 
             <th nowrap align="left" bgcolor="#FFFFFF">Display threshold:</th>
             <td nowrap bgcolor="#FFFFFF"> 
               <input type="text" name="threshold" size=10 maxlength=10 value="<:product threshold:>">
-           </td>
+            </td>
+            <td nowrap bgcolor="#FFFFFF"><:help product threshold:></td>
           </tr>
           <tr> 
             <th align="left" bgcolor="#FFFFFF">Options:</th>
             <td bgcolor="#FFFFFF"> 
-              <input type="text" name="options" value="<:product options:>" size=30> (<:alloptions:>)
-              </td>
+              <input type="text" name="options" value="<:product options:>" size=30>
+              (<:alloptions:>) </td>
+            <td bgcolor="#FFFFFF"><:help product options:></td>
           </tr>
-          <tr>
-            <th nowrap align="left" bgcolor="#FFFFFF">Thumbnail image:</th>
-            <td nowrap bgcolor="#FFFFFF">
+          <tr> 
+            <th nowrap align="left" bgcolor="#FFFFFF" valign="top">Thumbnail image:</th>
+            <td nowrap bgcolor="#FFFFFF"> 
               <input type="file" name="thumbnail">
             </td>
+            <td nowrap bgcolor="#FFFFFF" valign="top"><:help product thumb:></td>
           </tr>
         </table>
       </td>
index 75a40b7..4513e44 100644 (file)
@@ -8,14 +8,11 @@
 </head>
 
 <body>
-
-  <input type="button" onclick="history.go(0);" value="  Refresh  ">
-
-  <h1><: articleType :> Image Wizard</h1>
-
-  <h2>Add a new image</h2>
-
-<:message:><p>
+<h1><: articleType :> Image Wizard</h1>
+<:ifMessage:> 
+<p><b><:message:> </b></p>
+<:or:><:eif:>
+<h2>Add new image</h2>
 
 <form method="POST" action="<:script:>" enctype="multipart/form-data">
 
@@ -23,7 +20,7 @@
 <input type="hidden" name="id" value="<: article id :>">
 <input type="hidden" name="parentid" value="<: article parentid :>">
 <input type="hidden" name="imgtype" value="<: articleType :>">
-  <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000">
+  <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
     <tr> 
       <td> 
         <table cellpadding="6" border="0" cellspacing="1">
 <input type="hidden" name="id" value="<: article id :>">
 <input type="hidden" name="parentid" value="<: article parentid :>">
 <input type="hidden" name="imgtype" value="<: articleType :>">
-  <h2>Manage Images</h2>
+  <h2>Manage images</h2>
 
-<table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000">
+<table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
     <tr>
       <td>
         <table cellpadding="6" border="0" cellspacing="1">
+          <tr> 
+            <th valign="top" bgcolor="#FFFFFF" colspan="3">First Image Position</th>
+          </tr>
+          <tr> 
+            <td align="center" bgcolor="#FFFFFF" colspan="3"> <input type="radio" name="imagePos" value="tl" <: 
+              checked tl :>>Top Left &nbsp;<input type="radio" name="imagePos" value="tr" <: 
+              checked tr :>>Top Right &nbsp; <input type="radio" name="imagePos" value="bl" <: 
+              checked bl :>>Bottom Left &nbsp; <input type="radio" name="imagePos" value="br" <: 
+              checked br :>>Bottom Right </td>
+          </tr>
           <tr bgcolor="#FFFFFF"> 
-            <th> Image</th>
-            <th> Alt Text</th>
-            <th> URL</th>
-
-            <th> Modify</th>
+            <th colspan="3">Image</th>
           </tr>
           <: iterator begin image :> 
           <tr bgcolor="#FFFFFF"> 
-            <td align="center"> <img src="/images/<: image image :>" alt="<: image alt :>"<: 
+            <td align="center" colspan="3"> <img src="/images/<: image image :>" alt="<: image alt :>"<: 
               image height :><: image width :>></td>
-            <td valign="top"> 
-              <input type="text" name="alt" value="<: image alt :>">
+          </tr>
+          <tr bgcolor="#FFFFFF"> 
+            <th width="50%"> Alt Text</th>
+            <th width="50%"> URL</th>
+            <th nowrap> Modify</th>
+          </tr>
+          <tr bgcolor="#FFFFFF"> 
+            <td valign="top" width="50%"> 
+              <input type="text" name="alt" value="<: image alt :>" size="32">
             </td>
-            <td valign="top"> 
-              <input type="text" name="url" value="<: image url :>">
+            <td valign="top" width="50%"
+              <input type="text" name="url" value="<: image url :>" size="32">
             </td>
-
             <td valign="bottom" nowrap> 
               <input type="submit" name="removeimg_<: image order :>" value="Delete" onClick="return window.alert('Remember to update the article after deletion is complete')" >
               <:imgmove:> </td>
           </tr>
           <: iterator separator image :> 
           <tr bgcolor="#FFFFFF"> 
-            <td colspan="4">&nbsp;</td>
+            <td colspan="3">&nbsp;</td>
           </tr>
           <: iterator end image :> 
           <tr> 
-            <th valign="top" bgcolor="#FFFFFF"> First Image Position: </th>
-            <td bgcolor="#FFFFFF"> <input type="radio" name="imagePos" value="tl"<: 
-              checked tl :>> &nbsp; Top Left <br><input type="radio" name="imagePos" value="tr"
-              <: checked tr :>> &nbsp; Top Right <br><input type="radio" name="imagePos" value="bl"
-              <: checked bl :>> &nbsp; Bottom Left <br><input type="radio" name="imagePos" value="br"
-              <: checked br :>> &nbsp; Bottom Right</td>
-            <td colspan="2" align="right" valign="bottom" bgcolor="#FFFFFF"> 
+            <td align="right" bgcolor="#FFFFFF" colspan="3"> 
               <input type="submit" name="process" value="Save changes">
             </td>
         </table>
 </table>
 
   <p>
-    <input type="submit" name="back" value=" <<  Back  "></p>
+    <input type="submit" name="back" value=" <<  Back  ">
+  </p>
 
 </form>
 
index 73b05f0..f16f8fa 100644 (file)
@@ -6,7 +6,7 @@
 </form>
 <:if Products:> 
 <h4>Products list</h4>
-<table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" width="100%" class="table">
   <tr>
     <td>
       <table border=0 cellpadding="6" cellspacing="1" width="100%">
index 7cc4a8c..9da1525 100644 (file)
@@ -8,15 +8,13 @@
 </head>
 
 <body>
-<p><input type="button" onclick="history.go(0);" value="  Refresh  "></p>
-
-  <h1>Administration Page</h1>
+<h1>Administration Page</h1>
 <:ifMessage:> 
 <p><b><:message:></b></p>
 <:or:><:eif:>
 <p>| <a href="/admin/">Admin menu</a> | <:if children:> <a name="children"></a> 
 </p>
-<table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" width="100%">
+<table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" width="100%" class="table">
   <tr>
       <td>
       <table border=0 cellpadding="6" cellspacing="1" width="100%">
index 47b6a69..ceff207 100644 (file)
 </head>
 
 <body>
+<h1>Administration Page</h1>
+<:ifMessage:> 
+<p><b><:message:></b></p>
+<:or:><:eif:>
+<p>| <a href="/admin/">Admin menu</a> | <:ifnew:><:or:><a href="<:article admin:>">See 
+  article</a> | <:eif:><:editParent:> <:if new:><:or new:><a href="<:script:>?id=<:article id:>&_t=steps">Manage 
+  step children/parents</a> | <:eif new:></p>
+<h2>Manage Images</h2>
 
-  <input type="button" onclick="history.go(0);" value="  Refresh  ">
-
-  <h1>Administration Page</h1>
-
-  <h2>Select Images First</h2>
-
-  <p><form enctype="multipart/form-data" method="POST" action="<:script:>">
+  <form enctype="multipart/form-data" method="POST" action="<:script:>">
 
   <p>
   <input type="submit" name="artimg" value="<:articleType:> Image Wizard">
 
   <h2><:articleType:> Details</h2>
 
-  <:ifMessage:> 
-  <p><b><:message:></b></p>
-  <:or:><:eif:>
-  <p>| <a href="/admin/">Admin menu</a> | <:ifnew:><:or:><a href="<:article admin:>">See 
-    article</a> | <:eif:><:editParent:> <:if new:><:or new:><a href="<:script:>?id=<:article id:>&_t=steps">Manage 
-    stepchildren/stepparents</a> | <:eif new:> 
     <input type="hidden" name="level" value="<: level :>">
     <input type="hidden" name="id" value="<: article id :>">
-  </p>
-  <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" width="100%">
+
+  <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" width="100%" class="table">
     <tr>
       <td>
 
@@ -51,7 +47,7 @@
             <td bgcolor="#FFFFFF"><:help edit section:> </td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left"> <:articleType:> Title: 
+            <th nowrap bgcolor="#FFFFFF" align="left"> <:articleType:> title: 
             </th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <input type="text" name="title" maxlength="<:cfg fields title_size 255:>" size="64" value="<: article title :>">
@@ -59,7 +55,7 @@
             <td bgcolor="#FFFFFF"><:help edit title:> </td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left"> Title Image: </th>
+            <th nowrap bgcolor="#FFFFFF" align="left"> Title image: </th>
             <td bgcolor="#FFFFFF" width="100%"> <:titleImages:> (upload this to 
               the /images/titles directory)</td>
             <td bgcolor="#FFFFFF">&nbsp;</td>
             <td bgcolor="#FFFFFF" width="100%"> 
               <textarea name="body" rows="10" cols="60" wrap="virtual"><: article body :></textarea>
             </td>
-            <td bgcolor="#FFFFFF"><:help body body:> </td>
+            <td bgcolor="#FFFFFF" valign="top"><:help body body:> </td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left"> Release Date: </th>
+            <th nowrap bgcolor="#FFFFFF" align="left"> Release date: </th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <input type="text" name="release" value="<: article release :>" size="10" maxlength="10">
               (dd/mm/yyyy<: ifnew :> - default is today<: or :><: eif :>)</td>
             <td bgcolor="#FFFFFF"><:help edit release:></td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left"> Expire Date: </th>
+            <th nowrap bgcolor="#FFFFFF" align="left"> Expiry date: </th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <input type="text" name="expire" value="<: article expire :>" size="10" maxlength="10">
               (dd/mm/yyyy - <: ifnew :>default is never, <: or :><: eif :>blank 
             <td bgcolor="#FFFFFF"><:help edit expire:></td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left"> Summary Length: </th>
+            <th nowrap bgcolor="#FFFFFF" align="left"> Summary length: </th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <input type="text" name="summaryLength" size="10" maxlength="10" value="<: article summaryLength :>">
               (in characters - <: ifnew :>default inherited from section<: if 
               art :> or sub-section<: or art :><: eif art :>, <: or :><: eif :> 
               zero for no summary)</td>
-            <td bgcolor="#FFFFFF"><:help edit summaryLength:></td>
+            <td bgcolor="#FFFFFF"><:help edit summary:></td>
           </tr>
           <tr> 
             <th nowrap bgcolor="#FFFFFF" align="left"> Display threshold: </th>
             <td bgcolor="#FFFFFF"><:help edit listed:></td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left">Thumbnails:</th>
+            <th nowrap bgcolor="#FFFFFF" align="left" valign="top">Thumbnail image:</th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <input type=file name=thumbnail>
               <:ifArticle thumbImage:><img src="/images/<:article thumbImage:>"> 
               <input type=checkbox name="remove_thumb">
               Remove<:or:><:eif:></td>
-            <td bgcolor="#FFFFFF"><:help edit thumb:></td>
+            <td bgcolor="#FFFFFF" valign="top"><:help edit thumb:></td>
           </tr>
           <:if Article id:> 
           <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left"><a name="files"></a>Files:</th>
+            <th nowrap bgcolor="#FFFFFF" align="left" valign="top"><a name="files"></a>Files:</th>
             <td nowrap bgcolor="#FFFFFF" width="100%"> <:if Files:> 
               <table cellpadding="0" cellspacing="0" border="0" bgcolor="#333333">
                 <tr><td> 
                         <th>Filename</th>
                         <th>Size</th>
                         <th>Type</th>
-                        <th>Download?</th>
-                        <th>Requires Payment</th>
-                </tr>
-                <:iterator begin files:> 
+                        <th>D/l</th>
+                        <th>Pay</th>
+                        <th>User</th>
+                      </tr>
+                      <:iterator begin files:> 
                       <tr bgcolor="#FFFFFF"> 
                         <td><:file displayName:></td>
-                        <td align="center"><:file sizeInBytes:></td>
+                        <td align="center"><:kb file sizeInBytes:></td>
                         <td><:file contentType:></td>
                         <td align=center><:ifFile download:>Yes<:or:>No<:eif:></td>
                         <td align=center><:ifFile forSale:>Yes<:or:>No<:eif:></td>
-                </tr>
-                <:iterator end files:> 
-               </table>
+                        <td align=center><:ifFile requireUser:>Yes<:or:>No<:eif:></td>
+                      </tr>
+                      <:iterator end files:> 
+                    </table>
               </td></tr></table>
-              <p><:or Files:> No files are attached to this article. <:eif Files:> 
+              <:or Files:><p>No files are attached to this article.<:eif Files:> 
                 <a href="<:script:>?filelist=1&id=<:article id:>"><b>Manage Files</b></a></p>
             </td>
-            <td nowrap bgcolor="#FFFFFF"><:help edit files:></td>
+            <td nowrap bgcolor="#FFFFFF" valign="top"><:help edit files:></td>
           </tr>
           <:or Article:><:eif Article:> 
           <tr> 
               <:image width:> height=<:image height:>> <:iterator separator images:> 
               <hr noshade size="1">
               <: iterator end images :> &nbsp; <br></td>
-            <td align="center" bgcolor="#FFFFFF"><:help edit images:>
-          </td></tr>
+            <td bgcolor="#FFFFFF" valign="top"><:help edit images:> </td>
+          </tr>
         </table>
 </td>
 </tr>
 
   <p>
     <input type="submit" name="save"
-           value="  <: ifnew :>Add New<: or :>Update<: eif :> <: articleType:>  "></p>
+           value="  <: ifnew :>Add New<: or :>Update<: eif :> <: articleType :>  "></p>
   </form>
-<:if children:> <a name="children"></a> 
-<table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" width="100%">
+<:if children:> <:ifEq [article id] 3:> 
+<h2>Catalogs</h2>
+<:or:> 
+<h2><: childtype :></h2>
+<:eif:><a name="children"></a> 
+<table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" width="100%" class="table">
   <tr>
       <td>
       <table border=0 cellpadding="6" cellspacing="1" width="100%">
 <:or new:>
 <form action="/cgi-bin/admin/add.pl" method="POST">
 <input type=hidden name="parentid" value="<:article id:>">
-<p><input type=submit value="Add <:childtype:>"></p>
+  <p> 
+    <input type=submit value="Add <:ifEq [article id] 3:>Catalog<:or:><: childtype :><:eif:>">
+  </p>
 </form>
 <:eif new:> <:or HaveChildType:> <:eif HaveChildType:>
 <p><font size="-1">BSE Release <:release:></font></p>
index 47b6a69..ceff207 100644 (file)
 </head>
 
 <body>
+<h1>Administration Page</h1>
+<:ifMessage:> 
+<p><b><:message:></b></p>
+<:or:><:eif:>
+<p>| <a href="/admin/">Admin menu</a> | <:ifnew:><:or:><a href="<:article admin:>">See 
+  article</a> | <:eif:><:editParent:> <:if new:><:or new:><a href="<:script:>?id=<:article id:>&_t=steps">Manage 
+  step children/parents</a> | <:eif new:></p>
+<h2>Manage Images</h2>
 
-  <input type="button" onclick="history.go(0);" value="  Refresh  ">
-
-  <h1>Administration Page</h1>
-
-  <h2>Select Images First</h2>
-
-  <p><form enctype="multipart/form-data" method="POST" action="<:script:>">
+  <form enctype="multipart/form-data" method="POST" action="<:script:>">
 
   <p>
   <input type="submit" name="artimg" value="<:articleType:> Image Wizard">
 
   <h2><:articleType:> Details</h2>
 
-  <:ifMessage:> 
-  <p><b><:message:></b></p>
-  <:or:><:eif:>
-  <p>| <a href="/admin/">Admin menu</a> | <:ifnew:><:or:><a href="<:article admin:>">See 
-    article</a> | <:eif:><:editParent:> <:if new:><:or new:><a href="<:script:>?id=<:article id:>&_t=steps">Manage 
-    stepchildren/stepparents</a> | <:eif new:> 
     <input type="hidden" name="level" value="<: level :>">
     <input type="hidden" name="id" value="<: article id :>">
-  </p>
-  <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" width="100%">
+
+  <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" width="100%" class="table">
     <tr>
       <td>
 
@@ -51,7 +47,7 @@
             <td bgcolor="#FFFFFF"><:help edit section:> </td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left"> <:articleType:> Title: 
+            <th nowrap bgcolor="#FFFFFF" align="left"> <:articleType:> title: 
             </th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <input type="text" name="title" maxlength="<:cfg fields title_size 255:>" size="64" value="<: article title :>">
@@ -59,7 +55,7 @@
             <td bgcolor="#FFFFFF"><:help edit title:> </td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left"> Title Image: </th>
+            <th nowrap bgcolor="#FFFFFF" align="left"> Title image: </th>
             <td bgcolor="#FFFFFF" width="100%"> <:titleImages:> (upload this to 
               the /images/titles directory)</td>
             <td bgcolor="#FFFFFF">&nbsp;</td>
             <td bgcolor="#FFFFFF" width="100%"> 
               <textarea name="body" rows="10" cols="60" wrap="virtual"><: article body :></textarea>
             </td>
-            <td bgcolor="#FFFFFF"><:help body body:> </td>
+            <td bgcolor="#FFFFFF" valign="top"><:help body body:> </td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left"> Release Date: </th>
+            <th nowrap bgcolor="#FFFFFF" align="left"> Release date: </th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <input type="text" name="release" value="<: article release :>" size="10" maxlength="10">
               (dd/mm/yyyy<: ifnew :> - default is today<: or :><: eif :>)</td>
             <td bgcolor="#FFFFFF"><:help edit release:></td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left"> Expire Date: </th>
+            <th nowrap bgcolor="#FFFFFF" align="left"> Expiry date: </th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <input type="text" name="expire" value="<: article expire :>" size="10" maxlength="10">
               (dd/mm/yyyy - <: ifnew :>default is never, <: or :><: eif :>blank 
             <td bgcolor="#FFFFFF"><:help edit expire:></td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left"> Summary Length: </th>
+            <th nowrap bgcolor="#FFFFFF" align="left"> Summary length: </th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <input type="text" name="summaryLength" size="10" maxlength="10" value="<: article summaryLength :>">
               (in characters - <: ifnew :>default inherited from section<: if 
               art :> or sub-section<: or art :><: eif art :>, <: or :><: eif :> 
               zero for no summary)</td>
-            <td bgcolor="#FFFFFF"><:help edit summaryLength:></td>
+            <td bgcolor="#FFFFFF"><:help edit summary:></td>
           </tr>
           <tr> 
             <th nowrap bgcolor="#FFFFFF" align="left"> Display threshold: </th>
             <td bgcolor="#FFFFFF"><:help edit listed:></td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left">Thumbnails:</th>
+            <th nowrap bgcolor="#FFFFFF" align="left" valign="top">Thumbnail image:</th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <input type=file name=thumbnail>
               <:ifArticle thumbImage:><img src="/images/<:article thumbImage:>"> 
               <input type=checkbox name="remove_thumb">
               Remove<:or:><:eif:></td>
-            <td bgcolor="#FFFFFF"><:help edit thumb:></td>
+            <td bgcolor="#FFFFFF" valign="top"><:help edit thumb:></td>
           </tr>
           <:if Article id:> 
           <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left"><a name="files"></a>Files:</th>
+            <th nowrap bgcolor="#FFFFFF" align="left" valign="top"><a name="files"></a>Files:</th>
             <td nowrap bgcolor="#FFFFFF" width="100%"> <:if Files:> 
               <table cellpadding="0" cellspacing="0" border="0" bgcolor="#333333">
                 <tr><td> 
                         <th>Filename</th>
                         <th>Size</th>
                         <th>Type</th>
-                        <th>Download?</th>
-                        <th>Requires Payment</th>
-                </tr>
-                <:iterator begin files:> 
+                        <th>D/l</th>
+                        <th>Pay</th>
+                        <th>User</th>
+                      </tr>
+                      <:iterator begin files:> 
                       <tr bgcolor="#FFFFFF"> 
                         <td><:file displayName:></td>
-                        <td align="center"><:file sizeInBytes:></td>
+                        <td align="center"><:kb file sizeInBytes:></td>
                         <td><:file contentType:></td>
                         <td align=center><:ifFile download:>Yes<:or:>No<:eif:></td>
                         <td align=center><:ifFile forSale:>Yes<:or:>No<:eif:></td>
-                </tr>
-                <:iterator end files:> 
-               </table>
+                        <td align=center><:ifFile requireUser:>Yes<:or:>No<:eif:></td>
+                      </tr>
+                      <:iterator end files:> 
+                    </table>
               </td></tr></table>
-              <p><:or Files:> No files are attached to this article. <:eif Files:> 
+              <:or Files:><p>No files are attached to this article.<:eif Files:> 
                 <a href="<:script:>?filelist=1&id=<:article id:>"><b>Manage Files</b></a></p>
             </td>
-            <td nowrap bgcolor="#FFFFFF"><:help edit files:></td>
+            <td nowrap bgcolor="#FFFFFF" valign="top"><:help edit files:></td>
           </tr>
           <:or Article:><:eif Article:> 
           <tr> 
               <:image width:> height=<:image height:>> <:iterator separator images:> 
               <hr noshade size="1">
               <: iterator end images :> &nbsp; <br></td>
-            <td align="center" bgcolor="#FFFFFF"><:help edit images:>
-          </td></tr>
+            <td bgcolor="#FFFFFF" valign="top"><:help edit images:> </td>
+          </tr>
         </table>
 </td>
 </tr>
 
   <p>
     <input type="submit" name="save"
-           value="  <: ifnew :>Add New<: or :>Update<: eif :> <: articleType:>  "></p>
+           value="  <: ifnew :>Add New<: or :>Update<: eif :> <: articleType :>  "></p>
   </form>
-<:if children:> <a name="children"></a> 
-<table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" width="100%">
+<:if children:> <:ifEq [article id] 3:> 
+<h2>Catalogs</h2>
+<:or:> 
+<h2><: childtype :></h2>
+<:eif:><a name="children"></a> 
+<table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" width="100%" class="table">
   <tr>
       <td>
       <table border=0 cellpadding="6" cellspacing="1" width="100%">
 <:or new:>
 <form action="/cgi-bin/admin/add.pl" method="POST">
 <input type=hidden name="parentid" value="<:article id:>">
-<p><input type=submit value="Add <:childtype:>"></p>
+  <p> 
+    <input type=submit value="Add <:ifEq [article id] 3:>Catalog<:or:><: childtype :><:eif:>">
+  </p>
 </form>
 <:eif new:> <:or HaveChildType:> <:eif HaveChildType:>
 <p><font size="-1">BSE Release <:release:></font></p>
index 6a6a48b..64628a0 100644 (file)
 </head>
 
 <body>
-
-  <input type="button" onclick="history.go(0);" value="  Refresh  ">
-
-  
 <h1>Shop Administration</h1>
+<:ifMessage:> 
+<p><b><:message:></b></p>
+<:or:><:eif:> 
+<p>| <a href="/admin/">Admin menu</a> | <:ifnew:><:or:><a href="<:article admin:>">See 
+  catalog</a> | <:eif:><:editParent:> <a href="<:script:>">Manage catalogs</a> 
+  | <:if new:><:or new:><a href="<:script:>?id=<:article id:>&_t=steps">Manage 
+  step children/parents</a> | <:eif new:></p>
+<h2>Manage Images</h2>
 
-  <h2>Select Images First</h2>
-
-  <p><form enctype="multipart/form-data" method="POST" action="<:script:>">
+  <form enctype="multipart/form-data" method="POST" action="<:script:>">
 
   <!--input type="hidden" name="return_url" value="<:script:>?level=<: level :>&id=<:article id:>" -->
 
 
   <h2>Catalog Details</h2>
 
-  <p><:ifMessage:></p>
-  <p><b><:message:></b></p>
-  <:or:><:eif:> 
-  <p>| <a href="/admin/">Admin menu</a> | <:ifnew:><:or:><a href="<:article admin:>">See 
-    catalog</a> | <:eif:><:editParent:> <a href="/cgi-bin/admin/shopadmin.pl">Manage 
-    store</a> | <:if new:><:or new:><a href="<:script:>?id=<:article id:>&_t=steps">Manage 
-    stepchildren/stepparents</a> | <:eif new:> 
-    <input type="hidden" name="level" value="<: level :>">
-    <input type="hidden" name="id" value="<: article id :>">
-  </p>
-  <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" width="100%">
+  <input type="hidden" name="level" value="<: level :>">
+  <input type="hidden" name="id" value="<: article id :>">
+  <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" width="100%" class="table">
     <tr>
       <td>
 
             <th bgcolor="#FFFFFF" nowrap align="left"> Parent: </th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <select name="parentid">
-                <option value="">Please Select a <: parentType :> 
-               <: list subsections :> 
+                <option value="">Please Select a <: parentType :> <: list subsections 
+                :> 
               </select>
             </td>
+            <td bgcolor="#FFFFFF"><:help catalog parent:></td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" nowrap align="left"> Catalog Title: </th>
+            <th bgcolor="#FFFFFF" nowrap align="left"> Catalog title: </th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <input type="text" name="title" maxlength="64" size="64" value="<: article title :>">
             </td>
+            <td bgcolor="#FFFFFF"><:help catalog title:></td>
           </tr>
           <tr> 
             <th bgcolor="#FFFFFF" nowrap align="left"> Template: </th>
             <td bgcolor="#FFFFFF" width="100%"> <:templates:> </td>
+            <td bgcolor="#FFFFFF"><:help catalog template:></td>
           </tr>
           <tr> 
-            <th valign="top" bgcolor="#FFFFFF" nowrap align="left"> Body: </th>
+            <th valign="top" bgcolor="#FFFFFF" nowrap align="left"> Body:</th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <textarea name="body" rows="10" cols="60" wrap="virtual"><: article body :></textarea>
             </td>
+            <td bgcolor="#FFFFFF" valign="top"><:help body body:></td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" nowrap align="left"> Release Date: </th>
+            <th bgcolor="#FFFFFF" nowrap align="left"> Release date: </th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <input type="text" name="release" value="<: article release :>" size="10" maxlength="10">
               (dd/mm/yyyy<: ifnew :> - default is today<: or :><: eif :>)</td>
+            <td bgcolor="#FFFFFF"><:help catalog release:></td>
           </tr>
-          
           <tr> 
-            <th bgcolor="#FFFFFF" nowrap align="left"> Expire Date: </th>
+            <th bgcolor="#FFFFFF" nowrap align="left"> Expiry date: </th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <input type="text" name="expire" value="<: article expire :>" size="10" maxlength="10">
               (dd/mm/yyyy - <: ifnew :>default is never, <: or :><: eif :>blank 
               for never expires)</td>
+            <td bgcolor="#FFFFFF"><:help catalog expire:></td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" nowrap align="left"> Summary Length: </th>
+            <th bgcolor="#FFFFFF" nowrap align="left"> Summary length: </th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <input type="text" name="summaryLength" size="10" maxlength="10" value="<: article summaryLength :>">
-              (in characters - <: ifnew :>default inherited from section<: if art :> or sub-section<: 
-              or art :><: eif art :>, <: or :><: eif :>zero for no 
-              summary)</td>
+              (in characters - <: ifnew :>default inherited from section<: if 
+              art :> or sub-section<: or art :><: eif art :>, <: or :><: eif :>zero 
+              for no summary)</td>
+            <td bgcolor="#FFFFFF"><:help catalog summary:></td>
           </tr>
           <tr> 
             <th bgcolor="#FFFFFF" nowrap align="left"> Display threshold: </th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <input type="text" name="threshold" size="10" maxlength="10" value="<: article threshold :>">
             </td>
+            <td bgcolor="#FFFFFF"><:help catalog threshold:></td>
           </tr>
           <tr> 
             <th bgcolor="#FFFFFF" nowrap align="left"> Keywords: </th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <input type="text" name="keyword" maxlength="255" size="60" value="<: article keyword :>">
-               (comma separated)
-            </td>
+              (comma separated) </td>
+            <td bgcolor="#FFFFFF"><:help catalog keywords:></td>
           </tr>
           <tr> 
             <th bgcolor="#FFFFFF" nowrap align="left">List article:</th>
             <td bgcolor="#FFFFFF" width="100%"> <:list listed:> </td>
+            <td bgcolor="#FFFFFF"><:help catalog list:></td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" nowrap align="left">Thumbnails:</th>
+            <th bgcolor="#FFFFFF" nowrap align="left" valign="top">Thumbnail image:</th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <input type=file name=thumbnail>
               <:ifArticle thumbImage:><img src="/images/<:article thumbImage:>"> 
               <input type=checkbox name="remove_thumb">
-               Remove<:or:><:eif:></td>
+              Remove<:or:><:eif:></td>
+            <td bgcolor="#FFFFFF" valign="top"><:help catalog thumb:></td>
           </tr>
           <tr> 
-            <th valign="top" bgcolor="#FFFFFF" nowrap align="left"> Uploaded files: 
+            <th valign="top" bgcolor="#FFFFFF" nowrap align="left"> Uploaded images: 
             </th>
             <td align="center" bgcolor="#FFFFFF" width="100%"> <: iterator begin 
               images :> <img src="/images/<: image image :>" alt="<:image alt :>" width=              <:image 
               width:> height=<:image height:>> <: iterator separator images :> 
               <hr noshade size="1">
               <: iterator end images :> &nbsp; <br>
+            <td bgcolor="#FFFFFF" valign="top"><:help catalog images:>
+          
         </table>
 </td>
 </tr>
     <input type="submit" name="save"
            value="  <: ifnew :>Add New<: or :>Update<: eif :> Catalog  "></p>
   </form>
-<:if children:> <a name="children"></a> 
-<table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" width="100%">
+<:if children:>
+<h2>Products / Sub-catalogs</h2>
+<a name="children"></a> 
+<table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" width="100%" class="table">
   <tr>
       <td>
       <table border=0 cellpadding="6" cellspacing="1" width="100%">
index 37d53c0..cbfb75c 100644 (file)
 </head>
 <body>
 <h1>Shop Administration</h1>
-<h2><:action:> Product</h2>
-<p><:ifMessage:></p>
+<:ifMessage:>
 <p><b><:message:></b></p>
 <:or:><:eif:> 
-<p>| <a href="/admin/">Admin menu</a> | <a href="<:product admin:>">See 
-  product</a> | <a href="<:script:>">Manage store</a> <:if Product listed:> | 
-  <a href="<:script:>?id=<:product id:>&delete_product=1">Hide</a> |<:or Product:> 
-  | <a href="<:script:>?id=<:product id:>&undelete_product=1">Show</a> |<:eif 
-  Product:> <a href="/cgi-bin/admin/add.pl?id=<:product id:>&_t=steps">Manage 
-  stepparents</a> |<:hiddenNote:></p>
-
-<form action="<:script:>" enctype="multipart/form-data" method="POST"><p><input type=submit name=showimages value="Image Wizard"></p>
-
-<input type="hidden" name="id" value="<:product id:>">
-  <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000">
+<p>| <a href="/admin/">Admin menu</a> | <a href="<:product admin:>">See product</a> 
+  | <a href="<:script:>">Manage catalogs</a><:if Product listed:> | <a href="<:script:>?id=<:product id:>&delete_product=1">Hide</a> 
+  |<:or Product:> | <a href="<:script:>?id=<:product id:>&undelete_product=1">Show</a> 
+  |<:eif Product:> <a href="/cgi-bin/admin/add.pl?id=<:product id:>&_t=steps">Manage 
+  step parents</a> |<:hiddenNote:></p>
+<h2>Manage Images</h2>
+<form action="<:script:>" enctype="multipart/form-data" method="POST">
+  <p>
+    <input type=submit name=showimages value="Image Wizard">
+  </p>
+  <h2><:action:> Product</h2>
+  <p>
+    <input type="hidden" name="id" value="<:product id:>">
+  </p>
+  <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
     <tr>
       <td>
         <table border=0 cellpadding="6" cellspacing="1" width="100%">
           <tr> 
             <th align="left" bgcolor="#FFFFFF">Title:</th>
             <td bgcolor="#FFFFFF"><:product title:></td>
+            <td nowrap bgcolor="#FFFFFF"><:help product title:></td>
+          </tr>
+          <tr> 
+            <th nowrap align="left" bgcolor="#FFFFFF">Summary:</th>
+            <td nowrap bgcolor="#FFFFFF"><:product summary:></td>
+            <td nowrap bgcolor="#FFFFFF"><:help product summary:></td>
           </tr>
           <tr> 
             <th align="left" bgcolor="#FFFFFF">Catalog:</th>
             <td bgcolor="#FFFFFF"><:catalogs:></td>
+            <td nowrap bgcolor="#FFFFFF"><:help product catalog:></td>
           </tr>
           <tr> 
-            <th align="left" bgcolor="#FFFFFF" valign="top">Description:</th>
+            <th align="left" bgcolor="#FFFFFF" valign="top"> Body:</th>
             <td bgcolor="#FFFFFF"> 
               <textarea name=body rows=15 cols=60 wrap=virtual><:product body:></textarea>
             </td>
+            <td nowrap bgcolor="#FFFFFF" valign="top"><:help body body:></td>
           </tr>
           <tr> 
             <th nowrap align="left" bgcolor="#FFFFFF">Lead time:</th>
             <td nowrap bgcolor="#FFFFFF"> 
               <input type="text" name="leadTime" value="<:product leadTime:>" size=5>
               days</td>
+            <td nowrap bgcolor="#FFFFFF"><:help product leadtime:></td>
           </tr>
           <tr> 
             <th align="left" bgcolor="#FFFFFF">Retail price:</th>
             <td bgcolor="#FFFFFF">$ 
               <input type="text" name="retailPrice" value="<:money retailPrice:>" size=7>
               (0.00)</td>
+            <td nowrap bgcolor="#FFFFFF"><:help product retail:></td>
           </tr>
           <tr> 
             <th align="left" bgcolor="#FFFFFF">Wholesale price:</th>
             <td bgcolor="#FFFFFF">$ 
               <input type="text" name="wholesalePrice" value="<:money wholesalePrice:>" size=7>
               (0.00)</td>
+            <td nowrap bgcolor="#FFFFFF"><:help product wholesale:></td>
           </tr>
           <tr> 
             <th align="left" bgcolor="#FFFFFF">GST:</th>
             <td bgcolor="#FFFFFF">$ 
               <input type="text" name="gst" value="<:money gst:>" size=7>
               (0.00)</td>
+            <td nowrap bgcolor="#FFFFFF"><:help product gst:></td>
           </tr>
           <tr> 
             <th align="left" bgcolor="#FFFFFF">Release date:</th>
             <td bgcolor="#FFFFFF"> 
               <input type="text" name="release" value="<:date product release:>" size=11>
               (dd/mm/yyyy)</td>
+            <td nowrap bgcolor="#FFFFFF"><:help product release:></td>
           </tr>
           <tr> 
             <th align="left" bgcolor="#FFFFFF">Expiry date:</th>
             <td bgcolor="#FFFFFF"> 
               <input type="text" name="expire" value="<:date product expire:>" size=11>
               (dd/mm/yyyy)</td>
+            <td nowrap bgcolor="#FFFFFF"><:help product expire:></td>
           </tr>
           <tr> 
             <th nowrap align="left" bgcolor="#FFFFFF">Summary length:</th>
             <td nowrap bgcolor="#FFFFFF"> 
               <input type="text" name="summaryLength" size="10" maxlength="10" value="<:product summaryLength:>">
             </td>
+            <td nowrap bgcolor="#FFFFFF"><:help product summary:></td>
           </tr>
           <tr> 
             <th nowrap align="left" bgcolor="#FFFFFF">Display threshold:</th>
             <td nowrap bgcolor="#FFFFFF"> 
               <input type="text" name="threshold" size=10 maxlength=10 value="<:product threshold:>">
-           </td>
+            </td>
+            <td nowrap bgcolor="#FFFFFF"><:help product threshold:></td>
           </tr>
           <tr> 
             <th align="left" bgcolor="#FFFFFF">Options:</th>
             <td bgcolor="#FFFFFF"> 
               <input type="text" name="options" value="<:product options:>" size=30>
               (<:alloptions:>) </td>
+            <td bgcolor="#FFFFFF"><:help product options:></td>
           </tr>
           <tr> 
-            <th nowrap align="left" bgcolor="#FFFFFF">Thumbnail image:</th>
+            <th nowrap align="left" bgcolor="#FFFFFF" valign="top">Thumbnail image:</th>
             <td nowrap bgcolor="#FFFFFF"> 
               <input type="file" name="thumbnail">
-              <:ifProduct thumbImage:><img src="/images/<:product thumbImage:>">
+              <:ifProduct thumbImage:><img src="/images/<:product thumbImage:>"> 
               <input type=checkbox name="remove_thumb">
               Remove<:or:><:eif:> </td>
+            <td nowrap bgcolor="#FFFFFF" valign="top"><:help product thumb:></td>
           </tr>
           <tr> 
-            <th nowrap align="left" bgcolor="#FFFFFF"><a name="files"></a>Files:</th>
+            <th nowrap align="left" bgcolor="#FFFFFF" valign="top"><a name="files"></a>Files:</th>
             <td nowrap bgcolor="#FFFFFF" width="100%"> <:if Files:> 
               <table cellpadding="0" cellspacing="0" border="0" bgcolor="#333333">
-                <tr>
+                <tr> 
                   <td> 
                     <table cellpadding="5" cellspacing="1" border="0">
                       <tr bgcolor="#FFFFFF"> 
                         <th>Filename</th>
                         <th>Size</th>
                         <th>Type</th>
-                        <th>Download?</th>
+                        <th>D/l</th>
+                        <th>Pay</th>
+                        <th>User</th>
                       </tr>
                       <:iterator begin files:> 
                       <tr bgcolor="#FFFFFF"> 
                         <td><:file displayName:></td>
-                        <td align="center"><:file sizeInBytes:></td>
+                        <td align="center"><:kb file sizeInBytes:></td>
                         <td><:file contentType:></td>
                         <td align=center><:ifFile download:>Yes<:or:>No<:eif:></td>
+                        <td align=center><:ifFile forSale:>Yes<:or:>No<:eif:></td>
+                        <td align=center><:ifFile requireUser:>Yes<:or:>No<:eif:></td>
                       </tr>
                       <:iterator end files:> 
                     </table>
                   </td>
                 </tr>
               </table>
-              <p><:or Files:> No files are attached to this article. <:eif Files:> 
-                <a href="<:script:>?filelist=1&id=<:product id:>"><b>Manage 
-                Files</b></a></p>
+              <:or Files:><p>No files are attached to this article.<:eif Files:> 
+                <a href="<:script:>?filelist=1&id=<:product id:>"><b>Manage Files</b></a></p>
             </td>
+            <td nowrap bgcolor="#FFFFFF" width="100%" valign="top"><:help product 
+              files:></td>
           </tr>
           <tr> 
-            <th valign="top" nowrap bgcolor="#FFFFFF"> Uploaded images: </th>
-            <td align="center" bgcolor="#FFFFFF" width="100%">
-            <:if Images:> <:iterator begin 
-              images:> <img src="/images/<: image image :>" alt="<:image alt :>" width= 
+            <th valign="top" nowrap bgcolor="#FFFFFF" align="left"> Uploaded images: 
+            </th>
+            <td align="center" bgcolor="#FFFFFF" width="100%"> <:if Images:> <:iterator 
+              begin images:> <img src="/images/<: image image :>" alt="<:image alt :>" width= 
               <:image width:> height=<:image height:>> <:iterator separator images:> 
               <hr noshade size="1">
-              <: iterator end images :> &nbsp; 
-            <:or Images:>No images<:eif Images:>
-           </td>
-         </tr>
+              <: iterator end images :> &nbsp; <:or Images:>No images<:eif Images:> 
+            </td>
+            <td valign="top" bgcolor="#FFFFFF" width="100%"><:help product images:></td>
+          </tr>
         </table>
       </td>
     </tr>
index 5d9b362..c500f7b 100644 (file)
@@ -2,7 +2,7 @@
 <head>
 
   <title>
-    Manage step<:ifMatch [article generator] "Product":><:or:> children/<:eif:>parents
+    Manage step <:ifMatch [article generator] "Product":><:or:> children/<:eif:>parents
   </title>
 
   <link rel="stylesheet" type="text/css" href="/css/admin.css">
 </head>
 
 <body>
+<h1>Manage step <:ifMatch [article generator] "Product":><:or:> children/<:eif:>parents</h1>
 
-  <input type="button" onclick="history.go(0);" value="  Refresh  ">
-
-  <h1>Manage step<:ifMatch [article generator] "Product":><:or:> children/<:eif:>parents</h1>
-
-<p>| <a href="/admin/">Admin menu</a> | <:ifMatch [article generator] "Product":><a href="/cgi-bin/admin/shopadmin.pl">Manage 
-  store</a> | <a href="/cgi-bin/admin/shopadmin.pl?id=<:article id:>&edit_product=1">Edit 
-  Product</a><:or:><a href="/cgi-bin/admin/add.pl?id=<:article id:>">Edit Article</a><:eif:> 
+<p>| <a href="/admin/">Admin menu</a> | <:ifMatch [article generator] "Product":><a href="<:script:>">Manage 
+  catalogs</a> | <a href="/cgi-bin/admin/shopadmin.pl?id=<:article id:>&edit_product=1">Edit 
+  product</a><:or:><a href="/cgi-bin/admin/add.pl?id=<:article id:>">Edit article</a><:eif:> 
   |</p>
-<:if new:><:or new:>
-<:if Match [article generator] "Product":><:or Match:>
-<h2><a name="step"></a>Step Children</h2>
-<table border="0" cellspacing="0" cellpadding="0" bgcolor='#000000' width="100%">
+<:if new:><:or new:> <:if Match [article generator] "Product":><:or Match:> 
+<h2><a name="step"></a>Step children</h2>
+<table border="0" cellspacing="0" cellpadding="0" bgcolor='#000000' width="100%" class="table">
   <tr><td>
       <table border="0" cellpadding="6" cellspacing="1" width="100%">
         <tr bgcolor="#FFFFFF"> 
@@ -91,9 +87,9 @@
         <:or Possibles:><:eif Possibles:> 
       </table>
 </td></tr></table>
-<h2><:eif Match:> <:eif new:> <a name="stepparents"></a></h2>
-<h3>Step parents</h3>
-<table border="0" cellspacing="0" cellpadding="0" bgcolor='#000000' width="100%">
+<:eif Match:> <:eif new:> <a name="stepparents"></a>
+<h2>Step parents</h2>
+<table border="0" cellspacing="0" cellpadding="0" bgcolor='#000000' width="100%" class="table">
   <tr><td>
       <table border=0 cellpadding="6" cellspacing="1" width="100%">
         <tr bgcolor="#FFFFFF"> 
index 6734969..70e9b2a 100644 (file)
@@ -9,19 +9,16 @@
 </head>
 
 <body>
-
-  <input type="button" onclick="history.go(0);" value="  Refresh  " />
-
-  <h1>File Wizard</h1>
-
-  <h2>Add a new file</h2>
-
-<:ifMessage:><p><b><:message:></b></p><:or:><:eif:>
+<h1>File Wizard</h1>
+<:ifMessage:>
+<p><b><:message:></b></p>
+<:or:><:eif:> 
+<h2>Add new file</h2>
 
 <form method="post" action="<:script:>" enctype="multipart/form-data">
 
 <input type="hidden" name="id" value="<: article id :>" />
-  <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000">
+  <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
     <tr> 
       <td> 
         <table cellpadding="6" border="0" cellspacing="1">
@@ -61,7 +58,7 @@
             <td bgcolor="#FFFFFF"><:help file forSale:> </td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left"> Require user: </th>
+            <th bgcolor="#FFFFFF" align="left"> Require login: </th>
             <td bgcolor="#FFFFFF"> 
               <input type="checkbox" name="requireUser" value="1" />
             </td>
   </table>
 </form>
 
-  <h2>Manage Files</h2>
+  
+<h2>Manage files</h2>
 
 <form method="post" action="<:script:>" enctype="multipart/form-data">
 <input type="hidden" name="id" value="<: article id :>" />
-<table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000">
+<table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
     <tr>
       <td>
         <table cellpadding="6" border="0" cellspacing="1">
-          <tr>
+          <tr> 
             <th bgcolor="#FFFFFF" nowrap> File</th>
             <th bgcolor="#FFFFFF" nowrap> Description</th>
             <th bgcolor="#FFFFFF" nowrap> Content-Type</th>
-            <th bgcolor="#FFFFFF" nowrap> Download</th>
-            <th bgcolor="#FFFFFF" nowrap> Require<br>
-              Payment</th>
-            <th bgcolor="#FFFFFF" nowrap> Require<br>
-              User</th>
-            <th bgcolor="#FFFFFF" nowrap>Modify </th>
           </tr>
-<:if Files:>
-<: iterator begin files :>
-    <tr bgcolor="#FFFFFF"> 
-      <td align="center"> <:file displayName:></td>
-      <td valign="top"> 
-        <input type="text" name="description_<:file id:>" value="<: file description :>" /></td>
-      <td valign="top"> 
-        <input type="text" name="contentType_<:file id:>" value="<: file contentType :>" /></td>
-      <td valign="top" align="center"><input type="checkbox" name="download_<:file id:>"<:ifFile download:> checked<:or:><:eif:> /> </td>
-      <td valign="top" align="center"><input type="checkbox" name="forSale_<:file id:>"<:ifFile forSale:> checked<:or:><:eif:> /> </td>
-      <td valign="top" align="center"><input type="checkbox" name="requireUser_<:file id:>"<:ifFile requireUser:> checked<:or:><:eif:> /> </td>
-            <td nowrap> <b><a href="<:script:>?filedel=1&amp;id=<:article id:>&amp;file=<:file id:>">Remove</a></b> 
-              <:move:></td>
+          <:if Files:> <: iterator begin files :> 
+          <tr bgcolor="#FFFFFF"> 
+            <td nowrap> <:file displayName:></td>
+            <td valign="top"> 
+              <input type="text" name="description_<:file id:>" value="<: file description :>" />
+            </td>
+            <td valign="top"> 
+              <input type="text" name="contentType_<:file id:>" value="<: file contentType :>" />
+            </td>
           </tr>
-<: iterator separator files :>
-    <tr bgcolor="#FFFFFF"> 
-      <td colspan="7">&nbsp;</td>
-    </tr>
-<: iterator end files :>
-
-  <tr>
-      <td colspan="7" align="right" valign="bottom" bgcolor="#FFFFFF"> 
-        <input type="submit" name="filesave" value="  Save changes  " /></td>
-  </tr>
-
-<:or Files:>
-
-    <tr bgcolor="#FFFFFF"> 
-      <td colspan="7" align="center">No files are attached to this article</td>
-    </tr>
-
-<:eif Files:>
-
-  </table>
+          <tr bgcolor="#FFFFFF"> 
+            <td colspan="3"> 
+              <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                <tr bgcolor="#FFFFFF"> 
+                  <td valign="top" align="center" nowrap> <input type="checkbox" name="download_<:file id:>"
+                    <:ifFile download:> checked<:or:><:eif:> />Download&nbsp;&nbsp;&nbsp;</td>
+                  <td valign="top" align="center" nowrap> <input type="checkbox" name="forSale_<:file id:>"
+                    <:ifFile forSale:> checked<:or:><:eif:> />Require payment&nbsp;&nbsp;&nbsp;</td>
+                  <td valign="top" align="center" nowrap> <input type="checkbox" name="requireUser_<:file id:>"
+                    <:ifFile requireUser:> checked<:or:><:eif:> />Require login 
+                    &nbsp;&nbsp;&nbsp;</td>
+                  <td nowrap align="right" width="100%"> <b><a href="<:script:>?filedel=1&amp;id=<:article id:>&amp;file=<:file id:>">Remove</a></b> 
+                    <:move:></td>
+                </tr>
+              </table>
+            </td>
+          </tr>
+          <: iterator separator files :> 
+          <tr bgcolor="#FFFFFF"> 
+            <td colspan="3">&nbsp;</td>
+          </tr>
+          <: iterator end files :> 
+          <tr> 
+            <td colspan="3" align="right" valign="bottom" bgcolor="#FFFFFF"> 
+              <input type="submit" name="filesave" value="  Save changes  " />
+            </td>
+          </tr>
+          <:or Files:> 
+          <tr bgcolor="#FFFFFF"> 
+            <td colspan="3" align="center">No files are attached to this article</td>
+          </tr>
+          <:eif Files:> 
+        </table>
 </td>
 </tr>
 </table>
index 0332479..f68aa9e 100644 (file)
@@ -3,11 +3,11 @@
 </head>
 <body>
 <h1>Shop Administration</h1>
-<h2>Order details</h2>
 <p>| <a href="/admin/">Admin menu</a> | <a href="<:script:>"></a><a href="<:script:>">Manage 
-  store</a> | <a href="<:script:>?order_list=1">Order list</a> | <a href="<:script:>?order_list=1&template=order_list_unfilled">Unfilled 
-  Orders</a> | <a href="<:script:>?order_list=1&template=order_list_filled">Filled 
-  Orders</a> |</p>
+  catalogs</a> | <a href="<:script:>?order_list=1">Manage orders</a> | <a href="<:script:>?order_list=1&template=order_list_unfilled">Unfilled 
+  orders</a> | <a href="<:script:>?order_list=1&template=order_list_filled">Filled 
+  orders</a> |</p>
+<h2>Order details</h2>
 <table cellpadding="6" cellspacing="1" border="0">
  <tr><td>E-mail:</td><td><a href="mailto:<:order emailAddress:>"><:order emailAddress:></a></td></tr>
  <tr><td>Date:</td><td><:date order orderDate:></td></tr>
@@ -35,7 +35,7 @@
 </table>
 
 <br>
-<table bgcolor="#000000" cellpadding="0" cellspacing="0" border="0">
+<table bgcolor="#000000" cellpadding="0" cellspacing="0" border="0" class="table">
   <tr>
 <td>
 
index 0f83f08..4206f39 100644 (file)
@@ -3,14 +3,13 @@
 </head>
 <body>
 <h1>Shop Administration</h1>
-<h2>Order list</h2>
-
-<p>| <a href="/admin/">Admin menu</a> | <a href="<:script:>">Manage store</a> 
+<p>| <a href="/admin/">Admin menu</a> | <a href="<:script:>">Manage catalogs</a> 
   | <a href="<:script:>?order_list=1&template=order_list_unfilled">Unfilled orders</a> 
   | <a href="<:script:>?order_list=1&template=order_list_filled">Filled orders</a> 
   |</p>
+<h2>Order list</h2>
 
-<table bgcolor="#000000" cellpadding="0" cellspacing="0" border="0" width="100%">
+<table bgcolor="#000000" cellpadding="0" cellspacing="0" border="0" width="100%" class="table">
   <tr>
 <td>
       <table border=0 cellpadding="6" cellspacing="1" width="100%">
@@ -20,7 +19,7 @@
           <th>Date</th>
           <th>Total</th>
           <th>GST</th>
-          <th>View</th>
+          <th>Details</th>
         </tr>
         <tr bgcolor="#FFFFFF"> 
           <td colspan="6"> 
@@ -42,8 +41,8 @@
           <td nowrap><:date orderDate:></td>
           <td align=right nowrap>$<:money total:></td>
           <td align=right nowrap>$<:money gst:></td>
-          <td nowrap> <a href="<:script:>?id=<:order id:>&order_detail=1">View 
-            order </a> </td>
+          <td nowrap> <a href="<:script:>?id=<:order id:>&order_detail=1">Order 
+            details </a> </td>
         </tr>
         <:iterator end orders:> 
       </table>
index e1e50f3..de35534 100644 (file)
@@ -3,13 +3,12 @@
 </head>
 <body>
 <h1>Shop Administration</h1>
-<h2>Order list - Filled orders</h2>
-
-<p>| <a href="/admin/">Admin menu</a> | <a href="<:script:>">Manage store</a> 
+<p>| <a href="/admin/">Admin menu</a> | <a href="<:script:>">Manage catalogs</a> 
   | <a href="<:script:>?order_list=1&template=order_list_unfilled">Unfilled orders</a> 
-  | <a href="<:script:>?order_list=1">All Orders</a> |</p>
+  | <a href="<:script:>?order_list=1">All orders</a> |</p>
+<h2>Order list - Filled orders</h2>
 
-<table bgcolor="#000000" cellpadding="0" cellspacing="0" border="0" width="100%">
+<table bgcolor="#000000" cellpadding="0" cellspacing="0" border="0" width="100%" class="table">
   <tr>
 <td>
       <table border=0 cellpadding="6" cellspacing="1" width="100%">
@@ -19,7 +18,7 @@
           <th>Date</th>
           <th>Total</th>
           <th>GST</th>
-          <th>View</th>
+          <th>Details</th>
         </tr>
         <tr bgcolor="#FFFFFF"> 
           <td colspan="6"> 
@@ -42,8 +41,8 @@
           <td nowrap><:date orderDate:></td>
           <td align=right nowrap>$<:money total:></td>
           <td align=right nowrap>$<:money gst:></td>
-          <td nowrap> <a href="<:script:>?id=<:order id:>&order_detail=1">View 
-            order </a> </td>
+          <td nowrap> <a href="<:script:>?id=<:order id:>&order_detail=1">Order 
+            details </a> </td>
         </tr>
         <:iterator end orders:> 
       </table>
index 8ba231c..23782d0 100644 (file)
@@ -3,13 +3,12 @@
 </head>
 <body>
 <h1>Shop Administration</h1>
-<h2>Order list - Unfilled orders</h2>
-
-<p>| <a href="/admin/">Admin menu</a> | <a href="<:script:>">Manage store</a> 
+<p>| <a href="/admin/">Admin menu</a> | <a href="<:script:>">Manage catalogs</a> 
   | <a href="<:script:>?order_list=1&template=order_list_filled">Filled orders</a> 
   | <a href="<:script:>?order_list=1">All orders</a> |</p>
+<h2>Order list - Unfilled orders</h2>
 
-<table bgcolor="#000000" cellpadding="0" cellspacing="0" border="0" width="100%">
+<table bgcolor="#000000" cellpadding="0" cellspacing="0" border="0" width="100%" class="table">
   <tr>
 <td>
       <table border=0 cellpadding="6" cellspacing="1" width="100%">
@@ -19,7 +18,7 @@
           <th>Date</th>
           <th>Total</th>
           <th>GST</th>
-          <th>View</th>
+          <th>Details</th>
         </tr>
         <tr bgcolor="#FFFFFF"> 
           <td colspan="6"> 
@@ -42,8 +41,8 @@
           <td nowrap><:date orderDate:></td>
           <td align=right nowrap>$<:money total:></td>
           <td align=right nowrap>$<:money gst:></td>
-          <td nowrap> <a href="<:script:>?id=<:order id:>&order_detail=1">View 
-            order</a></td>
+          <td nowrap> <a href="<:script:>?id=<:order id:>&order_detail=1">Order 
+            details </a></td>
         </tr>
         <:iterator end orders:> 
       </table>
index 8eff9d3..f2c53e0 100644 (file)
@@ -3,18 +3,18 @@
 </head>
 <body>
 <h1>Shop Administration</h1>
-<h2>Product details</h2>
 <p>| <a href="/admin/">Admin menu</a> | <a href="<:product admin:>">See product</a> 
-  | <a href="<:script:>">Manage store</a> | <a href="<:script:>?id=<:product id:>&edit_product=1">Edit</a> 
-  <:if Product listed:> | <a href="<:script:>?id=<:product id:>&delete_product=1">Hide</a> 
+  | <a href="<:script:>">Manage catalogs</a> | <a href="<:script:>?id=<:product id:>&edit_product=1">Edit 
+  product </a> <:if Product listed:> | <a href="<:script:>?id=<:product id:>&delete_product=1">Hide</a> 
   |<:or Product:> | <a href="<:script:>?id=<:product id:>&undelete_product=1">Show</a> 
   |<:eif Product:> <:hiddenNote:></p>
-<table bgcolor="#000000" cellpadding="0" cellspacing="0" border="0" width="100%">
+<h2>Product details</h2>
+<table bgcolor="#000000" cellpadding="0" cellspacing="0" border="0" width="100%" class="table">
   <tr>
 <td>
       <table border=0 cellpadding="6" cellspacing="1" width="100%">
         <tr> 
-          <th align="left" nowrap bgcolor="#FFFFFF">Name:</th>
+          <th align="left" nowrap bgcolor="#FFFFFF">Title:</th>
           <td bgcolor="#FFFFFF" width="100%"><:product title:></td>
         </tr>
         <tr> 
@@ -47,7 +47,8 @@
         </tr>
         <tr> 
           <th align="left" nowrap bgcolor="#FFFFFF">Expiry date:</th>
-          <td bgcolor="#FFFFFF" width="100%"><:date product expire:></td>
+          <td nowrap bgcolor="#FFFFFF"><:ifMatch [date product expire] "31/12/9999":>Never<:or:><:date 
+            product expire:><:eif:></td>
         </tr>
         <tr> 
           <th align="left" nowrap bgcolor="#FFFFFF">Options:</th>
index 56be576..61492c6 100644 (file)
@@ -7,9 +7,10 @@
 <:ifMessage:><p><b><:message:></b></p>
 <:or:><:eif:> 
 <p>| <a href="/admin/">Admin menu</a> | <a href="/cgi-bin/admin/admin.pl?id=<:shopid:>">See 
-  store</a> | <a href="<:script:>?order_list=1">Order list</a> | <a href="/cgi-bin/admin/admin.pl?id=<:shopid:>"></a><:if 
-  ShowStepKids:><a href="<:script:>?showstepkids=0">Hide stepkids</a><:or ShowStepKids:><a href="<:script:>?showstepkids=1">Show 
-  stepkids</a><:eif ShowStepKids:> | </p>
+  shop</a> | <a href="<:script:>?order_list=1">Manage orders</a> | <a href="/cgi-bin/admin/admin.pl?id=<:shopid:>"></a><:if 
+  ShowStepKids:><a href="<:script:>?showstepkids=0">Hide step children</a><:or 
+  ShowStepKids:><a href="<:script:>?showstepkids=1">Show step children</a><:eif 
+  ShowStepKids:> | </p>
 <:iterator begin catalogs:> <a name="cat<:catalog id:>"></a> 
 <h2>Catalog: <:catalog title:> <:movecat:></h2>
 <p><:embed catalog catalog.tmpl:></p>
index 320fe3d..afb49fd 100644 (file)
 
 <:ifMessage:><p><b><:message:></b></p><:or:><:eif:>
 
-<p>| <a href="/admin/"><b>Admin menu</b></a> | <a href="<:script:>"><b>Subscriptions List</b></a> |</p>
+<p>| <a href="/admin/">Admin menu</a> | <a href="<:script:>">Subscriptions List</a> 
+  |</p>
 
 <form action="<:script:>" method="GET">
-<table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000">
+<table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
     <tr>
       <td>
         <table cellpadding="6" border="0" cellspacing="1">
           <tr bgcolor="#FFFFFF"> 
-            <th>Name:</th>
+            <th align="left" nowrap>Name:</th>
             <td> 
               <input type="text" name="name" value="<:old name:>" size="40" />
             </td>
             <td><:help subs name:> <:ifError name:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error name:>" /><:or:><:eif:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
-            <th>Title:</th>
+            <th align="left" nowrap>Title:</th>
             <td> 
               <input type="text" name="title" value="<:old title:>" size="40" />
             </td>
             <td><:help subs title:> <:ifError title:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error title:>" /><:or:><:eif:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
-            <th>Description:</th>
+            <th align="left" valign="top" nowrap>Description:</th>
             <td valign="top"> 
               <textarea name="description" cols="60" rows="10" wrap="virtual"><:old description:></textarea>
             </td>
             <td valign="top"><:help subs description:> <:ifError description:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error description:>" /><:or:><:eif:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
-            <th>Frequency:</th>
+            <th align="left" nowrap>Frequency:</th>
             <td> 
               <input type="text" name="frequency" value="<:old frequency:>" size="40" />
             </td>
             <td><:help subs frequency:> <:ifError frequency:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error frequency:>" /><:or:><:eif:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
-            <th>HTML Template:</th>
+            <th align="left" nowrap>HTML template:</th>
             <td><:template html_template htmlemail 1:> </td>
             <td><:help subs html_template:> <:ifError html_template:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error html_template:>" /><:or:><:eif:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
-            <th>Text Template:</th>
+            <th align="left" nowrap>Text template:</th>
             <td><:template text_template textemail:> </td>
             <td><:help subs text_template:> <:ifError text_template:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error text_template:>" /><:or:><:eif:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
-            <th>Visible:</th>
+            <th align="left" nowrap>Visible:</th>
             <td><input type="checkbox" name="visible" value="1"<:ifOld visible:> 
-              checked<:or:><:eif:> /> </td>
+              checked<:or:><:eif:> /> Make this subscription available</td>
             <td><:help subs visible:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
             <td><:help subs archiving:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
-            <th>Archive:</th>
+            <th align="left" nowrap>Archive:</th>
             <td><input type="checkbox" name="archive" value="1"<:ifOld archive:> 
-              checked<:or:><:eif:> /> </td>
+              checked<:or:><:eif:> /> Archive this subscription</td>
             <td><:help subs archive:> </td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
-            <th>Keywords:</th>
+            <th align="left" nowrap>Keywords:</th>
             <td> 
               <input type="text" name="keyword" value="<:old keyword:>" size="40" />
             </td>
             <td><:help subs keyword:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
-            <th>Article Template:</th>
+            <th align="left" nowrap>Article template:</th>
             <td><:template article_template:> </td>
             <td><:help subs template:> <:ifError article_template:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error article_template:>" /><:or:><:eif:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
-            <th>Archive Parent:</th>
+            <th align="left" nowrap>Archive parent:</th>
             <td><:parent:> </td>
             <td><:help subs parent:> <:ifError parentId:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error parentId:>" /><:or:><:eif:></td>
           </tr>
index 575862a..315f32f 100644 (file)
 
 <:ifMessage:><p><b><:message:></b></p><:or:><:eif:>
 
-<p>| <a href="/admin/"><b>Admin menu</b></a> | <a href="<:script:>"><b>Subscriptions List</b></a> |</p>
+<p>| <a href="/admin/">Admin menu</a> | <a href="<:script:>">Subscriptions List</a> 
+  |</p>
 
 <form action="<:script:>" method="POST"><input type="hidden" name="id" value="<:subscription id:>">
-<table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000">
+<table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
     <tr>
       <td>
         <table cellpadding="6" border="0" cellspacing="1">
           <tr bgcolor="#FFFFFF"> 
-            <th>Name:</th>
+            <th align="left" nowrap>Name:</th>
             <td> 
               <input type="text" name="name" value="<:old name:>" size="40" />
             </td>
             <td><:help subs name:> <:ifError name:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error name:>" /><:or:><:eif:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
-            <th>Title:</th>
+            <th align="left" nowrap>Title:</th>
             <td> 
               <input type="text" name="title" value="<:old title:>" size="40" />
             </td>
             <td><:help subs title:> <:ifError title:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error title:>" /><:or:><:eif:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
-            <th>Description:</th>
+            <th align="left" valign="top" nowrap>Description:</th>
             <td valign="top"> 
               <textarea name="description" cols="60" rows="10" wrap="virtual"><:old description:></textarea>
             </td>
             <td valign="top"><:help subs description:> <:ifError description:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error description:>" /><:or:><:eif:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
-            <th>Frequency:</th>
+            <th align="left" nowrap>Frequency:</th>
             <td> 
               <input type="text" name="frequency" value="<:old frequency:>" size="40" />
             </td>
             <td><:help subs frequency:> <:ifError frequency:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error frequency:>" /><:or:><:eif:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
-            <th>HTML Template:</th>
+            <th align="left" nowrap>HTML template:</th>
             <td><:template html_template htmlemail 1:> </td>
             <td><:help subs html_template:> <:ifError html_template:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error html_template:>" /><:or:><:eif:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
-            <th>Text Template:</th>
+            <th align="left" nowrap>Text template:</th>
             <td><:template text_template textemail:> </td>
             <td><:help subs text_template:> <:ifError text_template:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error text_template:>" /><:or:><:eif:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
-            <th>Visible:</th>
+            <th align="left" nowrap>Visible:</th>
             <td><input type="checkbox" name="visible" value="1"<:ifOld visible:> 
-              checked<:or:><:eif:> /> </td>
+              checked<:or:><:eif:> /> Make this subscription available</td>
             <td><:help subs visible:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
             <td><:help subs archiving:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
-            <th>Archive:</th>
+            <th align="left" nowrap>Archive:</th>
             <td><input type="checkbox" name="archive" value="1"<:ifOld archive:> 
-              checked<:or:><:eif:> /> </td>
+              checked<:or:><:eif:> /> Archive this subscription</td>
             <td><:help subs archive:> </td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
-            <th>Keywords:</th>
+            <th align="left" nowrap>Keywords:</th>
             <td> 
               <input type="text" name="keyword" value="<:old keyword:>" size="40" />
             </td>
             <td><:help subs keyword:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
-            <th>Article Template:</th>
+            <th align="left" nowrap>Article template:</th>
             <td><:template article_template:> </td>
             <td><:help subs template:> <:ifError article_template:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error article_template:>" /><:or:><:eif:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
-            <th>Archive Parent:</th>
+            <th align="left" nowrap>Archive parent:</th>
             <td><:parent:> </td>
             <td><:help subs parent:> <:ifError parentId:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error parentId:>" /><:or:><:eif:></td>
           </tr>
index d037553..6f585f3 100644 (file)
 
 <:ifMessage:><p><b><:message:></b></p><:or:><:eif:>
 
-<p>| <a href="/admin/"><b>Admin menu</b></a> | <a href="<:script:>?add=1"><b>Add New Subscription</b></a> |</p>
+<p>| <a href="/admin/">Admin menu</a> | <a href="<:script:>?add=1">Add New Subscription</a> 
+  |</p>
 
-<table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000">
+<table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
     <tr>
       <td>
-  <table cellpadding="6" border="0" cellspacing="1">
-    <tr bgcolor="#FFFFFF">
+      <table cellpadding="6" border="0" cellspacing="1">
+        <tr bgcolor="#FFFFFF">
       <th>Name</th>
       <th>Title</th>
       <th>Frequency</th>
       <th>Visible</th>
       <th>Last published</th>
-      <th>&nbsp;</th>
+          <th>Modify</th>
     </tr>
 <:if Subscriptions:>
 <:iterator begin subscriptions:>
       <td><:subscription frequency:></td>
       <td align="center"><:ifSubscription visible:>Yes<:or:>No<:eif:></td>
       <td align="center"><:ifMatch [subscription lastSent] "0000-00-00":>Never<:or:><:date subscription lastSent:><:eif:></td>
-      <td>
-        <a href="<:script:>?edit=1&id=<:subscription id:>"><b>Edit</b></a>
-        <a href="<:script:>?start_send=1&id=<:subscription id:>"><b>Send</b></a>
-      </td>
+          <td nowrap> <a href="<:script:>?edit=1&id=<:subscription id:>"><b>Edit</b></a> 
+            <a href="<:script:>?start_send=1&id=<:subscription id:>"><b>Send</b></a> 
+          </td>
     </tr>
 <:iterator end subscriptions:>
 <:or Subscriptions:>
index e41afe3..bd9bc08 100644 (file)
 
 <h1><:cfg site name:> Send Subscription</h1>
 
-<:ifMessage:><p><b><:message:></b></p><:or:><:eif:>
-
-<p>| <a href="/admin/"><b>Admin menu</b></a> | <a href="<:script:>" target="_top"><b>Subscriptions List</b></a> |</p>
+<:ifMessage:><p><b><:message:></b></p>
+<:or:><:eif:> 
+<p>| <a href="/admin/" target="_top">Admin menu</a> | <a href="<:script:>" target="_top">Subscriptions 
+  List</a> |</p>
 
 <form action="<:script:>" method="POST" name="sub" target="preview"><input type="hidden" name="id" value="<:subscription id:>">
-<table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000">
+<table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
     <tr>
       <td>
         <table cellpadding="6" border="0" cellspacing="1">
           <tr bgcolor="#FFFFFF"> 
-            <th>Title/Subject:</th>
+            <th align="left" nowrap>Title/Subject:</th>
             <td> 
               <input type="text" name="title" value="<:old title:>" size="40" />
             </td>
             <td><:help subssend title:> <:ifError title:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error title:>" /><:or:><:eif:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
-            <th>Body:</th>
+            <th align="left" valign="top" nowrap>Body:</th>
             <td valign="top"> 
               <textarea name="body" cols="60" rows="10" wrap="virtual"><:old body:></textarea>
             </td>
           </tr>
           <:if Cfg subscriptions override:> 
           <tr bgcolor="#FFFFFF"> 
-            <th>HTML Template:</th>
+            <th align="left" nowrap>HTML template:</th>
             <td><:template html_template htmlemail 1:> </td>
             <td><:help subssend html_template:> <:ifError html_template:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error html_template:>" /><:or:><:eif:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
-            <th>Text Template:</th>
+            <th align="left" nowrap>Text template:</th>
             <td><:template text_template textemail:> </td>
             <td><:help subssend text_template:> <:ifError text_template:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error text_template:>" /><:or:><:eif:></td>
           </tr>
             <td><:help subssend archiving:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
-            <th>Archive:</th>
+            <th align="left" nowrap>Archive:</th>
             <td> 
               <input type="hidden" name="have_archive_check" value="1"><input type="checkbox" name="archive" value="1" 
-              <:ifOld archive:> checked<:or:><:eif:> /> </td>
+              <:ifOld archive:> checked<:or:><:eif:> /> Archive this subscription</td>
             <td><:help subssend archive:> </td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
-            <th>Keywords:</th>
+            <th align="left" nowrap>Keywords:</th>
             <td> 
               <input type="text" name="keyword" value="<:old keyword:>" size="40" />
             </td>
             <td><:help subssend keyword:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
-            <th>Article Template:</th>
+            <th align="left" nowrap>Article template:</th>
             <td><:template article_template:> </td>
             <td><:help subssend template:> <:ifError article_template:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error article_template:>" /><:or:><:eif:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
-            <th>Archive Parent:</th>
+            <th align="left" nowrap>Archive parent:</th>
             <td><:parent:> </td>
             <td><:help subssend parent:> <:ifError parentId:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error parentId:>" /><:or:><:eif:></td>
           </tr>
index 0755717..b30f3d3 100644 (file)
@@ -34,7 +34,7 @@ children:><:ifAdmin:>
 <hr noshade size="1">
 <:or:><:eif:><:moveDown:><:moveUp:><:embed child:><:iterator separator children:><br>
 <:iterator end children:> <:or UnderThreshold:> <:iterator begin children:> 
-<p><a href="<:url child:>"><b><font face="Verdana, Arial, Helvetica, sans-serif" size="3"><:child 
+<p><:thumbnail child:> <a href="<:url child:>"><b><font face="Verdana, Arial, Helvetica, sans-serif" size="3"><:child 
   title:></font></b></a><:moveDown:><:moveUp:><br>
   <:if Child summaryLength:><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><:summary:></font><:or 
   Child:><:eif Child:></p>
index c351f99..97763a0 100644 (file)
@@ -34,12 +34,12 @@ allkids:><:ifAdmin:>
 <hr noshade size="1">
 <:or:><:eif:><:movestepkid:><:embed allkid:><:iterator separator allkids:><br>
 <:iterator end allkids:> <:or UnderThreshold:><:iterator begin allkids:> 
-<p><a href="<:url allkid:>"><b><font face="Verdana, Arial, Helvetica, sans-serif" size="3"><:allkid 
+<p><:thumbnail allkid:> <a href="<:url child:>"><b><font face="Verdana, Arial, Helvetica, sans-serif" size="3"></font></b></a><a href="<:url allkid:>"><b><font face="Verdana, Arial, Helvetica, sans-serif" size="3"><:allkid 
   title:></font></b></a> <:movestepkid:><br>
-  <:if Allkid summaryLength:><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><:summary allkid:></font><:or 
-  Allkid:><:eif Allkid:></p>
-<:iterator separator allkids:><:iterator end allkids:><:eif UnderThreshold:>
-<:if Stepparents:>
+  <:if Allkid summaryLength:><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><:summary 
+  allkid:></font><:or Allkid:><:eif Allkid:></p>
+<:iterator separator allkids:><:iterator end allkids:><:eif UnderThreshold:> <:if 
+Stepparents:> 
 <p><font face="Verdana, Arial, Helvetica, sans-serif" size="-2">The following 
   other related sections may be of interest:</font></p>
 <ul>
index a505bde..a4b7d3e 100644 (file)
@@ -96,7 +96,8 @@ begin allkids:><:ifAdmin:>
 <hr noshade size="1">
 <:or:><:eif:><:movestepkid:><:embed allkid:><:iterator separator allkids:><br>
 <:iterator end allkids:> <:or UnderThreshold:><:iterator begin allkids:> 
-<p><a href="<:url allkid:>"><b><font face="Verdana, Arial, Helvetica, sans-serif" size="3"><:allkid 
+<p><:thumbnail allkid:> <a href="<:url child:>"><b><font face="Verdana, Arial, Helvetica, sans-serif" size="3"></font></b></a> 
+  <a href="<:url allkid:>"><b><font face="Verdana, Arial, Helvetica, sans-serif" size="3"><:allkid 
   title:></font></b></a> <:movestepkid:><br>
   <:if Allkid summaryLength:><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><:summary 
   allkid:></font><:or Allkid:><:eif Allkid:></p>
index 598c1c7..c5bdfab 100644 (file)
@@ -97,7 +97,7 @@ begin allkids:><:ifAdmin:>
 <hr noshade size="1">
 <:or:><:eif:><:movestepkid:><:embed allkid:><:iterator separator allkids:><br>
 <:iterator end allkids:> <:or UnderThreshold:><:iterator begin allkids:> 
-<p><a href="<:url allkid:>"><b><font face="Verdana, Arial, Helvetica, sans-serif" size="3"><:allkid 
+<p><:thumbnail allkid:> <a href="<:url allkid:>"><b><font face="Verdana, Arial, Helvetica, sans-serif" size="3"><:allkid 
   title:></font></b></a> <:movestepkid:><br>
   <:if Allkid summaryLength:><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><:summary 
   allkid:></font><:or Allkid:><:eif Allkid:></p>
index b911234..5fa4543 100644 (file)
     the newsletter, and then click on an encoded link in a
     confirmation email that was sent to this address.</font></p>
 
-    <p><font size="-1">If you don't want to receive this newsletter 
-    anymore you can <a href="<:cfg site url:>/cgi-bin/user.pl?unsub=<:user confirmSecret:>&u=<:user id:>&s=<:sub id:>">Unsubscribe from this newsletter</a> or<a href="<:cfg site url:>/cgi-bin/user.pl?unsub=<:user confirmSecret:>&u=<:user id:>&s=all">Unsubscribe from all <:cfg site url:> newsletters.</a> </font></p>
+    
+<p><font size="-1">If you don't want to receive this newsletter anymore you can 
+  <a href="<:cfg site url:>/cgi-bin/user.pl?unsub=<:user confirmSecret:>&u=<:user id:>&s=<:sub id:>">Unsubscribe 
+  from this newsletter</a> or <a href="<:cfg site url:>/cgi-bin/user.pl?unsub=<:user confirmSecret:>&u=<:user id:>&s=all">Unsubscribe 
+  from all <:cfg site url:> newsletters.</a> </font></p>
 
   </body>
 </html>
\ No newline at end of file
index 9d5344c..f58c090 100644 (file)
@@ -3,8 +3,8 @@
 <:ifCgi product:><input type=hidden name=product value="<:cgi product |h:>"><:or:><:eif:>
 <:ifCgi product_id:><input type=hidden name=product_id value="<:cgi product_id |h:>"><:or:><:eif:>
 <div align=center>
-  <table width="350">
-    <tr> 
+    <table width="350">
+      <tr> 
       <th colspan="2" align="center"> 
         <p><font face="Verdana, Arial, Helvetica, sans-serif" size="3"><b><:msg:></b></font></p>
       </th>
@@ -14,8 +14,8 @@
       <td><input type=text name=email value=<:cgi email |h:>></td>
     </tr>
     <tr> 
-      <td colspan="2"> 
-        <input type=submit value="Register Interest">
+        <td colspan="2" align="right"> 
+          <input type=submit value="Register Interest">
       </td>
     </tr>
   </table>
index 7d3ddac..d481005 100644 (file)
@@ -9,7 +9,8 @@
     <tr> 
       <td colspan="2"> 
         <p><font face="Verdana, Arial, Helvetica, sans-serif" size="2">The shop owner has been notified of your interest<:ifProduct:> in product '<:product |h:>'<:or:><:eif:>.</font></p>
-       <p>When the product becomes available you will be contacted through <b><:email |h:>.</p>
+           <p><font face="Verdana, Arial, Helvetica, sans-serif" size="2">When the 
+          product becomes available you will be contacted through <b><:email |h:></b>.</font></p>
       </td>
     </tr>
   </table>
index 477abe0..a923262 100644 (file)
@@ -8,8 +8,9 @@
     </tr>
     <tr> 
       <td colspan="2"> 
-        <p><font face="Verdana, Arial, Helvetica, sans-serif" size="2">There was an error when registering your interest:</p>
-       <p><:msg:></p>
+        <p><font face="Verdana, Arial, Helvetica, sans-serif" size="2">There was 
+          an error when registering your interest:</font></p>
+        <p><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><:msg:></font></p>
       </td>
     </tr>
   </table>
diff --git a/site/templates/printable/justkids.tmpl b/site/templates/printable/justkids.tmpl
deleted file mode 100644 (file)
index d4165f8..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<:article id:>
-<:iterator begin children:>
-<:ifInMenu:>
-<:embed child printable/justkids.tmpl:>
-<:or:>
-<:embed child printable/printable.tmpl:>
-<:eif:>
-<hr>
-<:iterator end children:>
index 86b0d04..626916d 100644 (file)
       </th>
     </tr>
     <tr> 
-      <td colspan="2" align="center"> 
-        <p><font face="Verdana, Arial, Helvetica, sans-serif" size="2">Hello <:user 
-          userId:></font></p>
-      </td>
+      <td colspan="2" align="center"> <font face="Verdana, Arial, Helvetica, sans-serif" size="2">Hello 
+        <:user userId:><br>
+        Last logged in: <:date user lastLogon:><br>
+        <br>
+        </font></td>
     </tr>
     <:if Message:> 
     <tr> 
@@ -48,7 +49,7 @@
         <th nowrap align="left"><b><font face="Verdana, Arial, Helvetica, sans-serif" size="-2">Email 
           Address:</font></b></th>
         <td width="100%"> 
-          <input type="text" name="email" value="<:last email:>" size="40" />
+          <input type="text" name="email" value="<:last email:>" size="40" maxlength="127" />
         </td>
       </tr>
       <!--//<tr> 
@@ -69,7 +70,8 @@
           <table border="0" cellspacing="0" cellpadding="0">
             <:iterator begin subscriptions:> 
             <tr height="20"> 
-              <td> <input type="checkbox" name="subscription" value="<:subscription id:>"<:ifSubscribed:> checked<:or:><:eif:> /></td>
+              <td> <input type="checkbox" name="subscription" value="<:subscription id:>"<:ifSubscribed:> 
+                checked<:or:><:eif:> /></td>
               <td><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><:subscription 
                 name:></font></td>
               <td>&nbsp;&nbsp;<a href="#" onClick="javascript:window.open('<:siteUrl:><:script:>?subinfo=1&id=<:subscription id:>', 'subscription_info','width=350,height=200,location=no,status=no,menubar=no,scrollbars=yes'); return 0"><img src="/images/info.gif" width="16" height="16" border="0" /></a></td>
@@ -89,8 +91,9 @@
             your subscription. If you change your email address you will need 
             to reconfirm your subscription.</font></div>
           <:eif User:> <:eif AnySubs:> 
-          <p> <input type="checkbox" name="textOnlyMail" value="1"<:ifLast textOnlyMail:> checked<:or:><:eif:> /> 
-          <font face="Verdana, Arial, Helvetica, sans-serif" size="2">Text only E-mail messages</font></p>
+          <p> <input type="checkbox" name="textOnlyMail" value="1"<:ifLast textOnlyMail:> 
+            checked<:or:><:eif:> /> <font face="Verdana, Arial, Helvetica, sans-serif" size="2">Text 
+            only E-mail messages</font></p>
         </td>
       </tr>
       <:or Subscriptions:><:eif Subscriptions:> 
         <th nowrap align="left"><b><font face="Verdana, Arial, Helvetica, sans-serif" size="-2">First 
           Name:</font></b></th>
         <td width="100%"> 
-          <input type="text" name="name1" value="<:last name1:>" size="40" />
+          <input type="text" name="name1" value="<:last name1:>" size="40" maxlength="127" />
         </td>
       </tr>
       <tr> 
         <th nowrap align="left"><b><font face="Verdana, Arial, Helvetica, sans-serif" size="-2">Last 
           Name:</font></b></th>
         <td width="100%"> 
-          <input type="text" name="name2" value="<:last name2:>" size="40" />
+          <input type="text" name="name2" value="<:last name2:>" size="40" maxlength="127" />
+        </td>
+      </tr>
+      <tr> 
+        <th nowrap align="left"><b><font face="Verdana, Arial, Helvetica, sans-serif" size="-2">Title:</font></b></th>
+        <td width="100%"> 
+          <input type="text" name="title" value="<:last title:>" size="40" maxlength="127" />
+        </td>
+      </tr>
+      <tr> 
+        <th nowrap align="left"><b><font face="Verdana, Arial, Helvetica, sans-serif" size="-2">Organisation:</font></b></th>
+        <td width="100%"> 
+          <input type="text" name="organization" value="<:last organization:>" size="40" maxlength="127" />
         </td>
       </tr>
       <tr> 
         <th nowrap align="left"><b><font face="Verdana, Arial, Helvetica, sans-serif" size="-2">Street:</font></b></th>
         <td width="100%"> 
-          <input type="text" name="address" value="<:last address:>" size="40" />
+          <input type="text" name="address" value="<:last address:>" size="40" maxlength="127" />
         </td>
       </tr>
       <tr> 
         <th nowrap align="left"><b><font face="Verdana, Arial, Helvetica, sans-serif" size="-2">Suburb:</font></b></th>
         <td width="100%"> 
-          <input type="text" name="city" value="<:last city:>" size="40" />
+          <input type="text" name="city" value="<:last city:>" size="40" maxlength="127" />
         </td>
       </tr>
       <tr> 
         <th nowrap align="left"><b><font face="Verdana, Arial, Helvetica, sans-serif" size="-2">State:</font></b></th>
         <td width="100%"> 
-          <input type="text" name="state" value="<:last state:>" size="8" />
+          <input type="text" name="state" value="<:last state:>" size="8" maxlength="40" />
         </td>
       </tr>
       <tr> 
         <th nowrap align="left"><b><font face="Verdana, Arial, Helvetica, sans-serif" size="-2">Post 
           Code:</font></b></th>
         <td width="100%"> 
-          <input type="text" name="postcode" value="<:last postcode:>" size="8" />
+          <input type="text" name="postcode" value="<:last postcode:>" size="8" maxlength="40" />
         </td>
       </tr>
       <tr> 
         <th nowrap align="left"><b><font face="Verdana, Arial, Helvetica, sans-serif" size="-2">Country:</font></b></th>
         <td width="100%"> 
-          <input type="text" name="country" value="<:last country:>" size="32" />
+          <input type="text" name="country" value="<:last country:>" size="32" maxlength="127" />
         </td>
       </tr>
       <tr> 
         <th nowrap align="left"><b><font face="Verdana, Arial, Helvetica, sans-serif" size="-2">Phone:</font></b></th>
         <td width="100%"> 
-          <input type="text" name="telephone" value="<:last telephone:>" size="32" />
+          <input type="text" name="telephone" value="<:last telephone:>" size="32" maxlength="80" />
         </td>
       </tr>
       <tr> 
         <th nowrap align="left"><b><font face="Verdana, Arial, Helvetica, sans-serif" size="-2">Facsimile:</font></b></th>
         <td width="100%"> 
-          <input type="text" name="facsimile" value="<:last facsimile:>" size="32" />
+          <input type="text" name="facsimile" value="<:last facsimile:>" size="32" maxlength="80" />
         </td>
       </tr>
       <tr> 
         <th nowrap align="left"><b><font face="Verdana, Arial, Helvetica, sans-serif" size="-2">Old 
           Password:</font></b></th>
         <td width="100%"> 
-          <input type="password" name="old_password" size="40" />
+          <input type="password" name="old_password" size="40" maxlength="40" />
         </td>
       </tr>
       <tr> 
         <th nowrap align="left"><b><font face="Verdana, Arial, Helvetica, sans-serif" size="-2">New 
           Password:</font></b></th>
         <td width="100%"> 
-          <input type="password" name="password" value="" size="40" />
+          <input type="password" name="password" value="" size="40" maxlength="40" />
         </td>
       </tr>
       <tr> 
         <th nowrap align="left"><b><font face="Verdana, Arial, Helvetica, sans-serif" size="-2">Confirm 
           Password:</font></b></th>
         <td width="100%"> 
-          <input type="password" name="confirm_password" value="" size="40" />
+          <input type="password" name="confirm_password" value="" size="40" maxlength="40" />
         </td>
       </tr>
       <tr> 
       </tr>
     </form>
   </table>
-</div>
\ No newline at end of file
+</div>
index 06468fd..9a3be6c 100644 (file)
     </tr>
     <:or Message:><:eif Message:> 
     <tr> 
-      <th align="center"><font face="Verdana, Arial, Helvetica, sans-serif" size="3">Your 
+      <th align="center" height="20"><font face="Verdana, Arial, Helvetica, sans-serif" size="3">Your 
         Orders</font></th>
     </tr>
+    <tr>
+      <td align="center"> 
+        <p><font face="Verdana, Arial, Helvetica, sans-serif" size="2">Hello <:user 
+          userId:><br>
+          Last logged in: <:date user lastLogon:></font><br>
+          <br>
+        </p>
+        </td>
+    </tr>
     <:if Orders:>
 <:iterator begin orders:>
     <tr>
         </table>
         <table width="100%" cellpadding="3" cellspacing="1">
           <tr bgcolor="#CCCCCC"> 
-            <th colspan="3"><font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#666666"><:ifEq 
-              [cfg downloads must_be_filled] "yes":>Files available when order 
-              status is &#145;Complete&#146;<:or:>Files<:eif:></font></th>
+            <th colspan="3"><font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#666666"><:if 
+              Order filled:>Files available<:or Order:><:ifEq [cfg downloads must_be_filled] 
+              "yes":>Files available when order status is &#145;Complete&#146;<:or:>Files<:eif:><:eif 
+              Order:></font></th>
           </tr>
           <tr bgcolor="#EEEEEE"> 
             <th width="50%" align="left"><font face="Verdana, Arial, Helvetica, sans-serif" size="2">Description</font></th>