0.02_18 commit r0_11_18
authorTony Cook <tony@develop-help.com>
Wed, 26 Jun 2002 11:23:14 +0000 (11:23 +0000)
committertony <tony@45cb6cf1-00bc-42d2-bb5a-07f51df49f94>
Wed, 26 Jun 2002 11:23:14 +0000 (11:23 +0000)
27 files changed:
Makefile
site/cgi-bin/admin/add.pl
site/cgi-bin/modules/BSE/UserReg.pm
site/cgi-bin/modules/BSE/Util/SQL.pm
site/cgi-bin/modules/Generate.pm
site/cgi-bin/modules/Generate/Catalog.pm
site/docs/bse.pod
site/htdocs/admin/index.html
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/catalog.tmpl
site/templates/catalog/multi.tmpl
site/templates/printable/printable.tmpl

index 8e8c204..622fff9 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=0.11_17
+VERSION=0.11_18
 DISTNAME=bse-$(VERSION)
 DISTBUILD=$(DISTNAME)
 DISTTAR=../$(DISTNAME).tar
index 1ea7816..e296429 100755 (executable)
@@ -489,12 +489,11 @@ sub save_new_article {
       (my $extra = lc $article->{title}) =~ tr/a-z0-9/_/sc;
       $link .= "/".$extra;
     }
-    $article->setAdmin("$CGI_URI/admin/admin.pl?id=$article->{id}");
   }
   else {
     $link = $urlbase.$SHOP_URI."/shop$article->{id}.html";
-    $article->setAdmin($CGI_URI."/admin/shopadmin.pl");
   }
+  $article->setAdmin("$CGI_URI/admin/admin.pl?id=$article->{id}");
   $article->setLink($link);
   $article->save();
 
index 334de8e..6d1cf3f 100644 (file)
@@ -112,7 +112,7 @@ sub _got_user_refresh {
       if $debug;
 
     #my ($secprot, $sechost, $secport) = 
-    #  $securl =~ m!^(\w+)://([\w-.]+)(?::(\d+))?!;
+    #  $securl =~ m!^(\w+)://([\w.-]+)(?::(\d+))?!;
 
     # get info about the current host
     my $port = $ENV{SERVER_PORT} || 80;
@@ -446,7 +446,7 @@ sub userpage {
   $message ||= $cgi->param('message') || '';
 
   my $must_be_paid = $cfg->entryBool('downloads', 'must_be_paid', 0);
-  my $must_be_filled = $cfg->entryBool('download', 'must_be_filled', 0);
+  my $must_be_filled = $cfg->entryBool('downloads', 'must_be_filled', 0);
 
   my $order_index;
   my $item_index;
index 872cad5..8a71bd2 100644 (file)
@@ -3,7 +3,7 @@ use strict;
 use vars qw(@EXPORT_OK @ISA);
 require 'Exporter.pm';
 @EXPORT_OK = qw/now_datetime sql_datetime date_to_sql sql_to_date sql_date 
-                now_sqldate sql_datetime_to_epoch/;
+                now_sqldate now_sqldatetime sql_datetime_to_epoch/;
 @ISA = qw/Exporter/;
 
 =head1 NAME
@@ -35,10 +35,15 @@ sub sql_datetime {
   return strftime('%Y-%m-%d %H:%M:%S', localtime shift);
 }
 
+# obsolete
 sub now_datetime {
   return sql_datetime(time);
 }
 
+sub now_sqldatetime {
+  return sql_datetime(time);
+}
+
 sub sql_date {
   use POSIX qw/strftime/;
   return strftime('%Y-%m-%d', localtime shift);
index 953f17c..2ffc56b 100644 (file)
@@ -191,7 +191,10 @@ sub _embed_low {
       eval {
        require $genname;
       };
-      $@ and return "** Cannot load generator $embed->{generator} for article $id **";
+      if ($@) {
+       print STDERR "Cannot load generator $embed->{generator}: $@\n";
+       return "** Cannot load generator $embed->{generator} for article $id **";
+      }
       $gen = $embed->{generator}->new(admin=>$self->{admin}, cfg=>$self->{cfg});
     }
 
index 46edb11..ef9f76b 100644 (file)
@@ -114,6 +114,36 @@ HTML
      iterate_allprods_reset => sub { $allprod_index = -1 },
      iterate_allprods => sub { ++$allprod_index < @allprods },
      allprod => sub { CGI::escapeHTML($allprods[$allprod_index]{$_[0]}) },
+     moveallprod =>
+     sub {
+       return '' unless $self->{admin};
+       my $html = '';
+       my $can_move_up = $allprod_index > 0;
+       my $can_move_down = $allprod_index < $#allprods;
+       return '' unless $can_move_up || $can_move_down;
+       my $blank = '<img src="/images/trans_pixel.gif" width="17" height="13" border="0" alt="" align="absbotton">';
+       my $myid = $allprods[$allprod_index]{id};
+       my $refreshto = "$CGI_URI/admin/admin.pl?id=$article->{id}";
+       if ($can_move_down) {
+        my $nextid = $allprods[$allprod_index+1]{id};
+        $html .= <<HTML;
+<a href="$CGI_URI/admin/move.pl?stepparent=$article->{id}&d=swap&id=$myid&other=$nextid&refreshto=$refreshto"><img src="$IMAGES_URI/admin/move_down.gif" width="17" height="13" border="0" alt="Move Down" align="absbottom"></a>
+HTML
+       }
+       else {
+        $html .= $blank;
+       }
+       if ($can_move_up) {
+        my $previd = $allprods[$allprod_index-1]{id};
+        $html .= <<HTML;
+<a href="$CGI_URI/admin/move.pl?stepparent=$article->{id}&d=swap&id=$myid&other=$previd&refreshto=$refreshto"><img src="$IMAGES_URI/admin/move_up.gif" width="17" height="13" border="0" alt="Move Up" align="absbottom"></a>
+HTML
+       }
+       else {
+        $html .= $blank;
+       }
+       return $html;
+     },
      ifAnyProds => sub { CGI::escapeHTML(@allprods) },
      iterate_stepprods_reset => sub { $stepprod_index = -1 },
      iterate_stepprods => sub { ++$stepprod_index < @stepprods; },
index 2e185bb..678f546 100644 (file)
@@ -10,6 +10,33 @@ Maybe I'll add some other bits here.
 
 =head1 CHANGES
 
+=head2 0.11_18
+
+=over
+
+=item *
+
+must_be_filled really fixed now (#128)
+
+=item *
+
+was calling function (now_sqldatetime()) that didn't exist
+
+=item *
+
+integrated new templates from Adrian, hopefully I got the right
+revisions.
+
+=item *
+
+<:moveallprod:> for the catalogs page (#122)
+
+=item *
+
+admin link for new catalogs now points at admin.pl (#120)
+
+=back
+
 =head2 0.11_17
 
 =over
index 5a87318..36656ef 100644 (file)
@@ -1,16 +1,21 @@
 <html><head><title>Administration Centre</title>
 <link 
+
 rel="stylesheet" 
+
 href="/css/admin.css">
 </head>
 <body>
 <h1>Administration 
+
 Centre</h1>
 <p>
 <table width="50%" border="0" cellspacing="0" 
+
 cellpadding="5">
   <tr> 
     <td colspan="2"><a 
+
 href="/cgi-bin/admin/admin.pl?id=1">Browse in edit mode</a></td>
  
 </tr>
@@ -20,6 +25,7 @@ mode</a></td>
   </tr>
   <tr> 
     <td colspan="2"><a 
+
 href="/cgi-bin/admin/add.pl?parentid=2">Add to home page</a></td>
  
 </tr>
@@ -30,67 +36,97 @@ href="/cgi-bin/admin/add.pl?parentid=2">Add to home page</a></td>
 </tr>
   <tr> 
     <td colspan="2"><a 
+
 href="/cgi-bin/admin/add.pl?id=-1">Administer sections</a></td>
  
 </tr>
   <tr> 
     <td width="15">&nbsp;</td>
     <td>&#149; <a 
-href="/cgi-bin/admin/add.pl?level=1&parentid=-1">Add a new section</a></td>
-</tr>
+
+href="/cgi-bin/admin/add.pl?level=1&parentid=-1">Add a new 
+section</a></td>
+  </tr>
   <tr> 
     <td width="15">&nbsp;</td>
-    <td>&#149; <a 
-href="/cgi-bin/admin/add.pl?level=2">Add a new subsection</a></td>
  
-</tr>
+<td>&#149; <a 
+href="/cgi-bin/admin/add.pl?level=2">Add a new 
+subsection</a></td>
+  </tr>
   <tr> 
     <td width="15">&nbsp;</td>
-    <td>&#149; <a 
-href="/cgi-bin/admin/add.pl">Add a new article</a></td>
-  </tr>
  
-<tr> 
-    <td width="15">&nbsp;</td>
-    <td>&nbsp;</td>
+<td>&#149; <a 
+href="/cgi-bin/admin/add.pl">Add a new 
+article</a></td>
   </tr>
+  <tr> 
+    <td width="15">&nbsp;</td>
  
-<tr> 
-    <td colspan="2"><a href="/cgi-bin/admin/shopadmin.pl">Shop 
-administration</a></td>
+<td>&nbsp;</td>
   </tr>
+  <tr> 
+    <td colspan="2"><a 
+href="/cgi-bin/admin/shopadmin.pl">Shop administration</a></td>
+</tr>
+  <tr> 
+    <td 
+width="15">&nbsp;</td>
+    <td>&#149; <a 
+
+href="/cgi-bin/admin/shopadmin.pl?order_list=1&template=order_list_unfilled">View 
+
+      current orders</a> (<a 
+href="/cgi-bin/admin/shopadmin.pl?order_list=1">all</a> 
+      or <a 
+href="/cgi-bin/admin/shopadmin.pl?order_list=1&template=order_list_filled">filled</a>)</td>
+</tr>
   <tr> 
     <td 
 width="15">&nbsp;</td>
     <td>&#149; <a 
+
 href="/cgi-bin/admin/add.pl?parentid=3">Add catalog</a></td>
-  </tr>
  
-<tr> 
+</tr>
+  <tr> 
     <td width="15">&nbsp;</td>
     <td>&nbsp;</td>
-  </tr>
-
-<tr> 
-    <td colspan="2"><a href="/cgi-bin/admin/subs.pl">Subscriptions
-administration</a></td>
-  </tr>
  
-<tr> 
+</tr>
+  <tr> 
+    <td colspan="2"><a 
+href="/cgi-bin/admin/subs.pl">Subscriptions administration</a></td>
+</tr>
+  <tr> 
     <td width="15">&nbsp;</td>
     <td>&nbsp;</td>
-  </tr>
-
-<tr> 
-    <td colspan="2"><a href="/cgi-bin/admin/generate.pl">Regenerate static &amp; base pages</a> (<a href="/cgi-bin/admin/generate.pl?progress=1">verbose</a>)</td>
-  </tr>
+</tr>
+  <tr> 
+    <td colspan="2"><a 
+href="/cgi-bin/admin/generate.pl">Regenerate static &amp; 
+      base 
+pages</a> (<a 
+href="/cgi-bin/admin/generate.pl?progress=1">verbose</a>)</td>
+</tr>
   <tr> 
     <td width="15">&nbsp;</td>
-    <td>&#149; <a href="/cgi-bin/admin/generate.pl?id=extras">Regenerate extras and base pages</a>  (<a href="/cgi-bin/admin/generate.pl?id=extras&progress=1">verbose</a>)</td>
-  </tr>
+    <td>&#149; <a 
+href="/cgi-bin/admin/generate.pl?id=extras">Regenerate extras 
+and base pages</a> (<a 
+href="/cgi-bin/admin/generate.pl?id=extras&progress=1">verbose</a>)</td>
+</tr>
   <tr> 
     <td colspan="2"><a 
+
 href="/cgi-bin/admin/makeIndex.pl">Regenerate search index</a></td>
  
 </tr>
@@ -101,6 +137,7 @@ href="/cgi-bin/admin/makeIndex.pl">Regenerate search index</a></td>
 </tr>
   <tr> 
     <td colspan="2"><a 
+
 href="/cgi-bin/admin/userlist.pl">Download member list</a></td>
  
 </tr>
@@ -119,15 +156,18 @@ tools</a></td>
 <td>&nbsp;</td>
   </tr>
   <tr> 
-    <td colspan="2">
+    <td colspan="2"> 
       <form 
+
 action="/cgi-bin/admin/admin.pl">
         Jump to: 
         <input 
+
 type=text name=id size=4>
         <input type="submit" 
+
 value="Jump!">
-        (Article ID eg: 1 = Home)
+        (Article ID eg: 1 = Home) 
       </form>
  
 </td>
index 91d43cb..9f9591b 100644 (file)
@@ -7,8 +7,8 @@
 <:ifMessage:>
 <p><b><:message:> </b></p>
 <:or:><:eif:> 
-<p>| <a href="/admin/">Admin menu</a> | <a href="<:script:>">Product list</a> | 
-</p>
+<p>| <a href="/admin/">Admin menu</a> | <a href="<:script:>">Manage store</a> 
+  | </p>
 
 <form action="<:script:>" enctype="multipart/form-data" method=POST><p><input type=submit name=showimages value="Image Wizard"></p>
 
@@ -36,7 +36,8 @@
             </td>
           </tr>
           <tr> 
-            <th nowrap align="left" bgcolor="#FFFFFF">Body:<:help body body:></th>
+            <th nowrap align="left" bgcolor="#FFFFFF" valign="top">Body:<:help 
+              body body:></th>
             <td nowrap bgcolor="#FFFFFF"> 
               <textarea name="body" rows=15 cols=60 wrap=virtual><:product body:></textarea>
             </td>
index c09012e..75a40b7 100644 (file)
       <td> 
         <table cellpadding="6" border="0" cellspacing="1">
           <tr> 
-            <th bgcolor="#FFFFFF"> Image file to add: </th>
+            <th bgcolor="#FFFFFF" align="left"> Image file to add: </th>
             <td bgcolor="#FFFFFF"> 
               <input type="file" name="image">
             </td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF"> Alt text for image: </th>
+            <th bgcolor="#FFFFFF" align="left"> Alt text for image: </th>
             <td bgcolor="#FFFFFF"> 
               <input type="text" name="altIn">
             </td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF"> URL for image: </th>
+            <th bgcolor="#FFFFFF" align="left"> URL for image: </th>
             <td bgcolor="#FFFFFF"> 
               <input type="text" name="url" width="40">
             </td>
index 3b51cbb..73b05f0 100644 (file)
@@ -1,4 +1,9 @@
-<p><a href="/cgi-bin/admin/add.pl?id=<:catalog id:>">Edit catalog</a></p>
+<form name="" action="/cgi-bin/admin/add.pl" method="post">
+  <p><input type=hidden name=id value="<:catalog id:>">
+    <input type="submit" name="edit_catalog" value="Edit Catalog">
+  </p>
+</form>
 <:if Products:> 
 <h4>Products list</h4>
 <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" width="100%">
     <td>
       <table border=0 cellpadding="6" cellspacing="1" width="100%">
         <tr> 
-          <th bgcolor="#FFFFFF">Id</th>
+          <th bgcolor="#FFFFFF" nowrap>Id</th>
           <th bgcolor="#FFFFFF" width="100%">Name</th>
-          <th bgcolor="#FFFFFF">Release</th>
-          <th bgcolor="#FFFFFF">Expire</th>
-          <th bgcolor="#FFFFFF">Retail</th>
-          <th bgcolor="#FFFFFF">Wholesale</th>
-          <th bgcolor="#FFFFFF">GST</th>
-          <th bgcolor="#FFFFFF">Modify</th>
-          <th bgcolor="#FFFFFF">&nbsp;</th>
+          <th bgcolor="#FFFFFF" nowrap>Release</th>
+          <th bgcolor="#FFFFFF" nowrap>Expire</th>
+          <th bgcolor="#FFFFFF" nowrap>Retail</th>
+          <th bgcolor="#FFFFFF" nowrap>Wsale</th>
+          <th bgcolor="#FFFFFF" nowrap>GST</th>
+          <th bgcolor="#FFFFFF" nowrap>Modify</th>
+          <th bgcolor="#FFFFFF">Note</th>
         </tr>
         <:iterator begin products:> 
         <tr bgcolor="#FFFFFF"> 
-          <td align="center"><a href="<:script:>?id=<:product id:>&product_detail=1"><:product 
-            id:></a></td>
-          <td width="100%"><:product title:></td>
-          <td><:date release:></td>
-          <td><:date expire:></td>
-          <td align=right>$<:money retailPrice:></td>
-          <td align=right>$<:money wholesalePrice:></td>
-          <td align=right>$<:money gst:></td>
+          <td align="center" nowrap><:product id:></td>
+          <td width="100%"><a href="<:product admin:>"><:product title:></a></td>
+          <td nowrap><:date release:></td>
+          <td nowrap><:ifMatch [date expire] "31/12/9999":>Never<:or:><:date expire:><:eif:></td>
+          <td align=right nowrap>$<:money retailPrice:></td>
+          <td align=right nowrap>$<:money wholesalePrice:></td>
+          <td align=right nowrap>$<:money gst:></td>
           <td nowrap><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> 
             <:or Product:> <a href="<:script:>?id=<:product id:>&undelete_product=1">Show</a> 
@@ -38,7 +42,8 @@
   </tr>
 </table>
 <:or Products:><:eif Products:>
-<form action="<:script:>"><input type=hidden name=parentid value="<:catalog id:>"><p><input type=submit name="add_product" value="Add Product"></p></form>
+<form action="<:script:>" method="post">
+  <p><input type=hidden name=parentid value="<:catalog id:>"><input type=submit name="add_product" value="Add Product"></p></form>
 <h4>Sub catalogs</h4>
 <h4><:if Subcats :> <:iterator begin subcats:> </h4>
 <ul>
@@ -48,5 +53,6 @@
 </ul>
 <:iterator end subcats:>
 <:or Subcats:><:eif Subcats:>
-<form action="/cgi-bin/admin/add.pl"><input type=hidden name=parentid value="<:catalog id:>"><input type=submit value="Add Sub-catalog"></form>
+<form action="/cgi-bin/admin/add.pl" method="post">
+  <input type=hidden name=parentid value="<:catalog id:>"><input type=submit value="Add Sub-catalog"></form>
 
index eff33f1..7cc4a8c 100644 (file)
   <tr>
       <td>
       <table border=0 cellpadding="6" cellspacing="1" width="100%">
-        <tr><th>Title</th><th>Summary</th><th>Listed</th>
-          <th>Modify</th>
+        <tr bgcolor="#FFFFFF"> 
+          <th width="30%">Title</th>
+          <th width="70%">Summary</th>
+          <th>Listed</th>
+          <th nowrap>Modify</th>
         </tr>
-  <tr> 
-      <td colspan="4" bgcolor="#FFFFFF">Reorder child articles: <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&sort=title&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>">by 
-       title</a> | <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&sort=date&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>">by 
-       date</a> | <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&reverse=1&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>">reverse 
-       order</a></td>
-  </tr>
-<:iterator begin children:>
-  <tr bgcolor="#FFFFFF"> 
-    <td><a href="<:child admin:>"><:child title:></a></td>
-    <td><: summary child body :></td>
-    <td bgcolor="#FFFFFF" align="center"><: is child listed :></td>
-          <td bgcolor="#FFFFFF" nowrap> 
-            <form name="edit child" method="post" action="/cgi-bin/admin/add.pl">
-              <input type="submit" name="edit child" value="Edit">
-              <input type="hidden" name="id" value="<:child id:>">
-            </form>
-            <form action="<:script:>" onSubmit="return window.confirm('Are you sure you want to delete this article')" method=POST>
-              <input type=hidden name=id value="<:article id:>">
-              <input type=hidden name="deleteid" value="<:child id:>">
-              <input type=submit name=remove value="Delete">
-            </form>
-            <:if NextChild:> <a href="/cgi-bin/admin/move.pl?id=<:child id:>&d=down&edit=1&all=1"><img src="/images/admin/move_down.gif" width="17" height="13" border="0" alt="Move Down" align="absbottom"></a> 
-            <:or NextChild:> <:eif NextChild:> <:if PrevChild:> <a href="/cgi-bin/admin/move.pl?id=<:child id:>&d=up&edit=1&all=1"><img src="/images/admin/move_up.gif" width="17" height="13" border="0" alt="Move Up" align="absbottom"></a> 
-            <:or PrevChild:> <:eif PrevChild:> </td>
-</tr>
-<:iterator separator children:>
-<:iterator end children:>
-</table>
+        <tr> 
+          <td colspan="4" bgcolor="#FFFFFF">Reorder child articles: <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&sort=title&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>">by 
+            title</a> | <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&sort=date&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>">by 
+            date</a> | <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&reverse=1&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>">reverse 
+            order</a></td>
+        </tr>
+        <:iterator begin children:> 
+        <tr bgcolor="#FFFFFF"> 
+          <td width="30%"><a href="<:child admin:>"><:child title:></a></td>
+          <td width="70%"><: summary child body :></td>
+          <td bgcolor="#FFFFFF" align="center"><: is child listed :></td>
+          <td nowrap> <a href="/cgi-bin/admin/add.pl?id=<:child id:>">Edit</a> 
+            <a href="/cgi-bin/admin/add.pl?id=<:article id:>&deleteid=<:child id:>&remove=1" onClick="return window.confirm('Are you sure you want to delete this section')">Delete</a> 
+            <:if NextChild:><a href="/cgi-bin/admin/move.pl?id=<:child id:>&d=down&edit=1&all=1"><img src="/images/admin/move_down.gif" width="17" height="13" alt="Move Down" border="0"></a><:or 
+            NextChild:><:eif NextChild:><:if PrevChild:><a href="/cgi-bin/admin/move.pl?id=<:child id:>&d=up&edit=1&all=1"><img src="/images/admin/move_up.gif" width="17" height="13" alt="Move Up" border="0"></a><:or 
+            PrevChild:><:eif PrevChild:> </td>
+        </tr>
+        <:iterator separator children:> <:iterator end children:> 
+      </table>
 </td>
 </tr>
 </table>
index df99785..47b6a69 100644 (file)
@@ -41,7 +41,7 @@
 
         <table cellpadding="6" border="0" cellspacing="1" width="100%">
           <tr> 
-            <th nowrap bgcolor="#FFFFFF"> <:parentType:>: </th>
+            <th nowrap bgcolor="#FFFFFF" align="left"> <:parentType:>: </th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <select name="parentid">
                 <option value="">Please select a Section <: ifart :><: list subsections 
             <td bgcolor="#FFFFFF"><:help edit section:> </td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF"> <:articleType:> Title: </th>
+            <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 :>">
             </td>
             <td bgcolor="#FFFFFF"><:help edit title:> </td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF"> 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>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF"> Template: </th>
+            <th nowrap bgcolor="#FFFFFF" align="left"> Template: </th>
             <td bgcolor="#FFFFFF" width="100%"> <:templates:> </td>
             <td bgcolor="#FFFFFF"><:help edit template:> </td>
           </tr>
           <tr> 
-            <th valign="top" nowrap bgcolor="#FFFFFF"> Body: </th>
+            <th valign="top" nowrap bgcolor="#FFFFFF" 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"><:help body body:> </td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF"> 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"> Expire Date: </th>
+            <th nowrap bgcolor="#FFFFFF" align="left"> Expire 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 
@@ -91,7 +92,7 @@
             <td bgcolor="#FFFFFF"><:help edit expire:></td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF"> 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 
             <td bgcolor="#FFFFFF"><:help edit summaryLength:></td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF"> Display threshold: </th>
+            <th nowrap bgcolor="#FFFFFF" 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 edit threshold:> </td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF"> Keywords: </th>
+            <th nowrap bgcolor="#FFFFFF" align="left"> Keywords: </th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <input type="text" name="keyword" maxlength="255" size="60" value="<: article keyword :>">
               (comma separated)</td>
             <td bgcolor="#FFFFFF"><:help edit keywords:> </td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF">List article:</th>
+            <th nowrap bgcolor="#FFFFFF" align="left">List article:</th>
             <td bgcolor="#FFFFFF" width="100%"> <:list listed:> </td>
             <td bgcolor="#FFFFFF"><:help edit listed:></td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF">Thumbnails:</th>
+            <th nowrap bgcolor="#FFFFFF" align="left">Thumbnails:</th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <input type=file name=thumbnail>
               <:ifArticle thumbImage:><img src="/images/<:article thumbImage:>"> 
           </tr>
           <:if Article id:> 
           <tr> 
-            <th nowrap bgcolor="#FFFFFF"><a name="files"></a>Files:</th>
+            <th nowrap bgcolor="#FFFFFF" align="left"><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> 
           </tr>
           <:or Article:><:eif Article:> 
           <tr> 
-            <th valign="top" nowrap bgcolor="#FFFFFF"> Uploaded images: </th>
+            <th valign="top" nowrap bgcolor="#FFFFFF" 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>
+              <: iterator end images :> &nbsp; <br></td>
             <td align="center" bgcolor="#FFFFFF"><:help edit images:>
-          
+          </td></tr>
         </table>
 </td>
 </tr>
       <td>
       <table border=0 cellpadding="6" cellspacing="1" width="100%">
         <tr bgcolor="#FFFFFF"> 
-          <th width="50%">Title</th>
-          <th width="50%">Summary</th>
+          <th width="30%">Title</th>
+          <th width="70%">Summary</th>
           <th>Listed</th>
-          <th>Modify</th>
+          <th nowrap>Modify</th>
         </tr>
         <tr> 
           <td colspan="4" bgcolor="#FFFFFF">Reorder child articles: <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&sort=title&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>">by 
         </tr>
         <:iterator begin children:> 
         <tr bgcolor="#FFFFFF"> 
-          <td width="50%"><a href="<:child admin:>"><:child title:></a></td>
-          <td width="50%"><: summary child body :></td>
+          <td width="30%"><a href="<:child admin:>"><:child title:></a></td>
+          <td width="70%"><: summary child body :></td>
           <td align="center"><: is child listed :></td>
-          <td nowrap> 
-            <form name="edit child" method="post" action="/cgi-bin/admin/add.pl">
-              <input type="submit" name="edit child" value="Edit">
-              <input type="hidden" name="id" value="<:child id:>">
-            </form>
-            <form action="<:script:>" onSubmit="return window.confirm('Are you sure you want to delete this article')" method=POST>
-              <input type=hidden name=id2 value="<:article id:>">
-              <input type=hidden name="deleteid" value="<:child id:>">
-              <input type=submit name=remove value="Delete">
-            </form>
-            <:if NextChild:> <a href="/cgi-bin/admin/move.pl?id=<:child id:>&d=down&edit=1&all=1"> 
-            <img src="/images/admin/move_down.gif" width="17" height="13" alt="Move Down" border="0"></a> 
-            <:or NextChild:> <:eif NextChild:> <:if PrevChild:> <a href="/cgi-bin/admin/move.pl?id=<:child id:>&d=up&edit=1&all=1"> 
-            <img src="/images/admin/move_up.gif" width="17" height="13" alt="Move Up" border="0"></a> 
-            <:or PrevChild:> <:eif PrevChild:> </td>
+          <td nowrap> <a href="/cgi-bin/admin/add.pl?id=<:child id:>">Edit</a> 
+            <a href="/cgi-bin/admin/add.pl?id=<:article id:>&deleteid=<:child id:>&remove=1" onClick="return window.confirm('Are you sure you want to delete this article')">Delete</a> 
+            <:if NextChild:><a href="/cgi-bin/admin/move.pl?id=<:child id:>&d=down&edit=1&all=1"><img src="/images/admin/move_down.gif" width="17" height="13" alt="Move Down" border="0"></a><:or 
+            NextChild:><:eif NextChild:><:if PrevChild:><a href="/cgi-bin/admin/move.pl?id=<:child id:>&d=up&edit=1&all=1"><img src="/images/admin/move_up.gif" width="17" height="13" alt="Move Up" border="0"></a><:or 
+            PrevChild:><:eif PrevChild:> </td>
         </tr>
         <:iterator separator children:> <:iterator end children:> 
       </table>
index df99785..47b6a69 100644 (file)
@@ -41,7 +41,7 @@
 
         <table cellpadding="6" border="0" cellspacing="1" width="100%">
           <tr> 
-            <th nowrap bgcolor="#FFFFFF"> <:parentType:>: </th>
+            <th nowrap bgcolor="#FFFFFF" align="left"> <:parentType:>: </th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <select name="parentid">
                 <option value="">Please select a Section <: ifart :><: list subsections 
             <td bgcolor="#FFFFFF"><:help edit section:> </td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF"> <:articleType:> Title: </th>
+            <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 :>">
             </td>
             <td bgcolor="#FFFFFF"><:help edit title:> </td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF"> 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>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF"> Template: </th>
+            <th nowrap bgcolor="#FFFFFF" align="left"> Template: </th>
             <td bgcolor="#FFFFFF" width="100%"> <:templates:> </td>
             <td bgcolor="#FFFFFF"><:help edit template:> </td>
           </tr>
           <tr> 
-            <th valign="top" nowrap bgcolor="#FFFFFF"> Body: </th>
+            <th valign="top" nowrap bgcolor="#FFFFFF" 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"><:help body body:> </td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF"> 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"> Expire Date: </th>
+            <th nowrap bgcolor="#FFFFFF" align="left"> Expire 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 
@@ -91,7 +92,7 @@
             <td bgcolor="#FFFFFF"><:help edit expire:></td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF"> 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 
             <td bgcolor="#FFFFFF"><:help edit summaryLength:></td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF"> Display threshold: </th>
+            <th nowrap bgcolor="#FFFFFF" 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 edit threshold:> </td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF"> Keywords: </th>
+            <th nowrap bgcolor="#FFFFFF" align="left"> Keywords: </th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <input type="text" name="keyword" maxlength="255" size="60" value="<: article keyword :>">
               (comma separated)</td>
             <td bgcolor="#FFFFFF"><:help edit keywords:> </td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF">List article:</th>
+            <th nowrap bgcolor="#FFFFFF" align="left">List article:</th>
             <td bgcolor="#FFFFFF" width="100%"> <:list listed:> </td>
             <td bgcolor="#FFFFFF"><:help edit listed:></td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF">Thumbnails:</th>
+            <th nowrap bgcolor="#FFFFFF" align="left">Thumbnails:</th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <input type=file name=thumbnail>
               <:ifArticle thumbImage:><img src="/images/<:article thumbImage:>"> 
           </tr>
           <:if Article id:> 
           <tr> 
-            <th nowrap bgcolor="#FFFFFF"><a name="files"></a>Files:</th>
+            <th nowrap bgcolor="#FFFFFF" align="left"><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> 
           </tr>
           <:or Article:><:eif Article:> 
           <tr> 
-            <th valign="top" nowrap bgcolor="#FFFFFF"> Uploaded images: </th>
+            <th valign="top" nowrap bgcolor="#FFFFFF" 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>
+              <: iterator end images :> &nbsp; <br></td>
             <td align="center" bgcolor="#FFFFFF"><:help edit images:>
-          
+          </td></tr>
         </table>
 </td>
 </tr>
       <td>
       <table border=0 cellpadding="6" cellspacing="1" width="100%">
         <tr bgcolor="#FFFFFF"> 
-          <th width="50%">Title</th>
-          <th width="50%">Summary</th>
+          <th width="30%">Title</th>
+          <th width="70%">Summary</th>
           <th>Listed</th>
-          <th>Modify</th>
+          <th nowrap>Modify</th>
         </tr>
         <tr> 
           <td colspan="4" bgcolor="#FFFFFF">Reorder child articles: <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&sort=title&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>">by 
         </tr>
         <:iterator begin children:> 
         <tr bgcolor="#FFFFFF"> 
-          <td width="50%"><a href="<:child admin:>"><:child title:></a></td>
-          <td width="50%"><: summary child body :></td>
+          <td width="30%"><a href="<:child admin:>"><:child title:></a></td>
+          <td width="70%"><: summary child body :></td>
           <td align="center"><: is child listed :></td>
-          <td nowrap> 
-            <form name="edit child" method="post" action="/cgi-bin/admin/add.pl">
-              <input type="submit" name="edit child" value="Edit">
-              <input type="hidden" name="id" value="<:child id:>">
-            </form>
-            <form action="<:script:>" onSubmit="return window.confirm('Are you sure you want to delete this article')" method=POST>
-              <input type=hidden name=id2 value="<:article id:>">
-              <input type=hidden name="deleteid" value="<:child id:>">
-              <input type=submit name=remove value="Delete">
-            </form>
-            <:if NextChild:> <a href="/cgi-bin/admin/move.pl?id=<:child id:>&d=down&edit=1&all=1"> 
-            <img src="/images/admin/move_down.gif" width="17" height="13" alt="Move Down" border="0"></a> 
-            <:or NextChild:> <:eif NextChild:> <:if PrevChild:> <a href="/cgi-bin/admin/move.pl?id=<:child id:>&d=up&edit=1&all=1"> 
-            <img src="/images/admin/move_up.gif" width="17" height="13" alt="Move Up" border="0"></a> 
-            <:or PrevChild:> <:eif PrevChild:> </td>
+          <td nowrap> <a href="/cgi-bin/admin/add.pl?id=<:child id:>">Edit</a> 
+            <a href="/cgi-bin/admin/add.pl?id=<:article id:>&deleteid=<:child id:>&remove=1" onClick="return window.confirm('Are you sure you want to delete this article')">Delete</a> 
+            <:if NextChild:><a href="/cgi-bin/admin/move.pl?id=<:child id:>&d=down&edit=1&all=1"><img src="/images/admin/move_down.gif" width="17" height="13" alt="Move Down" border="0"></a><:or 
+            NextChild:><:eif NextChild:><:if PrevChild:><a href="/cgi-bin/admin/move.pl?id=<:child id:>&d=up&edit=1&all=1"><img src="/images/admin/move_up.gif" width="17" height="13" alt="Move Up" border="0"></a><:or 
+            PrevChild:><:eif PrevChild:> </td>
         </tr>
         <:iterator separator children:> <:iterator end children:> 
       </table>
index cf12492..6a6a48b 100644 (file)
@@ -33,7 +33,7 @@
   <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:> <a href="/cgi-bin/admin/shopadmin.pl">Manage 
+    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 :>">
@@ -45,7 +45,7 @@
 
         <table cellpadding="6" border="0" cellspacing="1" width="100%">
           <tr> 
-            <th bgcolor="#FFFFFF" nowrap> Parent: </th>
+            <th bgcolor="#FFFFFF" nowrap align="left"> Parent: </th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <select name="parentid">
                 <option value="">Please Select a <: parentType :> 
             </td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" nowrap> 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>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" nowrap> Template: </th>
+            <th bgcolor="#FFFFFF" nowrap align="left"> Template: </th>
             <td bgcolor="#FFFFFF" width="100%"> <:templates:> </td>
           </tr>
           <tr> 
-            <th valign="top" bgcolor="#FFFFFF" nowrap> 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>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" nowrap> 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>
           </tr>
           
           <tr> 
-            <th bgcolor="#FFFFFF" nowrap> Expire Date: </th>
+            <th bgcolor="#FFFFFF" nowrap align="left"> Expire 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>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" nowrap> 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<: 
               summary)</td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" nowrap> Display threshold: </th>
+            <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>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" nowrap> Keywords: </th>
+            <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>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" nowrap>List article:</th>
+            <th bgcolor="#FFFFFF" nowrap align="left">List article:</th>
             <td bgcolor="#FFFFFF" width="100%"> <:list listed:> </td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" nowrap>Thumbnails:</th>
+            <th bgcolor="#FFFFFF" nowrap align="left">Thumbnails:</th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <input type=file name=thumbnail>
               <:ifArticle thumbImage:><img src="/images/<:article thumbImage:>"> 
                Remove<:or:><:eif:></td>
           </tr>
           <tr> 
-            <th valign="top" bgcolor="#FFFFFF" nowrap> Uploaded files: </th>
+            <th valign="top" bgcolor="#FFFFFF" nowrap align="left"> Uploaded files: 
+            </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 :> 
       <td>
       <table border=0 cellpadding="6" cellspacing="1" width="100%">
         <tr bgcolor="#FFFFFF"> 
-          <th>Title</th>
-          <th>Summary</th>
+          <th width="30%">Title</th>
+          <th width="70%">Summary</th>
           <th>Listed</th>
-          <th>Modify</th>
+          <th nowrap>Modify</th>
         </tr>
         <tr> 
           <td colspan="4" bgcolor="#FFFFFF">Reorder child articles: <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&sort=title&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>">by 
         </tr>
         <:iterator begin children:> 
         <tr bgcolor="#FFFFFF"> 
-          <td><a href="<:child admin:>"><:child title:></a></td>
-          <td><: summary child body :></td>
+          <td width="30%"><a href="<:child admin:>"><:child title:></a></td>
+          <td width="70%"><: summary child body :></td>
           <td align="center"><: is child listed :></td>
-          <td nowrap> <: edit child Edit :> <:if NextChild:> <a href="/cgi-bin/admin/move.pl?id=<:child id:>&d=down&edit=1&all=1"> 
-            <img src="/images/admin/move_down.gif" width="17" height="13" alt="Move Down" border="0"></a> 
-            <:or NextChild:> <:eif NextChild:> <:if PrevChild:> <a href="/cgi-bin/admin/move.pl?id=<:child id:>&d=up&edit=1&all=1"> 
-            <img src="/images/admin/move_up.gif" width="17" height="13" alt="Move Up" border="0"></a> 
-            <:or PrevChild:> <:eif PrevChild:> </td>
+          <td nowrap> <: edit child Edit :> <:if NextChild:><a href="/cgi-bin/admin/move.pl?id=<:child id:>&d=down&edit=1&all=1"><img src="/images/admin/move_down.gif" width="17" height="13" alt="Move Down" border="0"></a><:or 
+            NextChild:><:eif NextChild:><:if PrevChild:><a href="/cgi-bin/admin/move.pl?id=<:child id:>&d=up&edit=1&all=1"><img src="/images/admin/move_up.gif" width="17" height="13" alt="Move Up" border="0"></a><:or 
+            PrevChild:><:eif PrevChild:> </td>
         </tr>
         <:iterator separator children:> <:iterator end children:> 
       </table>
 <: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 Sub-catalog">
+  </p>
 </form>
 <:eif new:> <:or HaveChildType:> <:eif HaveChildType:> 
 <p><font size="-1">BSE Release <:release:></font></p>
index 78f2ba1..37d53c0 100644 (file)
@@ -7,11 +7,11 @@
 <p><:ifMessage:></p>
 <p><b><:message:></b></p>
 <:or:><:eif:> 
-<p>| <a href="/admin/">Admin menu</a> | <a href="<:script:>">Product list</a> 
-  | <a href="<:script:>?id=<:product id:>&product_detail=1">Product details</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 
+<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>
@@ -30,7 +30,7 @@
             <td bgcolor="#FFFFFF"><:catalogs:></td>
           </tr>
           <tr> 
-            <th align="left" bgcolor="#FFFFFF">Description:</th>
+            <th align="left" bgcolor="#FFFFFF" valign="top">Description:</th>
             <td bgcolor="#FFFFFF"> 
               <textarea name=body rows=15 cols=60 wrap=virtual><:product body:></textarea>
             </td>
                 </tr>
               </table>
               <p><:or Files:> No files are attached to this article. <:eif Files:> 
-                <a href="<:script:>?filelist=1&id=<:article id:>"><b>Manage Files</b></a></p>
+                <a href="<:script:>?filelist=1&id=<:product id:>"><b>Manage 
+                Files</b></a></p>
             </td>
           </tr>
           <tr> 
index bb7c8d0..5d9b362 100644 (file)
 
   <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">Products list</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>
+<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>
 <:if new:><:or new:>
 <:if Match [article generator] "Product":><:or Match:>
 <h2><a name="step"></a>Step Children</h2>
       </table>
 </td></tr>
 </table>
-<p>&nbsp;</p>
 <p><font size="-1">BSE Release <:release:></font></p>
 </body
 ></html>
index c487e76..6734969 100644 (file)
       <td> 
         <table cellpadding="6" border="0" cellspacing="1">
           <tr> 
-            <th bgcolor="#FFFFFF">File to add: </th>
+            <th bgcolor="#FFFFFF" align="left">File to add: </th>
             <td bgcolor="#FFFFFF"> 
               <input type="file" name="file" />
             </td>
             <td bgcolor="#FFFFFF"><:help file file:> </td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF">Description: </th>
+            <th bgcolor="#FFFFFF" align="left">Description: </th>
             <td bgcolor="#FFFFFF"> 
               <input type="text" name="description" />
             </td>
             <td bgcolor="#FFFFFF"><:help file description:> </td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF"> Content-Type: </th>
+            <th bgcolor="#FFFFFF" align="left"> Content-Type: </th>
             <td bgcolor="#FFFFFF"> 
               <input type="text" name="contentType" />
               (blank for guess) </td>
             <td bgcolor="#FFFFFF"> <:help file content_type:></td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF"> Treat as download: </th>
+            <th bgcolor="#FFFFFF" align="left"> Treat as download: </th>
             <td bgcolor="#FFFFFF"> 
               <input type="checkbox" name="download" value="1" />
             </td>
             <td bgcolor="#FFFFFF"><:help file download:> </td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF"> Require payment: </th>
+            <th bgcolor="#FFFFFF" align="left"> Require payment: </th>
             <td bgcolor="#FFFFFF"> 
-              <input type="checkbox" name="forSale" value="1" checked />
+              <input type="checkbox" name="forSale" value="1" />
             </td>
             <td bgcolor="#FFFFFF"><:help file forSale:> </td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF"> Require user: </th>
+            <th bgcolor="#FFFFFF" align="left"> Require user: </th>
             <td bgcolor="#FFFFFF"> 
               <input type="checkbox" name="requireUser" value="1" />
             </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> 
-        <b><a href="<:script:>?filedel=1&amp;id=<:article id:>&amp;file=<:file id:>">Remove</a></b> <:move:></td></tr>
+            <td nowrap> <b><a href="<:script:>?filedel=1&amp;id=<:article id:>&amp;file=<:file id:>">Remove</a></b> 
+              <:move:></td>
+          </tr>
 <: iterator separator files :>
     <tr bgcolor="#FFFFFF"> 
       <td colspan="7">&nbsp;</td>
index d2e5e17..0332479 100644 (file)
@@ -4,8 +4,10 @@
 <body>
 <h1>Shop Administration</h1>
 <h2>Order details</h2>
-<p>| <a href="/admin/">Admin menu</a> | <a href="<:script:>"></a><a href="<:script:>">Product 
-  list</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>
+<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>
 <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>
 <td>
 
       <table border=0 cellpadding="6" cellspacing="1">
-        <tr>
<th>Description</th>
<th>Units</th>
<th>Unit Price</th>
<th>Extension</th>
<th>Unit Wholesale</th>
<th>Ext Wholesale</th>
<th>Unit GST</th>
<th>Ext GST</th>
+        <tr bgcolor="#FFFFFF"> 
         <th width="100%">Description</th>
         <th nowrap>Units</th>
         <th nowrap>Unit Price</th>
         <th nowrap>Extension</th>
         <th nowrap>Unit Wsale</th>
         <th nowrap>Ext Wsale</th>
         <th nowrap>Unit GST</th>
         <th nowrap>Ext GST</th>
 </tr>
 <:iterator begin items:>
         <tr bgcolor="#FFFFFF"> 
-          <td><a href="<:script:>?product_detail=1&id=<:product id:>"><:product 
+          <td width="100%"><a href="<:script:>?product_detail=1&id=<:product id:>"><:product 
             title:></a> <:options:></td>
-          <td align=center><:item units:></td>
-          <td align=right><:money item price:></td>
-          <td align=right><:extension price:></td>
-          <td align=right><:money item wholesalePrice:></td>
-          <td align=right><:extension wholesalePrice:></td>
-          <td align=right><:money item gst:></td>
-          <td align=right><:extension gst:></td>
+          <td align=center nowrap><:item units:></td>
+          <td align=right nowrap><:money item price:></td>
+          <td align=right nowrap><:extension price:></td>
+          <td align=right nowrap><:money item wholesalePrice:></td>
+          <td align=right nowrap><:extension wholesalePrice:></td>
+          <td align=right nowrap><:money item gst:></td>
+          <td align=right nowrap><:extension gst:></td>
 </tr>
 <:iterator end items:>
         <tr bgcolor="#FFFFFF"> 
           <td colspan=3 align=right>Total:</td>
-          <td align=right><:money order total:></td>
+          <td align=right nowrap><:money order total:></td>
           <td>&nbsp;</td>
-          <td align=right><:money order wholesaleTotal:></td>
+          <td align=right nowrap><:money order wholesaleTotal:></td>
           <td>&nbsp;</td>
-          <td align=right><:money order gst:></td>
+          <td align=right nowrap><:money order gst:></td>
 </tr>
 </table>
 </td>
@@ -78,5 +80,4 @@
 <:or Order:>
 <p>This order hasn't been filled yet.  <a href="/cgi-bin/admin/shopadmin.pl?id=<:order id:>&order_filled=Yep&filled=1&detail=1">Mark order filled</a>.</p>
 <:eif Order:>
-<p><font size="-1">BSE Release <:release:></font></p>
 </body></html>
index c74adfa..0f83f08 100644 (file)
@@ -5,7 +5,10 @@
 <h1>Shop Administration</h1>
 <h2>Order list</h2>
 
-<p>| <a href="/admin/">Admin menu</a> | <a href="<:script:>">Products 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>
+<p>| <a href="/admin/">Admin menu</a> | <a href="<:script:>">Manage store</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>
 
 <table bgcolor="#000000" cellpadding="0" cellspacing="0" border="0" width="100%">
   <tr>
         <tr bgcolor="#FFFFFF"> 
           <td align="center" nowrap><a href="<:script:>?id=<:order id:>&order_detail=1"><:order 
             id:></a></td>
-          <td width="100%"><:order delivFirstName:><:order delivLastName:></td>
+          <td width="100%"><:order delivFirstName:> <:order delivLastName:></td>
           <td nowrap><:date orderDate:></td>
           <td align=right nowrap>$<:money total:></td>
           <td align=right nowrap>$<:money gst:></td>
-          <td align=right> 
-            <form name="view order" method="post" action="<:script:>">
-              <input type="hidden" name="order_detail" value="1">
-              <input type="hidden" name="id" value="<:order id:>">
-              <input type="submit" name="view order" value="View order">
-            </form>
-          </td>
+          <td nowrap> <a href="<:script:>?id=<:order id:>&order_detail=1">View 
+            order </a> </td>
         </tr>
         <:iterator end orders:> 
       </table>
index 4b01406..e1e50f3 100644 (file)
@@ -5,7 +5,9 @@
 <h1>Shop Administration</h1>
 <h2>Order list - Filled orders</h2>
 
-<p>| <a href="/admin/">Admin menu</a> | <a href="<:script:>">Products list</a> | <a href="<:script:>?order_list=1&template=order_list_unfilled">Unfilled orders</a> | <a href="<:script:>?order_list=1">All Orders</a> |</p>
+<p>| <a href="/admin/">Admin menu</a> | <a href="<:script:>">Manage store</a> 
+  | <a href="<:script:>?order_list=1&template=order_list_unfilled">Unfilled orders</a> 
+  | <a href="<:script:>?order_list=1">All Orders</a> |</p>
 
 <table bgcolor="#000000" cellpadding="0" cellspacing="0" border="0" width="100%">
   <tr>
         <tr bgcolor="#FFFFFF"> 
           <td align="center" nowrap><a href="<:script:>?id=<:order id:>&order_detail=1"><:order 
             id:></a></td>
-          <td width="100%"><:order delivFirstName:><:order delivLastName:></td>
+          <td width="100%"><:order delivFirstName:> <:order delivLastName:></td>
           <td nowrap><:date orderDate:></td>
           <td align=right nowrap>$<:money total:></td>
           <td align=right nowrap>$<:money gst:></td>
-          <td align=right>
-            <form name="view order" method="post" action="<:script:>">
-              <input type="hidden" name="order_detail" value="1">
-              <input type="hidden" name="id" value="<:order id:>">
-              <input type="submit" name="view order" value="View order">
-            </form>
-          </td>
+          <td nowrap> <a href="<:script:>?id=<:order id:>&order_detail=1">View 
+            order </a> </td>
         </tr>
         <:iterator end orders:> 
       </table>
index 59692b9..8ba231c 100644 (file)
@@ -5,7 +5,9 @@
 <h1>Shop Administration</h1>
 <h2>Order list - Unfilled orders</h2>
 
-<p>| <a href="/admin/">Admin menu</a> | <a href="<:script:>">Products list</a> | <a href="<:script:>?order_list=1&template=order_list_filled">Filled orders</a> | <a href="<:script:>?order_list=1">All orders</a> |</p>
+<p>| <a href="/admin/">Admin menu</a> | <a href="<:script:>">Manage store</a> 
+  | <a href="<:script:>?order_list=1&template=order_list_filled">Filled orders</a> 
+  | <a href="<:script:>?order_list=1">All orders</a> |</p>
 
 <table bgcolor="#000000" cellpadding="0" cellspacing="0" border="0" width="100%">
   <tr>
@@ -13,7 +15,7 @@
       <table border=0 cellpadding="6" cellspacing="1" width="100%">
         <tr bgcolor="#FFFFFF"> 
           <th>Id</th>
-          <th>Name</th>
+          <th width="100%">Name</th>
           <th>Date</th>
           <th>Total</th>
           <th>GST</th>
         <tr bgcolor="#FFFFFF"> 
           <td align="center" nowrap><a href="<:script:>?id=<:order id:>&order_detail=1"><:order 
             id:></a></td>
-          <td><:order delivFirstName:><:order delivLastName:></td>
+          <td width="100%"><:order delivFirstName:> <:order delivLastName:></td>
           <td nowrap><:date orderDate:></td>
           <td align=right nowrap>$<:money total:></td>
           <td align=right nowrap>$<:money gst:></td>
-          <td align=right> 
-            <form name="view order" method="post" action="<:script:>">
-              <input type="hidden" name="order_detail" value="1">
-              <input type="hidden" name="id" value="<:order id:>">
-              <input type="submit" name="view order" value="View order">
-            </form>
-          </td>
+          <td nowrap> <a href="<:script:>?id=<:order id:>&order_detail=1">View 
+            order</a></td>
         </tr>
         <:iterator end orders:> 
       </table>
index 9ef1307..8eff9d3 100644 (file)
@@ -4,10 +4,11 @@
 <body>
 <h1>Shop Administration</h1>
 <h2>Product details</h2>
-<p>| <a href="/admin/">Admin menu</a> | <a href="<:script:>">Product list</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> 
-  |<:or Product:> | <a href="<:script:>?id=<:product id:>&undelete_product=1">Show</a> |<:eif Product:> <:hiddenNote:></p>
+<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> 
+  |<: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%">
   <tr>
 <td>
         <tr> 
           <th align="left" nowrap bgcolor="#FFFFFF">Name:</th>
           <td bgcolor="#FFFFFF" width="100%"><:product title:></td>
-  </tr>
-  <tr> 
+        </tr>
+        <tr> 
           <th align="left" nowrap bgcolor="#FFFFFF">Summary:</th>
           <td bgcolor="#FFFFFF" width="100%"><:product summary:></td>
-  </tr>
-  <tr> 
-          <th align="left" nowrap bgcolor="#FFFFFF">Description:</th>
-          <td bgcolor="#FFFFFF" width="100%"><:product body:></td>
-  </tr>
-  <tr> 
+        </tr>
+        <tr> 
+          <th align="left" nowrap bgcolor="#FFFFFF" valign="top">Description:</th>
+          <td bgcolor="#FFFFFF" width="100%"><:bodytext product body:></td>
+        </tr>
+        <tr> 
           <th align="left" nowrap bgcolor="#FFFFFF">Lead time:</th>
           <td bgcolor="#FFFFFF" width="100%"><:product leadTime:> days</td>
-  </tr>
-  <tr> 
+        </tr>
+        <tr> 
           <th align="left" nowrap bgcolor="#FFFFFF">Retail price:</th>
           <td bgcolor="#FFFFFF" width="100%">$<:money retailPrice:></td>
-  </tr>
-  <tr> 
+        </tr>
+        <tr> 
           <th align="left" nowrap bgcolor="#FFFFFF">Wholesale price:</th>
           <td bgcolor="#FFFFFF" width="100%">$<:money wholesalePrice:></td>
-  </tr>
-  <tr> 
+        </tr>
+        <tr> 
           <th align="left" nowrap bgcolor="#FFFFFF">GST:</th>
           <td bgcolor="#FFFFFF" width="100%">$<:money gst:></td>
-  </tr>
-  <tr> 
+        </tr>
+        <tr> 
           <th align="left" nowrap bgcolor="#FFFFFF">Release date:</th>
           <td bgcolor="#FFFFFF" width="100%"><:date product release:></td>
-  </tr>
-  <tr> 
+        </tr>
+        <tr> 
           <th align="left" nowrap bgcolor="#FFFFFF">Expiry date:</th>
           <td bgcolor="#FFFFFF" width="100%"><:date product expire:></td>
-  </tr>
-  <tr> 
+        </tr>
+        <tr> 
           <th align="left" nowrap bgcolor="#FFFFFF">Options:</th>
           <td bgcolor="#FFFFFF" width="100%"><:product options:></td>
-  </tr>
-  <tr> 
-          <th align="left" nowrap bgcolor="#FFFFFF">Picture:</th>
-          <td bgcolor="#FFFFFF" width="100%"><:ifImage:><img src="/images/<:product imageName:>" width="<:product imageWidth:>" height="<:product imageHeight:>"><:or:>&nbsp;<:eif:> 
-            <input type="file" name="imageName">
-    </td>
-  </tr>
-  <tr>
-          <th align="left" nowrap bgcolor="#FFFFFF">Thumbnail:</th>
-          <td width="100%" bgcolor="#FFFFFF"><:ifProduct thumbImage:><img src="/images/<:product thumbImage:>"><:or:><:eif:></td>
-  </tr>
-</table>
+        </tr>
+      </table>
 </td>
 </tr>
 </table>
 <p><font size="-1">BSE Release <:release:></font></p>
 </body>
-</html>
\ No newline at end of file
+</html>
index 15a69a3..56be576 100644 (file)
@@ -4,16 +4,20 @@
 
 <body>
 <h1>Shop Administration</h1>
-<:ifMessage:><p><b><:message:></b></p><:or:><:eif:>
-<p>| <a href="/admin/">Admin menu</a> | <a href="<:script:>?order_list=1">Order 
-  list</a> | <a href="/cgi-bin/admin/admin.pl?id=<:shopid:>">Online store</a> | <:if ShowStepKids:><a href="<:script:>?showstepkids=0">Hide stepkids</a><:or ShowStepKids:><a href="<:script:>?showstepkids=1">Show stepkids</a><:eif ShowStepKids:> | </p> 
-<:iterator begin catalogs:> 
-<a name="cat<:catalog id:>"></a>
+<: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>
+<:iterator begin catalogs:> <a name="cat<:catalog id:>"></a> 
 <h2>Catalog: <:catalog title:> <:movecat:></h2>
-<:embed catalog catalog.tmpl:>
+<p><:embed catalog catalog.tmpl:></p>
+<p>&nbsp; </p>
 <hr noshade size="1">
-<:iterator end catalogs:>
-<p><form action="/cgi-bin/admin/add.pl"><input type=hidden name=parentid value=3><input type=submit value="Add Catalog"></form></p>
+<:iterator end catalogs:> 
+<form action="/cgi-bin/admin/add.pl" method="post">
+  <input type=hidden name=parentid value=3><input type=submit value="Add Catalog"></form>
 <p><font size="-1">BSE Release <:release:></font></p>
 </body>
 </html>
\ No newline at end of file
index 21e6868..9a2cc24 100644 (file)
@@ -41,7 +41,7 @@
           <:iterator begin allprods:> 
           <tr valign="middle" align="center" bgcolor="#FFFFFF"> 
             <td width="100%" align="left"> &nbsp;<font face="Verdana, Arial, Helvetica, sans-serif" size="-2"><a href="<:url allprod:>"><:allprod 
-              summary:></a></font><:moveUp:><:moveDown:></td>
+              summary:></a></font><:moveallprod:></td>
 <:ifAllprod retailPrice:>
             <td align="right"> <font face="Verdana, Arial, Helvetica, sans-serif" size="-2"><b>$<:money allprod retailPrice:></b></font></td>
 <:or:>
index da62e7c..ed7a6d5 100644 (file)
@@ -43,7 +43,7 @@
           <:iterator begin allprods:> 
           <tr valign="middle" align="center" bgcolor="#FFFFFF"> 
             <td width="100%" align="left"> &nbsp;<font face="Verdana, Arial, Helvetica, sans-serif" size="-2"><a href="<:url allprod:>"><:allprod 
-              summary:></a></font> <!-- <:moveUp:><:moveDown:> --></td>
+              summary:></a></font> <:moveallprod:></td>
 <:ifAllprod retailPrice:>
             <td align="right"> <font face="Verdana, Arial, Helvetica, sans-serif" size="-2"><b>$<:money allprod retailPrice:></b></font></td>
 <:or:>
index 1787bed..e244b40 100644 (file)
@@ -27,7 +27,8 @@
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
   <tr> 
     <td width="80%" height="24">&nbsp;&nbsp;<font face="Arial, Helvetica, sans-serif" size="4"><b><:title:></b></font></td>
-    <td height="24">&nbsp;</td>
+    <td height="24" align="right" nowrap><font face="Verdana, Arial, Helvetica, sans-serif" size="-2">Last 
+      modified: <:date article lastModified:></font></td>
   </tr>
   <tr> 
     <td colspan="2" height="1" bgcolor="#999999"><img src="/images/trans_pixel.gif" width="24" height="1" border="0"></td>
   </tr>
 </table>
 <p><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><:body:></font></p>
-<:embed end:><:if UnderThreshold:><:iterator begin children:><: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"><:chil
+<:if UnderThreshold allkids:><:iterator begin allkids:><: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"><:allki
   title:></font></b></a><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:><:eif UnderThreshold:> 
+  <: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:> 
 <hr noshade size="1">
 <div align="right"><font face="Verdana, Arial, Helvetica, sans-serif" size="1"><:siteName:> - <a href="http://www.visualthought.com.au/">vtc&copy;2002</a></font></div>
 </body>