Get current gadget title from first gadget's user preferences, then gadget's...

Get current gadget title from first gadget's user preferences, then gadget's title and finally main gadget template's title.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@39311 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_viewColumnWidget.xml

@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37,7 +34,7 @@
         </item>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
+            <value> <unicode encoding="cdata"><![CDATA[
 
 <tal:block \n
      tal:repeat="box_id python: options[\'section_layout\']"\n
@@ -94,7 +91,7 @@
              title="Minimize"></a>\n
         </tal:block>\n
         <span class="gadget_title" \n
-              tal:content="python: here.Base_translateString(box.getProperty(\'preferred_header_title\', None) or gadget.getTitle())"/>\n
+              tal:content="python: here.Base_translateString(box.getProperty(\'preferred_header_title\', box.getProperty(\'title\', None)) or gadget.getTitle())"/>\n
         </span>\n
       </h3>\n
 \n
@@ -205,7 +202,7 @@
 </tal:block>\n
 
 
-]]></string> </value>
+]]></unicode> </value>
         </item>
         <item>
             <key> <string>content_type</string> </key>
@@ -219,9 +216,13 @@
             <key> <string>id</string> </key>
             <value> <string>KnowledgePad_viewColumnWidget</string> </value>
         </item>
+        <item>
+            <key> <string>output_encoding</string> </key>
+            <value> <string>utf-8</string> </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Render boxes for a column</string> </value>
+            <value> <unicode>Render boxes for a column</unicode> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_knowledge_pad/bt/revision

-559
+560
\ No newline at end of file