Changeset 953 for WAeUP_SRP/trunk/skins

Timestamp:

27 Nov 2006, 22:03:04 (18 years ago)

Author:

Henrik Bettermann

Message:

member directory acl permission, schema and layouts changed
not yet optimized

Location:

WAeUP_SRP/trunk/skins/waeup_directory

Files:

• getWAeUPDirectoryActions.py (added)
• layout_waeup_dir_edit.pt (modified) (1 diff)
• member_create_form.pt (added)
• member_created.py (added)
• member_delete.py (added)
• member_edit_form.pt (added)
• member_view.pt (modified) (1 diff)
• members_edit_form.pt (deleted)
• search_members.py (modified) (1 diff)
• search_members_form.pt (modified) (2 diffs)
• search_members_results.pt (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_directory/layout_waeup_dir_edit.pt

@@ -67 +67 @@
     <tal:block condition="has_edits">
     <input type="submit" class="standalone"
-      name="cpsdirectory_entry_edit_form:method"
+      name="member_edit_form:method"
       value="button_change" i18n:attributes="value"
       tal:condition="not:creation" />
     <input type="submit" class="standalone"
-      name="cpsdirectory_entry_create_form:method"
+      name="member_create_form:method"
       value="button_create" i18n:attributes="value"
       tal:condition="creation" />

WAeUP_SRP/trunk/skins/waeup_directory/member_view.pt

@@ -6 +6 @@
   "/>
 <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, 'view', id)"/>
-
+      python:context.getWAeUPDirectoryActions(actions, dirname, dir, 'view', 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_view_entry">view entry</span>
-    </h1>
-    <div class="description">
-    </div>
-  </metal:block>
+
 
   <metal:block fill-slot="main" tal:define="
-    title_field dir/title_field;
+    
     res python: dir.renderEntryDetailed(id);
     global rendered_main python: res[0];
     ds python: res[1];
     global title ds/?title_field|id;">
+    
+    <h3>
+      <span tal:content="ds/fullname" />     
+    </h3>
+
 
     <div tal:replace="structure rendered_main">Rendered main...</div>

WAeUP_SRP/trunk/skins/waeup_directory/search_members.py

@@ -56 +56 @@
     results = dir.searchEntries(return_fields=return_fields, **mapping)
 except SearchSizeLimitExceeded, e:
-    rendered = dir.cpsdirectory_entry_search_errors(exception=e)
+    rendered = dir.member_search_errors(exception=e)
     return rendered, 'results'
 

WAeUP_SRP/trunk/skins/waeup_directory/search_members_form.pt

@@ -9 +9 @@
       python:context.setDirectoryBreadCrumbs(request, dirname, dir, dirtitle)"/>
     <tal:block define="global actions
-      python:context.getDirectoryActions(actions, dirname, dir, 'search')"/>
+      python:context.getWAeUPDirectoryActions(actions, dirname, dir, 'search')"/>
 
     <link rel="Stylesheet" type="text/css" href=""
@@ -27 +27 @@
     global portal_status_message python: (validate and not ok and
       'psm_content_error') or request.form.get('portal_status_message', '');">
-    <h1>
-      <span i18n:translate="" tal:content="dirtitle" />:
-      <span tal:condition="python: ok == 'results'"
-        i18n:translate="">cpsdir_label_results
-      </span>
-      <span tal:condition="python: ok != 'results'"
-         i18n:translate="cpsdir_label_search_entry">search an entry
-      </span>
-    </h1>
-
+    <h3>
+      Search Member Section
+    </h3>
+    <br />
     <div tal:replace="structure rendered_main">Rendered main...</div>
   </metal:block>

WAeUP_SRP/trunk/skins/waeup_directory/search_members_results.pt

@@ -16 +16 @@
   ">
   <div style="padding-left: 1.5em">
-    <form action="cpsdirectory_entry_delete" method="post">
+    <form action="member_delete" method="post">
       <table tal:condition="results" summary="search result list">
         <tr>