[Erp5-report] r23331 - in /erp5/trunk/bt5/erp5_wizard: SkinTemplateItem/portal_skins/erp5_w...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Sep 2 10:50:21 CEST 2008
Author: ivan
Date: Tue Sep 2 10:50:18 2008
New Revision: 23331
URL: http://svn.erp5.org?rev=23331&view=rev
Log:
Wizard uses a dedicated template that simplifies UI.
Added:
erp5/trunk/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/wizard_main_template.xml
erp5/trunk/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/wizard_template_erp5_xhtml_style.xml
Modified:
erp5/trunk/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/Wizard_viewInstallationStatus.xml
erp5/trunk/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/wizard_dialog.xml
erp5/trunk/bt5/erp5_wizard/bt/change_log
erp5/trunk/bt5/erp5_wizard/bt/revision
Modified: erp5/trunk/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/Wizard_viewInstallationStatus.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/Wizard_viewInstallationStatus.xml?rev=23331&r1=23330&r2=23331&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/Wizard_viewInstallationStatus.xml (original)
+++ erp5/trunk/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/Wizard_viewInstallationStatus.xml Tue Sep 2 10:50:18 2008
@@ -62,26 +62,26 @@
dummy python: local_parameter_list.update({\'object_uid\': object_uid, \'object_path\': object_path, \'form_id\': form_id});\n
title string:${template/title_or_id} - ${here/Title};\n
">\n
- <tal:block metal:use-macro="here/main_template/macros/master">\n
+ <tal:block metal:use-macro="here/wizard_main_template/macros/master">\n
<tal:block metal:fill-slot="main">\n
\n
- <script type="text/javascript" \n
- language="javascript" \n
- tal:content="here/Wizard_generateJavaScript"/>\n
+ <script type="text/javascript" \n
+ language="javascript" \n
+ tal:content="here/Wizard_generateJavaScript"/>\n
\n
- <div class="dialog_box">\n
- <h2>Installation Report</h2>\n
-<!--\n
-\t<div id="server_installation_status" \n
- tal:content="structure here/portal_wizard/getInstallationStatusReportFromServer">\n
+ <div class="dialog_box">\n
+ <h2>Installation Report</h2>\n
+ \n
+ <div id="server_installation_status" \n
+ tal:content="structure here/portal_wizard/getInstallationStatusReportFromServer">\n
</div>\n
<br/>\n
--->\n
-\t<div id="client_installation_status">\n
-\t <p> Loading ... </p>\n
+ \n
+ <div id="client_installation_status">\n
+ <p> Loading ... </p>\n
</div>\n
</div>\n
- </tal:block>\n
+ </tal:block>\n
</tal:block>\n
</tal:block>\n
</tal:block>\n
Modified: erp5/trunk/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/wizard_dialog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/wizard_dialog.xml?rev=23331&r1=23330&r2=23331&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/wizard_dialog.xml (original)
+++ erp5/trunk/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/wizard_dialog.xml Tue Sep 2 10:50:18 2008
@@ -74,7 +74,7 @@
xmlns:tal="http://xml.zope.org/namespaces/tal"\n
xmlns:metal="http://xml.zope.org/namespaces/metal"\n
xmlns:i18n="http://xml.zope.org/namespaces/i18n"\n
- metal:use-macro="here/main_template/macros/master">\n
+ metal:use-macro="here/wizard_main_template/macros/master">\n
\n
<head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html;; charset=utf-8\')">\n
<meta name="description" content="Generated by form_dialog" />\n
Added: erp5/trunk/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/wizard_main_template.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/wizard_main_template.xml?rev=23331&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/wizard_main_template.xml (added)
+++ erp5/trunk/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/wizard_main_template.xml Tue Sep 2 10:50:18 2008
@@ -1,0 +1,110 @@
+<?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>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <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>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+<tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"\n
+ xmlns:metal="http://xml.zope.org/namespaces/metal"\n
+ xmlns:i18n="http://xml.zope.org/namespaces/i18n">\n
+ <tal:block tal:replace="nothing">\n
+<!--\n
+IDEAS:\n
+ - Add callbacks to ERP5Form object (selection ?) to gather needed fields -> put them in http_parameter_list.\n
+-->\n
+ </tal:block>\n
+ <tal:block metal:define-macro="master">\n
+ <tal:block\n
+ tal:define="ignore_layout request/ignore_layout | nothing;\n
+ layout_form_id request/layout_form_id | here/getApplicableLayout | nothing;\n
+ layout_form python: layout_form_id and getattr(here, layout_form_id, None) or None;\n
+ is_web_mode python: (layout_form is not None) and (not ignore_layout);\n
+ editable_mode python: (not is_web_mode) or request.get(\'editable_mode\', False);\n
+ editable_mode_backup editable_mode;\n
+ dummy python: request.set(\'editable_mode\', editable_mode);\n
+ dummy python: request.set(\'is_web_mode\', is_web_mode);\n
+ page_template python: is_web_mode and ((layout_form.meta_type==\'Page Template\' and layout_form.id) or getattr(layout_form, \'pt\', None)) or \'wizard_template_erp5_xhtml_style\';">\n
+ <tal:block metal:use-macro="python: getattr(here, page_template).macros[\'master\']">\n
+ <tal:block metal:fill-slot="context_bar">\n
+ <tal:block metal:define-slot="context_bar" />\n
+ </tal:block>\n
+ <tal:block metal:fill-slot="main"\n
+ tal:define="editable_mode editable_mode_backup;\n
+ dummy python: request.set(\'editable_mode\', editable_mode);">\n
+ <tal:block metal:define-slot="main" />\n
+ </tal:block>\n
+ </tal:block>\n
+ </tal:block>\n
+ </tal:block>\n
+</tal:block>\n
+
+
+]]></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>wizard_main_template</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/wizard_template_erp5_xhtml_style.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/wizard_template_erp5_xhtml_style.xml?rev=23331&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/wizard_template_erp5_xhtml_style.xml (added)
+++ erp5/trunk/bt5/erp5_wizard/SkinTemplateItem/portal_skins/erp5_wizard/wizard_template_erp5_xhtml_style.xml Tue Sep 2 10:50:18 2008
@@ -1,0 +1,198 @@
+<?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>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <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>_owner</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+<tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"\n
+ xmlns:metal="http://xml.zope.org/namespaces/metal"\n
+ xmlns:i18n="http://xml.zope.org/namespaces/i18n">\n
+ <tal:block tal:replace="nothing">\n
+<!--\n
+IDEAS:\n
+ - Add callbacks to ERP5Form object (selection ?) to gather needed fields -> put them in http_parameter_list.\n
+-->\n
+ </tal:block>\n
+ <tal:block metal:define-macro="master">\n
+ <tal:block tal:define="global_definitions_macros here/global_definitions/macros">\n
+ <tal:block metal:use-macro="global_definitions_macros/header_definitions" />\n
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\n
+ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">\n
+ <head>\n
+ <base tal:attributes="href python: \'%s/\' % (url, )" />\n
+ <meta name="generator" content="ERP5 - Copyright (C) 2001 - 2008. All rights reserved." />\n
+ <meta name="description" content=""\n
+ tal:attributes="content title | string:ERP5 Free Open Source ERP and CRM" />\n
+ <meta name="keywords" content=""\n
+ tal:attributes="content python:\', \'.join(here.getProperty(\'subject_list\', []) or [])" />\n
+ <meta name="robots" content="index, follow" />\n
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n
+ <meta http-equiv="Content-Script-Type" content="text/javascript" />\n
+ <meta http-equiv="Content-Style-Type" content="text/css" />\n
+ <title tal:define="title title | string:ERP5"\n
+ tal:content="python: \'%s | %s\' % (title, here.getPortalObject().title_or_id())"></title>\n
+ <tal:block tal:replace="nothing">\n
+ <!-- Render each field\'s css and include css\'s and javascripts. -->\n
+ </tal:block>\n
+ <tal:block tal:condition="python: form is not None">\n
+ <tal:block tal:repeat="group python: [x for x in form.get_groups(include_empty=0) if x != \'hidden\']">\n
+ <tal:block tal:repeat="field python: form.get_fields_in_group(group)">\n
+ <tal:block tal:define="css python: field.render_css(REQUEST=request)">\n
+ <style tal:condition="python: css is not None"\n
+ tal:content="css"\n
+ tal:attributes="type python:\'text/css\'">\n
+ </style>\n
+ </tal:block>\n
+ <tal:block tal:define="dummy python: css_list.extend(field.get_css_list(REQUEST=request))" />\n
+ <tal:block tal:define="dummy python: js_list.extend(field.get_javascript_list(REQUEST=request))" />\n
+ </tal:block>\n
+ </tal:block>\n
+ </tal:block>\n
+ <tal:block tal:repeat="css python: css_list">\n
+ <link tal:attributes="href css" type="text/css" rel="stylesheet" />\n
+ </tal:block>\n
+ <tal:block tal:repeat="js python: js_list">\n
+ <script tal:attributes="src js" type="text/javascript"></script>\n
+ </tal:block>\n
+ <link rel="icon" tal:attributes="href string:${portal_path}/favicon.ico" type="image/x-icon" />\n
+ <link rel="shortcut icon" tal:attributes="href string:${portal_path}/favicon.ico" type="image/x-icon" />\n
+ </head>\n
+ <body>\n
+ <form id="main_form"\n
+ tal:attributes="enctype form/Form_getEnctype | enctype | nothing;\n
+ action url;\n
+ method python:str(path(\'form/method | string:post\')).lower()">\n
+ <fieldset id="hidden_fieldset">\n
+ <!-- Hidden button as explained in http://ppewww.ph.gla.ac.uk/~flavell/www/formquestion.html -->\n
+ <!-- We should probably call the default method instead -->\n
+ <input tal:condition="form_action | nothing"\n
+ id="hidden_button" type="submit" value="dummy"\n
+ tal:attributes="name string:${form_action}:method" />\n
+ <tal:block metal:use-macro="global_definitions_macros/http_definitions" />\n
+ </fieldset>\n
+ <tal:block metal:define-slot="layout">\n
+ <div style="padding: 0.5em; \n
+ margin: 0.5em; \n
+ border:1px solid #3D5474;\n
+ background-color: #BAD0F0;">\n
+ <h1> ERP5 Express Configuration </h1>\n
+ </div>\n
+<!--\n
+ <div id="bars">\n
+ <div id="main_bar"\n
+ tal:content="structure portal/ERP5Site_renderCachedNavigationBox">\n
+ </div>\n
+ <div id="context_bar">\n
+ <tal:block metal:define-slot="context_bar" />\n
+ </div>\n
+ </div>\n
+-->\n
+ <div id="status">\n
+<!--\n
+ <div id="breadcrumb">\n
+ <tal:block tal:repeat="item here/breadcrumbs">\n
+ <a tal:attributes="href item/url" tal:content="item/title" />\n
+ /\n
+ </tal:block>\n
+ </div>\n
+ <div id="logged_in_as">\n
+ <tal:block tal:condition="not: portal/portal_membership/isAnonymousUser">\n
+ <span class="logged_txt" i18n:translate="" i18n:domain="ui">Logged In as :</span>\n
+ <tal:block tal:replace="python:portal.portal_membership.getAuthenticatedMember().getUserName()" />\n
+ </tal:block>\n
+ </div>\n
+-->\n
+ <p class="clear"></p>\n
+ <div tal:content="request/portal_status_message | nothing" id="transition_message" />\n
+ <div id="information_area" tal:condition="python: request.has_key(\'field_errors\')" \n
+ i18n:translate="" i18n:domain="ui">\n
+ Input data has errors. Please look at error messages below.\n
+ </div>\n
+ </div>\n
+ <div id="master">\n
+ <tal:block metal:define-slot="main" />\n
+ </div>\n
+ </tal:block>\n
+ </form>\n
+ </body>\n
+ </html>\n
+ </tal:block>\n
+ </tal:block>\n
+</tal:block>\n
+
+
+]]></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>wizard_template_erp5_xhtml_style</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>uid</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_wizard/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_wizard/bt/change_log?rev=23331&r1=23330&r2=23331&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_wizard/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_wizard/bt/change_log Tue Sep 2 10:50:18 2008
@@ -1,3 +1,6 @@
+2008-09-02 ivan
+* Wizard uses a dedicated template
+
2008-06-27 yusei
* Start to develop version 5.2.
@@ -14,4 +17,4 @@
* Added a exclusive preference object for erp5 express and its view form.
2006-04-14 Romain
-* First build.
+* First build.
Modified: erp5/trunk/bt5/erp5_wizard/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_wizard/bt/revision?rev=23331&r1=23330&r2=23331&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_wizard/bt/revision (original)
+++ erp5/trunk/bt5/erp5_wizard/bt/revision Tue Sep 2 10:50:18 2008
@@ -1,1 +1,1 @@
-67
+69
More information about the Erp5-report
mailing list