Commit 74b935b1 authored by Vincent Pelletier's avatar Vincent Pelletier

Add support for layouts in all page templates.



git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6504 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 68c47949
...@@ -79,24 +79,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -79,24 +79,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
-->\n -->\n
</span>\n </span>\n
\n \n
<html xmlns="http://www.w3.org/1999/xhtml" lang="en"\n <tal:block tal:define="layout_form_id here/getApplicableLayout | nothing;\n
xml:lang="en"\n ignore_layout request/ignore_layout | nothing;\n
xmlns:tal="http://xml.zope.org/namespaces/tal"\n editable_mode request/editable_mode | nothing;\n
xmlns:metal="http://xml.zope.org/namespaces/metal"\n global layout_form python:(not layout_form_id or ignore_layout) or getattr(here, layout_form_id, None);\n
xmlns:i18n="http://xml.zope.org/namespaces/i18n"\n default_layout string:dialog_master;\n
metal:use-macro="here/dialog_master/macros/master">\n layout_id layout_form/pt | default_layout;">\n
\n <tal:block metal:use-macro="python:getattr(here,layout_id).macros[\'master\']">\n
<head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html;; charset=utf-8\')">\n <tal:block metal:fill-slot="main">\n
<meta name="description" content="Generated by form_dialog" />\n
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n
<title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>\n
<link href="erp5.css" rel="stylesheet" type="text/css"/>\n
</head>\n
\n
<body><div metal:fill-slot="main">\n
<div class="Search">\n <div class="Search">\n
\n
\n
<span tal:define="groups python: form.get_groups(include_empty=1);\n <span tal:define="groups python: form.get_groups(include_empty=1);\n
field_errors python: request.get(\'field_errors\',{});\n field_errors python: request.get(\'field_errors\',{});\n
params python: here.portal_selections.getSelectionParams(selection_name, REQUEST=request);\n params python: here.portal_selections.getSelectionParams(selection_name, REQUEST=request);\n
...@@ -290,10 +281,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -290,10 +281,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
</span>\n </span>\n
</span>\n </span>\n
</div>\n </div>\n
</div>\n </tal:block>\n
</body>\n </tal:block>\n
</html>\n </tal:block>
]]></string> </value> ]]></string> </value>
</item> </item>
...@@ -309,6 +299,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -309,6 +299,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>form_dialog</string> </value> <value> <string>form_dialog</string> </value>
</item> </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
...@@ -72,29 +72,18 @@ along with this program; if not, write to the Free Software\n ...@@ -72,29 +72,18 @@ along with this program; if not, write to the Free Software\n
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
-->\n -->\n
</span>\n </span>\n
\n <tal:block tal:define="layout_form_id here/getApplicableLayout | nothing;\n
<html xmlns="http://www.w3.org/1999/xhtml" lang="en"\n ignore_layout request/ignore_layout | nothing;\n
xml:lang="en"\n editable_mode request/editable_mode | nothing;\n
xmlns:tal="http://xml.zope.org/namespaces/tal"\n global layout_form python:(not layout_form_id or ignore_layout) or getattr(here, layout_form_id, None);\n
xmlns:metal="http://xml.zope.org/namespaces/metal"\n default_layout string:list_dialog_master;\n
xmlns:i18n="http://xml.zope.org/namespaces/i18n"\n layout_id layout_form/pt | default_layout;">\n
metal:use-macro="here/list_dialog_master/macros/master">\n <tal:block metal:use-macro="python:getattr(here,layout_id).macros[\'master\']">\n
\n <tal:block metal:fill-slot="main">\n
<head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html;; charset=utf-8\')">\n
<meta name="description" content="Generated by form_folder_delete" />\n
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n
<title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>\n
<link href="erp5.css" rel="stylesheet" type="text/css"/>\n
</head>\n
\n
<body><div metal:fill-slot="main">\n
<div class="Search">\n <div class="Search">\n
\n
\n
<span tal:define="groups python: form.get_groups(include_empty=1);\n <span tal:define="groups python: form.get_groups(include_empty=1);\n
field_errors python: request.get(\'field_errors\',{});\n field_errors python: request.get(\'field_errors\',{});\n
dummy python: request.set(\'here\',here)">\n dummy python: request.set(\'here\',here)">\n
\n
<table width="100%">\n <table width="100%">\n
<span tal:repeat="field python:form.get_fields_in_group(groups[0])">\n <span tal:repeat="field python:form.get_fields_in_group(groups[0])">\n
<tr>\n <tr>\n
...@@ -110,16 +99,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -110,16 +99,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
</tr>\n </tr>\n
</span>\n </span>\n
</table>\n </table>\n
\n
</span>\n </span>\n
\n
<input type="hidden" name="selection_index" value="" tal:attributes="value request/selection_index | string:">\n <input type="hidden" name="selection_index" value="" tal:attributes="value request/selection_index | string:">\n
<input type="hidden" name="object_uid" value="" tal:attributes="value request/object_uid">\n <input type="hidden" name="object_uid" value="" tal:attributes="value request/object_uid">\n
\n
</div>\n </div>\n
</div>\n </tal:block>\n
</body>\n </tal:block>\n
</html>\n </tal:block>\n
]]></string> </value> ]]></string> </value>
...@@ -136,6 +122,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -136,6 +122,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>form_folder_delete</string> </value> <value> <string>form_folder_delete</string> </value>
</item> </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
...@@ -72,7 +72,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -72,7 +72,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
editable_mode request/editable_mode | nothing;\n editable_mode request/editable_mode | nothing;\n
global ignore_layout request/ignore_layout | nothing;\n global ignore_layout request/ignore_layout | nothing;\n
global layout_form python:(not layout_form_id or ignore_layout) or getattr(here, layout_form_id, None);\n global layout_form python:(not layout_form_id or ignore_layout) or getattr(here, layout_form_id, None);\n
layout_id layout_form/pt | string:list_master">\n default_layout string:list_master;\n
layout_id layout_form/pt | default_layout;">\n
<tal:block tal:condition="python: not layout_form_id or ignore_layout">\n <tal:block tal:condition="python: not layout_form_id or ignore_layout">\n
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">\n <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">\n
<?xml-stylesheet href="erp5.css" rel="stylesheet" type="text/css"?>\n <?xml-stylesheet href="erp5.css" rel="stylesheet" type="text/css"?>\n
......
...@@ -72,22 +72,14 @@ along with this program; if not, write to the Free Software\n ...@@ -72,22 +72,14 @@ along with this program; if not, write to the Free Software\n
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
-->\n -->\n
</span>\n </span>\n
\n <tal:block tal:define="layout_form_id here/getApplicableLayout | nothing;\n
<html xmlns="http://www.w3.org/1999/xhtml" lang="en"\n ignore_layout request/ignore_layout | nothing;\n
xml:lang="en"\n editable_mode request/editable_mode | nothing;\n
xmlns:tal="http://xml.zope.org/namespaces/tal"\n global layout_form python:(not layout_form_id or ignore_layout) or getattr(here, layout_form_id, None);\n
xmlns:i18n="http://xml.zope.org/namespaces/i18n"\n default_layout string:list_dialog_master;\n
xmlns:metal="http://xml.zope.org/namespaces/metal"\n layout_id layout_form/pt | default_layout;">\n
metal:use-macro="here/list_dialog_master/macros/master">\n <tal:block metal:use-macro="python:getattr(here,layout_id).macros[\'master\']">\n
\n <tal:block metal:fill-slot="main">\n
<head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html;; charset=utf-8\')">\n
<meta name="description" content="Generated by form_list_dialog" />\n
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n
<title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>\n
<link href="erp5.css" rel="stylesheet" type="text/css"/>\n
</head>\n
\n
<body><div metal:fill-slot="main">\n
<div class="Search">\n <div class="Search">\n
\n \n
\n \n
...@@ -280,10 +272,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -280,10 +272,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
</span>\n </span>\n
\n \n
</div>\n </div>\n
</div>\n </tal:block>\n
</body>\n </tal:block>\n
</html>\n </tal:block>
]]></string> </value> ]]></string> </value>
</item> </item>
...@@ -299,6 +290,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -299,6 +290,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>form_list_dialog</string> </value> <value> <string>form_list_dialog</string> </value>
</item> </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
...@@ -48,10 +48,6 @@ ...@@ -48,10 +48,6 @@
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"\n
"DTD/xhtml1-strict.dtd">\n
<?xml-stylesheet href="erp5.css" rel="stylesheet" type="text/css"?>\n
\n
<span tal:replace="nothing">\n <span tal:replace="nothing">\n
<!--\n <!--\n
Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.\n Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.\n
...@@ -72,36 +68,30 @@ along with this program; if not, write to the Free Software\n ...@@ -72,36 +68,30 @@ along with this program; if not, write to the Free Software\n
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
-->\n -->\n
</span>\n </span>\n
\n <tal:block tal:define="layout_form_id here/getApplicableLayout | nothing;\n
<html xmlns="http://www.w3.org/1999/xhtml" lang="en"\n ignore_layout request/ignore_layout | nothing;\n
xml:lang="en"\n editable_mode python:1;\n
xmlns:tal="http://xml.zope.org/namespaces/tal"\n dummy python:request.set(\'editable_mode\', editable_mode);\n
xmlns:metal="http://xml.zope.org/namespaces/metal"\n global layout_form python:(not layout_form_id or ignore_layout) or getattr(here, layout_form_id, None);\n
xmlns:i18n="http://xml.zope.org/namespaces/i18n"\n default_layout string:list_dialog_master;\n
metal:use-macro="here/list_dialog_master/macros/master">\n layout_id layout_form/pt | default_layout;">\n
\n <tal:block tal:condition="python: not layout_form_id or ignore_layout">\n
<head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html;; charset=utf-8\')">\n <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"\n
<meta name="description" content="Generated by form_list_relation" />\n "DTD/xhtml1-strict.dtd">\n
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n <?xml-stylesheet href="erp5.css" rel="stylesheet" type="text/css"?>\n
<title tal:content="template/title_or_id" xmlns:i18n="http://xml.zope.org/namespaces/i18n"\n </tal:block>\n
>The title</title>\n <tal:block metal:use-macro="python:getattr(here,layout_id).macros[\'master\']">\n
<link href="erp5.css" rel="stylesheet" type="text/css"/>\n <div metal:fill-slot="main">\n
</head>\n
\n
<body><div metal:fill-slot="main">\n
<div class="Search" tal:define="form_pickle request/form_pickle | nothing;\n <div class="Search" tal:define="form_pickle request/form_pickle | nothing;\n
form_signature request/form_signature | nothing;">\n form_signature request/form_signature | nothing;">\n
\n <span tal:define="groups form/get_groups;\n
\n
<span tal:define="groups form/get_groups;\n
field_errors python: request.get(\'field_errors\',{});\n field_errors python: request.get(\'field_errors\',{});\n
dummy python: request.set(\'here\',here);" >\n dummy python: request.set(\'here\',here);" >\n
\n
<table width="100%">\n <table width="100%">\n
<span tal:repeat="field python:form.get_fields_in_group(groups[0])">\n <span tal:repeat="field python:form.get_fields_in_group(groups[0])">\n
<tr>\n <tr>\n
<td tal:define="value python:request.get(field.id,None)">\n <td tal:define="value python:request.get(field.id,None)">\n
<span tal:replace="structure python:field.render(value,request)" />\n <tal:block tal:replace="structure python:field.render(value,request)" />\n
</td>\n </td>\n
</tr>\n </tr>\n
<tr tal:condition="python: field_errors.has_key(field.id)">\n <tr tal:condition="python: field_errors.has_key(field.id)">\n
...@@ -112,20 +102,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -112,20 +102,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
</tr>\n </tr>\n
</span>\n </span>\n
</table>\n </table>\n
\n </span>\n
</span>\n <input type="hidden" name="form_pickle" tal:attributes="value form_pickle | nothing" tal:condition="form_pickle | nothing"/>\n
\n <input type="hidden" name="form_signature" tal:attributes="value form_signature | nothing" tal:condition="form_signature | nothing"/>\n
<input type="hidden" name="form_pickle" value="" tal:attributes="value form_pickle | nothing" tal:condition="form_pickle | nothing"/>\n <input type="hidden" name="selection_index" tal:attributes="value request/selection_index | nothing">\n
<input type="hidden" name="form_signature" value="" tal:attributes="value form_signature | nothing" tal:condition="form_signature | nothing"/>\n <input type="hidden" name="object_uid" tal:attributes="value request/object_uid">\n
<input type="hidden" name="selection_index" value="" tal:attributes="value request/selection_index | nothing">\n <input type="hidden" name="field_id" tal:attributes="value request/field_id">\n
<input type="hidden" name="object_uid" value="" tal:attributes="value request/object_uid">\n
<input type="hidden" name="field_id" value="" tal:attributes="value request/field_id">\n
\n
</div>\n </div>\n
</div>\n </div>\n
</body>\n </tal:block>\n
</html>\n </tal:block>
]]></string> </value> ]]></string> </value>
</item> </item>
......
...@@ -72,26 +72,14 @@ along with this program; if not, write to the Free Software\n ...@@ -72,26 +72,14 @@ along with this program; if not, write to the Free Software\n
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
-->\n -->\n
</span>\n </span>\n
\n <tal:block tal:define="layout_form_id here/getApplicableLayout | nothing;\n
<html xmlns="http://www.w3.org/1999/xhtml" lang="en"\n ignore_layout request/ignore_layout | nothing;\n
xml:lang="en"\n editable_mode request/editable_mode | nothing;\n
xmlns:tal="http://xml.zope.org/namespaces/tal"\n global layout_form python:(not layout_form_id or ignore_layout) or getattr(here, layout_form_id, None);\n
xmlns:metal="http://xml.zope.org/namespaces/metal"\n default_layout string:list_dialog_master;\n
xmlns:i18n="http://xml.zope.org/namespaces/i18n"\n layout_id layout_form/pt | default_layout;">\n
metal:use-macro="here/list_dialog_master/macros/master">\n <tal:block metal:use-macro="python:getattr(here,layout_id).macros[\'master\']">\n
\n <tal:block metal:fill-slot="main">\n
<head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html;; charset=utf-8\')">\n
<meta name="description" content="Generated by form_list_ui" />\n
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n
<title tal:content="template/title_or_id"\n
i18n:translate="" i18n:domain="ui">\n
The title\n
</title>\n
<link href="erp5.css" rel="stylesheet" type="text/css" />\n
</head>\n
\n
<body>\n
<div metal:fill-slot="main">\n
<div class="Search">\n <div class="Search">\n
<span tal:define="field_errors python: request.get(\'field_errors\',{});\n <span tal:define="field_errors python: request.get(\'field_errors\',{});\n
form_id request/form_id;\n form_id request/form_id;\n
...@@ -203,11 +191,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -203,11 +191,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
\n \n
</span>\n </span>\n
</div>\n </div>\n
</div>\n </tal:block>\n
</body>\n </tal:block>\n
\n </tal:block>
</html>\n
]]></string> </value> ]]></string> </value>
</item> </item>
...@@ -223,6 +209,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -223,6 +209,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>form_list_ui</string> </value> <value> <string>form_list_ui</string> </value>
</item> </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
...@@ -72,28 +72,15 @@ along with this program; if not, write to the Free Software\n ...@@ -72,28 +72,15 @@ along with this program; if not, write to the Free Software\n
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
-->\n -->\n
</span>\n </span>\n
\n <tal:block tal:define="layout_form_id here/getApplicableLayout | nothing;\n
<html xmlns="http://www.w3.org/1999/xhtml" lang="en"\n ignore_layout request/ignore_layout | nothing;\n
xml:lang="en"\n editable_mode request/editable_mode | nothing;\n
xmlns:tal="http://xml.zope.org/namespaces/tal"\n global layout_form python:(not layout_form_id or ignore_layout) or getattr(here, layout_form_id, None);\n
xmlns:metal="http://xml.zope.org/namespaces/metal"\n default_layout string:list_dialog_master;\n
xmlns:i18n="http://xml.zope.org/namespaces/i18n"\n layout_id layout_form/pt | default_layout;">\n
metal:use-macro="here/list_dialog_master/macros/master">\n <tal:block metal:use-macro="python:getattr(here,layout_id).macros[\'master\']">\n
\n <tal:block metal:fill-slot="main">\n
<head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html;; charset=utf-8\')">\n
<meta name="description" content="Generated by form_sort" />\n
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n
<title tal:content="template/title_or_id"\n
i18n:translate="" i18n:domain="ui">\n
The title\n
</title>\n
<link href="erp5.css" rel="stylesheet" type="text/css" />\n
</head>\n
\n
<body><div metal:fill-slot="main">\n
<div class="Search">\n <div class="Search">\n
\n
\n
<span tal:define="groups python: form.get_groups(include_empty=1);\n <span tal:define="groups python: form.get_groups(include_empty=1);\n
sort_on python:here.portal_selections.getSelectionSortOrder(selection_name, REQUEST=request);\n sort_on python:here.portal_selections.getSelectionSortOrder(selection_name, REQUEST=request);\n
dummy python: request.set(\'here\',here);\n dummy python: request.set(\'here\',here);\n
...@@ -163,9 +150,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -163,9 +150,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
</span>\n </span>\n
\n \n
</div>\n </div>\n
</div>\n </tal:block>\n
</body>\n </tal:block>\n
</html>\n </tal:block>\n
]]></string> </value> ]]></string> </value>
...@@ -182,6 +169,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -182,6 +169,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>form_sort</string> </value> <value> <string>form_sort</string> </value>
</item> </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
...@@ -72,26 +72,14 @@ along with this program; if not, write to the Free Software\n ...@@ -72,26 +72,14 @@ along with this program; if not, write to the Free Software\n
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
-->\n -->\n
</span>\n </span>\n
\n <tal:block tal:define="layout_form_id here/getApplicableLayout | nothing;\n
<html xmlns="http://www.w3.org/1999/xhtml" lang="en"\n ignore_layout request/ignore_layout | nothing;\n
xml:lang="en"\n editable_mode request/editable_mode | nothing;\n
xmlns:tal="http://xml.zope.org/namespaces/tal"\n global layout_form python:(not layout_form_id or ignore_layout) or getattr(here, layout_form_id, None);\n
xmlns:i18n="http://xml.zope.org/namespaces/i18n"\n default_layout string:main_template;\n
xmlns:metal="http://xml.zope.org/namespaces/metal"\n layout_id layout_form/pt | default_layout;">\n
metal:use-macro="here/main_template/macros/master">\n <tal:block metal:use-macro="python:getattr(here,layout_id).macros[\'master\']">\n
<head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html;; charset=utf-8\')">\n <tal:block metal:fill-slot="main">\n
<meta name="description" content="Generated by index_html" />\n
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\n
<title i18n:translate="" i18n:domain="ui">ERP5 Front Page</title>\n
<link href="erp5.css" rel="stylesheet" type="text/css" />\n
</head>\n
\n
<body style="position: relative">\n
<div metal:fill-slot="header">\n
</div><!-- header slot -->\n
\n
<div metal:fill-slot="main">\n
\n
<div id="content_well"\n <div id="content_well"\n
style="float: left; top: 0; width: 80%;">\n style="float: left; top: 0; width: 80%;">\n
\n \n
...@@ -131,15 +119,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -131,15 +119,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
<span tal:condition="python: here.portal_membership.isAnonymousUser()">\n <span tal:condition="python: here.portal_membership.isAnonymousUser()">\n
<p tal:define="dummy python:request.RESPONSE.redirect(\'%s/login_form\' % here.absolute_url())"/>\n <p tal:define="dummy python:request.RESPONSE.redirect(\'%s/login_form\' % here.absolute_url())"/>\n
</span>\n </span>\n
\n
</div>\n </div>\n
\n </tal:block>\n
</div>\n </tal:block>\n
\n </tal:block>
\n
</body>\n
</html>\n
]]></string> </value> ]]></string> </value>
</item> </item>
......
...@@ -50,30 +50,24 @@ ...@@ -50,30 +50,24 @@
<tal:block tal:condition="here/portal_skins/updateSkinCookie | nothing"\n <tal:block tal:condition="here/portal_skins/updateSkinCookie | nothing"\n
tal:define="dummy here/setupCurrentSkin" />\n tal:define="dummy here/setupCurrentSkin" />\n
\n <tal:block tal:define="layout_form_id here/getApplicableLayout | nothing;\n
<html xmlns:tal="http://xml.zope.org/namespaces/tal"\n ignore_layout request/ignore_layout | nothing;\n
xmlns:metal="http://xml.zope.org/namespaces/metal"\n editable_mode request/editable_mode | nothing;\n
metal:use-macro="here/main_template/macros/master">\n global layout_form python:(not layout_form_id or ignore_layout) or getattr(here, layout_form_id, None);\n
<body>\n default_layout string:main_template;\n
\n layout_id layout_form/pt | default_layout;">\n
<div metal:fill-slot="main" i18n:domain="ui">\n <tal:block metal:use-macro="python:getattr(here,layout_id).macros[\'master\']">\n
\n <tal:block metal:fill-slot="main">\n
<div tal:define="p_props here/portal_properties;\n <div tal:define="p_props here/portal_properties;\n
p_url here/portal_url;\n p_url here/portal_url;\n
mtool here/portal_membership;\n mtool here/portal_membership;\n
isAnon mtool/isAnonymousUser|nothing;\n isAnon mtool/isAnonymousUser|nothing;\n
member mtool/getAuthenticatedMember;\n member mtool/getAuthenticatedMember;\n
now here/ZopeTime;\n now here/ZopeTime;\n
never string:2000/01/01;\n never string:2000/01/01;">\n
"\n
>\n
\n
<div tal:condition="isAnon">\n <div tal:condition="isAnon">\n
\n
<span tal:define="dummy python:request[\'RESPONSE\'].expireCookie(\'__ac\'\n <span tal:define="dummy python:request[\'RESPONSE\'].expireCookie(\'__ac\'\n
, path=\'/\')"\n , path=\'/\')"/>\n
/>\n
\n
<h1 class="DesktopTitle" i18n:translate="">Login failure</h1>\n <h1 class="DesktopTitle" i18n:translate="">Login failure</h1>\n
\n \n
<p class="Desktop" i18n:translate="">You are not currently logged in. Your\n <p class="Desktop" i18n:translate="">You are not currently logged in. Your\n
...@@ -171,11 +165,9 @@ ...@@ -171,11 +165,9 @@
</div><!-- not isAnon -->\n </div><!-- not isAnon -->\n
\n \n
</div><!-- define p_props -->\n </div><!-- define p_props -->\n
\n </tal:block>\n
</div><!-- metal:fill-slot="main" -->\n </tal:block>\n
\n </tal:block>
</body>\n
</html>
]]></string> </value> ]]></string> </value>
</item> </item>
......
...@@ -69,7 +69,8 @@ ...@@ -69,7 +69,8 @@
ignore_layout request/ignore_layout | nothing;\n ignore_layout request/ignore_layout | nothing;\n
editable_mode request/editable_mode | nothing;\n editable_mode request/editable_mode | nothing;\n
layout_form python:(not layout_form_id or ignore_layout) or getattr(here, layout_form_id, None);\n layout_form python:(not layout_form_id or ignore_layout) or getattr(here, layout_form_id, None);\n
layout_id layout_form/pt | string:main_template;"\n default_layout string:main_template;\n
layout_id layout_form/pt | default_layout;"\n
i18n:domain="ui">\n i18n:domain="ui">\n
<tal:block metal:use-macro="python:getattr(here,layout_id).macros[\'master\']">\n <tal:block metal:use-macro="python:getattr(here,layout_id).macros[\'master\']">\n
<tal:block metal:fill-slot="main">\n <tal:block metal:fill-slot="main">\n
......
...@@ -85,26 +85,14 @@ along with this program; if not, write to the Free Software\n ...@@ -85,26 +85,14 @@ along with this program; if not, write to the Free Software\n
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
-->\n -->\n
</tal:block>\n </tal:block>\n
\n <tal:block tal:define="layout_form_id here/getApplicableLayout | nothing;\n
<html xmlns="http://www.w3.org/1999/xhtml" lang="en"\n ignore_layout request/ignore_layout | nothing;\n
xml:lang="en"\n editable_mode request/editable_mode | nothing;\n
xmlns:tal="http://xml.zope.org/namespaces/tal"\n global layout_form python:(not layout_form_id or ignore_layout) or getattr(here, layout_form_id, None);\n
xmlns:metal="http://xml.zope.org/namespaces/metal"\n default_layout string:view_master;\n
xmlns:i18n="http://xml.zope.org/namespaces/i18n"\n layout_id layout_form/pt | default_layout;">\n
metal:use-macro="here/view_master/macros/master">\n <tal:block metal:use-macro="python:getattr(here,layout_id).macros[\'master\']">\n
\n <tal:block metal:fill-slot="main">\n
<head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html;; charset=utf-8\')">\n
<meta name="description" content="Generated by form_view" />\n
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n
<title tal:content="template/title_or_id"\n
i18n:translate="" i18n:domain="ui">\n
The title\n
</title>\n
<link href="erp5.css" rel="stylesheet" type="text/css" />\n
</head>\n
<body>\n
\n
<tal:block metal:fill-slot="main"> \n
<div class="Main" metal:define-macro="form_layout">\n <div class="Main" metal:define-macro="form_layout">\n
<tal:block tal:define="groups python: form.get_groups(include_empty=1);\n <tal:block tal:define="groups python: form.get_groups(include_empty=1);\n
field_errors python: request.get(\'field_errors\',{});\n field_errors python: request.get(\'field_errors\',{});\n
...@@ -156,10 +144,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n ...@@ -156,10 +144,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
</tal:block>\n </tal:block>\n
</div>\n </div>\n
</tal:block>\n </tal:block>\n
\n </tal:block>\n
</body>\n </tal:block>
</html>\n
]]></string> </value> ]]></string> </value>
</item> </item>
......
2006-04-10 vincent
* add layout support in all templates
2006-03-04 jerome 2006-03-04 jerome
* stop translating portal status messages. * stop translating portal status messages.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment