[Erp5-report] r8090 - in /erp5/trunk/bt5/erp5_xhtml_style: SkinTemplateItem/portal_skins/er...

[nobody at svn.erp5.org]

Author: vincent
Date: Tue Jun 20 15:32:27 2006
New Revision: 8090

URL: http://svn.erp5.org?rev=8090&view=rev
Log:
2006-06-20 Vincent
Correct form button values when in a dialog.

Modified:
    erp5/trunk/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog.xml
    erp5/trunk/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_view_dialog.xml
    erp5/trunk/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/main_template.xml
    erp5/trunk/bt5/erp5_xhtml_style/bt/change_log
    erp5/trunk/bt5/erp5_xhtml_style/bt/maintainer_list

Modified: erp5/trunk/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog.xml?rev=8090&r1=8089&r2=8090&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog.xml (original)
+++ erp5/trunk/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog.xml Tue Jun 20 15:32:27 2006
@@ -73,7 +73,7 @@
 -->\n
 </tal:block>\n
 <tal:block metal:define-macro="master">\n
-  <tal:block tal:define="dialog_type string:View">\n
+  <tal:block tal:define="dialog_type dialog_type | string:">\n
     <tal:block metal:use-macro="here/list_dialog_master/macros/master">\n
       <tal:block metal:fill-slot="main">\n
         <div class="dialog_box">\n

Modified: erp5/trunk/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_view_dialog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_view_dialog.xml?rev=8090&r1=8089&r2=8090&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_view_dialog.xml (original)
+++ erp5/trunk/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_view_dialog.xml Tue Jun 20 15:32:27 2006
@@ -72,9 +72,11 @@
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.\n
 -->\n
 </tal:block>\n
-<tal:block metal:use-macro="here/dialog/macros/master">\n
-  <tal:block metal:fill-slot="main">\n
-    <tal:block metal:use-macro="here/form/macros/master" />\n
+<tal:block tal:define="dialog_type string:View">\n
+  <tal:block metal:use-macro="here/dialog/macros/master">\n
+    <tal:block metal:fill-slot="main">\n
+      <tal:block metal:use-macro="here/form/macros/master" />\n
+    </tal:block>\n
   </tal:block>\n
 </tal:block>
 

Modified: erp5/trunk/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/main_template.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/main_template.xml?rev=8090&r1=8089&r2=8090&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/main_template.xml (original)
+++ erp5/trunk/bt5/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/main_template.xml Tue Jun 20 15:32:27 2006
@@ -99,7 +99,7 @@
                        global selection_index request/selection_index | nothing;\n
                        global selection_url python: selection_name and here.portal_selections.getSelectionListUrlFor(selection_name,REQUEST=request) or None;\n
 \n
-                       global current_url python: dialog_id and url + \'/\' + dialog_id or None;\n
+                       current_url python: dialog_id and \'%s/%s\' % (url, dialog_id) or None;\n
                        global current_action python: current_url and here.ERP5Site_getCurrentAction(current_url, actions) or None;\n
                        form_pickle request/form_pickle | nothing;\n
                        form_signature request/form_signature | nothing;\n

Modified: erp5/trunk/bt5/erp5_xhtml_style/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_xhtml_style/bt/change_log?rev=8090&r1=8089&r2=8090&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_xhtml_style/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_xhtml_style/bt/change_log Tue Jun 20 15:32:27 2006
@@ -1,3 +1,6 @@
+2006-06-20 Vincent
+Correct form button values when in a dialog.
+
 2006-06-15 Vincent
 Initial commit.
 Valid XHTML1.0 Strict + CSS 2.0.

Modified: erp5/trunk/bt5/erp5_xhtml_style/bt/maintainer_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_xhtml_style/bt/maintainer_list?rev=8090&r1=8089&r2=8090&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_xhtml_style/bt/maintainer_list (original)
+++ erp5/trunk/bt5/erp5_xhtml_style/bt/maintainer_list Tue Jun 20 15:32:27 2006
@@ -1,0 +1,1 @@
+vincent