Changeset 1917


Ignore:
Timestamp:
17 Jun 2007, 19:54:54 (18 years ago)
Author:
Henrik Bettermann
Message:

ticket #213

Location:
WAeUP_SRP/trunk
Files:
2 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • WAeUP_SRP/trunk/profiles/default/actions.xml

    r1912 r1917  
    112112  </action>
    113113  <action title="  " action_id="dummy" category="student_object"
    114      condition_expr="" url_expr="" visible="True"/>
     114     condition_expr="" url_expr="" visible="False"/>
    115115  <action title="  " action_id="dummy2" category="object" condition_expr=""
    116      url_expr="" visible="True"/>
     116     url_expr="" visible="False"/>
    117117  <action title="Apply for PUME" action_id="apply_admission"
    118118     category="student" condition_expr="not:member"
  • WAeUP_SRP/trunk/skins/waeup_design/main_template.pt

    r1796 r1917  
    134134                <tal:block repeat="portlet python:ptool.getPortlets(context=context, slot=object_tabs)"
    135135                           tal:content="structure python:portlet.render_cache(context_obj=context, portlet=portlet, boxedit=None)" />
     136            <metal:block define-slot="action_slot" />
    136137            </div>
    137138          </td>
  • WAeUP_SRP/trunk/skins/waeup_directory/member_create_form.pt

    r1901 r1917  
    55  "/>
    66<metal:block use-macro="here/main_template/macros/master">
     7
     8  <metal:block fill-slot="action_slot"
     9               tal:define="actions python:context.getMembersDirectoryActions('create')">   
     10     <span metal:use-macro="here/member_view/macros/members_actions" />
     11  </metal:block>
    712  <metal:block fill-slot="main" tal:define="
    8   actions python:context.getMembersDirectoryActions('create');
    9   dummy dir/checkCreateEntryAllowed;
    10   validate python: request.has_key('member_create_form');
    11   create_request python: validate and request or nothing;
    12   res python: dir.renderCreateEntryDetailed(
    13   validate=validate, request=create_request,
    14   created_callback='member_created');
    15   global rendered_main python: res[0];
    16   rendered_ok python: res[1];
    17   ds python: res[2];
    18   global portal_status_message python: validate and (rendered_ok and
    19   'psm_content_changed' or 'psm_content_error') or '';"
    20   >
    21     <span metal:use-macro="here/member_view/macros/members_actions" />
     13          dummy dir/checkCreateEntryAllowed;
     14          validate python: request.has_key('member_create_form');
     15          create_request python: validate and request or nothing;
     16          res python: dir.renderCreateEntryDetailed(
     17          validate=validate, request=create_request,
     18          created_callback='member_created');
     19          global rendered_main python: res[0];
     20          rendered_ok python: res[1];
     21          ds python: res[2];
     22          global portal_status_message python: validate and (rendered_ok and
     23          'psm_content_changed' or 'psm_content_error') or '';"
     24          >
    2225    <h3>
    2326      Create Member     
  • WAeUP_SRP/trunk/skins/waeup_directory/member_edit_form.pt

    r1901 r1917  
    66  "/>
    77<metal:block use-macro="here/main_template/macros/master">
     8  <metal:block fill-slot="action_slot"
     9               tal:define="actions python:context.getMembersDirectoryActions('edit')">   
     10     <span metal:use-macro="here/member_view/macros/members_actions" />
     11  </metal:block>
    812  <metal:block fill-slot="main" tal:define="
    9   actions python:context.getMembersDirectoryActions('edit');
    10   title_field dir/title_field;
    11   validate python: request.has_key('member_edit_form');
    12   edit_request python: validate and request or nothing;
    13   res python: dir.renderEditEntryDetailed(id, request=edit_request);
    14   global rendered_main python: res[0];
    15   rendered_ok python: res[1];
    16   ds python: res[2];
    17   global title ds/?title_field|id;
    18   portal_status_message request/portal_status_message|nothing;
    19   global portal_status_message python: portal_status_message or (validate
    20   and (rendered_ok and 'psm_content_changed' or 'psm_content_error'))
    21   or '';"
    22   >
    23     <span metal:use-macro="here/member_view/macros/members_actions" />
     13          title_field dir/title_field;
     14          validate python: request.has_key('member_edit_form');
     15          edit_request python: validate and request or nothing;
     16          res python: dir.renderEditEntryDetailed(id, request=edit_request);
     17          global rendered_main python: res[0];
     18          rendered_ok python: res[1];
     19          ds python: res[2];
     20          global title ds/?title_field|id;
     21          portal_status_message request/portal_status_message|nothing;
     22          global portal_status_message python: portal_status_message or (validate
     23          and (rendered_ok and 'psm_content_changed' or 'psm_content_error'))
     24          or '';"
     25          >
    2426    <h3>
    2527      <span tal:content="ds/fullname" />     
  • WAeUP_SRP/trunk/skins/waeup_directory/member_view.pt

    r1901 r1917  
    66  "/>
    77  <metal:block use-macro="here/main_template/macros/master">
     8
     9  <metal:block fill-slot="action_slot" tal:define="
     10                        actions python:context.getMembersDirectoryActions('view')">   
     11  <metal:block define-macro="members_actions">
     12  <span class="fontColordefaultfontcolors fontShapeaverage cpsskinsHBox body" >
     13    <span tal:repeat="action actions">
     14      <a tal:define="icon_tag action/icon_tag"
     15         tal:attributes="href action/url;
     16         class python:icon_tag and 'noicon' or None"
     17         >
     18        <tal:block condition="python:icon_tag"
     19                   content="structure icon_tag"/>
     20        <tal:block condition="python:not icon_tag">
     21          <img tal:attributes="src
     22          string:${base_url}noicon.png;
     23          alt action/title"
     24          />
     25        </tal:block>
     26        <tal:block i18n:translate="" content="action/title" />
     27      </a>
     28    </span>
     29  </span>
     30  </metal:block>
     31  </metal:block>
     32
    833  <metal:block fill-slot="main" tal:define="
    9   actions python:context.getMembersDirectoryActions('view');
    10   res python: dir.renderEntryDetailed(id);
    11   global rendered_main python: res[0];
    12   ds python: res[1];
    13   global title ds/?title_field|id;"
    14   >
    15     <div class="fontColordefaultfontcolors fontShapeaverage cpsskinsHBox body"
    16          metal:define-macro="members_actions">
    17       <span tal:repeat="action actions">
    18         <a tal:define="icon_tag action/icon_tag"
    19            tal:attributes="href action/url;
    20            class python:icon_tag and 'noicon' or None"
    21            >
    22           <tal:block condition="python:icon_tag"
    23                      content="structure icon_tag"/>
    24           <tal:block condition="python:not icon_tag">
    25             <img tal:attributes="src
    26             string:${base_url}noicon.png;
    27             alt action/title"
    28             />
    29           </tal:block>
    30           <tal:block i18n:translate="" content="action/title" />
    31         </a>
    32       </span>
    33     </div>
     34         res python: dir.renderEntryDetailed(id);
     35         global rendered_main python: res[0];
     36         ds python: res[1];">
    3437    <h3>
    3538      <span tal:content="ds/fullname" />     
  • WAeUP_SRP/trunk/skins/waeup_directory/search_members_form.pt

    r1901 r1917  
    55  "/>
    66  <metal:block use-macro="here/main_template/macros/master" >
    7   <metal:block fill-slot="header"/>
     7  <metal:block fill-slot="action_slot"
     8               tal:define="actions python:context.getMembersDirectoryActions('search')">   
     9     <span metal:use-macro="here/member_view/macros/members_actions" />
     10  </metal:block>
    811  <metal:block fill-slot="main" tal:define="
    9   actions python:context.getMembersDirectoryActions('search');
    10   validate python: request.has_key('cpsdirectory_search_button');
    11   res python: dir.renderSearchDetailed(request=request, validate=validate,
    12   callback='search_members');
    13   global rendered_main python: res[0];
    14   global ok python: res[1];
    15   ds python: res[2];
    16   global portal_status_message python: (validate and not ok and
    17   'psm_content_error') or request.form.get('portal_status_message', '');"
    18   >
    19     <span metal:use-macro="here/member_view/macros/members_actions" />
     12          validate python: request.has_key('cpsdirectory_search_button');
     13          res python: dir.renderSearchDetailed(request=request, validate=validate,
     14          callback='search_members');
     15          global rendered_main python: res[0];
     16          global ok python: res[1];
     17          ds python: res[2];
     18          global portal_status_message python: (validate and not ok and
     19          'psm_content_error') or request.form.get('portal_status_message', '');">
    2020    <h3>
    2121      Search Member Section
Note: See TracChangeset for help on using the changeset viewer.