vincentd

remove useless template and fix some css

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

bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce/Product_getRelatedDescription.xml

@@ -63,10 +63,12 @@ web_page = portal.portal_catalog(portal_type=\'Web Page\',\n
                                  default_publication_section_uid=context.restrictedTraverse(\'portal_categories/publication_section/pamphlet/web/short\').getUid(),\n
                                  #src__=1,\n
                                  )\n
+#context.pdb()\n
+\n
 #return web_page\n
 if web_page is None or len(web_page) == 0:\n
   return context.Base_translateString("No more information for this product.")\n
-return "\\n".join([x.getObject().getTitle() for x in web_page])\n
+return web_page[0].getObject().asStrippedHTML()\n
 </string> </value>
         </item>
         <item>
@@ -111,10 +113,7 @@ return "\\n".join([x.getObject().getTitle() for x in web_page])\n
                             <string>web_page</string>
                             <string>None</string>
                             <string>len</string>
-                            <string>append</string>
-                            <string>$append0</string>
-                            <string>_getiter_</string>
-                            <string>x</string>
+                            <string>_getitem_</string>
                           </tuple>
                         </value>
                     </item>

bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_multiflex_layout/mf54_commerce.css.xml

@@ -76,12 +76,27 @@
 \n
 ">\n
 \n
+.main_content h2 {margin:0px;}\n
+\n
+#fieldset_left {padding:10px;}\n
+#fieldset_left div.field {margin-top:5px; margin-bottom: 10px;}\n
+#fieldset_left label {float:left; width: <tal:block tal:replace="python: main_content_width / 5"/>px;}\n
+#fieldset_left label a {display:none;}\n
+#fieldset_right {padding:10px;}\n
+#fieldset_right div.field {margin-top:5px; margin-bottom: 10px;}\n
+#fieldset_right label {float:left; width:<tal:block tal:replace="python: main_content_width / 5"/>px;}\n
+#fieldset_right label a {display:none;}\n
+#fieldset_center {padding:10px;}\n
+#fieldset_center div.field {margin-top:5px; margin-bottom: 10px;}\n
+#fieldset_center label {float:left; width:<tal:block tal:replace="python: main_content_width / 5"/>px;}\n
+#fieldset_center label a {display:none;}\n
+\n
 div.subcontent-box.cartbox fieldset.widget div.field label {display: none;}\n
 div.subcontent-box.cartbox h1.group_title {background: url(./mf54_image/icon_celltitle_cart.jpg) no-repeat; background-position:229px 5px;}\n
 div.subcontent-box.loginbox fieldset.widget div.field div p {font-weight: bold;color: #646464;}\n
 div.subcontent-box.loginbox fieldset.widget div.field div {text-align:center;}\n
 div.subcontent-box.loginbox fieldset.widget div.field div a {font-weight: bold;color: #646464; margin-left: 8px;}\n
-div.subcontent-box.cartbox fieldset.widget div.field table {background-color:green;}\n
+div.subcontent-box.cartbox fieldset.widget div.field table {background-color:green; margin:0px; width:100%; padding:5px;}\n
 div.subcontent-box.cartbox fieldset.widget div.field table tr td {background-color:#FFFFFF; border:none;}\n
 div.subcontent-box.cartbox fieldset.widget div.field table tr td.cart_top {border-bottom: dashed 1px #cccccc;}\n
 div.subcontent-box.cartbox fieldset.widget div.field table tr td.cart_middle {border-bottom: solid 1px #dddddd;}\n
@@ -94,6 +109,7 @@ div.subcontent-box.cartbox fieldset.widget div.field table tr td.cart_bottom div
 div.subcontent-box.cartbox fieldset.widget div.field table tr td.cart_bottom div.cart_right {float:right; text-align:right; padding:2px;}\n
 div.subcontent-box.cartbox fieldset.widget div.field table tr td.cart_bottom div.cart_right a {font-weight: bold; font-size:121%;}\n
 \n
+.sidemenu1 ul {border:none;}\n
 \n
 div.selected-product {height : 110px; width:<tal:block tal:replace="main_content_width"/>px; padding-left:25px; margin-bottom:10px;}\n
 div.selected-product div {float:left; width:100px; height:100px; text-align:center; padding-right: 25px;}\n
@@ -150,15 +166,12 @@ div.shopping_cart_renderer div.input {padding:0px;}\n
 .shopping_cart_renderer_shipping label a {display:none;}\n
 .shopping_cart_renderer_submit label a {display:none;}\n
 \n
-div.shopping_cart_renderer_shipping {width: <tal:block tal:replace="python: main_content_width - 40"/>px; height:20px; margin-bottom:20px; margin-top:20px; padding-left:20px; padding-right:20px; padding-top:3px; padding-bottom:3px; background-color:<tal:block tal:replace="body_color"/>;}\n
+div.shopping_cart_renderer_shipping {clear:both; height:20px; margin-bottom:20px; margin-top:20px; padding-left:20px; padding-right:20px; padding-top:3px; padding-bottom:3px;}\n
 .shopping_cart_renderer_shipping label {float:left; width: <tal:block tal:replace="python: main_content_width / 4"/>px; height:20px;padding:0px;}\n
-.shopping_cart_renderer_shipping div {float:right; height:20px; padding:0px}\n
-div.shopping_cart_renderer_submit {width: <tal:block tal:replace="python: main_content_width - 40"/>px; height:20px; margin-bottom:20px; padding-left:20px; padding-right:20px; padding-top:3px;  padding-bottom:3px; background-color:<tal:block tal:replace="body_color"/>;}\n
+.shopping_cart_renderer_shipping div {height:20px; padding:0px}\n
+div.shopping_cart_renderer_submit {clear:both; height:20px; margin-bottom:20px; padding-left:20px; padding-right:20px; padding-top:3px;  padding-bottom:3px;}\n
 .shopping_cart_renderer_submit label {float:left; width: <tal:block tal:replace="python: main_content_width / 8"/>px; height:20px;padding:0px;}\n
-.shopping_cart_renderer_submit div {float:right; height:20px; padding:0px}\n
-.shopping_cart_renderer_submit input {float:right;}\n
-.shopping_cart_renderer input {float:right;}\n
-\n
+.shopping_cart_renderer_submit div {margin-left:10px; height:20px; padding:0px}\n
 \n
 .mf_commerce_text {font: 12px <tal:block tal:replace="python: \',\'.join(font_list)"/>}\n
 .mf_commerce_text_bold {font: bold 12px <tal:block tal:replace="python: \',\'.join(font_list)"/>;}\n
@@ -168,7 +181,7 @@ div.shopping_cart_renderer_submit {width: <tal:block tal:replace="python: main_c
 div.hiddenLabel label {display:none;}\n
 fieldset.editable div.input {padding:0px;}\n
 \n
-.main_content table {border-top: solid 1px <tal:block tal:replace="primary_color"/>; margin-bottom:10px;}\n
+.main_content table {width:100%; margin: 0px 0px 10px 0px}\n
 .main_content table th {border:none; background-color:<tal:block tal:replace="body_color"/>;}\n
 .main_content table tr {border:none; border-bottom:dashed 1px <tal:block tal:replace="menu_color"/>; background-color:#FFF;}\n
 .main_content table td {border:none; background-color:#FFF;}\n
@@ -182,22 +195,6 @@ fieldset.editable div.input {padding:0px;}\n
 .main_content .pageNavigation input {vertical-align:middle;}\n
 .main_content table td.td_check_all {background-color:<tal:block tal:replace="body_color"/>;}\n
 \n
-#fieldset_left {padding:10px;}\n
-#fieldset_left div.field {float:left; width:90%; margin-top:5px; margin-bottom: 10px;}\n
-#fieldset_left label {float:left; width: <tal:block tal:replace="python: main_content_width / 5"/>px;}\n
-#fieldset_left label a {display:none;}\n
-#fieldset_left div.input {float:left;}\n
-#fieldset_right {padding:10px;}\n
-#fieldset_right div.field {float:left; width:90%; margin-top:5px; margin-bottom: 10px;}\n
-#fieldset_right label {float:left; width:<tal:block tal:replace="python: main_content_width / 5"/>px;}\n
-#fieldset_right label a {display:none;}\n
-#fieldset_right div.input {float:left;}\n
-#fieldset_center {padding:10px;}\n
-#fieldset_center div.field {float:left; width:90%; margin-top:5px; margin-bottom: 10px;}\n
-#fieldset_center label {float:left; width:<tal:block tal:replace="python: main_content_width / 5"/>px;}\n
-#fieldset_center label a {display:none;}\n
-#fieldset_center div.input {float:left;}\n
-\n
 .ecommerce_submit {margin:10px; margin-left:20px;}\n
 \n
 </tal:block>

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

-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_bind_names</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
-                </klass>
-                <tuple/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_asgns</string> </key>
-                        <value>
-                          <dictionary>
-                            <item>
-                                <key> <string>name_subpath</string> </key>
-                                <value> <string>traverse_subpath</string> </value>
-                            </item>
-                          </dictionary>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>_text</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
-
-<div class="product_description_header" id="product_description_header">\n
-  <a onClick="MochiKit.Visual.toggle(\'product_description\', \'slide\'); return false;"\n
-     i18n:translate=""\n
-     i18n:domain="ui">More Description</a>\n
-</div>\n
-<div class="menu_block_container" id="product_description_container">\n
-  <div class="product_description" id="product_description">\n
-    <div>\n
-      <tal:block  tal:content="here/Product_getRelatedDescription">\n
-      </tal:block>\n
-    </div>\n
-    <div class="product_description_close" >\n
-      <a onClick="MochiKit.Visual.slideUp(\'product_description\'); return false;"\n
-         i18n:translate=""\n
-         i18n:domain="ui">Close</a>\n
-    </div>\n
-  </div>\n
-</div>
-
-]]></string> </value>
-        </item>
-        <item>
-            <key> <string>content_type</string> </key>
-            <value> <string>text/html</string> </value>
-        </item>
-        <item>
-            <key> <string>expand</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>Product_viewRelatedDescription</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string></string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>

bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_widget_library/Resource_viewAsShop/related_description.xml

@@ -274,7 +274,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>related_description</string> </value>
+                    <value> <string>Description</string> </value>
                 </item>
                 <item>
                     <key> <string>unicode</string> </key>
@@ -305,7 +305,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>here/Product_viewRelatedDescription</string> </value>
+            <value> <string>here/Product_getRelatedDescription</string> </value>
         </item>
       </dictionary>
     </pickle>

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

@@ -48,14 +48,14 @@
     <span tal:replace="python: here.Base_translateString(\'Taxes\')"/>\n
   </h2>\n
 \n
-    <p tal:condition="python: tax_info is not None">\n
-      <span tal:replace="python: here.Base_translateString(\'For your location the following taxes are applicable\')"/> :\n
-      <b>\n
+    <div tal:condition="python: tax_info is not None">\n
+      <p><span tal:replace="python: here.Base_translateString(\'For your location the following taxes are applicable\')"/> :</p>\n
+        <ul>\n
           <tal:block tal:repeat="tax_name python: tax_info.keys()">\n
             <li tal:content="python: \'%s (%s %s)\' %(tax_name, tax_info[tax_name], \'%\')">item </li>\n
           </tal:block>\n
-      </b>\n
-    </p>\n
+        </ul>\n
+    </div>\n
 \n
     <p tal:condition="python: tax_info is None"> \n
       <span tal:replace="python: here.Base_translateString(\'You do not have to pay any taxes.\')"/>  \n

bt5/erp5_commerce/bt/revision

-136
+137
\ No newline at end of file