Index: WAeUP_SRP/trunk/skins/waeup_directory/member_create_form.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_directory/member_create_form.pt	(revision 1906)
+++ WAeUP_SRP/trunk/skins/waeup_directory/member_create_form.pt	(revision 1917)
@@ -5,19 +5,22 @@
   "/>
 <metal:block use-macro="here/main_template/macros/master">
+
+  <metal:block fill-slot="action_slot" 
+               tal:define="actions python:context.getMembersDirectoryActions('create')">   
+     <span metal:use-macro="here/member_view/macros/members_actions" />
+  </metal:block>
   <metal:block fill-slot="main" tal:define="
-  actions python:context.getMembersDirectoryActions('create');
-  dummy dir/checkCreateEntryAllowed;
-  validate python: request.has_key('member_create_form');
-  create_request python: validate and request or nothing;
-  res python: dir.renderCreateEntryDetailed(
-  validate=validate, request=create_request,
-  created_callback='member_created');
-  global rendered_main python: res[0];
-  rendered_ok python: res[1];
-  ds python: res[2];
-  global portal_status_message python: validate and (rendered_ok and 
-  'psm_content_changed' or 'psm_content_error') or '';"
-  >
-    <span metal:use-macro="here/member_view/macros/members_actions" />
+          dummy dir/checkCreateEntryAllowed;
+          validate python: request.has_key('member_create_form');
+          create_request python: validate and request or nothing;
+          res python: dir.renderCreateEntryDetailed(
+          validate=validate, request=create_request,
+          created_callback='member_created');
+          global rendered_main python: res[0];
+          rendered_ok python: res[1];
+          ds python: res[2];
+          global portal_status_message python: validate and (rendered_ok and 
+          'psm_content_changed' or 'psm_content_error') or '';"
+          >
     <h3>
       Create Member     
Index: WAeUP_SRP/trunk/skins/waeup_directory/member_edit_form.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_directory/member_edit_form.pt	(revision 1906)
+++ WAeUP_SRP/trunk/skins/waeup_directory/member_edit_form.pt	(revision 1917)
@@ -6,20 +6,22 @@
   "/>
 <metal:block use-macro="here/main_template/macros/master">
+  <metal:block fill-slot="action_slot" 
+               tal:define="actions python:context.getMembersDirectoryActions('edit')">   
+     <span metal:use-macro="here/member_view/macros/members_actions" />
+  </metal:block>
   <metal:block fill-slot="main" tal:define="
-  actions python:context.getMembersDirectoryActions('edit');
-  title_field dir/title_field;
-  validate python: request.has_key('member_edit_form');
-  edit_request python: validate and request or nothing;
-  res python: dir.renderEditEntryDetailed(id, request=edit_request);
-  global rendered_main python: res[0];
-  rendered_ok python: res[1];
-  ds python: res[2];
-  global title ds/?title_field|id;
-  portal_status_message request/portal_status_message|nothing;
-  global portal_status_message python: portal_status_message or (validate 
-  and (rendered_ok and 'psm_content_changed' or 'psm_content_error')) 
-  or '';"
-  >
-    <span metal:use-macro="here/member_view/macros/members_actions" />
+          title_field dir/title_field;
+          validate python: request.has_key('member_edit_form');
+          edit_request python: validate and request or nothing;
+          res python: dir.renderEditEntryDetailed(id, request=edit_request);
+          global rendered_main python: res[0];
+          rendered_ok python: res[1];
+          ds python: res[2];
+          global title ds/?title_field|id;
+          portal_status_message request/portal_status_message|nothing;
+          global portal_status_message python: portal_status_message or (validate 
+          and (rendered_ok and 'psm_content_changed' or 'psm_content_error')) 
+          or '';"
+          >
     <h3>
       <span tal:content="ds/fullname" />     
Index: WAeUP_SRP/trunk/skins/waeup_directory/member_view.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_directory/member_view.pt	(revision 1906)
+++ WAeUP_SRP/trunk/skins/waeup_directory/member_view.pt	(revision 1917)
@@ -6,30 +6,33 @@
   "/>
   <metal:block use-macro="here/main_template/macros/master">
+
+  <metal:block fill-slot="action_slot" tal:define="
+                        actions python:context.getMembersDirectoryActions('view')">   
+  <metal:block define-macro="members_actions">
+  <span class="fontColordefaultfontcolors fontShapeaverage cpsskinsHBox body" >
+    <span tal:repeat="action actions">
+      <a tal:define="icon_tag action/icon_tag"
+         tal:attributes="href action/url;
+         class python:icon_tag and 'noicon' or None"
+         >
+        <tal:block condition="python:icon_tag"
+                   content="structure icon_tag"/>
+        <tal:block condition="python:not icon_tag">
+          <img tal:attributes="src
+          string:${base_url}noicon.png;
+          alt action/title" 
+          />
+        </tal:block>
+        <tal:block i18n:translate="" content="action/title" />
+      </a>
+    </span>
+  </span>
+  </metal:block>
+  </metal:block>
+
   <metal:block fill-slot="main" tal:define="
-  actions python:context.getMembersDirectoryActions('view');
-  res python: dir.renderEntryDetailed(id);
-  global rendered_main python: res[0];
-  ds python: res[1];
-  global title ds/?title_field|id;"
-  >
-    <div class="fontColordefaultfontcolors fontShapeaverage cpsskinsHBox body" 
-         metal:define-macro="members_actions">
-      <span tal:repeat="action actions">
-        <a tal:define="icon_tag action/icon_tag"
-           tal:attributes="href action/url;
-           class python:icon_tag and 'noicon' or None"
-           >
-          <tal:block condition="python:icon_tag"
-                     content="structure icon_tag"/>
-          <tal:block condition="python:not icon_tag">
-            <img tal:attributes="src
-            string:${base_url}noicon.png;
-            alt action/title" 
-            />
-          </tal:block>
-          <tal:block i18n:translate="" content="action/title" />
-        </a>
-      </span>
-    </div>
+         res python: dir.renderEntryDetailed(id);
+         global rendered_main python: res[0];
+         ds python: res[1];">
     <h3>
       <span tal:content="ds/fullname" />     
Index: WAeUP_SRP/trunk/skins/waeup_directory/search_members_form.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_directory/search_members_form.pt	(revision 1906)
+++ WAeUP_SRP/trunk/skins/waeup_directory/search_members_form.pt	(revision 1917)
@@ -5,17 +5,17 @@
   "/>
   <metal:block use-macro="here/main_template/macros/master" >
-  <metal:block fill-slot="header"/>
+  <metal:block fill-slot="action_slot" 
+               tal:define="actions python:context.getMembersDirectoryActions('search')">   
+     <span metal:use-macro="here/member_view/macros/members_actions" />
+  </metal:block>
   <metal:block fill-slot="main" tal:define="
-  actions python:context.getMembersDirectoryActions('search');
-  validate python: request.has_key('cpsdirectory_search_button');
-  res python: dir.renderSearchDetailed(request=request, validate=validate,
-  callback='search_members');
-  global rendered_main python: res[0];
-  global ok python: res[1];
-  ds python: res[2];
-  global portal_status_message python: (validate and not ok and
-  'psm_content_error') or request.form.get('portal_status_message', '');"
-  >
-    <span metal:use-macro="here/member_view/macros/members_actions" />
+          validate python: request.has_key('cpsdirectory_search_button');
+          res python: dir.renderSearchDetailed(request=request, validate=validate,
+          callback='search_members');
+          global rendered_main python: res[0];
+          global ok python: res[1];
+          ds python: res[2];
+          global portal_status_message python: (validate and not ok and
+          'psm_content_error') or request.form.get('portal_status_message', '');">
     <h3>
       Search Member Section
