[Erp5-report] r28283 - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: SkinTemplat...

[nobody at svn.erp5.org]

Author: rafael
Date: Wed Aug  5 14:09:05 2009
New Revision: 28283

URL: http://svn.erp5.org?rev=28283&view=rev
Log:
Added a 'head' group to dialogs so that we can put some text at the head of the dialog (ie. before dialog fields)  (change requested by JPS)

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_dialog.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml?rev=28283&r1=28282&r2=28283&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml [utf8] Wed Aug  5 14:09:05 2009
@@ -56,6 +56,7 @@
       <tal:block metal:use-macro="here/main_template/macros/master">\n
         <tal:block metal:fill-slot="main">\n
           <div class="list_dialog">\n
+            <tal:block metal:define-slot="head" />\n
             <tal:block metal:define-slot="main" />\n
             <tal:block metal:define-slot="bottom" />\n
           </div>\n
@@ -74,8 +75,7 @@
       </tal:block>\n
     </tal:block>\n
   </tal:block>\n
-</tal:block>\n
-
+</tal:block>
 
 ]]></string> </value>
         </item>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_dialog.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_dialog.xml?rev=28283&r1=28282&r2=28283&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_dialog.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_dialog.xml [utf8] Wed Aug  5 14:09:05 2009
@@ -47,6 +47,29 @@
              dialog_mode python: True;\n
              dummy python: request.set(\'editable_mode\', editable_mode)">\n
     <tal:block metal:use-macro="here/dialog_main/macros/master">\n
+\n
+      <tal:block metal:define-macro="head">\n
+       <tal:block metal:fill-slot="head">\n
+        <tal:block tal:define="dummy python: request.set(\'here\', here);\n
+                   head_group python: form.get_fields_in_group(\'head\')">\n
+          <div tal:condition="python: len(head_group) > 0"\n
+               class="head">\n
+            <tal:block tal:repeat="field head_group">\n
+              <tal:block tal:condition="preferred_html_style_developper_mode">\n
+                <tal:block metal:use-macro="developper_shortcut_render/macros/field_developper" />\n
+              </tal:block>\n
+              <tal:block tal:define="field_description field/Field_getDescription"\n
+                         tal:condition="preferred_html_style_translator_mode">\n
+                <tal:block metal:use-macro="developper_shortcut_render/macros/field_translator" />\n
+              </tal:block>\n
+              <tal:block tal:define="value python:request.get(field.id, None)"\n
+                         tal:replace="structure python:field.render(value, request)" />\n
+            </tal:block>\n
+          </div>\n
+        </tal:block>\n
+       </tal:block>\n
+      </tal:block>\n
+\n
       <tal:block metal:fill-slot="main">\n
         <tal:block tal:define="dummy python: request.set(\'here\', here);\n
                    dialog_actions python: here.Base_fixDialogActions(actions, dialog_category);\n
@@ -89,7 +112,7 @@
                  tal:define="group_list form/Form_getGroupTitleAndId">\n
               <tal:block tal:repeat="group group_list">\n
                 <tal:block tal:define="gid    group/gid">\n
-                  <fieldset tal:condition="python: \'hidden\' not in gid and \'bottom\' not in gid"\n
+                  <fieldset tal:condition="python: \'hidden\' not in gid and \'bottom\' not in gid and \'head\' not in gid"\n
                             tal:attributes="class gid;\n
                             id    python: \'fieldset_\' + gid.replace(\' \', \'_\');">\n
                     <legend tal:content="group/gtitle" class="group_title" />\n
@@ -107,8 +130,8 @@
         </tal:block>\n
       </tal:block>\n
 \n
-     <tal:block metal:define-macro="bottom">\n
-      <tal:block metal:fill-slot="bottom">\n
+      <tal:block metal:define-macro="bottom">\n
+       <tal:block metal:fill-slot="bottom">\n
         <tal:block tal:define="dummy python: request.set(\'here\', here);\n
                    bottom_group python: form.get_fields_in_group(\'bottom\')">\n
           <div tal:condition="python: len(bottom_group) > 0"\n
@@ -128,10 +151,10 @@
         </tal:block>\n
        </tal:block>\n
       </tal:block>\n
+\n
     </tal:block>\n
   </tal:block>\n
-</tal:block>\n
-
+</tal:block>
 
 ]]></string> </value>
         </item>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision?rev=28283&r1=28282&r2=28283&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] Wed Aug  5 14:09:05 2009
@@ -1,1 +1,1 @@
-792
+793