Change default name bindings for container and script

lib/python/Products/PythonScripts/Bindings.py

@@ -83,7 +83,7 @@
 # 
 ##############################################################################
 
-__version__='$Revision: 1.1 $'[11:-2]
+__version__='$Revision: 1.2 $'[11:-2]
 
 import Globals
 from Globals import Persistent, HTMLFile, package_home
@@ -95,8 +95,8 @@ import os
 _www = os.path.join(package_home(globals()), 'www')
 
 defaultBindings = {'name_context': 'context',
-                   'name_container': 'self',
-                   'name_m_self': 'm_self',
+                   'name_container': 'container',
+                   'name_m_self': 'script',
                    'name_ns': '',
                    'name_subpath': 'traverse_subpath'}
 

lib/python/Products/PythonScripts/www/scriptBindings.dtml

@@ -15,20 +15,6 @@
     automatically be provided under that name when the script is called.
 </em></p>
 <table cellpadding="2">
-<tr>
-  <th align="left" valign="top">Container</th>
-  <td align="left" valign="top" nowrap><input type="text" name="name_container"
-  value="<dtml-var expr="getAssignedName('name_container', '')" html_quote>">
-  <br>
-  Recommended: <code>self</code>
-  </td><td align="left" valign="top">
-  This is the <dtml-with expr="aq_inner.aq_parent">&dtml-meta_type;
-  "&dtml.missing.html_quote-title_or_id;"</dtml-with>, in which this
-  script is located.  This doesn't change unless you move the script.
-  If the script is in a ZClass, the Container is the class instance.
-  </td>
-</tr>
-<tr><td>&nbsp;</td></tr>
 <tr>
   <th align="left" valign="top">Context</th>
   <td align="left" valign="top"><input type="text" name="name_context"
@@ -42,12 +28,26 @@
   </td>
 </tr>
 <tr><td>&nbsp;</td></tr>
+<tr>
+  <th align="left" valign="top">Container</th>
+  <td align="left" valign="top" nowrap><input type="text" name="name_container"
+  value="<dtml-var expr="getAssignedName('name_container', '')" html_quote>">
+  <br>
+  Rec: <code>container</code>
+  </td><td align="left" valign="top">
+  This is the <dtml-with expr="aq_inner.aq_parent">&dtml-meta_type;
+  "&dtml.missing.html_quote-title_or_id;"</dtml-with>, in which this
+  script is located.  This doesn't change unless you move the script.
+  If the script is in a ZClass, the Container is the class instance.
+  </td>
+</tr>
+<tr><td>&nbsp;</td></tr>
 <tr>
   <th align="left" valign="top">Script</th>
   <td align="left" valign="top"><input type="text" name="name_m_self"
   value="<dtml-var expr="getAssignedName('name_m_self', '')" html_quote>">
   <br>
-  Recommended: <code>m_self</code>
+  Recommended: <code>script</code>
   </td><td align="left" valign="top">
   This is the object &quot;&dtml-title_or_id;&quot; itself.
   </td>