Commit 05a306be authored by Fabien Morin's avatar Fabien Morin

change my_title to my_preferred_header_title to not be in conflic with porperties from other forms

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31553 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 04a08f25
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
<key> <string>left</string> </key> <key> <string>left</string> </key>
<value> <value>
<list> <list>
<string>my_title</string> <string>my_preferred_header_title</string>
<string>my_preferred_width</string> <string>my_preferred_width</string>
<string>my_preferred_height</string> <string>my_preferred_height</string>
<string>my_preferred_title</string> <string>my_preferred_title</string>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_title</string> </value> <value> <string>my_preferred_header_title</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -121,9 +121,7 @@ ...@@ -121,9 +121,7 @@
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <value> <string></string> </value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -242,7 +240,7 @@ ...@@ -242,7 +240,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Gadget Title</string> </value> <value> <string>Header Title</string> </value>
</item> </item>
<item> <item>
<key> <string>truncate</string> </key> <key> <string>truncate</string> </key>
...@@ -262,20 +260,4 @@ ...@@ -262,20 +260,4 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: context.hasTitle() and context.getTitle() or \'\'</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
<key> <string>left</string> </key> <key> <string>left</string> </key>
<value> <value>
<list> <list>
<string>my_title</string> <string>my_preferred_header_title</string>
<string>my_preferred_width</string> <string>my_preferred_width</string>
<string>my_preferred_height</string> <string>my_preferred_height</string>
<string>my_preferred_title</string> <string>my_preferred_title</string>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_title</string> </value> <value> <string>my_preferred_header_title</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -121,9 +121,7 @@ ...@@ -121,9 +121,7 @@
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <value> <string></string> </value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -242,7 +240,7 @@ ...@@ -242,7 +240,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Gadget Title</string> </value> <value> <string>Header Title</string> </value>
</item> </item>
<item> <item>
<key> <string>truncate</string> </key> <key> <string>truncate</string> </key>
...@@ -262,20 +260,4 @@ ...@@ -262,20 +260,4 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: context.hasTitle() and context.getTitle() or \'\'</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
<key> <string>left</string> </key> <key> <string>left</string> </key>
<value> <value>
<list> <list>
<string>my_title</string> <string>my_preferred_header_title</string>
<string>my_preferred_width</string> <string>my_preferred_width</string>
<string>my_preferred_height</string> <string>my_preferred_height</string>
<string>my_preferred_title</string> <string>my_preferred_title</string>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_title</string> </value> <value> <string>my_preferred_header_title</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -121,9 +121,7 @@ ...@@ -121,9 +121,7 @@
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <value> <string></string> </value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -242,7 +240,7 @@ ...@@ -242,7 +240,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Gadget Title</string> </value> <value> <string>Header Title</string> </value>
</item> </item>
<item> <item>
<key> <string>truncate</string> </key> <key> <string>truncate</string> </key>
...@@ -262,20 +260,4 @@ ...@@ -262,20 +260,4 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: context.hasTitle() and context.getTitle() or \'\'</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
<key> <string>left</string> </key> <key> <string>left</string> </key>
<value> <value>
<list> <list>
<string>my_title</string> <string>my_preferred_header_title</string>
<string>my_preferred_width</string> <string>my_preferred_width</string>
<string>my_preferred_height</string> <string>my_preferred_height</string>
<string>my_preferred_title</string> <string>my_preferred_title</string>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_title</string> </value> <value> <string>my_preferred_header_title</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -121,9 +121,7 @@ ...@@ -121,9 +121,7 @@
</item> </item>
<item> <item>
<key> <string>default</string> </key> <key> <string>default</string> </key>
<value> <value> <string></string> </value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -242,7 +240,7 @@ ...@@ -242,7 +240,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Gadget Title</string> </value> <value> <string>Header Title</string> </value>
</item> </item>
<item> <item>
<key> <string>truncate</string> </key> <key> <string>truncate</string> </key>
...@@ -262,20 +260,4 @@ ...@@ -262,20 +260,4 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: context.hasTitle() and context.getTitle() or \'\'</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<key> <string>center</string> </key> <key> <string>center</string> </key>
<value> <value>
<list> <list>
<string>my_title</string> <string>my_preferred_header_title</string>
<string>my_listbox_selection_list_lines</string> <string>my_listbox_selection_list_lines</string>
</list> </list>
</value> </value>
......
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<key> <string>center</string> </key> <key> <string>center</string> </key>
<value> <value>
<list> <list>
<string>my_title</string> <string>my_preferred_header_title</string>
<string>my_preferred_rss_feed</string> <string>my_preferred_rss_feed</string>
<string>my_preferred_username</string> <string>my_preferred_username</string>
<string>my_preferred_password</string> <string>my_preferred_password</string>
......
...@@ -94,7 +94,8 @@ ...@@ -94,7 +94,8 @@
title="Minimize"></a>\n title="Minimize"></a>\n
</tal:block>\n </tal:block>\n
<span class="gadget_title" \n <span class="gadget_title" \n
tal:content="python: here.Base_translateString(box.hasTitle() and box.getTitle() or gadget.getTitle())"/>\n tal:define="dummy python:context.log(box)"\n
tal:content="python: here.Base_translateString(box.getProperty(\'preferred_header_title\', None) or gadget.getTitle())"/>\n
</span>\n </span>\n
</h3>\n </h3>\n
\n \n
......
439 442
\ No newline at end of file \ No newline at end of file
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