2006-01-02 JPS

* Small fixes to make xhtml style compatible with erp5_web. * clear tags no longer used if in web mode * do not display group title if not defined git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@11832 20353a03-c40f-0410-a6d1-a30d3c3de9de

2006-01-02 JPS
* Small fixes to make xhtml style compatible with erp5_web. * clear tags no longer used if in web mode * do not display group title if not defined git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@11832 20353a03-c40f-0410-a6d1-a30d3c3de9de
d8c8e865 · Jean-Paul Smets · 65e0f5c0 · d8c8e865 · d8c8e865 · d8c8e865
Commit d8c8e865 authored Jan 02, 2007 by Jean-Paul Smets
7 changed files
--- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_redirect.xml
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_redirect.xml
@@ -75,7 +75,8 @@
   page from a script. It should probably be extended, reviewed and documented\n
   so that less code is copied and pasted in dialog scripts.\n
 \n
-   TODO: improve API and extensively document.\n
+   TODO: improve API and extensively document. ERP5Site_redirect may \n
+   be redundant.\n
 """\n
 from ZTUtils import make_query\n
 request_form = context.REQUEST.form\n

--- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Form_getGroupTitleAndId.xml
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Form_getGroupTitleAndId.xml
@@ -69,7 +69,7 @@
        <item>
            <key> <string>_body</string> </key>
            <value> <string>"""\n
-  This script split a form group id in two part:\n
+  This script splits a form group id in two part:\n
    * a group id,\n
    * a group title.\n
 \n
@@ -116,7 +116,7 @@ def getFormGroupTitleAndId():\n
    group_title = \')\'.join(group_title_list[:-1]).strip()\n
    # Return the group id if no title found\n
    if len(group_title) == 0:\n
-      group_title = group_id\n
+      group_title = None\n
    res.append({\'gid\': group_id, \'gtitle\': group_title, \'goid\': original_group_id})\n
  return res\n
 \n

--- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/field_render.xml
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/field_render.xml
@@ -106,7 +106,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.\n
              class="error"\n
              tal:content="python: field_errors[field_id].error_text"\n
              i18n:translate="" i18n:domain="ui"/>\n
-        <p class="clear"></p>\n
+        <p class="clear" tal:condition="not:is_web_mode"></p>\n
      </tal:block>\n
    </div>\n
  </tal:block>\n

--- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_render.xml
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_render.xml
@@ -118,7 +118,7 @@ It is possible to specify a group id and a group title by naming a group followi
        <fieldset tal:condition="python: gid.find(\'hidden\') < 0"\n
                  tal:attributes="class gid;\n
                                  id    python: \'fieldset_%s\' % (gid.replace(\' \', \'_\'), );">\n
-          <legend tal:content="group/gtitle" class="group_title"/>\n
+          <legend tal:condition="group/gtitle" tal:content="group/gtitle" class="group_title"/>\n
          <tal:block tal:repeat="field python: form.get_fields_in_group(group[\'goid\'])">\n
            <tal:block metal:use-macro="field_render"/>\n
          </tal:block>\n

--- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml
@@ -62,7 +62,7 @@
           dummy                 python: local_parameter_list.update({\'cancel_url\': cancel_url});\n
 \n
    global actions          python: here.getPortalObject().portal_actions.listFilteredActionsFor(here);\n
-    global url              python: \'%s%s\' % (request[\'SERVER_URL\'], here.getPath(), );\n
+    global url              here/absolute_url;\n
    global current_form_id  python: local_parameter_list.get(\'dialog_id\', local_parameter_list.get(\'form_id\', \'view\'));\n
    global current_url      python: \'%s/%s\' % (url, current_form_id);\n
    global current_action   python: here.ERP5Site_getCurrentAction(current_url, actions);\n

--- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/images/save-preview.png.xml
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/images/save-preview.png.xml
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>OFS.Image</string>
+          <string>Image</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>__name__</string> </key>
+            <value> <string>save-preview.png</string> </value>
+        </item>
+        <item>
+            <key> <string>content_type</string> </key>
+            <value> <string>image/png</string> </value>
+        </item>
+        <item>
+            <key> <string>data</string> </key>
+            <value> <string encoding="base64">iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABmJLR0QA/wD/AP+gvaeTAAAACXBI
+WXMAAAsSAAALEgHS3X78AAAAB3RJTUUH0wgcEjo6jsYXEgAABD9JREFUeNqFlF+IVFUcxz935s44
+s9uubbqotemmZGEPmy710GKkBIJREFLiw9JDiYFg0oMI6YMGRvRQoORT4Usv+hKYhYhhQmL2UMsa
+xLqbu6tuu7M6u/Pnzrnnfw93dmanTA/8OL9z7uVzv/f7O+cXXLt+23e0ZQkCWoYHnANrHdZ6ytUo
+LhTufmqU+HjXm1ssDxnB8OiMf2ZNN2G6FTpdusvpa2c48csXjIkbkIdclKPTPzZWmJ46iOUi3zD3
+YHBvN95q7ty5A4Cymo9+OMQ5d5Z4TQwdQAowwBxkbmWVv+FOm6rZ93/wcCHJZDL09vbinOPkpZOc
+y50l7osT4Cx03lxK170uUqSJwihbXHZvJxLHuxzgK2buD/agdaJ4qjzF1yOniAdiaIPUaJrnfu9j
+W+cONjz1PPlsnqnKLX71P2cuLf1+cENn/87XPx8UWhu0Nty8NctsYf5sAg5geHqYYqnIaHGUiRUT
+0A1UYc3kap7lVQp3s7RpxZH92xMtfpArN68ERy8cXbJ/z44lC0q/+3GI4aHRwYYVu8/tZig7RNAT
+QD+kl6UhgMm1k4xnPmPZ2Fp21g42ixMEDKwd4Pye8y0WzJdruMUeH99+nL2/7aW4qUhHd0eyuRIq
+6QrROLzR9R59Tzz9sFOGUoZSqdoE96/s51jvMQ5fO8z6F9fTs7yHmdIM40PjbG7bxeb1Ayzv6nwg
+1DlPqVyhNF9ugtOpNBtXbGQfH3Di6pes61vH9MgsB3oP8dILA3jv8R5mi5V6nqwXZmMMc3MVCjNF
+aiJugoMgIJ/Ps+3JbVy5fp0Lf3zLy8HbhH+v4OrtMYyxGOvQxmKMwxiLthalDLGQlEsVokhQnKsQ
+x6oJ9t4jhMA42CRf4a3Od6hEknJFJRBt0cai6scqlpo4llQqEaIWI6VCSo1SijiOW8E1ERNrj1YG
+pS3OOdrzWYxNFCplCLzDGUh5S9o7cpk0qXyWTCogk05REAIp1WIrUuTy7QShR2mD0obckgyvbenD
+OYcQCiEkUmq0Nihl6rNGKdOIU2cuMitkq8dhJosPPEonvw5gjEUIiRAKrc19wK0fkEqhlG6CrXOU
+ylWsAxlrlLYYbZiYuMf0dBmtTd1rnfitdcMeYxJ4LhciY4VUstVjoy3Wg6orM1oTBJ729hClQGsI
+Q08YQjrtMQZSKY/WniDwgEP9W3E6zLB6dQ/Oe4yxVKMa1hiq1Zj5+VpDVaLQopTGmAUrLFobMpmg
+boVqdjfnkwYPEAtJFAm8c2htcM5i7X/DGIe1FucM1tr6ldZorQijmuTPv6aSQlkPeCIRI4QE5zHG
+4L3DuSSS3NbXyWztQu7RSqGVJhwZuTH40+XLqxbf+VIxdWRp1yN5aw3VaqlR+eYpaC2i1rbxTlQp
+I2sRwf2aydatH74vhPwklpLHVz2Ktb6h2FqP927RXvOZc56xsUlqIuYfIv5OEWwnTTQAAAAASUVO
+RK5CYII=</string> </value>
+        </item>
+        <item>
+            <key> <string>height</string> </key>
+            <value> <int>22</int> </value>
+        </item>
+        <item>
+            <key> <string>precondition</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>size</string> </key>
+            <value> <long>1202</long> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Save and View</string> </value>
+        </item>
+        <item>
+            <key> <string>width</string> </key>
+            <value> <int>22</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
--- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/images/save.png.xml
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/images/save.png.xml
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <tuple>
+          <string>OFS.Image</string>
+          <string>Image</string>
+        </tuple>
+        <none/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>__name__</string> </key>
+            <value> <string>save.png</string> </value>
+        </item>
+        <item>
+            <key> <string>content_type</string> </key>
+            <value> <string>image/png</string> </value>
+        </item>
+        <item>
+            <key> <string>data</string> </key>
+            <value> <string encoding="base64">iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABmJLR0QA/wD/AP+gvaeTAAAACXBI
+WXMAAAsSAAALEgHS3X78AAAAB3RJTUUH1goICwsb4nOaGgAABLpJREFUOMuVlE2PXEcZRk/Vvbf7
+dk/39DjjmbETk0TATEiCoiBLRNkhpIgPwb9gw449v4J/wDLsWIKcBaDAhshx4uA4thMTO7bH06an
+v+699fHWWyx6HCN2qXXVqadOPVWGbzie/A5bXqgu5/4rv5X+L3++ur/+cv3V579f3f303fbR3Xvv
+vEcEKL8p2Nb0i3F+zozcbllHa6qjSTXZu4wxN8rh6PQK10/feY9c/unP/zwy1kzIHKhmrDGs1i0+
+CCklSmtRVWJMiAj/MH8Z/6B89+2DvdOjorxZbG1f3Gts/xenZblYF+PPbnK0hFtSWmt/U/XKo6Is
+3jLZYC08nM4JQbDWsLu/TVVaRJQkwjBdMKHYLq192OP4Cqw+xJwcVcfr4at/m146fH/1ygO4tSht
+YX89Gg3ZOzjHoK6w1vKHK9fImtk7P+anPznk0oVzAOS4Qp9cJc9OMFKAs+QlzI5X3DI/fOvjlf/V
+Mnb3gas2BMH5iPOREAUfIh/e+JLpbIXzkZzzmd2MLj+B7n2Keg3NEOIYWY+4416iPXdIl3uXVXUP
+oAxRiJKIkpCUqXsFuzsjvvvyPi+9cJ5+r9pgwxLCdchfYNIEfA/tapanNXf7bzJvM84HQowAlDEm
+nsI1KYO6x4/ffpUXn99lf3fMsK4gZ3L7BcgnmLwGNyFLRQo7xL3v8eTkIou1I4RISmkDDiESoxCC
+0PrAcznzsx+9QVUVlIXFR0EWnt7qI/rp31gzAF+gocfK7fCgeo2FK2i7QIyCiD5NLMS48dz5SNsF
+NClJlZSUpJmBPuTl8XX2Ry2kbUgFvutx53Gfv2uP2bLDOY+I/G9iIcSED4ILkfmyRSQhkohJUQm8
+WF/Dbk8xdggRVApOlyVXTybc1ETjAt3/g2NMxDPHIooxkHMmA6pKJVN2R8dsDQ2GMSSD7+D4FO7p
+JaJafHB4HxBJpJQsvFmVIW4SJ1VGwz4X9yekpMQoeOepu9tc3M/U1QBiRhN0vqTr7fD84feZBPjg
+49t4H4hRTAihD2yVIWwc55yZjAe8fvjCBuojvp0zaDz1sE+hGTQTvdLELcoLb/D65Ds0jeeDjz7D
+OUeM0cYYBsDg68uLZ56bxrFeO0IQ1C8ZcIqlAja1a7vIdDVgVo/x84amdbRth+82jlX1Wd1C2Ly4
+1arjwYM5s1mDSMLGOZPdbYYDC1aR2PKfheP2dMhJFYnyGFuA6zwhBDQl8lNwlISPgnMBV1qKAuq6
+QCRTpAbyHrk4IBlhNr3BVyeRRXmAsZmiMKgm5OzUKSmqGSCV3kcq51k3Hb3CsF47lssOkURvOaMZ
+VPR9yfzhlJu34fPFPktTkZwjJcUYJcRIlEjSlIEOWJTOBYquxHUO3yu/7mJKibYNfHr9HvW/7jBr
+e5yEMU2xhYqezVEgk5KgScg5K8Y4IGzAvRLnImEQEUnkrOSspJDojh8x651n1d/HFQM0wWY9FIXF
+GFDNSFJUFVXNcC2XrvPY0tKs1gxLcK5FZLNBrLbwO9/G2TFqh9gENgvWKsbkZ33vWoLrSCLkjWPK
+ZtX+sVm335oeP3ntfl0xP5lt/oiUEO+QKIiuSBlSUkTSWbJn4NnjOe3Sk0T/qsojgP8CrNOFEjTc
+9+YAAAAASUVORK5CYII=</string> </value>
+        </item>
+        <item>
+            <key> <string>height</string> </key>
+            <value> <int>22</int> </value>
+        </item>
+        <item>
+            <key> <string>precondition</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>size</string> </key>
+            <value> <long>1325</long> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Save</string> </value>
+        </item>
+        <item>
+            <key> <string>width</string> </key>
+            <value> <int>22</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>