Changeset 844


Ignore:
Timestamp:
11 Nov 2006, 21:17:26 (18 years ago)
Author:
Henrik Bettermann
Message:

clearance edit form for mamager added
ticket 40 resolved
some text and layout changes
cpsdocument_edit_form only for managers allowed

Location:
WAeUP_SRP/trunk
Files:
2 added
12 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/profiles/default/layouts/student_clearance.xml

    r837 r844  
    44 <property name="layout_edit_method"></property>
    55 <property name="layout_view_method"></property>
    6  <property name="style_prefix">layout_waeup_</property>
     6 <property name="style_prefix">layout_clearance_</property>
    77 <property name="flexible_widgets"/>
    88 <property name="validate_values_expr"></property>
    … …  
    248248  <property name="label_edit">Entry Date</property>
    249249  <property name="readonly_layout_modes">
    250    <element value="edit"/>
    251250  </property>
    252251  <property name="hidden_layout_modes">
    … …  
    263262  <property name="label_edit">Entry Session</property>
    264263  <property name="readonly_layout_modes">
    265    <element value="edit"/>
    266264  </property>
    267265  <property name="hidden_layout_modes">
    … …  
    557555  <property name="label_edit">Matriculation Number</property>
    558556  <property name="readonly_layout_modes">
    559    <element value="edit"/>
    560557  </property>
    561558  <property name="hidden_layout_modes">

  • WAeUP_SRP/trunk/profiles/default/types/StudentAccommodation.xml

    r839 r844  
    3434 </action>
    3535 <action title="action_edit" action_id="edit" category="object"
    36     condition_expr="" url_expr="string:${object_url}/cpsdocument_edit"
     36    condition_expr="" url_expr="string:${object_url}/cpsdocument_edit_form"
    3737    visible="True">
    3838  <permission value="Modify portal content"/>

  • WAeUP_SRP/trunk/profiles/default/types/StudentApplication.xml

    r839 r844  
    3434 </action>
    3535 <action title="action_edit" action_id="edit" category="object"
    36     condition_expr="" url_expr="string:${object_url}/cpsdocument_edit"
     36    condition_expr="" url_expr="string:${object_url}/cpsdocument_edit_form"
    3737    visible="True">
    3838  <permission value="Modify portal content"/>

  • WAeUP_SRP/trunk/profiles/default/types/StudentClearance.xml

    r840 r844  
    3838 <action title="action_edit" action_id="edit" category="object"
    3939    condition_expr=""
    40     url_expr="string:${object_url}/cpsdocument_edit_form"
     40    url_expr="string:${object_url}/clearance_edit_form_manager"
    4141    visible="True">
    4242  <permission value="Modify portal content"/>

  • WAeUP_SRP/trunk/profiles/default/types/StudentPume.xml

    r839 r844  
    3434 </action>
    3535 <action title="action_edit" action_id="edit" category="object"
    36     condition_expr="" url_expr="string:${object_url}/cpsdocument_edit"
     36    condition_expr="" url_expr="string:${object_url}/cpsdocument_edit_form"
    3737    visible="True">
    3838  <permission value="Modify portal content"/>

  • WAeUP_SRP/trunk/skins/waeup_academics/getAcademicsInfo.py

    r805 r844  
    1 ## Script (Python) "cpsdocument_edit"
     1## Script (Python) "getAcademicsInfo"
    22##bind container=container
    33##bind context=context

  • WAeUP_SRP/trunk/skins/waeup_custom/cpsdocument_edit_form.pt

    r842 r844  
    11<tal:block define="
     2    info context/getStudentInfo;
    23    rendered_main python:context.getContent().render(layout_mode='edit',
    34           cluster=None,
    … …  
    910    edition python:True;
    1011    metadata metadata|nothing;
     12    is_manager info/is_manager|nothing;
    1113    ">
    1214<metal:block define-macro="edit_form">
    … …  
    6769 
    6870  <metal:block fill-slot="header">
     71    <span tal:condition="not: is_manager">
     72        <metal:block use-macro="here/error_not_found/macros/not_found" />
     73    </span>
     74    <span tal:condition="is_manager">
    6975    <h3 tal:condition="creation" i18n:translate="">
    7076      Create a document of type
    … …  
    9197    <br />       
    9298    </span>
     99    </span>
    93100  </metal:block>
    94101 
    95  
    96  
    97   <metal:block fill-slot="main">
     102 
     103  <metal:block fill-slot="main" tal:condition="is_manager">
    98104    <form action="ACTION" method="post" id="editForm"
    99105          enctype="multipart/form-data" class="workflow"

  • WAeUP_SRP/trunk/skins/waeup_default/isManager.py

    r805 r844  
    1 ## Script (Python) "cpsdocument_edit"
     1## Script (Python) "isManager"
    22##bind container=container
    33##bind context=context

  • WAeUP_SRP/trunk/skins/waeup_student/clearance_edit.py

    r832 r844  
    5656        args = getFormUidUrlArg(REQUEST)
    5757        psm = "Please correct Your errors."
    58 args['portal_status_message'] = psm
    59 url = clear.absolute_url() + action + '?' + urlencode(args)
    60 REQUEST.RESPONSE.redirect(url)
     58        args['portal_status_message'] = psm
     59if args:
     60  url = clear.absolute_url() + action + '?' + urlencode(args)
     61else:
     62  url = clear.absolute_url() + action
     63REQUEST.RESPONSE.redirect(url)

  • WAeUP_SRP/trunk/skins/waeup_student/clearance_edit_form.pt

    r832 r844  
    1414<metal:block define-macro="edit_form">
    1515<metal:block use-macro="here/waeup_content_master/macros/master">
    16   <metal:block fill-slot="style_slot">
    17     <link rel="Stylesheet" type="text/css" href=""
    18       tal:attributes="href string:${base_url}document.css" />
    19 
    20     <metal:block define-macro="widgets_javascript">
    21     <!-- XXX this has to move to CPSSchemas -->
    22     <style type="text/css"
    23       tal:content="string:@import url(${base_url}calendar-win2k-1.css);"></style>
    24     <script type="text/javascript" src="calendar.js"
    25       tal:attributes="src string:${base_url}calendar.js"></script>
    26     <script type="text/javascript" src="lang/calendar-en.js"
    27       tal:define="local cpsmcat/getSelectedLanguage"
    28       tal:attributes="src string:${base_url}lang/calendar-${local}.js"></script>
    29     <script type="text/javascript" src="calendar-setup.js"
    30       tal:attributes="src string:${base_url}calendar-setup.js"></script>
    31     <script type="text/javascript" src="prototype.js"
    32       tal:attributes="src string:${base_url}prototype.js"></script>
    33     <script type="text/javascript" src="effects.js"
    34       tal:attributes="src string:${base_url}effects.js"></script>
    35     <script type="text/javascript" src="controls.js"
    36       tal:attributes="src string:${base_url}controls.js"></script>
    37     <script type="text/javascript" src="cpsdocument.js"
    38       tal:attributes="src string:${base_url}cpsdocument.js"></script>
    39    </metal:block>
    40   </metal:block>
    4116
    4217  <metal:block fill-slot="header">

  • WAeUP_SRP/trunk/skins/waeup_student/clearance_slip.pt

    r837 r844  
    77      <span tal:condition="info">
    88           
    9         <h3>My Clearance/Eligibility Record</h3>
     9        <h3>Clearance/Eligibility Record</h3>
    1010        <br />
    1111        <span tal:omit-tag=""

  • WAeUP_SRP/trunk/skins/waeup_student/layout_clearance_view.pt

    r843 r844  
    1919            <tr>                         
    2020            <tal:block condition="widget/label">
    21             <td valign="top" nowrap>
     21            <td width="180px" valign="top" nowrap>
    2222              <span i18n:translate="" tal:condition="widget/is_i18n">
    2323                  <span tal:content="widget/label" />:</span>
Note: See TracChangeset for help on using the changeset viewer.