resync mtEdit.zpt with upstream Products/PageTemplates/www/ptEdit.zpt

product/MailTemplates/www/mtEdit.zpt

-<h1 tal:replace="structure here/manage_page_header">Header</h1>
+<h1 tal:replace="structure python:context.manage_page_header(management_page_charset='utf-8')">Header</h1>
 <h2 tal:define="manage_tabs_message options/manage_tabs_message | nothing"
-    tal:replace="structure here/manage_tabs">Tabs</h2>
+    tal:replace="structure context/manage_tabs">Tabs</h2>
 
 <tal:block define="global body request/other/text | request/form/text
-| here/read" /> 
+                                                  | context/read" /> 
 <form action="" method="post" tal:attributes="action request/URL1">
-<input type="hidden" name=":default_method" value="pt_changePrefs">
+<input type="hidden" name=":default_method" value="pt_changePrefs" />
+<input type="hidden" name="encoding" value="utf-8" />
 <table width="100%" cellspacing="0" cellpadding="2" border="0">
   <tr>
     <td align="left" valign="middle">
-    <div class="form-optional">
-    MailHost
-    </div>
+      <div class="form-optional">MailHost</div>
     </td>
     <td align="left" valign="middle">
-    <select name="mailhost"
-            tal:define="mh_meta_types python:('Mail Host','Maildrop Host')">
-      <option tal:define="mh python:here.restrictedTraverse(here.mailhost,None)"
-              tal:condition="python:getattr(mh,'meta_type',None) not in mh_meta_types"
-              tal:attributes="value here/mailhost"
-              tal:content="string:'${here/mailhost}' is no longer valid!"
-              selected="selected"/>
-      <option tal:repeat="mh python:here.superValues(mh_meta_types)"
-              tal:content="mh/title_and_id"
-              tal:attributes="value    mh/getId;
-                              selected python:here.mailhost==mh.getId()"/>
-    </select>
+      <select name="mailhost"
+              tal:define="mh_meta_types python:('Mail Host','Maildrop Host')">
+        <option tal:define="mh python:context.restrictedTraverse(context.mailhost,None)"
+                tal:condition="python:getattr(mh,'meta_type',None) not in mh_meta_types"
+                tal:attributes="value context/mailhost"
+                tal:content="string:'${context/mailhost}' is no longer valid!"
+                selected="selected"/>
+        <option tal:repeat="mh python:context.superValues(mh_meta_types)"
+                tal:content="mh/title_and_id"
+                tal:attributes="value    mh/getId;
+                                selected python:context.mailhost==mh.getId()"/>
+      </select>
     </td>
     <td align="left" valign="middle">
-    <div class="form-optional">
-    Content-Type
-    </div>
+      <div class="form-optional">Content-Type</div>
     </td>
     <td align="left" valign="middle">
-    <input type="text" name="content_type" size="14" 
-           tal:attributes="value request/content_type | here/content_type" />
+      <input type="text" name="content_type" size="14" 
+             tal:attributes="value request/content_type | context/content_type" />
     </td>
   </tr>
   <tr>
     <td align="left" valign="middle">
-    <div class="form-label">
-    Last Modified
-    </div>
+      <div class="form-label">Last Modified</div>
     </td>
     <td align="left" valign="middle">
-    <div class="form-text" 
-     tal:content="python:here.bobobase_modification_time().strftime('%Y-%m-%d %I:%M %p')">1/1/2000
-    </div>
+      <div class="form-text" 
+       tal:content="python:context.bobobase_modification_time().strftime('%Y-%m-%d %I:%M %p')">1/1/2000
+      </div>
     </td>
-    <td align="left" valign="top" colspan=2>
-      <a href="source.html" tal:condition="here/html">Browse HTML source</a>
-      <a href="source.xml" tal:condition="not:here/html">Browse XML source</a>
-      <br>
-      <input type="hidden" name="expand:int:default" value="0">
+    <td align="left" valign="top" colspan="2">
+      <a href="source.html" tal:condition="context/html">Browse HTML source</a>
+      <a href="source.xml" tal:condition="not:context/html">Browse XML source</a>
+      <br />
+      <input type="hidden" name="expand:int:default" value="0" />
       <input type="checkbox" value="1" name="expand:int"
-       tal:attributes="checked request/expand | here/expand">
+             tal:attributes="checked request/expand | context/expand" />
       Expand macros when editing
     </td>
   </tr>
 
-  <tr tal:define="errors here/pt_errors" tal:condition="errors">
-    <tal:block define="global body python:here.document_src({'raw':1})"/>
+  <tr tal:define="errors context/pt_errors" tal:condition="errors">
     <td align="left" valign="middle" class="form-label">Errors</td>
     <td align="left" valign="middle" style="background-color: #FFDDDD"
-    colspan="3">
-<pre tal:content="python:modules['string'].join(errors, '\n')">errors</pre>
+        colspan="3">
+<pre tal:content="python:'\n'.join(errors)">errors</pre>
     </td>
   </tr>
-
-  <tr tal:define="warnings here/pt_warnings" tal:condition="warnings">
-    <td align="left" valign="middle" class="form-label">Warnings</td>
-    <td align="left" valign="middle" style="background-color: #FFEEDD"
-     colspan="3">
-<pre tal:content="python:modules['string'].join(warnings, '\n')">errors</pre>
-    </td>
-  </tr>
-
   <tr>
     <td align="left" valign="top" colspan="4"
-      tal:define="width request/dtpref_cols | string:100%;
-                  relative_width python:str(width).endswith('%')">
+        tal:define="width request/dtpref_cols | string:100%;
+                    relative_width python:str(width).endswith('%')">
       <textarea name="text:text" wrap="off" style="width: 100%;" rows="20"
-        tal:condition="relative_width"
-        tal:attributes="style string:width: $width;;;
-                        rows request/dtpref_rows | default"
-        tal:content="body">Template Body</textarea>
+                tal:condition="relative_width"
+                tal:attributes="style string:width: $width;;;
+                                rows request/dtpref_rows | default"
+                tal:content="body">Template Body</textarea>
       <textarea name="text:text" wrap="off" rows="20" cols="50"
-        tal:condition="not:relative_width"
-        tal:attributes="cols width; rows request/dtpref_rows | default"
-        tal:content="body">Template Body</textarea>
+                tal:condition="not:relative_width"
+                tal:attributes="cols width; rows request/dtpref_rows | default"
+                tal:content="body">Template Body</textarea>
     </td>
   </tr>
 
 <tr>
   <td align="left" valign="top" colspan="4">
   <div class="form-element">
-    <em tal:condition="here/wl_isLocked">Locked by WebDAV</em>
-    <input tal:condition="not:here/wl_isLocked"
-     class="form-element" type="submit" 
-     name="pt_editAction:method" value="Save Changes">
-  &nbsp;&nbsp;
-  <input class="form-element" type="submit" name="height" value="Taller">
-  <input class="form-element" type="submit" name="height" value="Shorter">
-  <input class="form-element" type="submit" name="width" value="Wider">
-  <input class="form-element" type="submit" name="width" value="Narrower">
+    <em tal:condition="context/wl_isLocked">Locked by WebDAV</em>
+    <input tal:condition="not:context/wl_isLocked"
+           class="form-element" type="submit" 
+           name="pt_editAction:method" value="Save Changes"/>
+    &nbsp;&nbsp;
+    <input class="form-element" type="submit" name="height" value="Taller" />
+    <input class="form-element" type="submit" name="height" value="Shorter" />
+    <input class="form-element" type="submit" name="width" value="Wider" />
+    <input class="form-element" type="submit" name="width" value="Narrower" />
   </div>
   </td>
 </tr>
 </table>
 </form>
 
-<p class="form-help">
-You can upload the text for <span tal:replace="here/title_and_id" />
-using the following form.
-Choose an existing HTML or XML file from your local computer by clicking
-<em>browse</em>.  You can also <a href="document_src">click here</a>
-to view or download the current text.
-</p>
+<p class="form-help">You can upload the text for
+<span tal:replace="context/title_and_id" /> using the following form.
+Choose an existing HTML or XML file from your local computer by
+clicking <em>browse</em>.  You can also <a href="document_src">click
+here</a> to view or download the current text.</p>
 
-<form action="pt_upload" method="post" 
- enctype="multipart/form-data">
+<form action="pt_upload" method="post" enctype="multipart/form-data">
 <table cellpadding="2" cellspacing="0" border="0">
 <tr>
   <td align="left" valign="top">
-  <div class="form-label">
-  File &nbsp;
-  </div>
+    <div class="form-label">File &nbsp;</div>
   </td>
   <td align="left" valign="top">
-  <input type="file" name="file" size="25" value="">
+    <input type="file" name="file" size="40" value="" />
+  </td>
+</tr>
+<tr>
+  <td align="left" valign="top">
+    <div class="form-label">Encoding &nbsp;</div>
+  </td>
+  <td align="left" valign="top" colspan="2">
+    <input name="encoding" value="utf-8" />
+  </td>
+  <td align="left" valign="top" colspan="1">
+    <em>(only used for non-XML and non-XHTML content)</em>
   </td>
 </tr>
 <tr>
   <td></td>
   <td align="left" valign="top">
   <div class="form-element">
-    <em tal:condition="here/wl_isLocked">Locked by WebDAV</em>
-    <input tal:condition="not:here/wl_isLocked"
-    class="form-element" type="submit" value="Upload File">
+    <em tal:condition="context/wl_isLocked">Locked by WebDAV</em>
+    <input tal:condition="not:context/wl_isLocked"
+           class="form-element" type="submit" value="Upload File" />
   </div>
   </td>
 </tr>
 </table>
 </form>
 
-<h1 tal:replace="structure here/manage_page_footer">Footer</h1>
+<h1 tal:replace="structure context/manage_page_footer">Footer</h1>