--- at/edit_macros.pt   2007-10-16 01:43:36.000000000 +0200
+++ src/plone-3.0-trunk/Archetypes/skins/archetypes/edit_macros.pt      2007-10-16 01:39:27.000000000 +0200
@@ -89,11 +89,14 @@

           <metal:block define-slot="widgets">
             <tal:tabbed tal:condition="allow_tabbing | nothing">
-              <fieldset tal:repeat="fieldset fieldsets"
-                        tal:attributes="id string:fieldset-${fieldset}">
+              <fieldset tal:define="sole_fieldset python:len(fieldsets) == 1"
+                        tal:repeat="fieldset fieldsets"
+                        tal:attributes="id string:fieldset-${fieldset}"
+                        tal:omit-tag="sole_fieldset">
                 <legend id=""
                         tal:content="python: view.getTranslatedSchemaLabel(fieldset)"
-                        tal:attributes="id string:fieldsetlegend-${fieldset}" />
+                        tal:attributes="id string:fieldsetlegend-${fieldset}"
+                        tal:condition="not:sole_fieldset" />
                 <tal:fields repeat="field python:schematas[fieldset].editableFields(here, visible_only=True)">
                   <metal:fieldMacro use-macro="python:here.widget(field.getName(), mode='edit')" />
                 </tal:fields>
@@ -116,6 +119,13 @@
                      tal:attributes="value fieldset"
                    />
            </tal:fieldsets>
+
+           <input type="hidden"
+                  name="fieldset"
+                  tal:attributes="value fieldset"
+                  tal:condition="python: fieldsets and not allow_tabbing"
+                  />
+

             <input type="hidden"
                    name="form.submitted"