fixed tab ordering to be more like prior versions

lib/python/OFS/DTMLDocument.py

@@ -84,7 +84,7 @@
 ##############################################################################
 """DTML Document objects."""
 
-__version__='$Revision: 1.36 $'[11:-2]
+__version__='$Revision: 1.37 $'[11:-2]
 from DocumentTemplate.DT_Util import InstanceDict, TemplateDict
 from ZPublisher.Converters import type_converters
 from Globals import HTML, HTMLFile, MessageDialog
@@ -109,8 +109,9 @@ class DTMLDocument(PropertyManager, DTMLMethod):
     icon     ='p_/dtmldoc'
 
     manage_options=(
-        DTMLMethod.manage_options+
-        PropertyManager.manage_options
+        DTMLMethod.manage_options[:2] +
+        PropertyManager.manage_options +
+        DTMLMethod.manage_options[2:]
         )
 
     __ac_permissions__=(

lib/python/OFS/Folder.py

@@ -87,9 +87,9 @@
 
 Folders are the basic container objects and are analogous to directories.
 
-$Id: Folder.py,v 1.90 2000/06/16 19:40:14 srichter Exp $"""
+$Id: Folder.py,v 1.91 2000/07/26 15:43:13 brian Exp $"""
 
-__version__='$Revision: 1.90 $'[11:-2]
+__version__='$Revision: 1.91 $'[11:-2]
 
 import Globals, SimpleItem, ObjectManager, PropertyManager
 import AccessControl.Role, webdav.Collection, FindSupport
@@ -155,15 +155,16 @@ class Folder(
     _properties=({'id':'title', 'type': 'string'},)
 
     manage_options=(
-        ObjectManager.ObjectManager.manage_options+
-        PropertyManager.PropertyManager.manage_options+
+        (ObjectManager.ObjectManager.manage_options[0],)+
         (
         {'label':'View', 'action':'index_html',
          'help':('OFSP','Folder_View.stx')},
         )+
-        FindSupport.FindSupport.manage_options+
+        PropertyManager.PropertyManager.manage_options+
+        (ObjectManager.ObjectManager.manage_options[1],)+
         AccessControl.Role.RoleManager.manage_options+
-        SimpleItem.Item.manage_options
+        SimpleItem.Item.manage_options+
+        FindSupport.FindSupport.manage_options
         )
 
     __ac_permissions__=()

lib/python/OFS/Image.py

@@ -84,7 +84,7 @@
 ##############################################################################
 """Image object"""
 
-__version__='$Revision: 1.111 $'[11:-2]
+__version__='$Revision: 1.112 $'[11:-2]
 
 import Globals, string, struct, content_types
 from OFS.content_types import guess_content_type
@@ -148,14 +148,17 @@ class File(Persistent,Implicit,PropertyManager,
          'help':('OFSP','File_Edit.stx')},
         {'label':'Upload', 'action':'manage_uploadForm',
          'help':('OFSP','File_Upload.stx')},
+        ) 
+        + PropertyManager.manage_options +
+        (
         {'label':'View', 'action':'',
          'help':('OFSP','File_View.stx')},
         )
-        +PropertyManager.manage_options
-        +Item_w__name__.manage_options
-        +RoleManager.manage_options
+        + RoleManager.manage_options
+        + Item_w__name__.manage_options
         )
 
+
     __ac_permissions__=(
         ('View management screens',
          ('manage', 'manage_main', 'manage_uploadForm',)),
@@ -464,12 +467,14 @@ class Image(File):
          'help':('OFSP','Image_Edit.stx')},
         {'label':'Upload', 'action':'manage_uploadForm',
          'help':('OFSP','File_Upload.stx')},
+        ) 
+        + PropertyManager.manage_options +
+        (
         {'label':'View', 'action':'view_image_or_file',
-         'help':('OFSP','Image_View.stx')}
+         'help':('OFSP','Image_View.stx')},
         )
-        +PropertyManager.manage_options
-        +Item_w__name__.manage_options
-        +RoleManager.manage_options
+        + RoleManager.manage_options
+        + Item_w__name__.manage_options
         )
 
     manage_editForm  =HTMLFile('imageEdit',globals(),Kind='Image',kind='image')