Follow changes from ERP5Form and erp5_xhtml_style

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

Follow changes from ERP5Form and erp5_xhtml_style
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18166 20353a03-c40f-0410-a6d1-a30d3c3de9de
6c4253e0 · Nicolas Delaby · 6070524f · 6c4253e0 · 6c4253e0 · 6c4253e0
Commit 6c4253e0 authored Dec 10, 2007 by Nicolas Delaby
3 changed files
--- a/bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/field_render.xml
+++ b/bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/field_render.xml
@@ -3,11 +3,8 @@
  <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
      <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
      </tuple>
    </pickle>
    <pickle>
@@ -79,7 +76,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.\n
                         field_errors python: request.get(\'field_errors\', {});\n
                         field_has_error  python: field_errors.has_key(field_id);\n
                         global form_id form_id | python: form.id;\n
-                         field_description python: here.Base_getFieldDescription(form_id=form_id, field=field)">\n
+                         field_description field/Field_getDescription;">\n
    <div tal:define="html_render  python: field.render_htmlgrid(value, request)"\n
         tal:attributes="title field_description;\n
                         class python: \' \'.join([x for x in [\'field\', field.is_required() and \'required\' or None, field_has_error and \'error\' or None, field.get_value(\'css_class\') or None] if x is not None])"\n

--- a/bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/template_erp5_xhtml_style.xml
+++ b/bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/template_erp5_xhtml_style.xml
@@ -3,11 +3,8 @@
  <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
      <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
      </tuple>
    </pickle>
    <pickle>
@@ -77,8 +74,8 @@ IDEAS:\n
 </tal:block>\n
 \n
 <tal:block metal:define-macro="master">\n
-\n
-<tal:block metal:use-macro="here/global_definitions/macros/header_definitions"/>\n
+<tal:block tal:define="global_definitions_macros here/global_definitions/macros">\n
+<tal:block metal:use-macro="global_definitions_macros/header_definitions"/>\n
 \n
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\n
 \n
@@ -91,7 +88,6 @@ IDEAS:\n
    <tal:block tal:repeat="css css_list">\n
      <link tal:attributes="href css" type="text/css" rel="stylesheet"/>\n
    </tal:block>\n
-    <tal:block metal:use-macro="here/global_definitions/macros/planning_box_definitions"/>\n
    <tal:block tal:repeat="js js_list">\n
      <script tal:attributes="src js" type="text/javascript">\n
      </script>\n
@@ -108,7 +104,7 @@ IDEAS:\n
      <input tal:condition="form_action | nothing"\n
             id="hidden_button" type="submit" value="dummy"\n
             tal:attributes="name python: \'%s:method\' % (form_action, )" />\n
-      <tal:block metal:use-macro="here/global_definitions/macros/http_definitions"/>\n
+      <tal:block metal:use-macro="global_definitions_macros/http_definitions"/>\n
      <div id="bars">\n
        <div id="main_bar">\n
          <span class="first">\n
@@ -125,6 +121,7 @@ IDEAS:\n
    </form>\n
  </body>\n
 </html>\n
+</tal:block>\n
 </tal:block>

 ]]></string> </value>

--- a/bt5/erp5_mobile/bt/revision
+++ b/bt5/erp5_mobile/bt/revision
-21
\ No newline at end of file
+23
\ No newline at end of file