0.12_23 commit r0_12_23
authorTony Cook <tony@develop-help.com>
Mon, 10 Mar 2003 13:57:08 +0000 (13:57 +0000)
committertony <tony@45cb6cf1-00bc-42d2-bb5a-07f51df49f94>
Mon, 10 Mar 2003 13:57:08 +0000 (13:57 +0000)
site/cgi-bin/admin/subs.pl
site/templates/admin/article_img.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/filelist.tmpl
site/templates/admin/subs/edit.tmpl
t/t00smoke.t

index f6b31c3..16e0512 100755 (executable)
@@ -237,7 +237,7 @@ sub addsave {
     _refresh_list($cfg);  
   }
   else {
-    sub_form($q, $req, $cfg, 'admin/subs/add', undef, 1, \@errors);
+    sub_form($q, $req, $cfg, 'admin/subs/edit', undef, 1, \@errors);
   }
 }
 
index d9902b0..ccd10c8 100644 (file)
             <td bgcolor="#FFFFFF"> 
               <input type="file" name="image"> 
             </td>
-            <td bgcolor="#FFFFFF"><:help image file:> <:error_img image:></td>
+            <td nowrap bgcolor="#FFFFFF"><:help image file:> <:error_img image:></td>
           </tr>
           <tr> 
             <th bgcolor="#FFFFFF" align="left">Alt text for image:</th>
             <td bgcolor="#FFFFFF"> 
               <input type="text" name="altIn" value="<:old altIn:>">
             </td>
-            <td bgcolor="#FFFFFF"><:help image alt:></td>
+            <td nowrap bgcolor="#FFFFFF"><:help image alt:> <:error_img altIn:></td>
           </tr>
           <tr> 
             <th bgcolor="#FFFFFF" align="left">URL for image:</th>
             <td bgcolor="#FFFFFF"> 
               <input type="text" name="url" value="<:old url:>">
             </td>
-            <td bgcolor="#FFFFFF"><:help image url:></td>
+            <td nowrap bgcolor="#FFFFFF"><:help image url:> <:error_img url:></td>
           </tr>
           <tr> 
             <td bgcolor="#FFFFFF" colspan="3" align="right"> 
index dce2d4b..d6d07ed 100644 (file)
                 <option value="">Please select a <:parentType:><: list:>
               </select><:or FieldPerm:><:parent title:> (<:parent id:>)<:eif FieldPerm:>
             </td>
-            <td bgcolor="#FFFFFF"><:help edit section:> </td>
+            <td nowrap bgcolor="#FFFFFF"><:help edit section:> <:error_img parentid:></td>
           </tr>
           <tr> 
             <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:> <:error_img title:></td>
+            <:ifFieldPerm title:><input type="text" name="title" maxlength="<:cfg fields title_size 255:>" size="64" value="<: old title article title :>">
+            <:or:><:default title:><:eif:></td>
+            <td nowrap bgcolor="#FFFFFF"><:help edit title:> <:error_img title:></td>
           </tr>
           <: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>
+            <td nowrap bgcolor="#FFFFFF"><:help edit titleImage:> <:error_img titleImage:></td>
           </tr><:or Cfg:><:eif Cfg:>
           <tr> 
             <th valign="top" nowrap bgcolor="#FFFFFF" 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:>
+              <:ifFieldPerm body:><textarea name="body" rows="10" cols="60" wrap="virtual"><: old body article body :></textarea>
+              <:or:><:bodytext article body:><:eif:>
             </td>
-            <td bgcolor="#FFFFFF" valign="top"><:help body body:> </td>
+            <td valign="top" nowrap bgcolor="#FFFFFF"><:help body body:> <:error_img body:></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>
+            <td nowrap bgcolor="#FFFFFF"><:help edit template:> <:error_img 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>
+            <td nowrap bgcolor="#FFFFFF"><:help edit listed:> <:error_img listed:></td>
           </tr>
                  <tr>
             <th nowrap bgcolor="#FFFFFF" align="left">Flags:</th>
               <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 nowrap bgcolor="#FFFFFF"><:help edit flags:> <:error_img flags:></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">
+              <:if FieldPerm release:><input type="text" name="release" value="<: old release 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>
+            <td nowrap bgcolor="#FFFFFF"><:help edit release:> <:error_img release:></td>
           </tr>
           <tr> 
             <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">
+              <:if FieldPerm expire:><input type="text" name="expire" value="<: old expire date "%d/%m/%Y" article expire :>" size="10" maxlength="10">
               (dd/mm/yyyy - <: ifNew :>default is never, <: or :><: eif :>blank 
               for never expires)<:or FieldPerm:><: date "%d/%m/%Y" article expire :><:eif FieldPerm:></td>
-            <td bgcolor="#FFFFFF"><:help edit expire:></td>
+            <td nowrap bgcolor="#FFFFFF"><:help edit expire:> <:error_img expire:></td>
           </tr>
           <tr> 
             <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 :>">
+              <:if FieldPerm summaryLength:><input type="text" name="summaryLength" size="10" maxlength="10" value="<: old summaryLength article summaryLength :>">
               (in characters - <: ifNew :>default inherited from <:parentType:>, <: or :><: eif :> 
               zero for no summary)<:or FieldPerm:><: article summaryLength :><:eif FieldPerm:></td>
-            <td bgcolor="#FFFFFF"><:help edit summary:></td>
+            <td nowrap bgcolor="#FFFFFF"><:help edit summary:> <:error_img summaryLength:></td>
           </tr>
           <tr> 
             <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:>
+              <:ifFieldPerm threshold:><input type="text" name="threshold" size="10" maxlength="10" value="<: old threshold article threshold :>"><:or:><: article threshold :><:eif:>
             </td>
-            <td bgcolor="#FFFFFF"><:help edit threshold:> </td>
+            <td nowrap bgcolor="#FFFFFF"><:help edit threshold:> <:error_img
+            threshold:></td>
           </tr>
           <tr> 
             <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 :>">
+              <:ifFieldPerm keyword:><input type="text" name="keyword" maxlength="255" size="60" value="<: old keyword article keyword :>">
               (comma separated)<:or:><: article threshold :><:eif:></td>
-            <td bgcolor="#FFFFFF"><:help edit keywords:></td>
+            <td nowrap bgcolor="#FFFFFF"><:help edit keywords:> <:error_img keyword:></td>
           </tr>
           <tr> 
             <th nowrap bgcolor="#FFFFFF" align="left" valign="top">Thumbnail image:</th>
-            <td bgcolor="#FFFFFF" width="100%"> 
-              <:ifFieldPerm thumbImage:><input type=file name=thumbnail><:or:><:eif:>
+            <td width="100%" valign="top" bgcolor="#FFFFFF"> 
+              <:ifFieldPerm thumbImage:>
+              <input type=file name=thumbnail><:or:><:eif:>
               <:ifArticle thumbImage:><img src="/images/<:article thumbImage:>"> 
               <:if FieldPerm thumbImage:><input type=checkbox name="remove_thumb">
-              Remove<:or FieldPerm:><:eif FieldPerm:><:or:><:eif:></td>
-            <td bgcolor="#FFFFFF" valign="top"><:help edit thumb:></td>
+            Remove<:or FieldPerm:><:eif FieldPerm:><:or:><:eif:></td>
+            <td valign="top" nowrap bgcolor="#FFFFFF"><:help edit thumb:> <:error_img
+            thumbImage:></td>
           </tr>
           <:if Article id:> 
           <tr> 
               <p>No files are attached to this article. <a href="<:script:>?filelist=1&id=<:article id:>"><b>Manage Files</b></a></p>
               <:eif Files:>
             </td>
-            <td nowrap bgcolor="#FFFFFF" valign="top"><:help edit files:></td>
+            <td nowrap bgcolor="#FFFFFF" valign="top"><:help edit files:> <:error_img
+            files:></td>
           </tr>
           <tr> 
             <th valign="top" nowrap bgcolor="#FFFFFF" align="left">Images: 
               <p align="left">No images are attached to this article.  <a href="<:script:>?id=<:article id:>&showimages=1"><b>Manage Images</b></a></p>
               <:eif Images:>
            </td>
-            <td bgcolor="#FFFFFF" valign="top"><:help edit images:> </td>
+            <td valign="top" nowrap bgcolor="#FFFFFF"><:help edit images:> <:error_img
+            images:></td>
           </tr>
           <:or Article:><:eif Article:> 
         </table>
index dce2d4b..d6d07ed 100644 (file)
                 <option value="">Please select a <:parentType:><: list:>
               </select><:or FieldPerm:><:parent title:> (<:parent id:>)<:eif FieldPerm:>
             </td>
-            <td bgcolor="#FFFFFF"><:help edit section:> </td>
+            <td nowrap bgcolor="#FFFFFF"><:help edit section:> <:error_img parentid:></td>
           </tr>
           <tr> 
             <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:> <:error_img title:></td>
+            <:ifFieldPerm title:><input type="text" name="title" maxlength="<:cfg fields title_size 255:>" size="64" value="<: old title article title :>">
+            <:or:><:default title:><:eif:></td>
+            <td nowrap bgcolor="#FFFFFF"><:help edit title:> <:error_img title:></td>
           </tr>
           <: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>
+            <td nowrap bgcolor="#FFFFFF"><:help edit titleImage:> <:error_img titleImage:></td>
           </tr><:or Cfg:><:eif Cfg:>
           <tr> 
             <th valign="top" nowrap bgcolor="#FFFFFF" 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:>
+              <:ifFieldPerm body:><textarea name="body" rows="10" cols="60" wrap="virtual"><: old body article body :></textarea>
+              <:or:><:bodytext article body:><:eif:>
             </td>
-            <td bgcolor="#FFFFFF" valign="top"><:help body body:> </td>
+            <td valign="top" nowrap bgcolor="#FFFFFF"><:help body body:> <:error_img body:></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>
+            <td nowrap bgcolor="#FFFFFF"><:help edit template:> <:error_img 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>
+            <td nowrap bgcolor="#FFFFFF"><:help edit listed:> <:error_img listed:></td>
           </tr>
                  <tr>
             <th nowrap bgcolor="#FFFFFF" align="left">Flags:</th>
               <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 nowrap bgcolor="#FFFFFF"><:help edit flags:> <:error_img flags:></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">
+              <:if FieldPerm release:><input type="text" name="release" value="<: old release 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>
+            <td nowrap bgcolor="#FFFFFF"><:help edit release:> <:error_img release:></td>
           </tr>
           <tr> 
             <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">
+              <:if FieldPerm expire:><input type="text" name="expire" value="<: old expire date "%d/%m/%Y" article expire :>" size="10" maxlength="10">
               (dd/mm/yyyy - <: ifNew :>default is never, <: or :><: eif :>blank 
               for never expires)<:or FieldPerm:><: date "%d/%m/%Y" article expire :><:eif FieldPerm:></td>
-            <td bgcolor="#FFFFFF"><:help edit expire:></td>
+            <td nowrap bgcolor="#FFFFFF"><:help edit expire:> <:error_img expire:></td>
           </tr>
           <tr> 
             <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 :>">
+              <:if FieldPerm summaryLength:><input type="text" name="summaryLength" size="10" maxlength="10" value="<: old summaryLength article summaryLength :>">
               (in characters - <: ifNew :>default inherited from <:parentType:>, <: or :><: eif :> 
               zero for no summary)<:or FieldPerm:><: article summaryLength :><:eif FieldPerm:></td>
-            <td bgcolor="#FFFFFF"><:help edit summary:></td>
+            <td nowrap bgcolor="#FFFFFF"><:help edit summary:> <:error_img summaryLength:></td>
           </tr>
           <tr> 
             <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:>
+              <:ifFieldPerm threshold:><input type="text" name="threshold" size="10" maxlength="10" value="<: old threshold article threshold :>"><:or:><: article threshold :><:eif:>
             </td>
-            <td bgcolor="#FFFFFF"><:help edit threshold:> </td>
+            <td nowrap bgcolor="#FFFFFF"><:help edit threshold:> <:error_img
+            threshold:></td>
           </tr>
           <tr> 
             <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 :>">
+              <:ifFieldPerm keyword:><input type="text" name="keyword" maxlength="255" size="60" value="<: old keyword article keyword :>">
               (comma separated)<:or:><: article threshold :><:eif:></td>
-            <td bgcolor="#FFFFFF"><:help edit keywords:></td>
+            <td nowrap bgcolor="#FFFFFF"><:help edit keywords:> <:error_img keyword:></td>
           </tr>
           <tr> 
             <th nowrap bgcolor="#FFFFFF" align="left" valign="top">Thumbnail image:</th>
-            <td bgcolor="#FFFFFF" width="100%"> 
-              <:ifFieldPerm thumbImage:><input type=file name=thumbnail><:or:><:eif:>
+            <td width="100%" valign="top" bgcolor="#FFFFFF"> 
+              <:ifFieldPerm thumbImage:>
+              <input type=file name=thumbnail><:or:><:eif:>
               <:ifArticle thumbImage:><img src="/images/<:article thumbImage:>"> 
               <:if FieldPerm thumbImage:><input type=checkbox name="remove_thumb">
-              Remove<:or FieldPerm:><:eif FieldPerm:><:or:><:eif:></td>
-            <td bgcolor="#FFFFFF" valign="top"><:help edit thumb:></td>
+            Remove<:or FieldPerm:><:eif FieldPerm:><:or:><:eif:></td>
+            <td valign="top" nowrap bgcolor="#FFFFFF"><:help edit thumb:> <:error_img
+            thumbImage:></td>
           </tr>
           <:if Article id:> 
           <tr> 
               <p>No files are attached to this article. <a href="<:script:>?filelist=1&id=<:article id:>"><b>Manage Files</b></a></p>
               <:eif Files:>
             </td>
-            <td nowrap bgcolor="#FFFFFF" valign="top"><:help edit files:></td>
+            <td nowrap bgcolor="#FFFFFF" valign="top"><:help edit files:> <:error_img
+            files:></td>
           </tr>
           <tr> 
             <th valign="top" nowrap bgcolor="#FFFFFF" align="left">Images: 
               <p align="left">No images are attached to this article.  <a href="<:script:>?id=<:article id:>&showimages=1"><b>Manage Images</b></a></p>
               <:eif Images:>
            </td>
-            <td bgcolor="#FFFFFF" valign="top"><:help edit images:> </td>
+            <td valign="top" nowrap bgcolor="#FFFFFF"><:help edit images:> <:error_img
+            images:></td>
           </tr>
           <:or Article:><:eif Article:> 
         </table>
index d17d75c..b795811 100644 (file)
@@ -2,7 +2,7 @@
 <head>
 
 <title>
-    <: ifNew :>New<: or :>Edit<: eif :> Catalog - Shop Administration
+    <: ifNew :>Add<: or :>Edit<: eif :> Catalog - Shop Administration
 </title>
 
   <link rel="stylesheet" type="text/css" href="/css/admin.css">
             <th bgcolor="#FFFFFF" nowrap align="left"> Parent: </th>
             <td bgcolor="#FFFFFF" width="100%"> 
               <:if FieldPerm parentid:><select name="parentid">
-                <option value="">Please Select a <: parentType :> <: list subsections 
-                :> 
+                <option value="">Please Select a <: parentType :> <: list subsections :> 
               </select><:or FieldPerm:><:parent title:> (<:parent id:>)<:eif FieldPerm:>
             </td>
-            <td bgcolor="#FFFFFF"><:help catalog parent:></td>
+            <td nowrap bgcolor="#FFFFFF"><:help catalog parent:> <:error_img parentid:></td>
           </tr>
           <tr> 
             <th bgcolor="#FFFFFF" nowrap align="left"> Catalog title: </th>
             <td bgcolor="#FFFFFF" width="100%"> 
-              <:ifFieldPerm title:><input type="text" name="title" maxlength="64" size="64" value="<: article title :>"><:or:><:default title:><:eif:>
+              <:ifFieldPerm title:><input type="text" name="title" maxlength="64" size="64" value="<: old title article title :>"><:or:><:default title:><:eif:>
             </td>
-            <td bgcolor="#FFFFFF"><:help catalog title:></td>
+            <td nowrap bgcolor="#FFFFFF"><:help catalog title:> <:error_img title:></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:>
+              <:ifFieldPerm body:><textarea name="body" rows="10" cols="60" wrap="virtual"><: old body article body :></textarea><:or:><:bodytext article body:><:eif:>
             </td>
-            <td bgcolor="#FFFFFF" valign="top"><:help body body:></td>
+            <td valign="top" nowrap bgcolor="#FFFFFF"><:help body body:> <:error_img
+            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>
+            <td nowrap bgcolor="#FFFFFF"><:help catalog template:> <:error_img 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>
+            <td nowrap bgcolor="#FFFFFF"><:help catalog list:> <:error_img listed:></td>
           </tr>
-         <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 nowrap bgcolor="#FFFFFF"><:help edit flags:> <:error_img flags:></td>
           </tr>
           <tr> 
             <th bgcolor="#FFFFFF" nowrap 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>
-            <td bgcolor="#FFFFFF"><:help catalog release:></td>
+              <:if FieldPerm release:><input type="text" name="release" value="<: old release 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 nowrap bgcolor="#FFFFFF"><:help catalog release:> <:error_img release:></td>
           </tr>
           <tr> 
             <th bgcolor="#FFFFFF" nowrap 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">
+              <:if FieldPerm expire:><input type="text" name="expire" value="<: old expire date "%d/%m/%Y" article expire :>" size="10" maxlength="10">
               (dd/mm/yyyy - <: ifNew :>default is never, <: or :><: eif :>blank 
               for never expires)<:or FieldPerm:><: date "%d/%m/%Y" article expire :><:eif FieldPerm:></td>
-            <td bgcolor="#FFFFFF"><:help catalog expire:></td>
+            <td nowrap bgcolor="#FFFFFF"><:help catalog expire:> <:error_img expire:></td>
           </tr>
           <tr> 
             <th bgcolor="#FFFFFF" nowrap 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 :>">
+              <:if FieldPerm summaryLength:><input type="text" name="summaryLength" size="10" maxlength="10" value="<: old summaryLength article summaryLength :>">
               (in characters - default inherited from parent catalog or shop, zero 
               for no summary)<:or FieldPerm:><: article summaryLength :><:eif FieldPerm:></td>
-            <td bgcolor="#FFFFFF"><:help catalog summary:></td>
+            <td nowrap bgcolor="#FFFFFF"><:help catalog summary:> <:error_img summaryLength:></td>
           </tr>
           <tr> 
             <th bgcolor="#FFFFFF" nowrap 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:>
+              <:ifFieldPerm threshold:><input type="text" name="threshold" size="10" maxlength="10" value="<: old threshold article threshold :>"><:or:><: article threshold :><:eif:>
             </td>
-            <td bgcolor="#FFFFFF"><:help catalog threshold:></td>
+            <td nowrap bgcolor="#FFFFFF"><:help catalog threshold:> <:error_img threshold:></td>
           </tr>
           <tr> 
             <th bgcolor="#FFFFFF" nowrap align="left"> Keywords: </th>
             <td bgcolor="#FFFFFF" width="100%"> 
-              <:ifFieldPerm keyword:><input type="text" name="keyword" maxlength="255" size="60" value="<: article keyword :>"><:or:><: article threshold :><:eif:>
+              <:ifFieldPerm keyword:><input type="text" name="keyword" maxlength="255" size="60" value="<: old keyword article keyword :>"><:or:><: article threshold :><:eif:>
               (comma separated) </td>
-            <td bgcolor="#FFFFFF"><:help catalog keywords:></td>
+            <td nowrap bgcolor="#FFFFFF"><:help catalog keywords:> <:error_img keyword:></td>
           </tr>
           <tr> 
             <th bgcolor="#FFFFFF" nowrap align="left" valign="top">Thumbnail image:</th>
-            <td bgcolor="#FFFFFF" width="100%"> 
-              <:ifFieldPerm thumbImage:><input type=file name=thumbnail><:or:><:eif:>
+            <td width="100%" valign="top" bgcolor="#FFFFFF"> 
+              <:ifFieldPerm thumbImage:>
+              <input type=file name=thumbnail><:or:><:eif:>
               <:ifArticle thumbImage:><img src="/images/<:article thumbImage:>"> 
               <:if FieldPerm thumbImage:><input type=checkbox name="remove_thumb">
-              Remove<:or FieldPerm:><:eif FieldPerm:><:or:><:eif:></td>
-            <td bgcolor="#FFFFFF" valign="top"><:help catalog thumb:></td>
+            Remove<:or FieldPerm:><:eif FieldPerm:><:or:><:eif:></td>
+            <td valign="top" nowrap bgcolor="#FFFFFF"><:help catalog thumb:> <:error_img
+            thumbImage:></td>
           </tr>
           <:if Article id:> 
           <tr> 
               <:or Files:>
               <p>No files are attached to this article. <a href="<:script:>?filelist=1&id=<:article id:>"><b>Manage Files</b></a></p><:eif Files:>
             </td>
-            <td nowrap bgcolor="#FFFFFF" valign="top"><:help edit files:></td>
+            <td nowrap bgcolor="#FFFFFF" valign="top"><:help edit files:> <:error_img
+            files:></td>
           </tr>
           <tr> 
             <th valign="top" bgcolor="#FFFFFF" nowrap align="left"> Images: 
              <:or Images:><p align="left">No images are attached to this article.  <a href="<:script:>?id=<:article id:>&showimages=1"><b>Manage Images</b></a></p>
              <:eif Images:>
            </td>
-            <td bgcolor="#FFFFFF" valign="top"><:help catalog images:></td>
+            <td valign="top" nowrap bgcolor="#FFFFFF"><:help catalog images:> <:error_img
+            images:></td>
           <:or Article:><:eif Article:> 
         </table>
       </td>
 
   <p><: ifNew :>
     <input type="submit" name="save"
-           value="  Add New Catalog  ">
+           value="  Add Catalog  ">
      <: or :>
     <:if UserCan edit_save:article:><input type="submit" name="save"
            value="  Update Catalog  "><:or UserCan:><:eif UserCan:><:eif:></p>
index fd2f688..3d34e85 100644 (file)
             <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>
+            <td nowrap bgcolor="#FFFFFF"><:help product catalog:> <:error_img
+              parentid:></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>
+            <td nowrap bgcolor="#FFFFFF"><:help product title:> <:error_img title:> <:error_img
+            title:></td>
           </tr>
           <tr> 
             <th nowrap align="left" bgcolor="#FFFFFF">Summary*:</th>
             <td bgcolor="#FFFFFF"> 
               <: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>
+            <td nowrap bgcolor="#FFFFFF" valign="top"><:help body body:> <:error_img
+            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>
+            <td nowrap bgcolor="#FFFFFF"><:help product template:> <:error_img
+            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>
+            <td bgcolor="#FFFFFF"><:help edit listed:> <:error_img listed:></td>
           </tr>
-         <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 flags:> <:error_img flags:></td>
           </tr>
           <tr> 
             <th nowrap align="left" bgcolor="#FFFFFF">Lead time:</th>
               <: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>
+            <td nowrap bgcolor="#FFFFFF"><:help product leadtime:> <:error_img
+            leadTime:></td>
           </tr>
           <tr> 
             <th align="left" bgcolor="#FFFFFF">Retail price:</th>
             <td bgcolor="#FFFFFF"> 
               <: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>
+            <td nowrap bgcolor="#FFFFFF"><:help product release:> <:error_img
+            release:></td>
           </tr>
           <tr> 
             <th align="left" bgcolor="#FFFFFF">Expiry date:</th>
             <td bgcolor="#FFFFFF"> 
               <: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>
+            <td nowrap bgcolor="#FFFFFF"><:help product expire:> <:error_img
+            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="<:old summaryLength product summaryLength:>"><:or:><:product summaryLength:><:eif:>
             </td>
-            <td nowrap bgcolor="#FFFFFF"><:help product summary:></td>
+            <td nowrap bgcolor="#FFFFFF"><:help product summary:> <:error_img
+            summaryLength:></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="<:old threshold product threshold:>"><:or:><:product threshold:><:eif:>
             </td>
-            <td nowrap bgcolor="#FFFFFF"><:help product threshold:></td>
+            <td nowrap bgcolor="#FFFFFF"><:help product threshold:> <:error_img
+            threshold:></td>
           </tr>
           <tr> 
             <th align="left" bgcolor="#FFFFFF">Options:</th>
             <td bgcolor="#FFFFFF"> 
               <: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>
+            <td bgcolor="#FFFFFF"><:help product options:> <:error_img options:></td>
           </tr>
           <tr> 
             <th nowrap align="left" bgcolor="#FFFFFF" valign="top">Thumbnail image:</th>
               <:ifProduct thumbImage:><img src="/images/<:product thumbImage:>"> 
               <:if FieldPerm thumbImage:><input type=checkbox name="remove_thumb">
               Remove<:or FieldPerm:><:eif FieldPerm:><:or:><:eif:> </td>
-            <td nowrap bgcolor="#FFFFFF" valign="top"><:help product thumb:></td>
+            <td nowrap bgcolor="#FFFFFF" valign="top"><:help product thumb:> <:error_img
+            thumbImage:></td>
           </tr>
                  <:if Article id:>
           <tr> 
               <p>No files are attached to this article. <a href="<:script:>?filelist=1&id=<:article id:>"><b>Manage Files</b></a></p><:eif Files:>
             </td>
             <td nowrap bgcolor="#FFFFFF" valign="top"><:help product 
-              files:></td>
+              files:> <:error_img files:></td>
           </tr>
           <tr> 
             <th valign="top" nowrap bgcolor="#FFFFFF" align="left"> Images: 
              <:or Images:><p align="left">No images are attached to this article.  <a href="<:script:>?id=<:article id:>&showimages=1"><b>Manage Images</b></a></p>
              <:eif Images:>
             </td>
-            <td valign="top" bgcolor="#FFFFFF"><:help product images:></td>
+            <td valign="top" bgcolor="#FFFFFF"><:help product images:> <:error_img
+            images:></td>
           </tr>
                  <:or Article:><:eif Article:>
         </table>
       included in an order.</font></p>
   <:if UserCan edit_save:article:>
   <p>
-    <input type=submit name="save" value="Save changes">
+    <:ifNew:><input type=submit name="save" value="Add Product"><:or:><input type=submit name="save" value="Update Product"><:eif:>
   </p><:or UserCan:><:eif UserCan:>
 </form>
 
index e4b8f59..0b4dec2 100644 (file)
             <td bgcolor="#FFFFFF"> 
               <input type="file" name="file" /> 
             </td>
-            <td bgcolor="#FFFFFF"><:help file file:> <:error_img file:></td>
+            <td nowrap bgcolor="#FFFFFF"><:help file file:> <:error_img file:></td>
           </tr>
           <tr> 
             <th bgcolor="#FFFFFF" align="left">Description:</th>
             <td bgcolor="#FFFFFF"> 
               <input type="text" name="description" value="<:old description:>" />
             </td>
-            <td bgcolor="#FFFFFF"><:help file description:></td>
+            <td nowrap bgcolor="#FFFFFF"><:help file description:> <:error_img description:></td>
           </tr>
           <tr> 
             <th bgcolor="#FFFFFF" align="left">Content-Type:</th>
             <td bgcolor="#FFFFFF"> 
               <input type="text" name="contentType" value="<:old contentType:>" />
               (blank for guess) </td>
-            <td bgcolor="#FFFFFF"><:help file content_type:></td>
+            <td nowrap bgcolor="#FFFFFF"><:help file content_type:> <:error_img contentType:></td>
           </tr>
           <tr> 
             <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 nowrap bgcolor="#FFFFFF"><:help file download:> <:error_img download:></td>
           </tr>
           <tr> 
             <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 nowrap bgcolor="#FFFFFF"><:help file forSale:> <:error_img forSale:></td>
           </tr>
           <tr> 
             <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 nowrap bgcolor="#FFFFFF"><:help file requireUser:> <:error_img requireUser:></td>
           </tr>
           <tr> 
             <td bgcolor="#FFFFFF" colspan="3" align="right"> 
index 2901080..1d3f800 100644 (file)
@@ -2,7 +2,7 @@
 <html>
 <head>
 
-  <title>Administration - Edit Subscription</title>
+  <title>Administration - <:ifNew:>add<:or:>Edit<:eif:> Subscription</title>
 
   <link rel="stylesheet" type="text/css" href="/css/admin.css" />
 
             <td> 
               <input type="text" name="name" value="<:old name:>" size="40" />
             </td>
-            <td><:help subs name:> <:ifError name:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error name:>" /><:or:><:eif:></td>
+            <td nowrap><:help subs name:> <:ifError name:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error name:>" /><:or:><:eif:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
             <th align="left" nowrap>Title:</th>
             <td> 
               <input type="text" name="title" value="<:old title:>" size="40" />
             </td>
-            <td><:help subs title:> <:ifError title:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error title:>" /><:or:><:eif:></td>
+            <td nowrap><:help subs title:> <:ifError title:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error title:>" /><:or:><:eif:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
             <th align="left" valign="top" nowrap>Description:</th>
             <td valign="top"> 
               <textarea name="description" cols="60" rows="10" wrap="virtual"><:old description:></textarea>
             </td>
-            <td valign="top"><:help subs description:> <:ifError description:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error description:>" /><:or:><:eif:></td>
+            <td valign="top" nowrap><:help subs description:> <:ifError description:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error description:>" /><:or:><:eif:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
             <th align="left" nowrap>Frequency:</th>
             <td> 
               <input type="text" name="frequency" value="<:old frequency:>" size="40" />
             </td>
-            <td><:help subs frequency:> <:ifError frequency:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error frequency:>" /><:or:><:eif:></td>
+            <td nowrap><:help subs frequency:> <:ifError frequency:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error frequency:>" /><:or:><:eif:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
             <th align="left" nowrap>HTML template:</th>
             <td><:template html_template htmlemail 1:> </td>
-            <td><:help subs html_template:> <:ifError html_template:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error html_template:>" /><:or:><:eif:></td>
+            <td nowrap><:help subs html_template:> <:ifError html_template:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error html_template:>" /><:or:><:eif:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
             <th align="left" nowrap>Text template:</th>
             <td><:template text_template textemail:> </td>
-            <td><:help subs text_template:> <:ifError text_template:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error text_template:>" /><:or:><:eif:></td>
+            <td nowrap><:help subs text_template:> <:ifError text_template:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error text_template:>" /><:or:><:eif:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
             <th align="left" nowrap>Visible:</th>
             <td><input type="checkbox" name="visible" value="1"<:ifOld visible:> 
               checked<:or:><:eif:> /> Make this subscription available</td>
-            <td><:help subs visible:></td>
+            <td nowrap><:help subs visible:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
             <th colspan="2">Archiving </th>
-            <td><:help subs archiving:></td>
+            <td nowrap><:help subs archiving:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
             <th align="left" nowrap>Archive:</th>
             <td><input type="checkbox" name="archive" value="1"<:ifOld archive:> 
               checked<:or:><:eif:> /> Archive this subscription</td>
-            <td><:help subs archive:> </td>
+            <td nowrap><:help subs archive:> </td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
             <th align="left" nowrap>Keywords:</th>
             <td> 
               <input type="text" name="keyword" value="<:old keyword:>" size="40" />
             </td>
-            <td><:help subs keyword:></td>
+            <td nowrap><:help subs keyword:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
             <th align="left" nowrap>Article template:</th>
             <td><:template article_template:> </td>
-            <td><:help subs template:> <:ifError article_template:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error article_template:>" /><:or:><:eif:></td>
+            <td nowrap><:help subs template:> <:ifError article_template:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error article_template:>" /><:or:><:eif:></td>
           </tr>
           <tr bgcolor="#FFFFFF"> 
             <th align="left" nowrap>Archive parent:</th>
             <td><:parent:> </td>
-            <td><:help subs parent:> <:ifError parentId:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error parentId:>" /><:or:><:eif:></td>
+            <td nowrap><:help subs parent:> <:ifError parentId:><img src="/images/admin/error.gif" width="16" height="16" alt="<:error parentId:>" /><:or:><:eif:></td>
           </tr>
         </table>
 </td>
 </tr>
 </table>
 <p>
-    <:ifNew:><input type="submit" name="addsave" value="Add Subscription"><:or:><input type="submit" name="editsave" value="Save Subscription"><:eif:>
+    <:ifNew:><input type="submit" name="addsave" value="Add Subscription"><:or:><input type="submit" name="editsave" value="Update Subscription"><:eif:>
   </p>
 </form>
 
index 5f2f763..6d33c2b 100644 (file)
@@ -34,7 +34,7 @@ fetch_ok($ua, "shop admin page", "$baseurl/cgi-bin/admin/shopadmin.pl",
 fetch_ok($ua, "add article form", "$baseurl/cgi-bin/admin/add.pl",
         qr!New\s+Page\sLev3!s);
 fetch_ok($ua, "add catalog form", "$baseurl/cgi-bin/admin/add.pl?type=Catalog",
-        qr!New\s+Catalog!s);
+        qr!Add\s+Catalog!s);
 fetch_ok($ua, "add product form", "$baseurl/cgi-bin/admin/add.pl?type=Product",
         qr!Add\s+product!s);
 fetch_ok($ua, "edit article form", "$baseurl/cgi-bin/admin/add.pl?id=1",