0.12_23 commit
authorTony Cook <tony@develop-help.com>
Mon, 10 Mar 2003 06:51:52 +0000 (06:51 +0000)
committertony <tony@45cb6cf1-00bc-42d2-bb5a-07f51df49f94>
Mon, 10 Mar 2003 06:51:52 +0000 (06:51 +0000)
12 files changed:
site/docs/bse.pod
site/templates/admin/article_img.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/subs/edit.tmpl
site/templates/admin/subs/list.tmpl
t/t10edit.t

index aa90612..ac83b13 100644 (file)
@@ -84,6 +84,11 @@ changed default level names in Constants.pm and bse.cfg
 
 changed tests to use the new level names
 
+=item *
+
+templates admin/subs/add.tmpl and admin/add_product.tmpl have be
+consolidated into their edit versions
+
 =back
 
 =head2 0.12_22
index 9cde714..d9902b0 100644 (file)
 <:ifMessage:> 
 <p><b><:message:> </b></p>
 <:or:><:eif:>
-<:if UserCan edit_images_add:article:>
+<p>| <a href="/cgi-bin/admin/menu.pl">Admin menu</a> | <:if Match [article generator] "Product":><a href="/cgi-bin/admin/add.pl?id=<:article id:>">Edit
+    product</a> | <a href="/cgi-bin/admin/shopadmin.pl">Manage catalogs</a> <:or
+    Match:><:if Eq [article id] [cfg articles shop]:><a href="/cgi-bin/admin/add.pl?id=<:article id:>">Edit
+    shop</a><:or Eq:><a href="/cgi-bin/admin/add.pl?id=<:article id:>"><:ifMatch
+    [article generator] "Catalog":>Edit catalog<:or:>Edit article<:eif:></a><:eif
+    Eq:><:eif Match:> |</p><:if UserCan edit_images_add:article:>
 <h2>Add new image</h2>
 
 <form method="POST" action="<:script:>" enctype="multipart/form-data">
       <td> 
         <table cellpadding="6" border="0" cellspacing="1">
           <tr> 
-            <th bgcolor="#FFFFFF" align="left"> Image file to add: </th>
+            <th bgcolor="#FFFFFF" align="left">Image file to add:</th>
             <td bgcolor="#FFFFFF"> 
-              <input type="file" name="image">
+              <input type="file" name="image"> 
             </td>
-            <td bgcolor="#FFFFFF"><:help image file:> </td>
+            <td bgcolor="#FFFFFF"><:help image file:> <:error_img image:></td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left"> Alt text for image: </th>
+            <th bgcolor="#FFFFFF" align="left">Alt text for image:</th>
             <td bgcolor="#FFFFFF"> 
-              <input type="text" name="altIn">
+              <input type="text" name="altIn" value="<:old altIn:>">
             </td>
-            <td bgcolor="#FFFFFF"><:help image alt:> </td>
+            <td bgcolor="#FFFFFF"><:help image alt:></td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left"> URL for image: </th>
+            <th bgcolor="#FFFFFF" align="left">URL for image:</th>
             <td bgcolor="#FFFFFF"> 
-              <input type="text" name="url" width="40">
+              <input type="text" name="url" value="<:old url:>">
             </td>
-            <td bgcolor="#FFFFFF"><:help image url:> </td>
+            <td bgcolor="#FFFFFF"><:help image url:></td>
           </tr>
           <tr> 
             <td bgcolor="#FFFFFF" colspan="3" align="right"> 
-              <input type="submit" name="addimg" value="  Add Image  ">
+              <input type="submit" name="addimg" value="Add Image">
             </td>
           </tr>
         </table>
 <input type="hidden" name="imgtype" value="<: articleType :>">
   <h2>Manage images</h2>
 
-<table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
+<table width="100%" border="0" cellpadding="0" cellspacing="0" bgcolor="#000000" class="table">
     <tr>
       <td>
-        <table cellpadding="6" border="0" cellspacing="1">
-          <tr> 
+        <table width="100%" border="0" cellpadding="6" cellspacing="1">
+          <:if Images:><tr> 
             <th valign="top" bgcolor="#FFFFFF" colspan="4">First Image Position</th>
           </tr>
-          <tr> 
+                 <tr> 
             <td bgcolor="#FFFFFF" colspan="4"> 
               <table width="100%" border="0" cellspacing="0" cellpadding="0">
                 <tr>
             </td>
          </tr>
 <:or:><:eif:>
+                 <:or Images:><tr><td colspan="4" align="center" bgcolor="#FFFFFF">No images
+                     are attached to this article</td>
+          </tr><:eif Images:>
         </table>
 </td>
 </tr>
index d073578..c9c6f61 100644 (file)
         </tr>
 <:if UserCan edit_reorder_children:>
         <tr> 
-          <td colspan="5" 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>
+          <td colspan="5" bgcolor="#FFFFFF">Sort  by: <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&sort=title&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>">title</a> | <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&sort=date&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>">date</a> | <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&reverse=1&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>">reverse</a></td>
         </tr>
 <:or UserCan:><:eif UserCan:>
         <:iterator begin children:> 
index 123da5d..dce2d4b 100644 (file)
@@ -19,7 +19,7 @@
     Eq:><a href="<:article admin:>">See article</a><:eif Eq:> | <:eif:><:editParent:> 
   <:if Eq [article id] [cfg articles shop]:><a href="/cgi-bin/admin/shopadmin.pl">Manage
    catalogs</a> |<:or Eq:><:eif Eq:><:if New:><:or New:> <a href="<:script:>?id=<:article id:>&_t=steps">Manage
-    step children/parents</a> | <:eif New:></p>
+    step children/parents</a> | <!--//<a href="<:script:>?id=<:article id:>&_t=options">Edit options</a> |//--><:eif New:></p>
 
   <h2><:articleType:> Details</h2>
 
@@ -69,7 +69,7 @@
 
         <table cellpadding="6" border="0" cellspacing="1" width="100%">
           <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left"> <:parentType:>: </th>
+            <th nowrap bgcolor="#FFFFFF" align="left">Parent:</th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <:if FieldPerm parentid:><select name="parentid">
                 <option value="">Please select a <:parentType:><: list:>
             <td bgcolor="#FFFFFF"><:help edit section:> </td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left"> <:articleType:> title: 
+            <th nowrap bgcolor="#FFFFFF" align="left">Title: 
             </th>
             <td bgcolor="#FFFFFF" width="100%"> 
-              <:ifFieldPerm title:><input type="text" name="title" maxlength="<:cfg fields title_size 255:>" size="64" value="<: article title :>"><:or:><:default title:><:eif:>
-            </td>
-            <td bgcolor="#FFFFFF"><:help edit title:> </td>
+            <:ifFieldPerm title:><input type="text" name="title" maxlength="<:cfg fields title_size 255:>" size="64" value="<: article title :>"><:or:><:default title:><:eif:></td>
+            <td bgcolor="#FFFFFF"><:help edit title:> <:error_img title:></td>
           </tr>
-          <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left"> Title image: </th>
+          <:if Cfg image title:><tr> 
+            <th nowrap bgcolor="#FFFFFF" align="left">Title image:</th>
             <td bgcolor="#FFFFFF" width="100%"><:ifFieldPerm titleImage:><:titleImages:> (upload this to 
               the /images/titles directory)<:or:><:article titleImage:><:eif:></td>
             <td bgcolor="#FFFFFF"><:help edit titleImage:></td>
-          </tr>
-          <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left"> Template: </th>
-            <td bgcolor="#FFFFFF" width="100%"><:ifFieldPerm template:> <:templates:><:or:><:article template:><:eif:> </td>
-            <td bgcolor="#FFFFFF"><:help edit template:> </td>
-          </tr>
+          </tr><:or Cfg:><:eif Cfg:>
           <tr> 
             <th valign="top" nowrap bgcolor="#FFFFFF" align="left"> Body: </th>
             <td bgcolor="#FFFFFF" width="100%"> 
             <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">Template:</th>
+            <td bgcolor="#FFFFFF" width="100%"><:ifFieldPerm template:> <:templates:><:or:><:article template:><:eif:> </td>
+            <td bgcolor="#FFFFFF"><:help edit template:> </td>
+          </tr>
+                 <tr> 
+            <th nowrap bgcolor="#FFFFFF" align="left">List article:</th>
+            <td bgcolor="#FFFFFF" width="100%"> <:if FieldPerm listed:><:list listed:><:or FieldPerm:><:if Article listed:><:ifEq [article listed] "1":>Yes<:or:>In Sections, but not menu<:eif:><:or Article:>No<:eif Article:><:eif FieldPerm:> </td>
+            <td bgcolor="#FFFFFF"><:help edit listed:></td>
+          </tr>
+                 <tr>
+            <th nowrap bgcolor="#FFFFFF" align="left">Flags:</th>
+            <td bgcolor="#FFFFFF" width="100%"><:iterator begin flags:><:if FieldPerm flags:>
+              <input type=checkbox name=flags value="<:flag id:>" <:ifFlagSet [flag id]:>checked<:or:>
+              <:eif:>><:or FieldPerm:><:ifFlagSet [flag id]:>Yes<:or:>No<:eif:>
+              <:eif FieldPerm:><:flag desc:><:iterator end flags:></td>
+            <td bgcolor="#FFFFFF"><:help edit listed:></td>
+          </tr>
+                 <tr> 
+            <th nowrap bgcolor="#FFFFFF" align="left">Release date:</th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <:if FieldPerm release:><input type="text" name="release" value="<: date "%d/%m/%Y" article release :>" size="10" maxlength="10">
               (dd/mm/yyyy<: ifNew :> - default is today<: or :><: eif :>)<:or FieldPerm:><: date "%d/%m/%Y" article release :><:eif FieldPerm:></td>
             <td bgcolor="#FFFFFF"><:help edit release:></td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left"> Expiry date: </th>
+            <th nowrap bgcolor="#FFFFFF" align="left">Expiry date:</th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <:if FieldPerm expire:><input type="text" name="expire" value="<: date "%d/%m/%Y" 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%"> 
               <:if FieldPerm summaryLength:><input type="text" name="summaryLength" size="10" maxlength="10" value="<: article summaryLength :>">
               (in characters - <: ifNew :>default inherited from <:parentType:>, <: or :><: eif :> 
             <td bgcolor="#FFFFFF"><:help edit summary:></td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left"> Display threshold: </th>
+            <th nowrap bgcolor="#FFFFFF" align="left">Display threshold:</th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <:ifFieldPerm threshold:><input type="text" name="threshold" size="10" maxlength="10" value="<: article threshold :>"><:or:><: article threshold :><:eif:>
             </td>
             <td bgcolor="#FFFFFF"><:help edit threshold:> </td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left"> Keywords: </th>
+            <th nowrap bgcolor="#FFFFFF" align="left">Keywords:</th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <:ifFieldPerm keyword:><input type="text" name="keyword" maxlength="255" size="60" value="<: article keyword :>">
               (comma separated)<:or:><: article threshold :><:eif:></td>
-            <td bgcolor="#FFFFFF"><:help edit keywords:> </td>
-          </tr>
-          <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left">List article:</th>
-            <td bgcolor="#FFFFFF" width="100%"> <:if FieldPerm listed:><:list listed:><:or FieldPerm:><:if Article listed:><:ifEq [article listed] "1":>Yes<:or:>In Sections, but not menu<:eif:><:or Article:>No<:eif Article:><:eif FieldPerm:> </td>
-            <td bgcolor="#FFFFFF"><:help edit listed:></td>
-          </tr>
-          <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left">Flags:</th>
-            <td bgcolor="#FFFFFF" width="100%"><:iterator begin flags:><:if FieldPerm flags:><input type=checkbox name=flags value="<:flag id:>" <:ifFlagSet [flag id]:>checked<:or:><:eif:>><:or FieldPerm:><:ifFlagSet [flag id]:>Yes<:or:>No<:eif:><:eif FieldPerm:><:flag desc:><:iterator end flags:></td>
-            <td bgcolor="#FFFFFF"><:help edit listed:></td>
+            <td bgcolor="#FFFFFF"><:help edit keywords:></td>
           </tr>
           <tr> 
             <th nowrap bgcolor="#FFFFFF" align="left" valign="top">Thumbnail image:</th>
             <td nowrap bgcolor="#FFFFFF" valign="top"><:help edit files:></td>
           </tr>
           <tr> 
-            <th valign="top" nowrap bgcolor="#FFFFFF" align="left"> Images: 
+            <th valign="top" nowrap bgcolor="#FFFFFF" align="left">Images: 
             </th>
             <td align="center" bgcolor="#FFFFFF" width="100%"><:if Images:> <:iterator begin 
               images:> <img src="/images/<: image image :>" alt="<:image alt :>" width= 
         </tr>
 <:if UserCan edit_reorder_children:article:>
         <tr> 
-          <td colspan="5" 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>
+          <td colspan="5" bgcolor="#FFFFFF">Sort by: <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&sort=title&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>">title</a> | <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&sort=date&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>">date</a> | <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&reverse=1&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>">reverse</a></td>
         </tr>
 <:or UserCan:><:eif UserCan:>
         <:iterator begin children:> 
index 123da5d..dce2d4b 100644 (file)
@@ -19,7 +19,7 @@
     Eq:><a href="<:article admin:>">See article</a><:eif Eq:> | <:eif:><:editParent:> 
   <:if Eq [article id] [cfg articles shop]:><a href="/cgi-bin/admin/shopadmin.pl">Manage
    catalogs</a> |<:or Eq:><:eif Eq:><:if New:><:or New:> <a href="<:script:>?id=<:article id:>&_t=steps">Manage
-    step children/parents</a> | <:eif New:></p>
+    step children/parents</a> | <!--//<a href="<:script:>?id=<:article id:>&_t=options">Edit options</a> |//--><:eif New:></p>
 
   <h2><:articleType:> Details</h2>
 
@@ -69,7 +69,7 @@
 
         <table cellpadding="6" border="0" cellspacing="1" width="100%">
           <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left"> <:parentType:>: </th>
+            <th nowrap bgcolor="#FFFFFF" align="left">Parent:</th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <:if FieldPerm parentid:><select name="parentid">
                 <option value="">Please select a <:parentType:><: list:>
             <td bgcolor="#FFFFFF"><:help edit section:> </td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left"> <:articleType:> title: 
+            <th nowrap bgcolor="#FFFFFF" align="left">Title: 
             </th>
             <td bgcolor="#FFFFFF" width="100%"> 
-              <:ifFieldPerm title:><input type="text" name="title" maxlength="<:cfg fields title_size 255:>" size="64" value="<: article title :>"><:or:><:default title:><:eif:>
-            </td>
-            <td bgcolor="#FFFFFF"><:help edit title:> </td>
+            <:ifFieldPerm title:><input type="text" name="title" maxlength="<:cfg fields title_size 255:>" size="64" value="<: article title :>"><:or:><:default title:><:eif:></td>
+            <td bgcolor="#FFFFFF"><:help edit title:> <:error_img title:></td>
           </tr>
-          <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left"> Title image: </th>
+          <:if Cfg image title:><tr> 
+            <th nowrap bgcolor="#FFFFFF" align="left">Title image:</th>
             <td bgcolor="#FFFFFF" width="100%"><:ifFieldPerm titleImage:><:titleImages:> (upload this to 
               the /images/titles directory)<:or:><:article titleImage:><:eif:></td>
             <td bgcolor="#FFFFFF"><:help edit titleImage:></td>
-          </tr>
-          <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left"> Template: </th>
-            <td bgcolor="#FFFFFF" width="100%"><:ifFieldPerm template:> <:templates:><:or:><:article template:><:eif:> </td>
-            <td bgcolor="#FFFFFF"><:help edit template:> </td>
-          </tr>
+          </tr><:or Cfg:><:eif Cfg:>
           <tr> 
             <th valign="top" nowrap bgcolor="#FFFFFF" align="left"> Body: </th>
             <td bgcolor="#FFFFFF" width="100%"> 
             <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">Template:</th>
+            <td bgcolor="#FFFFFF" width="100%"><:ifFieldPerm template:> <:templates:><:or:><:article template:><:eif:> </td>
+            <td bgcolor="#FFFFFF"><:help edit template:> </td>
+          </tr>
+                 <tr> 
+            <th nowrap bgcolor="#FFFFFF" align="left">List article:</th>
+            <td bgcolor="#FFFFFF" width="100%"> <:if FieldPerm listed:><:list listed:><:or FieldPerm:><:if Article listed:><:ifEq [article listed] "1":>Yes<:or:>In Sections, but not menu<:eif:><:or Article:>No<:eif Article:><:eif FieldPerm:> </td>
+            <td bgcolor="#FFFFFF"><:help edit listed:></td>
+          </tr>
+                 <tr>
+            <th nowrap bgcolor="#FFFFFF" align="left">Flags:</th>
+            <td bgcolor="#FFFFFF" width="100%"><:iterator begin flags:><:if FieldPerm flags:>
+              <input type=checkbox name=flags value="<:flag id:>" <:ifFlagSet [flag id]:>checked<:or:>
+              <:eif:>><:or FieldPerm:><:ifFlagSet [flag id]:>Yes<:or:>No<:eif:>
+              <:eif FieldPerm:><:flag desc:><:iterator end flags:></td>
+            <td bgcolor="#FFFFFF"><:help edit listed:></td>
+          </tr>
+                 <tr> 
+            <th nowrap bgcolor="#FFFFFF" align="left">Release date:</th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <:if FieldPerm release:><input type="text" name="release" value="<: date "%d/%m/%Y" article release :>" size="10" maxlength="10">
               (dd/mm/yyyy<: ifNew :> - default is today<: or :><: eif :>)<:or FieldPerm:><: date "%d/%m/%Y" article release :><:eif FieldPerm:></td>
             <td bgcolor="#FFFFFF"><:help edit release:></td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left"> Expiry date: </th>
+            <th nowrap bgcolor="#FFFFFF" align="left">Expiry date:</th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <:if FieldPerm expire:><input type="text" name="expire" value="<: date "%d/%m/%Y" 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%"> 
               <:if FieldPerm summaryLength:><input type="text" name="summaryLength" size="10" maxlength="10" value="<: article summaryLength :>">
               (in characters - <: ifNew :>default inherited from <:parentType:>, <: or :><: eif :> 
             <td bgcolor="#FFFFFF"><:help edit summary:></td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left"> Display threshold: </th>
+            <th nowrap bgcolor="#FFFFFF" align="left">Display threshold:</th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <:ifFieldPerm threshold:><input type="text" name="threshold" size="10" maxlength="10" value="<: article threshold :>"><:or:><: article threshold :><:eif:>
             </td>
             <td bgcolor="#FFFFFF"><:help edit threshold:> </td>
           </tr>
           <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left"> Keywords: </th>
+            <th nowrap bgcolor="#FFFFFF" align="left">Keywords:</th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <:ifFieldPerm keyword:><input type="text" name="keyword" maxlength="255" size="60" value="<: article keyword :>">
               (comma separated)<:or:><: article threshold :><:eif:></td>
-            <td bgcolor="#FFFFFF"><:help edit keywords:> </td>
-          </tr>
-          <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left">List article:</th>
-            <td bgcolor="#FFFFFF" width="100%"> <:if FieldPerm listed:><:list listed:><:or FieldPerm:><:if Article listed:><:ifEq [article listed] "1":>Yes<:or:>In Sections, but not menu<:eif:><:or Article:>No<:eif Article:><:eif FieldPerm:> </td>
-            <td bgcolor="#FFFFFF"><:help edit listed:></td>
-          </tr>
-          <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left">Flags:</th>
-            <td bgcolor="#FFFFFF" width="100%"><:iterator begin flags:><:if FieldPerm flags:><input type=checkbox name=flags value="<:flag id:>" <:ifFlagSet [flag id]:>checked<:or:><:eif:>><:or FieldPerm:><:ifFlagSet [flag id]:>Yes<:or:>No<:eif:><:eif FieldPerm:><:flag desc:><:iterator end flags:></td>
-            <td bgcolor="#FFFFFF"><:help edit listed:></td>
+            <td bgcolor="#FFFFFF"><:help edit keywords:></td>
           </tr>
           <tr> 
             <th nowrap bgcolor="#FFFFFF" align="left" valign="top">Thumbnail image:</th>
             <td nowrap bgcolor="#FFFFFF" valign="top"><:help edit files:></td>
           </tr>
           <tr> 
-            <th valign="top" nowrap bgcolor="#FFFFFF" align="left"> Images: 
+            <th valign="top" nowrap bgcolor="#FFFFFF" align="left">Images: 
             </th>
             <td align="center" bgcolor="#FFFFFF" width="100%"><:if Images:> <:iterator begin 
               images:> <img src="/images/<: image image :>" alt="<:image alt :>" width= 
         </tr>
 <:if UserCan edit_reorder_children:article:>
         <tr> 
-          <td colspan="5" 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>
+          <td colspan="5" bgcolor="#FFFFFF">Sort by: <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&sort=title&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>">title</a> | <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&sort=date&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>">date</a> | <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&reverse=1&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>">reverse</a></td>
         </tr>
 <:or UserCan:><:eif UserCan:>
         <:iterator begin children:> 
index 94d492d..d17d75c 100644 (file)
@@ -64,7 +64,6 @@
   <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" width="100%" class="table">
     <tr>
       <td>
-
         <table cellpadding="6" border="0" cellspacing="1" width="100%">
           <tr> 
             <th bgcolor="#FFFFFF" nowrap align="left"> Parent: </th>
             </td>
             <td bgcolor="#FFFFFF"><:help catalog title:></td>
           </tr>
-          <tr> 
-            <th bgcolor="#FFFFFF" nowrap align="left"> Template: </th>
-            <td bgcolor="#FFFFFF" width="100%"> <:ifFieldPerm titleImage:><:templates:><:or:><:article titleImage:><:eif:> </td>
-            <td bgcolor="#FFFFFF"><:help catalog template:></td>
-          </tr>
           <tr> 
             <th valign="top" bgcolor="#FFFFFF" nowrap align="left"> Body:</th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <:ifFieldPerm body:><textarea name="body" rows="10" cols="60" wrap="virtual"><: article body :></textarea><:or:><:bodytext article body:><:eif:>
             </td>
             <td bgcolor="#FFFFFF" valign="top"><:help body body:></td>
+          </tr>
+                 <tr> 
+            <th bgcolor="#FFFFFF" nowrap align="left"> Template: </th>
+            <td bgcolor="#FFFFFF" width="100%"> <:ifFieldPerm titleImage:><:templates:><:or:><:article titleImage:><:eif:> </td>
+            <td bgcolor="#FFFFFF"><:help catalog template:></td>
+          </tr>
+                 <tr> 
+            <th bgcolor="#FFFFFF" nowrap align="left">List article:</th>
+            <td bgcolor="#FFFFFF" width="100%"> <:if FieldPerm listed:><:list listed:><:or FieldPerm:><:if Article listed:><:ifEq [article listed] "1":>Yes<:or:>In Sections, but not menu<:eif:><:or Article:>No<:eif Article:><:eif FieldPerm:> </td>
+            <td bgcolor="#FFFFFF"><:help catalog list:></td>
+          </tr>
+         <tr>
+            <th nowrap bgcolor="#FFFFFF" align="left">Flags:</th>
+            <td bgcolor="#FFFFFF" width="100%"><:iterator begin flags:><:if FieldPerm flags:>
+              <input type=checkbox name=flags value="<:flag id:>" <:ifFlagSet [flag id]:>checked<:or:>
+              <:eif:>><:or FieldPerm:><:ifFlagSet [flag id]:>Yes<:or:>No<:eif:>
+              <:eif FieldPerm:><:flag desc:><:iterator end flags:></td>
+            <td bgcolor="#FFFFFF"><:help edit listed:></td>
           </tr>
           <tr> 
             <th bgcolor="#FFFFFF" nowrap align="left"> Release date: </th>
               (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%"> <:if FieldPerm listed:><:list listed:><:or FieldPerm:><:if Article listed:><:ifEq [article listed] "1":>Yes<:or:>In Sections, but not menu<:eif:><:or Article:>No<:eif Article:><:eif FieldPerm:> </td>
-            <td bgcolor="#FFFFFF"><:help catalog list:></td>
-          </tr>
-          <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left">Flags:</th>
-            <td bgcolor="#FFFFFF" width="100%"><:iterator begin flags:><:if FieldPerm flags:><input type=checkbox name=flags value="<:flag id:>" <:ifFlagSet [flag id]:>checked<:or:><:eif:>><:or FieldPerm:><:ifFlagSet [flag id]:>Yes<:or:>No<:eif:><:eif FieldPerm:><:flag desc:><:iterator end flags:></td>
-            <td bgcolor="#FFFFFF"><:help edit listed:></td>
-          </tr>
           <tr> 
             <th bgcolor="#FFFFFF" nowrap align="left" valign="top">Thumbnail image:</th>
             <td bgcolor="#FFFFFF" width="100%"> 
              <:eif Images:>
            </td>
             <td bgcolor="#FFFFFF" valign="top"><:help catalog images:></td>
-          
           <:or Article:><:eif Article:> 
         </table>
-</td>
-</tr>
-</table>
+      </td>
+    </tr>
+  </table>
 
   <p><: ifNew :>
     <input type="submit" name="save"
         </tr>
 <:if UserCan edit_reorder_children:article:>
         <tr> 
-          <td colspan="5" 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>
+          <td colspan="5" bgcolor="#FFFFFF">Sort by: <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&sort=title&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>">            title</a> | <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&sort=date&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>">date</a> | <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&reverse=1&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>">reverse</a></td>
         </tr>
 <:or UserCan:><:eif UserCan:>
         <:iterator begin children:> 
index f2247df..fd2f688 100644 (file)
@@ -1,4 +1,4 @@
-<html><head><title>Edit product - Shop administration</title>
+<html><head><title><:ifNew:>Add<:or:>Edit<:eif:> product - Shop administration</title>
   <link rel="stylesheet" type="text/css" href="/css/admin.css">
 </head>
 <body>
@@ -6,15 +6,18 @@
 <:ifMessage:>
 <p><b><:message:></b></p>
 <:or:><:eif:> 
-<p>| <a href="/cgi-bin/admin/menu.pl">Admin menu</a> | <a href="<:product admin:>">See 
-  product</a> | <a href="/cgi-bin/admin/add.pl?id=<:product parentid:>">Edit parent</a> 
-  | <a href="/cgi-bin/admin/shopadmin.pl">Manage catalogs</a> <:if UserCan edit_save:product,edit_field_edit_listed:product 
-  :><:if Product listed:> | <a href="<:script:>?id=<:product id:>&hide=1&r=<:script:>?id=<:product id:>">Hide 
-  product</a> <:or Product:> | <a href="<:script:>?id=<:product id:>&unhide=1&r=<:script:>?id=<:product id:>">Show 
-  product</a> <:eif Product:><:or UserCan:><:eif UserCan:>| <a href="/cgi-bin/admin/add.pl?id=<:product id:>&_t=steps">Manage 
-  step parents</a> | <:ifProduct listed:><:or:>Hidden<:eif:></p>
-  <h2>Edit Product</h2>
-<:if Or [iadminuser_count] [iadmingroup_count]:>
+<p>| <a href="/cgi-bin/admin/menu.pl">Admin menu</a> | <:if New:><:or New:><a href="<:product admin:>">See
+     product</a> | <a href="/cgi-bin/admin/add.pl?id=<:product parentid:>">Edit
+     parent</a> 
+  |<:eif New:> <a href="/cgi-bin/admin/shopadmin.pl">Manage catalogs</a> |<:if
+  New:><:or New:><:if UserCan edit_save:product,edit_field_edit_listed:product
+   :> <a href="/cgi-bin/admin/add.pl?id=<:product id:>&_t=steps">Manage
+      step parents</a> | <:if Product listed:> <a href="<:script:>?id=<:product id:>&hide=1&r=<:script:>?id=<:product id:>">Hide
+      product</a> |<:or Product:> <a href="<:script:>?id=<:product id:>&unhide=1&r=<:script:>?id=<:product id:>">Show
+      product</a> |<:eif Product:><:or UserCan:><:eif UserCan:><:ifProduct listed:><:or:> Hidden<:eif:><:eif
+      New:></p>
+  <h2>Product Details</h2>
+<:ifNew:><:or:><:if Or [iadminuser_count] [iadmingroup_count]:>
       <form action="/cgi-bin/admin/adminusers.pl">
   <input type=hidden name=id value="<: article id:>">
   <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
   </table>
       </form>
 <br>
-<:or Or:><:eif Or:>
+<:or Or:><:eif Or:><:eif:>
 <form action="<:script:>" enctype="multipart/form-data" method="POST">
     <input type="hidden" name="id" value="<:product id:>">
   <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"><:ifFieldPerm title:><input type="text" name="title" value="<:old title:>" size="60"><:or:><:product title:><:eif:></td>
-            <td nowrap bgcolor="#FFFFFF"><:help product title:></td>
-          </tr>
-          <tr> 
-            <th nowrap align="left" bgcolor="#FFFFFF">Summary:</th>
-            <td nowrap bgcolor="#FFFFFF"><:ifFieldPerm summary:><input type="text" name="summary" value="<:old summary:>" size=60><:or:><:product summary:><:eif:></td>
-            <td nowrap bgcolor="#FFFFFF"><:help product summary:></td>
-          </tr>
-          <tr> 
+                    <tr> 
             <th align="left" bgcolor="#FFFFFF">Catalog:</th>
             <td bgcolor="#FFFFFF">
 <:ifFieldPerm parentid:><select name="parentid"><:list:></select><:or:><:parent title:> (<:parent id:>)<:eif:></td>
             <td nowrap bgcolor="#FFFFFF"><:help product catalog:></td>
+          </tr>
+                 <tr> 
+            <th align="left" bgcolor="#FFFFFF">Title*:</th>
+            <td bgcolor="#FFFFFF"><:ifFieldPerm title:><input type="text" name="title" value="<:old title:>" size="60"><:or:><:product title:><:eif:> </td>
+            <td nowrap bgcolor="#FFFFFF"><:help product title:> <:error_img title:></td>
           </tr>
           <tr> 
-            <th nowrap align="left" bgcolor="#FFFFFF">Template:</th>
-            <td nowrap bgcolor="#FFFFFF"><:ifFieldPerm template:><:templates:><:or:><:product template:><:eif:></td>
-            <td nowrap bgcolor="#FFFFFF"><:help product template:></td>
+            <th nowrap align="left" bgcolor="#FFFFFF">Summary*:</th>
+            <td nowrap bgcolor="#FFFFFF"><:ifFieldPerm summary:><input type="text" name="summary" value="<:old summary:>" size=60><:or:><:product summary:><:eif:> </td>
+            <td nowrap bgcolor="#FFFFFF"><:help product summary:> <:error_img
+            summary:></td>
           </tr>
           <tr> 
             <th align="left" bgcolor="#FFFFFF" valign="top"> Body:</th>
             <td bgcolor="#FFFFFF"> 
-              <:ifFieldPerm body:><textarea name=body rows=15 cols=60 wrap=virtual><:product body:></textarea><:or:><:bodytext product body:><:eif:>
+              <:ifFieldPerm body:><textarea name=body rows=15 cols=60 wrap=virtual><:old body product body:></textarea><:or:><:bodytext product body:><:eif:>
             </td>
             <td nowrap bgcolor="#FFFFFF" valign="top"><:help body body:></td>
+          </tr>
+                 <tr> 
+            <th nowrap align="left" bgcolor="#FFFFFF">Template:</th>
+            <td nowrap bgcolor="#FFFFFF"><:ifFieldPerm template:><:templates:><:or:><:product template:><:eif:></td>
+            <td nowrap bgcolor="#FFFFFF"><:help product template:></td>
+          </tr>
+                 <tr> 
+            <th nowrap bgcolor="#FFFFFF" align="left">List article:</th>
+            <td bgcolor="#FFFFFF" width="100%"> <:if FieldPerm listed:><:list listed:><:or FieldPerm:><:if Article listed:><:ifEq [article listed] "1":>Yes<:or:>In Sections, but not menu<:eif:><:or Article:>No<:eif Article:><:eif FieldPerm:> </td>
+            <td bgcolor="#FFFFFF"><:help edit listed:></td>
+          </tr>
+         <tr>
+            <th nowrap bgcolor="#FFFFFF" align="left">Flags:</th>
+            <td bgcolor="#FFFFFF" width="100%"><:iterator begin flags:><:if FieldPerm flags:>
+              <input type=checkbox name=flags value="<:flag id:>" <:ifFlagSet [flag id]:>checked<:or:>
+              <:eif:>><:or FieldPerm:><:ifFlagSet [flag id]:>Yes<:or:>No<:eif:>
+              <:eif FieldPerm:><:flag desc:><:iterator end flags:></td>
+            <td bgcolor="#FFFFFF"><:help edit listed:></td>
           </tr>
           <tr> 
             <th nowrap align="left" bgcolor="#FFFFFF">Lead time:</th>
             <td nowrap bgcolor="#FFFFFF"> 
-              <:ifFieldPerm leadTime:><input type="text" name="leadTime" value="<:product leadTime:>" size=5><:or:><:product leadTime:><:eif:>
+              <:ifFieldPerm leadTime:>
+              <input type="text" name="leadTime" value="<:old leadTime:>" size=5><:or:><:product leadTime:><:eif:>
               days</td>
             <td nowrap bgcolor="#FFFFFF"><:help product leadtime:></td>
           </tr>
           <tr> 
             <th align="left" bgcolor="#FFFFFF">Retail price:</th>
             <td bgcolor="#FFFFFF">$ 
-              <:ifFieldPerm retailPrice:><input type="text" name="retailPrice" value="<:money product retailPrice:>" size=7>
-              (0.00)<:or:><:money product retailPrice:><:eif:></td>
-            <td nowrap bgcolor="#FFFFFF"><:help product retail:></td>
+              <:ifFieldPerm retailPrice:><input type="text" name="retailPrice" value="<:old retailPrice money product retailPrice:>" size=7>
+              (0.00)<:or:><:money product retailPrice:><:eif:> </td>
+            <td nowrap bgcolor="#FFFFFF"><:help product retail:> <:error_img retailPrice:></td>
           </tr>
           <tr> 
             <th align="left" bgcolor="#FFFFFF">Wholesale price:</th>
             <td bgcolor="#FFFFFF">$ 
-              <:ifFieldPerm wholesalePrice:><input type="text" name="wholesalePrice" value="<:money product wholesalePrice:>" size=7>
+              <:ifFieldPerm wholesalePrice:><input type="text" name="wholesalePrice" value="<:old wholesalePrice money product wholesalePrice:>" size=7>
               (0.00)<:or:><:money product wholesalePrice:><:eif:></td>
-            <td nowrap bgcolor="#FFFFFF"><:help product wholesale:></td>
+            <td nowrap bgcolor="#FFFFFF"><:help product wholesale:> <:error_img wholesalePrice:></td>
           </tr>
           <tr> 
             <th align="left" bgcolor="#FFFFFF">GST:</th>
             <td bgcolor="#FFFFFF">$ 
-              <:ifFieldPerm gst:><input type="text" name="gst" value="<:money product gst:>" size=7>
+              <:ifFieldPerm gst:><input type="text" name="gst" value="<:old gst money product gst:>" size=7>
               (0.00)<:or:><:money product gst:><:eif:></td>
-            <td nowrap bgcolor="#FFFFFF"><:help product gst:></td>
+            <td nowrap bgcolor="#FFFFFF"><:help product gst:> <:error_img gst:></td>
           </tr>
           <tr> 
             <th align="left" bgcolor="#FFFFFF">Release date:</th>
             <td bgcolor="#FFFFFF"> 
-              <:ifFieldPerm release:><input type="text" name="release" value="<:date "%d/%m/%Y" product release:>" size=11>
+              <:ifFieldPerm release:><input type="text" name="release" value="<:old release date "%d/%m/%Y" product release:>" size=11>
               (dd/mm/yyyy)<:or:><:date "%d/%m/%Y" product release:><:eif:></td>
             <td nowrap bgcolor="#FFFFFF"><:help product release:></td>
           </tr>
           <tr> 
             <th align="left" bgcolor="#FFFFFF">Expiry date:</th>
             <td bgcolor="#FFFFFF"> 
-              <:ifFieldPerm expire:><input type="text" name="expire" value="<:date "%d/%m/%Y" product expire:>" size=11>
+              <:ifFieldPerm expire:><input type="text" name="expire" value="<:old expire date "%d/%m/%Y" product expire:>" size=11>
               (dd/mm/yyyy)<:or:><:date "%d/%m/%Y" product expire:><:eif:></td>
             <td nowrap bgcolor="#FFFFFF"><:help product expire:></td>
           </tr>
           <tr> 
             <th nowrap align="left" bgcolor="#FFFFFF">Summary length:</th>
             <td nowrap bgcolor="#FFFFFF"> 
-              <:ifFieldPerm summaryLength:><input type="text" name="summaryLength" size="10" maxlength="10" value="<:product summaryLength:>"><:or:><:product summaryLength:><:eif:>
+              <:ifFieldPerm summaryLength:><input type="text" name="summaryLength" size="10" maxlength="10" value="<:old summaryLength product summaryLength:>"><:or:><:product summaryLength:><:eif:>
             </td>
             <td nowrap bgcolor="#FFFFFF"><:help product summary:></td>
           </tr>
           <tr> 
             <th nowrap align="left" bgcolor="#FFFFFF">Display threshold:</th>
             <td nowrap bgcolor="#FFFFFF"> 
-              <:ifFieldPerm threshold:><input type="text" name="threshold" size=10 maxlength=10 value="<:product threshold:>"><:or:><:product threshold:><:eif:>
+              <:ifFieldPerm threshold:><input type="text" name="threshold" size=10 maxlength=10 value="<:old threshold product threshold:>"><:or:><:product threshold:><:eif:>
             </td>
             <td nowrap bgcolor="#FFFFFF"><:help product threshold:></td>
           </tr>
           <tr> 
             <th align="left" bgcolor="#FFFFFF">Options:</th>
             <td bgcolor="#FFFFFF"> 
-              <:ifFieldPerm options:><input type="text" name="options" value="<:product options:>" size=30>
+              <:ifFieldPerm options:><input type="text" name="options" value="<:old options product options:>" size=30>
               (<:alloptions:>)<:or:><:product options:><:eif:> </td>
             <td bgcolor="#FFFFFF"><:help product options:></td>
           </tr>
-          <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left">List article:</th>
-            <td bgcolor="#FFFFFF" width="100%"> <:if FieldPerm listed:><:list listed:><:or FieldPerm:><:if Article listed:><:ifEq [article listed] "1":>Yes<:or:>In Sections, but not menu<:eif:><:or Article:>No<:eif Article:><:eif FieldPerm:> </td>
-            <td bgcolor="#FFFFFF"><:help edit listed:></td>
-          </tr>
-          <tr> 
-            <th nowrap bgcolor="#FFFFFF" align="left">Flags:</th>
-            <td bgcolor="#FFFFFF" width="100%"><:iterator begin flags:><:if FieldPerm flags:><input type=checkbox name=flags value="<:flag id:>" <:ifFlagSet [flag id]:>checked<:or:><:eif:>><:or FieldPerm:><:ifFlagSet [flag id]:>Yes<:or:>No<:eif:><:eif FieldPerm:><:flag desc:><:iterator end flags:></td>
-            <td bgcolor="#FFFFFF"><:help edit listed:></td>
-          </tr>
           <tr> 
             <th nowrap align="left" bgcolor="#FFFFFF" valign="top">Thumbnail image:</th>
             <td nowrap bgcolor="#FFFFFF"> 
               Remove<:or FieldPerm:><:eif FieldPerm:><:or:><:eif:> </td>
             <td nowrap bgcolor="#FFFFFF" valign="top"><:help product thumb:></td>
           </tr>
+                 <:if Article id:>
           <tr> 
             <th nowrap align="left" bgcolor="#FFFFFF" valign="top"><a name="files"></a>Files:</th>
             <td nowrap bgcolor="#FFFFFF"> <:if Files:> 
             </td>
             <td valign="top" bgcolor="#FFFFFF"><:help product images:></td>
           </tr>
+                 <:or Article:><:eif Article:>
         </table>
       </td>
     </tr>
   </table>
-  <:if UserCan edit_save:article:><p>
+  <p><font size="-1">*These fields cannot be modified once this product has been
+      included in an order.</font></p>
+  <:if UserCan edit_save:article:>
+  <p>
     <input type=submit name="save" value="Save changes">
   </p><:or UserCan:><:eif UserCan:>
 </form>
index 478a7a6..dc3361c 100644 (file)
 <p><b><:message:></b></p>
 <:or:><:eif:>
 
-<p>| <a href="/cgi-bin/admin/menu.pl">Admin menu</a> | <:ifMatch [article generator] "Product":><a href="/cgi-bin/admin/shopadmin.pl">Manage 
-  catalogs</a> | <a href="/cgi-bin/admin/add.pl?id=<:article id:>">Edit 
-  product</a><:or:><a href="/cgi-bin/admin/add.pl?id=<:article id:>"><:if Eq [article 
-  parentid] 3:>Edit catalog<:or Eq:>Edit article<:eif Eq:></a><:eif:> |</p>
-<:if New:><:or New:> <:if Match [article generator] "Product":><:or Match:> 
+<p>| <a href="/cgi-bin/admin/menu.pl">Admin menu</a> | <:if Match [article generator] "Product":><a href="/cgi-bin/admin/add.pl?id=<:article id:>">Edit
+    product</a> | <a href="/cgi-bin/admin/shopadmin.pl">Manage catalogs</a> <:or
+    Match:><:if Eq [article id] [cfg articles shop]:><a href="/cgi-bin/admin/add.pl?id=<:article id:>">Edit
+    shop</a><:or Eq:><a href="/cgi-bin/admin/add.pl?id=<:article id:>"><:ifMatch
+    [article generator] "Catalog":>Edit catalog<:or:>Edit article<:eif:></a><:eif
+    Eq:><:eif Match:> |</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%" class="table">
   <tr><td>
  
 <:if UserCan edit_reorder_children:article:>
         <tr> 
-          <td colspan="6" bgcolor="#FFFFFF">Reorder stepchild articles: <a href="/cgi-bin/admin/reorder.pl?stepparent=<:article id:>&sort=title&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>%26_t=steps%23step">by 
-            title</a> | <a href="/cgi-bin/admin/reorder.pl?stepparent=<:article id:>&sort=date&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>%26_t=steps%23step">by 
-            date</a> | <a href="/cgi-bin/admin/reorder.pl?stepparent=<:article id:>&reverse=1&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>%26_t=steps%23step">reverse 
-            order</a></td>
+          <td colspan="6" bgcolor="#FFFFFF">Sort by: <a href="/cgi-bin/admin/reorder.pl?stepparent=<:article id:>&sort=title&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>%26_t=steps%23step">title</a> | <a href="/cgi-bin/admin/reorder.pl?stepparent=<:article id:>&sort=date&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>%26_t=steps%23step">date</a> | <a href="/cgi-bin/admin/reorder.pl?stepparent=<:article id:>&reverse=1&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>%26_t=steps%23step">reverse</a></td>
         </tr>
 <:or UserCan:><:eif UserCan:>
         <form action="<:script:>" method="POST">
         </tr>
 <:if UserCan edit_reorder_stepparents:article :>
         <tr bgcolor="#FFFFFF"> 
-          <td colspan="6">Reorder stepparent articles: <a href="/cgi-bin/admin/reorder.pl?stepchild=<:article id:>&sort=title&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>%26_t=steps%23stepparents">by 
-            title</a> | <a href="/cgi-bin/admin/reorder.pl?stepchild=<:article id:>&sort=date&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>%26_t=steps%23stepparents">by 
-            date</a> | <a href="/cgi-bin/admin/reorder.pl?stepchild=<:article id:>&reverse=1&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>%26_t=steps%23stepparents">reverse 
-            order</a></td>
+          <td colspan="6">Sort by: <a href="/cgi-bin/admin/reorder.pl?stepchild=<:article id:>&sort=title&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>%26_t=steps%23stepparents">title</a> | <a href="/cgi-bin/admin/reorder.pl?stepchild=<:article id:>&sort=date&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>%26_t=steps%23stepparents">date</a> | <a href="/cgi-bin/admin/reorder.pl?stepchild=<:article id:>&reverse=1&refreshto=/cgi-bin/admin/add.pl?id=<:article id:>%26_t=steps%23stepparents">reverse</a></td>
         </tr>
 <:or UserCan:><:eif UserCan:>
         <form action="<:script:>" method="POST">
index 7f28f4b..e4b8f59 100644 (file)
 <h1>File Wizard</h1>
 <:ifMessage:>
 <p><b><:message:></b></p>
-<:or:><:eif:> 
-<:if UserCan edit_files_add:article :>
+<:or:><:eif:>
+<p>| <a href="/cgi-bin/admin/menu.pl">Admin menu</a> | <:if Match [article generator] "Product":><a href="/cgi-bin/admin/add.pl?id=<:article id:>">Edit
+    product</a> | <a href="/cgi-bin/admin/shopadmin.pl">Manage catalogs</a> <:or
+    Match:><:if Eq [article id] [cfg articles shop]:><a href="/cgi-bin/admin/add.pl?id=<:article id:>">Edit
+    shop</a><:or Eq:><a href="/cgi-bin/admin/add.pl?id=<:article id:>"><:ifMatch
+    [article generator] "Catalog":>Edit catalog<:or:>Edit article<:eif:></a><:eif
+    Eq:><:eif Match:> |</p><:if UserCan edit_files_add:article :>
 <h2>Add new file</h2>
 
 <form method="post" action="<:script:>" enctype="multipart/form-data">
       <td> 
         <table cellpadding="6" border="0" cellspacing="1">
           <tr> 
-            <th bgcolor="#FFFFFF" align="left">File to add: </th>
+            <th bgcolor="#FFFFFF" align="left">File to add:</th>
             <td bgcolor="#FFFFFF"> 
-              <input type="file" name="file" />
+              <input type="file" name="file" /> 
             </td>
-            <td bgcolor="#FFFFFF"><:help file file:> </td>
+            <td bgcolor="#FFFFFF"><:help file file:> <:error_img file:></td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left">Description: </th>
+            <th bgcolor="#FFFFFF" align="left">Description:</th>
             <td bgcolor="#FFFFFF"> 
-              <input type="text" name="description" />
+              <input type="text" name="description" value="<:old description:>" />
             </td>
-            <td bgcolor="#FFFFFF"><:help file description:> </td>
+            <td bgcolor="#FFFFFF"><:help file description:></td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left"> Content-Type: </th>
+            <th bgcolor="#FFFFFF" align="left">Content-Type:</th>
             <td bgcolor="#FFFFFF"> 
-              <input type="text" name="contentType" />
+              <input type="text" name="contentType" value="<:old contentType:>" />
               (blank for guess) </td>
-            <td bgcolor="#FFFFFF"> <:help file content_type:></td>
+            <td bgcolor="#FFFFFF"><:help file content_type:></td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left"> 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>
+            <td bgcolor="#FFFFFF"><:help file download:></td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left"> Require payment: </th>
+            <th bgcolor="#FFFFFF" align="left">Require payment:</th>
             <td bgcolor="#FFFFFF"> 
               <input type="checkbox" name="forSale" value="1" />
             </td>
-            <td bgcolor="#FFFFFF"><:help file forSale:> </td>
+            <td bgcolor="#FFFFFF"><:help file forSale:></td>
           </tr>
           <tr> 
-            <th bgcolor="#FFFFFF" align="left"> Require login: </th>
+            <th bgcolor="#FFFFFF" align="left">Require login:</th>
             <td bgcolor="#FFFFFF"> 
               <input type="checkbox" name="requireUser" value="1" />
             </td>
-            <td bgcolor="#FFFFFF"><:help file requireUser:> </td>
+            <td bgcolor="#FFFFFF"><:help file requireUser:></td>
           </tr>
           <tr> 
             <td bgcolor="#FFFFFF" colspan="3" align="right"> 
-              <input type="submit" name="fileadd" value="  Add File  " />
+              <input type="submit" name="fileadd" value="Add File" />
             </td>
           </tr>
         </table>
 
 <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" class="table">
+<table width="100%" border="0" cellpadding="0" cellspacing="0" bgcolor="#000000" class="table">
     <tr>
       <td>
-        <table cellpadding="6" border="0" cellspacing="1">
-          <tr> 
-            <th bgcolor="#FFFFFF" nowrap> File</th>
-            <th bgcolor="#FFFFFF" nowrap> Description</th>
+        <table width="100%" border="0" cellpadding="6" cellspacing="1">
+          <:if Files:><tr> 
+            <th width="50%" nowrap bgcolor="#FFFFFF"> File</th>
+            <th width="50%" nowrap bgcolor="#FFFFFF"> Description</th>
             <th bgcolor="#FFFFFF" nowrap> Content-Type</th>
           </tr>
-          <:if Files:> <: iterator begin files :> 
+          <: iterator begin files :> 
           <tr bgcolor="#FFFFFF"> 
             <td nowrap> <:file displayName:></td>
             <td valign="top"> 
-              <:ifUserCan edit_files_save:article:><input type="text" name="description_<:file id:>" value="<: file description :>" /><:or:><: file description :><:eif:>
+              <:ifUserCan edit_files_save:article:><input name="description_<:file id:>" type="text" value="<: file description :>" size="35" />
+              <:or:><: file description :><:eif:>
             </td>
             <td valign="top"> 
-               <:ifUserCan edit_files_save:article:><input type="text" name="contentType_<:file id:>" value="<: file contentType :>" /><:or:><: file contentType :><:eif:>
+               <:ifUserCan edit_files_save:article:><input name="contentType_<:file id:>" type="text" value="<: file contentType :>" size="20" />
+               <:or:><: file contentType :><:eif:>
             </td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
index 315f32f..2901080 100644 (file)
@@ -10,7 +10,7 @@
 
 <body>
 
-<h1>Edit Subscription</h1>
+<h1><:ifNew:>Add<:or:>Edit<:eif:> Subscription</h1>
 
 <:ifMessage:><p><b><:message:></b></p><:or:><:eif:>
 
@@ -98,7 +98,7 @@
 </tr>
 </table>
 <p>
-    <input type="submit" name="editsave" value="Save Subscription">
+    <:ifNew:><input type="submit" name="addsave" value="Add Subscription"><:or:><input type="submit" name="editsave" value="Save Subscription"><:eif:>
   </p>
 </form>
 
index 93a1b09..eab25da 100644 (file)
@@ -14,8 +14,7 @@
 
 <:ifMessage:><p><b><:message:></b></p><:or:><:eif:>
 
-<p>| <a href="/admin/">Admin menu</a> | <:ifUserCan subs_add:><a href="<:script:>?add=1">Add New Subscription</a> 
-  |<:or:><:eif:></p>
+<p>| <a href="/admin/">Admin menu</a> |</p>
 
 <table border="0" cellspacing="0" cellpadding="0" bgcolor="#000000" class="table">
     <tr>
 </td>
 </tr>
 </table>
-
+<:ifUserCan subs_add:>
+<form name="form1" method="post" action="<:script:>">
+  <p><input type="submit" name="add" value="Add Subscription">
+  </p>
+</form><:or:><:eif:>
 <p><font size="-1">BSE Release <:release:></font></p>
 </body>
 </html>
index d698803..195e370 100644 (file)
@@ -4,7 +4,7 @@ use BSE::Test qw(base_url make_ua fetch_ok skip check_form post_ok ok
                  check_content);
 #use WWW::Mechanize;
 ++$|;
-print "1..24\n";
+print "1..21\n";
 my $baseurl = base_url;
 my $ua = make_ua;
 
@@ -20,7 +20,6 @@ check_form($ua->{content},
           "edit form",
           parentid=>[ -1, 'select' ],
           id => [ '', 'hidden' ],
-          titleImage => [ '', 'select' ],
           template=> [ 'common/default.tmpl', 'select' ],
           body => [ '<maximum of 64Kb>', 'textarea' ],
           listed => [ 1, 'select' ],