Index: /WAeUP_SRP/trunk/skins/waeup_design/main_template.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_design/main_template.pt	(revision 1921)
+++ /WAeUP_SRP/trunk/skins/waeup_design/main_template.pt	(revision 1922)
@@ -107,5 +107,5 @@
                        class="fontColornavigation fontShapenavigation portalTabTabStyle cpsskinsHBox body">
                  <tal:block repeat="portlet python:ptool.getPortlets(context=context, slot=navigation_slot)"
-                  tal:content="structure python:portlet.render_cache(context_obj=context, portlet=portlet, boxedit=None)" />
+                  tal:content="structure python:portlet.render_cache(context_obj=context, portlet=portlet)" />
               </div>
             </td>
@@ -131,14 +131,16 @@
           </td>
           <td style="text-align: left; padding: 0.2em 0.2em 0em;" class="colorBarColor" valign="top">
-            <div id="object_tabs" class="fontColornavigation fontShapeaverage cpsskinsHBox body">
-                <tal:block repeat="portlet python:ptool.getPortlets(context=context, slot=object_tabs)"
-                           tal:content="structure python:portlet.render_cache(context_obj=context, portlet=portlet, boxedit=None)" />
             <metal:block define-slot="action_slot" />
+            <div id="object_tabs" class="fontColornavigation fontShapeaverage cpsskinsHBox body"
+                 tal:define="portlets python:ptool.getPortlets(context=context, slot=object_tabs)">
+                <tal:block repeat="portlet portlets"
+                           tal:content="structure python:portlet.render_cache(context_obj=context, portlet=portlet)" />
             </div>
           </td>
           <td tal:condition="not:student_theme"
               class="colorBarColor" valign="top" style="text-align: right;padding: 0.2em 0.2em 0em; width: 280px;">
-            <div id="status_slot" class="fontColordefaultfontcolors fontShapeaverage cpsskinsHBox body">
-                <tal:block repeat="portlet python:ptool.getPortlets(context=context, slot='status_slot')"
+            <div id="status_slot" class="fontColordefaultfontcolors fontShapeaverage cpsskinsHBox body"
+                 tal:define="portlets python:ptool.getPortlets(context=context, slot='status_slot')">
+                <tal:block repeat="portlet portlets"
                            tal:content="structure python:portlet.render_cache(context_obj=context, portlet=portlet, boxedit=None)" />
             </div>
