0.12_21 commit r0_12_21
authorTony Cook <tony@develop-help.com>
Tue, 29 Oct 2002 04:54:25 +0000 (04:54 +0000)
committertony <tony@45cb6cf1-00bc-42d2-bb5a-07f51df49f94>
Tue, 29 Oct 2002 04:54:25 +0000 (04:54 +0000)
20 files changed:
.cvsignore
MANIFEST
Makefile
site/cgi-bin/modules/Generate.pm
site/cgi-bin/modules/Generate/Catalog.pm
site/cgi-bin/printable.pl
site/docs/bse.pod
site/docs/config.pod
site/templates/1/shop_multicat.tmpl
site/templates/admin/edit_steps.tmpl
site/templates/admin/order_list.tmpl
site/templates/admin/order_list_filled.tmpl
site/templates/admin/order_list_unfilled.tmpl
site/templates/catalog.tmpl
site/templates/catalog/multi.tmpl
site/templates/catalog/shop_subcat.tmpl [new file with mode: 0644]
site/templates/common/sidebar.tmpl
site/templates/error.tmpl
site/templates/printable/wap.tmpl [new file with mode: 0644]
site/templates/user/userpage_base.tmpl

index e225142..5051121 100644 (file)
@@ -1,2 +1,3 @@
 INSTALL.html
 INSTALL.txt
+test-gosv.cfg
index 3faad39..bfab330 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -232,6 +232,7 @@ site/templates/base.tmpl
 site/templates/cart_base.tmpl
 site/templates/catalog.tmpl
 site/templates/catalog/multi.tmpl
+site/templates/catalog/shop_subcat.tmpl
 site/templates/checkout_base.tmpl
 site/templates/checkoutcard_base.tmpl
 site/templates/checkoutconfirm_base.tmpl
@@ -264,6 +265,7 @@ site/templates/menu/menu3.tmpl
 site/templates/menu/menu4.tmpl
 site/templates/menu/menu5.tmpl
 site/templates/printable/printable.tmpl
+site/templates/printable/wap.tmpl
 site/templates/search_base.tmpl
 site/templates/shop_help.tmpl
 site/templates/shop_sect.tmpl
index 3f6948a..5addda8 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=0.12_20
+VERSION=0.12_21
 DISTNAME=bse-$(VERSION)
 DISTBUILD=$(DISTNAME)
 DISTTAR=../$(DISTNAME).tar
index 79050e2..f1a0589 100644 (file)
@@ -348,7 +348,7 @@ sub format_body {
        last;
       }
       $part =~ s/\n([ \r]*\n)+/<p>/g;
-      $part =~ s/\n/<br>/g;
+      $part =~ s/\n/<br \/>/g;
       $out .= $part;
     }
   }
index 9939692..34524ab 100644 (file)
@@ -67,6 +67,10 @@ HTML
 <input type=hidden name="parentid" value="$article->{id}">
 <input type=hidden name="type" value="Product">
 <input type=submit value="Add product"></form></td>
+<td><form action="$CGI_URI/admin/add.pl">
+<input type=hidden name="parentid" value="$article->{id}">
+<input type=hidden name="type" value="Catalog">
+<input type=submit value="Add product"></form></td>
 HTML
          }
         $html .= <<HTML;
index dcbae08..eb22b23 100755 (executable)
@@ -7,6 +7,10 @@ use Carp; # 'verbose'; # remove the 'verbose' in production
 use Articles;
 use Constants qw($TMPLDIR);
 use Squirrel::Template;
+use BSE::Cfg;
+use BSE::Template;
+
+my $cfg = BSE::Cfg->new;
 
 my $id = param('id');
 defined $id or $id = 1;
@@ -27,13 +31,18 @@ my $template = param('template');
 
 # make sure they don't try to work outside the 
 my $file;
+my $type;
 if ($template) {
   if ($template =~ m!^/! || $template =~ /\.\./ || $template !~ /\.tmpl$/i) {
     error_page("Invalid template name '$template'");
   }
 
-  -e file_from_template($template) 
+  $file = file_from_template($template);
+  -e $file
     or error_page("Cannot find template '$template'");
+
+  $type = $cfg->entry('printable types', $template)
+    || BSE::Template->html_type($cfg);
 }
 else {
   for my $work ($article->{template}, 'printable.tmpl') {
@@ -43,6 +52,7 @@ else {
     last if -e $file;
   }
   -e $file or error_page("No template available for this page");
+  $type = BSE::Template->html_type($cfg);
 }
 
 open TMPLT, "< $file"
@@ -52,7 +62,7 @@ close TMPLT;
 
 $text =~ s/<:\s*embed\s+(?:start|end)\s*:>//g;
 
-print "Content-Type: text/html\n\n";
+print "Content-Type: $type\n\n";
 print $generator->generate_low($text, $article, 'Articles');
 
 sub error_page {
index 781e34d..82160dd 100644 (file)
@@ -10,6 +10,32 @@ Maybe I'll add some other bits here.
 
 =head1 CHANGES
 
+=head2 0.12_21
+
+=over
+
+=item *
+
+template change from adriam (edit_steps.tmpl):
+
+Finally fixed something that has bugged me for a while... I simply 
+moved the "if Kids" conditional to include the note about "Delete 
+only removes the stepkid relationship..." since not much point in 
+showing that is no step kids available... the step parent panel 
+already did this.
+
+=item *
+
+printable.pl now attempts to look for a content type for a given
+template.  This can be used for different types of presentation, for
+example WAP.
+
+=item *
+
+printable.pl now uses the configured charset if set.
+
+=back
+
 =head2 0.12_20
 
 =over
index 6cac9c4..79a3ad0 100644 (file)
@@ -518,6 +518,12 @@ This will provide translations from symbolic names to article ids.
 Currently this is used for converting article ids in the access
 control code, and for looking up the id of the shop.
 
+=head2 [printable type]
+
+If the user supplies a template name to printable.pl then you can use
+a different content type by adding an entry to this section.  The key
+is the template name, and the value is the full content type.
+
 =head1 AUTHOR
 
 Tony Cook <tony@develop-help.com>
index 9366280..9879f01 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap base.tmpl:> 
+<:wrap base.tmpl:> <:embed start:> <:admin:> 
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
   <tr> 
     <td width="80%" height="24">&nbsp;&nbsp;<font face="Arial, Helvetica, sans-serif" size="4" color="#FF7F00"><b><:title:></b></font></td>
     </td>
   </tr>
 </table>
-<:admin:>
-<p><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><:body:></font></p> 
-  
-<:ifAdmin:>
+<:ifArticle body:> 
+<p><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><:body:></font></p>
+<:or:><:eif:><:ifAdmin:>
 <p><font face="Verdana, Arial, Helvetica, sans-serif" size="2">Reorder child articles: 
   <a href="/cgi-bin/admin/reorder.pl?stepparent=<:article id:>&sort=title&refreshto=/cgi-bin/admin/admin.pl?id=<:article id:>">by 
   title</a> | <a href="/cgi-bin/admin/reorder.pl?stepparent=<:article id:>&sort=date&refreshto=/cgi-bin/admin/admin.pl?id=<:article id:>">by 
@@ -42,3 +41,4 @@
   <b>secure socket layer (SSL) encryption technology</b> to encode your personal 
   and credit card details when it is sent from your computer to ours. It&#146;s 
   the same technology that is used by larger online stores.</font></p>
+  <:embed end:>
index edcea49..42c44eb 100644 (file)
           <th>Expire</th>
           <th>Modify</th>
         </tr>
+        <:if Kids:>
         <tr bgcolor="#FFFFFF"> 
           <td colspan="5" align="center">Note: Delete only removes the stepchild 
             relationship. It does not delete the article.</td>
         </tr>
-        <:if Kids:> 
 <:if UserCan edit_reorder_children:article:>
         <tr> 
           <td colspan="5" 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 
         </tr>
         <:if StepParents:> 
         <tr bgcolor="#FFFFFF"> 
-          <td colspan="5" align="center">Note: Delete only removes the stepchild 
+          <td colspan="5" align="center">Note: Delete only removes the stepparent 
             relationship. It does not delete the article.</td>
         </tr>
 <:if UserCan edit_reorder_stepparents:article :>
index e48d1c9..3f8cc77 100644 (file)
@@ -38,7 +38,8 @@
         <tr bgcolor="#FFFFFF"> 
           <td align="center" nowrap><a href="<:script:>?id=<:order id:>&order_detail=1"><:order 
             id:></a></td>
-          <td width="100%"><:order delivFirstName:> <:order delivLastName:></td>
+          <td width="100%"><:order delivFirstName:> <:order delivLastName:> <:ifOrder 
+            userId:><font color="#CCCCCC">&#8212; (logged in)</font><:or:><:eif:></td>
           <td nowrap bgcolor="<:ifOrder filled:>#CC0033<:or:>#66CC00<:eif:>"><:ifOrder 
             filled:><font color="#999999">Completed</font><:or:><font color="#FFFFFF">Processing</font><:eif:></td>
           <td nowrap><:date orderDate:></td>
index 8750540..f94912b 100644 (file)
@@ -37,7 +37,8 @@
         <tr bgcolor="#FFFFFF"> 
           <td align="center" nowrap><a href="<:script:>?id=<:order id:>&order_detail=1"><:order 
             id:></a></td>
-          <td width="100%"><:order delivFirstName:> <:order delivLastName:></td>
+          <td width="100%"><:order delivFirstName:> <:order delivLastName:> <:ifOrder 
+            userId:><font color="#CCCCCC">&#8212; (logged in)</font><:or:><:eif:></td>
           <td nowrap><:date orderDate:></td>
           <td align=right nowrap>$<:money total:></td>
           <td align=right nowrap>$<:money gst:></td>
index 6db9097..3426541 100644 (file)
@@ -37,7 +37,8 @@
         <tr bgcolor="#FFFFFF"> 
           <td align="center" nowrap><a href="<:script:>?id=<:order id:>&order_detail=1"><:order 
             id:></a></td>
-          <td width="100%"><:order delivFirstName:> <:order delivLastName:></td>
+          <td width="100%"><:order delivFirstName:> <:order delivLastName:> <:ifOrder 
+            userId:><font color="#CCCCCC">&#8212; (logged in)</font><:or:><:eif:></td>
           <td nowrap><:date orderDate:></td>
           <td align=right nowrap>$<:money total:></td>
           <td align=right nowrap>$<:money gst:></td>
index 9a2cc24..f661b0e 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap base.tmpl:> 
+<:wrap base.tmpl:> <:embed start:><:admin:> <:if Embedded:><:or Embedded:> 
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
   <tr> 
     <td width="80%" height="24">&nbsp;&nbsp;<font face="Arial, Helvetica, sans-serif" size="4" color="#FF7F00"><b><:title:></b></font></td>
@@ -21,7 +21,9 @@
     </td>
   </tr>
 </table>
-<:embed start:><:admin:> 
+<:eif Embedded:> <:ifArticle body:> 
+<p><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><:body:></font></p>
+<:or:><:eif:>
 <form name="ff" method="POST" action="/cgi-bin/shop.pl">
   <table width="100%" border="0" cellspacing="0" cellpadding="0">
     <tr> 
@@ -41,7 +43,7 @@
           <:iterator begin allprods:> 
           <tr valign="middle" align="center" bgcolor="#FFFFFF"> 
             <td width="100%" align="left"> &nbsp;<font face="Verdana, Arial, Helvetica, sans-serif" size="-2"><a href="<:url allprod:>"><:allprod 
-              summary:></a></font><:moveallprod:></td>
+              summary:></a></font> <:moveallprod:></td>
 <:ifAllprod retailPrice:>
             <td align="right"> <font face="Verdana, Arial, Helvetica, sans-serif" size="-2"><b>$<:money allprod retailPrice:></b></font></td>
 <:or:>
index ed7a6d5..c6b8212 100644 (file)
@@ -1,4 +1,4 @@
-<:wrap base.tmpl:> 
+<:wrap base.tmpl:> <:embed start:><:admin:> <:if Embedded:><:or Embedded:> 
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
   <tr> 
     <td width="80%" height="24">&nbsp;&nbsp;<font face="Arial, Helvetica, sans-serif" size="4" color="#FF7F00"><b><:title:></b></font></td>
@@ -21,9 +21,9 @@
     </td>
   </tr>
 </table>
-<:embed start:><:admin:> 
-<p><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><:body:></font> 
-</p>
+<:eif Embedded:> <:ifArticle body:> 
+<p><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><:body:></font></p>
+<:or:><:eif:>
 <form name="ff" method="POST" action="/cgi-bin/shop.pl">
   <table width="100%" border="0" cellspacing="0" cellpadding="0">
     <tr> 
diff --git a/site/templates/catalog/shop_subcat.tmpl b/site/templates/catalog/shop_subcat.tmpl
new file mode 100644 (file)
index 0000000..87da504
--- /dev/null
@@ -0,0 +1,38 @@
+<:wrap base.tmpl:> <:embed start:> <:admin:> 
+<table width="100%" border="0" cellspacing="0" cellpadding="0">
+  <tr> 
+    <td width="80%" height="24">&nbsp;&nbsp;<font face="Arial, Helvetica, sans-serif" size="4" color="#FF7F00"><b><:title:></b></font></td>
+    <td height="24">&nbsp;</td>
+  </tr>
+  <tr> 
+    <td colspan="2" height="1" bgcolor="#999999"><img src="/images/trans_pixel.gif" width="24" height="1" border="0"></td>
+  </tr>
+  <tr> 
+    <td colspan="2"> 
+      <table width="100%" border="0" cellspacing="0" cellpadding="0">
+        <tr> 
+          <td width="100"><img src="/images/trans_pixel.gif" width="100" height="10" border="0"></td>
+          <td bgcolor="#999999" width="100%">&nbsp;<font face="Verdana, Arial, Helvetica, sans-serif" size="-2">/ 
+            <a href="<:ifAdmin:>/cgi-bin/admin/admin.pl?id=1<:or:>/<:eif:>"><font color="#FFFFFF">Home</font></a> 
+            / <:iterator begin crumbs:> <a href="<:url crumbs:>"><font color="#FFFFFF"><:crumbs 
+            title:></font></a> / <:iterator end crumbs:></font></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+<:ifArticle body:> 
+<p><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><:body:></font></p>
+<:or:><:eif:> <:if Subcats:> <:ifAdmin:> 
+<p><font face="Verdana, Arial, Helvetica, sans-serif" size="2">Reorder child articles: 
+  <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&sort=title&refreshto=/cgi-bin/admin/admin.pl?id=<:article id:>">by 
+  title</a> | <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&sort=date&refreshto=/cgi-bin/admin/admin.pl?id=<:article id:>">by 
+  date</a> | <a href="/cgi-bin/admin/reorder.pl?parentid=<:article id:>&reverse=1&refreshto=/cgi-bin/admin/admin.pl?id=<:article id:>">reverse 
+  order</a></font></p>
+<:or:><:eif:><:iterator begin catalogs:> 
+<p><:thumbnail catalog:> <a href="<:url catalog:>"><b><font face="Verdana, Arial, Helvetica, sans-serif" size="3"><:catalog 
+  title:></font></b></a> <:moveDown:><:moveUp:><br>
+  <:if Catalog summaryLength:><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><:summary 
+  catalog:></font><:or Catalog:><:eif Catalog:></p>
+<:iterator separator catalogs:><:iterator end catalogs:><:or Subcats:><:eif Subcats:><:embed 
+end:>
\ No newline at end of file
index 4f4846c..2be5688 100644 (file)
@@ -33,7 +33,9 @@
                   </table>
                   <table width="100%" border="0" cellspacing="0" cellpadding="10">
                     <tr> 
-                      <td><:if Article body:><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><:body:></font><:or Article:><:eif Article:><:ifAdmin:><:if Allkids:> 
+                      <td>
+<:ifArticle body:><p><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><:body:></font></p><:or:><:eif:>
+                        <:ifAdmin:><:if Allkids:> 
                         <p><font face="Verdana, Arial, Helvetica, sans-serif" size="2">Reorder 
                           child articles: <a href="/cgi-bin/admin/reorder.pl?stepparent=<:article id:>&sort=title&refreshto=/cgi-bin/admin/admin.pl?id=1">by 
                           title</a> | <a href="/cgi-bin/admin/reorder.pl?stepparent=<:article id:>&sort=date&refreshto=/cgi-bin/admin/admin.pl?id=1">by 
                         allkids:><:iterator begin allkids:><:ifAdmin:> <br>
                         <:or:><:eif:><:movestepkid:><:embed allkid:><:iterator 
                         separator allkids:><:iterator end allkids:> <:or UnderThreshold:><:iterator 
-                        begin allkids:> 
-                        <p><a href="<:url allkid:>"><b><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><:allkid 
-                          title:></font></b></a> <:movestepkid:></p>
-                        <:iterator separator allkids:><:iterator end allkids:><:eif 
-                        UnderThreshold:></td>
+                        begin allkids:> <a href="<:url allkid:>"><b><font face="Verdana, Arial, Helvetica, sans-serif" size="-2"><:allkid 
+                        title:></font></b></a> <:movestepkid:> <:iterator separator 
+                        allkids:>
+                        <hr width="100%" size="1" noshade>
+                        <:iterator end allkids:><:eif UnderThreshold:></td>
                     </tr>
                   </table>
                 </td>
@@ -84,9 +86,8 @@
     </td>
   </tr>
 </table>
-<:if Article body:> 
-<p><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><:body:></font></p>
-<:or Article:><:eif Article:><:if Embedded:><:or Embedded:><:ifAdmin:><:if Allkids:> 
+<:ifArticle body:><p><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><:body:></font></p><:or:><:eif:>
+<:if Embedded:><:or Embedded:><:ifAdmin:><:if Allkids:> 
 <p><font face="Verdana, Arial, Helvetica, sans-serif" size="2">Reorder child articles: 
   <a href="/cgi-bin/admin/reorder.pl?stepparent=<:article id:>&sort=title&refreshto=/cgi-bin/admin/admin.pl?id=<:article id:>">by 
   title</a> | <a href="/cgi-bin/admin/reorder.pl?stepparent=<:article id:>&sort=date&refreshto=/cgi-bin/admin/admin.pl?id=<:article id:>">by 
@@ -105,18 +106,15 @@ begin allkids:><:ifAdmin:>
 Embedded:><:if Files:> <br>
 <table border="0" cellspacing="0" cellpadding="0">
   <tr> 
-    <td> 
-      <table border="0" cellspacing="0" cellpadding="4" bgcolor="#999999">
+    <td> <table border="0" cellspacing="0" cellpadding="4" bgcolor="#999999">
         <tr> 
           <th nowrap><font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#FFFFFF">&nbsp;&nbsp;Related 
             file downloads&nbsp;&nbsp;</font></th>
         </tr>
-      </table>
-    </td>
+      </table></td>
   </tr>
   <tr> 
-    <td bgcolor="#999999"> 
-      <table cellspacing="1" cellpadding="4">
+    <td bgcolor="#999999"> <table cellspacing="1" cellpadding="4">
         <tr bgcolor="#CCCCCC"> 
           <th><font color="#000000" size="-2" face="Verdana, Arial, Helvetica, sans-serif">Description</font></th>
           <th><font color="#000000" size="-2" face="Verdana, Arial, Helvetica, sans-serif">Filename</font></th>
@@ -137,8 +135,7 @@ Embedded:><:if Files:> <br>
             requireUser:><img src="/images/filestatus/requireUser.gif" width="15" height="15" alt="For registered users only" title="For registered users only"><:or:><img src="/images/trans_pixel.gif" width="15" height="15" title="For registered users only"><:eif:><:eif 
             File:></td>
         </tr>
-        <:iterator end files:> </table>
-    </td>
+        <:iterator end files:> </table></td>
   </tr>
 </table>
 <:or Files:><:eif Files:>
\ No newline at end of file
index e54e39e..d42673d 100644 (file)
@@ -1,22 +1,20 @@
-<:wrap base.tmpl:>
+<:wrap base.tmpl:> 
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
   <tr> 
-    <td bgcolor="#CCCCFF" width="80%" height="24">&nbsp;&nbsp;<font face="Verdana, Arial, Helvetica, sans-serif" size="4"><b>Error</b></font></td>
-    <td height="24">&nbsp;</td>
+    <td height="24">&nbsp;&nbsp;<font face="Arial, Helvetica, sans-serif" size="4" color="#FF7F00"><b>Error</b></font></td>
   </tr>
   <tr> 
-    <td bgcolor="#999999" colspan="2" height="1"><img src="/images/trans_pixel.gif" width="24" height="1" border="0"></td>
+    <td height="1" bgcolor="#999999"><img src="/images/trans_pixel.gif" width="24" height="1" border="0"></td>
   </tr>
   <tr> 
-    <td colspan="2"> 
-      <table width="100%" border="0" cellspacing="0" cellpadding="0">
+    <td> <table width="100%" border="0" cellspacing="0" cellpadding="0">
         <tr> 
           <td width="100"><img src="/images/trans_pixel.gif" width="100" height="10" border="0"></td>
-          <td bgcolor="#333399" width="100%">&nbsp;<font face="Verdana, Arial, Helvetica, sans-serif" size="-2">/ 
-            <a href="<:ifAdmin:>/cgi-bin/admin/admin.pl?id=1<:or:>/<:eif:>"><font color="#FFFFFF">Home</font></a> / </font></td>
+          <td bgcolor="#999999" width="100%">&nbsp;<font face="Verdana, Arial, Helvetica, sans-serif" size="-2">/ 
+            <a href="<:ifAdmin:>/cgi-bin/admin/admin.pl?id=1<:or:>/<:eif:>"><font color="#FFFFFF">Home</font></a> 
+            /</font></td>
         </tr>
-      </table>
-    </td>
+      </table></td>
   </tr>
 </table>
 <p><br><br><br><font face="Verdana, Arial, Helvetica, sans-serif" size="-1"><:error:></font></p>
diff --git a/site/templates/printable/wap.tmpl b/site/templates/printable/wap.tmpl
new file mode 100644 (file)
index 0000000..6da461d
--- /dev/null
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://www.wapforum.org/DTD/wml_1.1.xml">
+<wml>
+<card id="card<:article id:>" title="<:article title:>">
+<p><small><:iterator begin level1:><a href="/cgi-bin/printable.pl?id=<:level1 id:>&amp;template=wap.tmpl">[<:level1 title:>]</a><:iterator separator level1:><br /><:iterator end level1:></small></p>
+<:ifArticle body:><p><:body:></p><:or:><:eif:>
+<:ifChildren:><p><:iterator begin children:><small><a href="/cgi-bin/printable.pl?id=<:child id:>&amp;template=wap.tmpl">[<:child title:>]</a></small><:iterator separator children:><br /><:iterator end children:></p><:or:><:eif:>
+<p><small><a href="/wap/">+</a> <:iterator begin crumbs:><a href="/cgi-bin/printable.pl?id=<:crumbs id:>&amp;template=wap.tmpl">+</a> <:iterator separator crumbs:> <:iterator end crumbs:></small></p>
+</card>
+</wml>
\ No newline at end of file
index b90ba44..2f2a5db 100644 (file)
@@ -1,14 +1,15 @@
 <:wrap base.tmpl:> 
 <p><font face="Verdana, Arial, Helvetica, sans-serif" size="2">Hello <:ifUser 
   name1:><:user name1:><:or:><:user userId:><:eif:>, this section contains your 
-  personal account details. From here you can manage your newsletter subscriptions<:ifCfg 
-  shop enabled:>, monitor the current status or purchase history of your orders 
-  from our on-line store<:or:><:eif:> and modify your personal details, for example, 
-  your password, email and mailing addresses etc.</font></p>
+  personal account details. From here you can <:ifCfg subscriptions enabled:> manage 
+  your newsletter subscriptions,<:or:><:eif:><:ifCfg shop enabled:> monitor the current status 
+  or purchase history of your orders from our on-line store<:or:><:eif:><:ifOr [cfg shop enabled] [cfg subscriptions enabled]:> and<:or:><:eif:> modify 
+  your personal details, for example, your password, email and mailing addresses 
+  etc.</font></p>
 <p><font face="Verdana, Arial, Helvetica, sans-serif" size="2">To modify your 
-  account options, like subscribing to one of our available newsletters, please 
+  account options, <:ifCfg subscriptions enabled:>like subscribing to one of our available newsletters,<:or:><:eif:> please 
   proceed to edit your &#8220;<a href="<:script:>?show_opts=1">User Profile</a>&#8221; 
-  and make your changes eg: select a newsletter from the available list and then 
+  and make your changes <:ifCfg subscriptions enabled:>eg: select a newsletter from the available list<:or:><:eif:> then 
   select &#8220;Save Options&#8221;.</font></p>
 <div align="center"> 
   <table border="0" cellspacing="0" cellpadding="0">