Index: /WAeUP_SRP/trunk/skins/waeup_directory/layout_waeup_dir_edit.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_directory/layout_waeup_dir_edit.pt	(revision 922)
+++ /WAeUP_SRP/trunk/skins/waeup_directory/layout_waeup_dir_edit.pt	(revision 923)
@@ -4,6 +4,6 @@
   ds options/datastructure;
   creation creation|nothing;
-  formaction python: test(creation, 'cpsdirectory_entry_create_form',
-                                    'cpsdirectory_entry_edit_form');
+  formaction python: test(creation, 'member_create_form',
+                                    'member_edit_form');
   ">
 <div class="group">
Index: /WAeUP_SRP/trunk/skins/waeup_directory/members_edit_form.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_directory/members_edit_form.pt	(revision 923)
+++ /WAeUP_SRP/trunk/skins/waeup_directory/members_edit_form.pt	(revision 923)
@@ -0,0 +1,43 @@
+<tal:block define="
+  global id request/id;
+  global dirname string:members;
+  global dir here/portal_directories/?dirname;
+  global dirtitle dir/title_or_id;
+  "/>
+<metal:block use-macro="here/main_template/macros/master">
+  <metal:block fill-slot="style_slot">
+    <tal:block define="dummy
+      python:context.setDirectoryBreadCrumbs(request, dirname, dir, dirtitle)"/>
+    <tal:block define="global actions
+      python:context.getDirectoryActions(actions, dirname, dir, 'edit', id)"/>
+
+    <link rel="Stylesheet" type="text/css" href=""
+      tal:attributes="href string:${base_url}document.css" />
+  </metal:block>
+
+  <metal:block fill-slot="header">
+    <h1>
+      <span i18n:translate="" tal:content="dirtitle" />:
+      <span i18n:translate="cpsdir_label_edit_entry">Edit entry</span>
+    </h1>
+    <div class="description">
+    </div>
+  </metal:block>
+
+  <metal:block fill-slot="main" tal:define="
+      title_field dir/title_field;
+      validate python: request.has_key('cpsdirectory_entry_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 '';">
+    <div tal:replace="structure rendered_main">Rendered main...</div>
+  </metal:block>
+
+</metal:block>
Index: /WAeUP_SRP/trunk/skins/waeup_directory/search_members_results.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_directory/search_members_results.pt	(revision 922)
+++ /WAeUP_SRP/trunk/skins/waeup_directory/search_members_results.pt	(revision 923)
@@ -50,8 +50,9 @@
                       onChange="location.href='/'+this.options[this.selectedIndex].value"
                       tal:attributes="onChange string:location.href='${context/portal_url}'+this.options[this.selectedIndex].value">
+                <option value="/search_members_form">Goto</option>
                 <option tal:repeat="role roles" value="." tal:content="role/getId"
                         tal:attributes="value string:${role/getPath}/folder_localrole_form"></option>
               </select>
-              <input class="form-element" type="submit" name="submit" value=" view " />
+              <input tal:condition="python:0" class="form-element" type="submit" name="submit" value=" view " />
             </form>
             <span tal:condition="python:0" tal:repeat="role roles"> 
