- improved message.

- for now, you can not search by Price.
- customer information can only be displayed if the user is not Anonymous.
- fixed a bug of register url and improved the code style.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@29043 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_multiflex_layout/erp5_web_multiflex5_commerce_layout/login_box.xml

@@ -13,13 +13,13 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>title</string>
                 <string>default</string>
-                <string>width</string>
+                <string>enabled</string>
                 <string>height</string>
                 <string>text_editor</string>
-                <string>enabled</string>
+                <string>title</string>
                 <string>whitespace_preserve</string>
+                <string>width</string>
               </list>
             </value>
         </item>
@@ -112,7 +112,7 @@
               <dictionary>
                 <item>
                     <key> <string>default</string> </key>
-                    <value> <string>login is not available actually.</string> </value>
+                    <value> <string>Login is not available actually.</string> </value>
                 </item>
                 <item>
                     <key> <string>enabled</string> </key>

bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_multiflex_layout/erp5_web_multiflex5_commerce_layout/product_list.xml

@@ -493,10 +493,6 @@
                           <string>title</string>
                           <string>Title</string>
                         </tuple>
-                        <tuple>
-                          <string>decoratedPrice</string>
-                          <string>Price</string>
-                        </tuple>
                       </list>
                     </value>
                 </item>

bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/SaleOrder_viewCustomerRenderer.xml

@@ -39,42 +39,41 @@
             <key> <string>_text</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-<tal:block tal:define="customer here/SaleOrder_getShoppingCartCustomer">\n
-  <br />\n
-  <h2>Customer Information</h2>\n
-\n
-  <table>\n
-    <tr>\n
-      <td>Name:</td>\n
-      <td><span tal:content="customer/getTitle"/></td>\n
-    </tr>\n
-    <tr>\n
-      <td>Email:</td>\n
-      <td> <span tal:content="customer/getDefaultEmailText"/></td>\n
-    </tr>\n
-    <tr>\n
-      <td>Telephone:</td>\n
-      <td> <span tal:content="customer/getDefaultTelephoneText"/></td>\n
-    </tr>\n
-    <tr>\n
-      <td>Address:</td>\n
-      <td><span tal:content="customer/getDefaultAddressStreetAddress"/></td>\n
-    </tr>\n
-    <tr>\n
-      <td>City:</td>\n
-      <td><span tal:content="customer/getDefaultAddressCity"/>\n
-      </td>\n
-    </tr>\n
-    <tr>\n
-      <td>ZIP:</td>\n
-      <td><span tal:content="customer/getDefaultAddressZipCode"/>\n
-      </td>\n
-    </tr>\n
-    <tr>\n
-      <td>Country:</td>\n
-      <td><span tal:content="customer/getDefaultAddressRegionTitle"/></td>\n
-    </tr>\n
-  </table>\n
+<tal:block tal:condition="python: not here.getPortalObject().portal_membership.isAnonymousUser()">\n
+  <tal:block tal:define="customer here/SaleOrder_getShoppingCartCustomer">\n
+    <br />\n
+    <h2>Customer Information</h2>\n
+    <table>\n
+      <tr>\n
+        <td>Name:</td>\n
+        <td><span tal:content="customer/getTitle"/></td>\n
+      </tr>\n
+      <tr>\n
+        <td>Email:</td>\n
+        <td> <span tal:content="customer/getDefaultEmailText"/></td>\n
+      </tr>\n
+      <tr>\n
+        <td>Telephone:</td>\n
+        <td> <span tal:content="customer/getDefaultTelephoneText"/></td>\n
+      </tr>\n
+      <tr>\n
+        <td>Address:</td>\n
+        <td><span tal:content="customer/getDefaultAddressStreetAddress"/></td>\n
+      </tr>\n
+      <tr>\n
+        <td>City:</td>\n
+        <td><span tal:content="customer/getDefaultAddressCity"/></td>\n
+      </tr>\n
+      <tr>\n
+        <td>ZIP:</td>\n
+        <td><span tal:content="customer/getDefaultAddressZipCode"/></td>\n
+      </tr>\n
+      <tr>\n
+        <td>Country:</td>\n
+        <td><span tal:content="customer/getDefaultAddressRegionTitle"/></td>\n
+      </tr>\n
+    </table>\n
+  </tal:block>\n
 </tal:block>
 
 ]]></string> </value>

bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/WebSite_viewStandardLoginWidgetRenderer.xml

@@ -45,7 +45,8 @@
      <span tal:replace="python: here.Base_translateString(\'You are not logged in\')"/>\n
    </p>\n
    <p class="article">\n
-     <a class="articlelink" href="register">\n
+     <a tal:attributes="href python: here.getWebSiteValue().absolute_url()+\'/register\';\n
+                        class string: articlelink">\n
        &#149; <span tal:replace="python: here.Base_translateString(\'I want to create an account\')"/>\n
      </a>\n
    </p>\n
@@ -77,7 +78,7 @@
     <span><span tal:replace="python: here.Base_translateString(\'You are logged as\')"/>  <span tal:replace="customer/getTitle"/></span>\n
     </p>\n
     <a class="articlelink" \n
-      tal:attributes="href python: \'%s/SaleOrderModule_viewAsWebSaleOrderList\' %website.sale_order_module.absolute_url()">\n
+      tal:attributes="href python: \'%s/SaleOrderModule_viewAsWebSaleOrderList\' % website.sale_order_module.absolute_url()">\n
       <span tal:replace="python: here.Base_translateString(\'My Orders\')"/>\n
     </a> &nbsp;\n
     <a class="articlelink" \n

bt5/erp5_commerce/bt/revision

-204
+211
\ No newline at end of file