Changeset 1737


Ignore:
Timestamp:
4 May 2007, 19:38:23 (18 years ago)
Author:
Henrik Bettermann
Message:

merging with CPSSkinsless branch

In ZMI:

  • delete all portlets in .cps_portlets
  • delete all portlets in portal_cpsportlets
  • import Portlet Tool, Skins Tool and Themes Tool
  • optionally: - delete all themes in portal_themes and delete all method themes in portal_themes
Location:
WAeUP_SRP/trunk
Files:
83 added
87 deleted
33 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/__init__.py

    r1350 r1737  
    2323# Only for CPS 3.4.1. In 3.4.2 and later this should be fixed.
    2424import PatchCPSDefaultImportExport
     25import PatchRenderActionIcon
    2526import Products.WAeUP_SRP.WAeUPPermissions
    2627import WAeUPTool

  • WAeUP_SRP/trunk/profiles/default/cps_portlets.xml

    r952 r1737  
    11<?xml version="1.0"?>
    22<object name=".cps_portlets" meta_type="CPS Placeful Portlets Container">
    3  <object name="portlet_122878951" meta_type="CPS Portlet"
     3 <object name="portlet_actions_staff" meta_type="CPS Portlet"
    44    portal_type="Actions Portlet"/>
    5  <object name="portlet_122878952" meta_type="CPS Portlet"
     5 <object name="portlet_actions_students" meta_type="CPS Portlet"
    66    portal_type="Actions Portlet"/>
    7  <object name="portlet_122878953" meta_type="CPS Portlet"
    8     portal_type="Custom Portlet"/>
    9  <object name="portlet_12306143" meta_type="CPS Portlet"
    10     portal_type="Actions Portlet"/>
    11  <object name="portlet_161679404" meta_type="CPS Portlet"
    12     portal_type="Add Item Portlet"/>
    13  <object name="portlet_161679405" meta_type="CPS Portlet"
    14     portal_type="Navigation Portlet"/>
    15  <object name="portlet_174592583" meta_type="CPS Portlet"
    16     portal_type="Add Item Portlet"/>
    17  <object name="portlet_174592585" meta_type="CPS Portlet"
    18     portal_type="Actions Portlet"/>
    19  <object name="portlet_174592586" meta_type="CPS Portlet"
    20     portal_type="Main Content Portlet"/>
    21  <object name="portlet_174592587" meta_type="CPS Portlet"
    22     portal_type="Add Item Portlet"/>
    23  <object name="portlet_174592588" meta_type="CPS Portlet"
    24     portal_type="Add Item Portlet"/>
    25  <object name="portlet_174592589" meta_type="CPS Portlet"
    26     portal_type="Actions Portlet"/>
    27  <object name="portlet_174592590" meta_type="CPS Portlet"
    28     portal_type="Actions Portlet"/>
    29  <object name="portlet_174592591" meta_type="CPS Portlet"
    30     portal_type="Text Portlet"/>
    31  <object name="portlet_174592592" meta_type="CPS Portlet"
    32     portal_type="Text Portlet"/>
    33  <object name="portlet_174592594" meta_type="CPS Portlet"
    34     portal_type="Text Portlet"/>
    35  <object name="portlet_234261018" meta_type="CPS Portlet"
    36     portal_type="Actions Portlet"/>
    37  <object name="portlet_252988174" meta_type="CPS Portlet"
    38     portal_type="Custom Portlet"/>
    39  <object name="portlet_317036513" meta_type="CPS Portlet"
    40     portal_type="Actions Portlet"/>
    41  <object name="portlet_317036514" meta_type="CPS Portlet"
    42     portal_type="Actions Portlet"/>
    43  <object name="portlet_317036515" meta_type="CPS Portlet"
    44     portal_type="Main Content Portlet"/>
    45  <object name="portlet_317036516" meta_type="CPS Portlet"
    46     portal_type="Actions Portlet"/>
    47  <object name="portlet_341785586" meta_type="CPS Portlet"
    48     portal_type="Main Content Portlet"/>
    49  <object name="portlet_368450196" meta_type="CPS Portlet"
    50     portal_type="Custom Portlet"/>
    51  <object name="portlet_368450197" meta_type="CPS Portlet"
    52     portal_type="Text Portlet"/>
    53  <object name="portlet_464817518" meta_type="CPS Portlet"
    54     portal_type="Actions Portlet"/>
    55  <object name="portlet_464817519" meta_type="CPS Portlet"
    56     portal_type="Custom Portlet"/>
    57  <object name="portlet_464817520" meta_type="CPS Portlet"
    58     portal_type="Main Content Portlet"/>
    59  <object name="portlet_506989420" meta_type="CPS Portlet"
    60     portal_type="Actions Portlet"/>
    61  <object name="portlet_563582796" meta_type="CPS Portlet"
    62     portal_type="Actions Portlet"/>
    63  <object name="portlet_57627398" meta_type="CPS Portlet"
    64     portal_type="Main Content Portlet"/>
    65  <object name="portlet_615085575" meta_type="CPS Portlet"
    66     portal_type="Search Portlet"/>
    67  <object name="portlet_615085576" meta_type="CPS Portlet"
    68     portal_type="Search Portlet"/>
    69  <object name="portlet_651968284" meta_type="CPS Portlet"
    70     portal_type="Main Content Portlet"/>
    71  <object name="portlet_688565662" meta_type="CPS Portlet"
    72     portal_type="Actions Portlet"/>
    73  <object name="portlet_728648475" meta_type="CPS Portlet"
    74     portal_type="Custom Portlet"/>
    75  <object name="portlet_778397188" meta_type="CPS Portlet"
    76     portal_type="Main Content Portlet"/>
    77  <object name="portlet_778397189" meta_type="CPS Portlet"
    78     portal_type="Breadcrumbs Portlet"/>
    79  <object name="portlet_778397191" meta_type="CPS Portlet"
    80     portal_type="Main Content Portlet"/>
    81  <object name="portlet_778397195" meta_type="CPS Portlet"
    82     portal_type="Actions Portlet"/>
    83  <object name="portlet_778397196" meta_type="CPS Portlet"
    84     portal_type="Actions Portlet"/>
    85  <object name="portlet_778397198" meta_type="CPS Portlet"
    86     portal_type="Actions Portlet"/>
    87  <object name="portlet_778397199" meta_type="CPS Portlet"
    88     portal_type="Text Portlet"/>
    89  <object name="portlet_778397201" meta_type="CPS Portlet"
    90     portal_type="Text Portlet"/>
    91  <object name="portlet_778397203" meta_type="CPS Portlet"
    92     portal_type="Add Item Portlet"/>
    93  <object name="portlet_778397204" meta_type="CPS Portlet"
    94     portal_type="Text Portlet"/>
    95  <object name="portlet_802892056" meta_type="CPS Portlet"
    96     portal_type="Text Portlet"/>
    97  <object name="portlet_851001221" meta_type="CPS Portlet"
    98     portal_type="Custom Portlet"/>
    99  <object name="portlet_882630613" meta_type="CPS Portlet"
    100     portal_type="Actions Portlet"/>
    101  <object name="portlet_916675861" meta_type="CPS Portlet"
    102     portal_type="Custom Portlet"/>
    103  <object name="portlet_916675862" meta_type="CPS Portlet"
    104     portal_type="Custom Portlet"/>
    105  <object name="portlet_951449960" meta_type="CPS Portlet"
    106     portal_type="Breadcrumbs Portlet"/>
    107  <object name="portlet_972599863" meta_type="CPS Portlet"
    108     portal_type="Text Portlet"/>
    109  <object name="portlet_975089837" meta_type="CPS Portlet"
    110     portal_type="Actions Portlet"/>
    111  <object name="portlet_accessibility" meta_type="CPS Portlet"
    112     portal_type="Custom Portlet"/>
    113  <object name="portlet_actions_header_sb" meta_type="CPS Portlet"
    114     portal_type="Actions Portlet"/>
    115  <object name="portlet_actions_object" meta_type="CPS Portlet"
    116     portal_type="Actions Portlet"/>
    117  <object name="portlet_actions_user" meta_type="CPS Portlet"
    118     portal_type="Actions Portlet"/>
    119  <object name="portlet_actions_user2" meta_type="CPS Portlet"
    120     portal_type="Custom Portlet"/>
    1217 <object name="portlet_breadcrumbs" meta_type="CPS Portlet"
    1228    portal_type="Breadcrumbs Portlet"/>
    1239 <object name="portlet_breadcrumbs2" meta_type="CPS Portlet"
    12410    portal_type="Breadcrumbs Portlet"/>
    125  <object name="portlet_conformance" meta_type="CPS Portlet"
     11 <object name="portlet_export_actions" meta_type="CPS Portlet"
     12    portal_type="Actions Portlet"/>
     13 <object name="portlet_global_actions" meta_type="CPS Portlet"
     14    portal_type="Actions Portlet"/>
     15 <object name="portlet_import_actions" meta_type="CPS Portlet"
     16    portal_type="Actions Portlet"/>
     17 <object name="portlet_navigation_staff" meta_type="CPS Portlet"
     18    portal_type="Actions Portlet"/>
     19 <object name="portlet_navigation_students" meta_type="CPS Portlet"
     20    portal_type="Actions Portlet"/>
     21 <object name="portlet_object_actions_staff" meta_type="CPS Portlet"
     22    portal_type="Actions Portlet"/>
     23 <object name="portlet_object_actions_students" meta_type="CPS Portlet"
     24    portal_type="Actions Portlet"/>
     25 <object name="portlet_registration_status" meta_type="CPS Portlet"
    12626    portal_type="Custom Portlet"/>
    127  <object name="portlet_conformance_statement" meta_type="CPS Portlet"
    128     portal_type="Custom Portlet"/>
    129  <object name="portlet_contactinfo" meta_type="CPS Portlet"
    130     portal_type="Custom Portlet"/>
    131  <object name="portlet_content_breaking_news" meta_type="CPS Portlet"
    132     portal_type="Content Portlet"/>
    133  <object name="portlet_copyright" meta_type="CPS Portlet"
    134     portal_type="Text Portlet"/>
    135  <object name="portlet_documents" meta_type="CPS Portlet"
    136     portal_type="Document Portlet"/>
    137  <object name="portlet_folderactions" meta_type="CPS Portlet"
    138     portal_type="Actions Portlet"/>
    139  <object name="portlet_foldercontents" meta_type="CPS Portlet"
    140     portal_type="Navigation Portlet"/>
    141  <object name="portlet_language" meta_type="CPS Portlet"
    142     portal_type="Language Portlet"/>
    143  <object name="portlet_latest_published" meta_type="CPS Portlet"
    144     portal_type="Content Portlet"/>
    145  <object name="portlet_main_content" meta_type="CPS Portlet"
    146     portal_type="Main Content Portlet"/>
    147  <object name="portlet_navigation_3tabs" meta_type="CPS Portlet"
    148     portal_type="Navigation Portlet"/>
    149  <object name="portlet_navigation_centertop" meta_type="CPS Portlet"
    150     portal_type="Navigation Portlet"/>
    151  <object name="portlet_navigation_front" meta_type="CPS Portlet"
    152     portal_type="Navigation Portlet"/>
    153  <object name="portlet_navigation_left" meta_type="CPS Portlet"
    154     portal_type="Navigation Portlet"/>
    155  <object name="portlet_navigation_members" meta_type="CPS Portlet"
    156     portal_type="Navigation Portlet"/>
    157  <object name="portlet_navigation_sections" meta_type="CPS Portlet"
    158     portal_type="Navigation Portlet"/>
    159  <object name="portlet_navigation_tabs" meta_type="CPS Portlet"
    160     portal_type="Navigation Portlet"/>
    161  <object name="portlet_navigation_workspaces" meta_type="CPS Portlet"
    162     portal_type="Navigation Portlet"/>
    163  <object name="portlet_objectactions" meta_type="CPS Portlet"
    164     portal_type="Actions Portlet"/>
    165  <object name="portlet_portalactions" meta_type="CPS Portlet"
    166     portal_type="Actions Portlet"/>
    16727 <object name="portlet_search" meta_type="CPS Portlet"
    16828    portal_type="Search Portlet"/>
    169  <object name="portlet_session" meta_type="CPS Portlet"
     29 <object name="portlet_search2" meta_type="CPS Portlet"
     30    portal_type="Search Portlet"/>
     31 <object name="portlet_search3" meta_type="CPS Portlet"
     32    portal_type="Search Portlet"/>
     33 <object name="portlet_session_info" meta_type="CPS Portlet"
    17034    portal_type="Custom Portlet"/>
    171  <object name="portlet_useractions" meta_type="CPS Portlet"
    172     portal_type="Actions Portlet"/>
    173  <object name="portlet_welcome" meta_type="CPS Portlet"
    174     portal_type="Text Portlet"/>
     35 <object name="portlet_workflow_status" meta_type="CPS Portlet"
     36    portal_type="Custom Portlet"/>
    17537</object>

  • WAeUP_SRP/trunk/profiles/default/skins.xml

    r1253 r1737  
    77 <object name="waeup_default" meta_type="Filesystem Directory View"
    88    directory="WAeUP_SRP/skins/waeup_default"/>
     9 <object name="waeup_design" meta_type="Filesystem Directory View"
     10    directory="WAeUP_SRP/skins/waeup_design"/>
    911 <object name="waeup_directory" meta_type="Filesystem Directory View"
    1012    directory="WAeUP_SRP/skins/waeup_directory"/>
    … …  
    3133  <layer name="waeup_accommodation" insert-after="waeup_custom"/>
    3234  <layer name="waeup_utilities" insert-after="waeup_custom"/> 
     35  <layer name="waeup_design" insert-after="waeup_custom"/>
     36  <layer name="CPSSkins" remove="" />
     37  <layer name="cpsskins_icons" remove="" />
     38  <layer name="cpsskins_cps3" remove="" />
     39  <layer name="cpsskins_cmf" remove="" />
     40
    3341 </skin-path>
    3442 <skin-path name="CPSSkins-macroless">
    … …  
    4250  <layer name="waeup_accommodation" insert-after="waeup_custom"/>
    4351  <layer name="waeup_utilities" insert-after="waeup_custom"/>
     52  <layer name="waeup_design" insert-after="waeup_custom"/>
     53  <layer name="CPSSkins" remove="" />
     54  <layer name="cpsskins_icons" remove="" />
     55  <layer name="cpsskins_cps3" remove="" />
     56  <layer name="cpsskins_cmf" remove="" />
    4457 </skin-path>
    4558</object>

  • WAeUP_SRP/trunk/profiles/default/themes.xml

    r1658 r1737  
    33 <property name="accesskey">*</property>
    44 <property name="debug_mode">True</property>
    5  <property name="method_themes">
    6   <element key="external_edit_form" value="WAeUP_Student+Slippage"/>
    7   <element key="external_clearance_edit_form" value="WAeUP_Student+Slippage"/>
    8   <element key="login_staff" value="WAeUP_Backoffice+Default"/>
    9   <element key="logged_out" value="WAeUP_Student+Default"/>
    10   <element key="index_html" value="WAeUP_Student+Default"/>
    11   <element key="application_slip" value="WAeUP_Student+Slippage"/>
    12   <element key="accommodation_slip" value="WAeUP_Student+Slippage"/>
    13   <element key="session_results_slip" value="WAeUP_Student+Slippage"/>
    14   <element key="pume_slip" value="WAeUP_Student+Slippage"/>
    15   <element key="entry_results_anon_slip" value="WAeUP_Student+Slippage"/>
    16   <element key="admission_slip" value="WAeUP_Student+Slippage"/>
    17   <element key="clearance_slip" value="WAeUP_Student+Slippage"/>
    18   <element key="inter_faculty_transfer_1" value="WAeUP_Student+Slippage"/>
    19   <element key="inter_faculty_transfer_2" value="WAeUP_Student+Slippage"/>
    20   <element key="inter_faculty_transfer_3" value="WAeUP_Student+Slippage"/>
    21   <element key="intra_faculty_transfer_1" value="WAeUP_Student+Slippage"/>
    22   <element key="intra_faculty_transfer_2" value="WAeUP_Student+Slippage"/>
    23   <element key="intra_faculty_transfer_3" value="WAeUP_Student+Slippage"/>
    24   <element key="payment_receipt" value="WAeUP_Student+Slippage"/>
    25   <element key="course_registration_slip" value="WAeUP_Student+Slippage"/>
    26   <element key="external_study_level_view" value="WAeUP_Student+Slippage"/>
    27   <element key="external_contact_student_form" value="WAeUP_Student+Slippage"/>
    28  </property>
    29  <object name="default" meta_type="Portal Theme"/>
    30  <object name="WAeUP_Student" meta_type="Portal Theme"/>
    31  <object name="WAeUP_Backoffice" meta_type="Portal Theme"/>
     5 <property name="method_themes"/>
    326</object>

  • WAeUP_SRP/trunk/skins/waeup_default/external_edit_form.pt

    r1028 r1737  
    1 <tal:block define="
    2     rendered_main python:context.getContent().render(layout_mode='edit',
     1<metal:defineblock tal:define="rendered_main python:context.getContent().render(layout_mode='edit',
    32           cluster=None,
    43           request=request,
    … …  
    98           is_allowed context/isSectionOfficer;
    109           creation python:False;
    11            metadata metadata|nothing;"
     10           metadata metadata|nothing;
     11           template here/slip_template/macros/master;"
    1212    >
    1313  <metal:block use-macro="context/waeup_edit_form/macros/edit_form" />
    14 </tal:block>
     14</metal:defineblock>

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

    r1077 r1737  
    2222       "SectionOfficer" in roles or\
    2323       "ClearanceOfficer" in roles or\
     24       "CourseAdviser" in roles or\
     25       "CourseAdvisers" in member.getGroups() or\
    2426       "ClearanceOfficers" in member.getGroups()

  • WAeUP_SRP/trunk/skins/waeup_default/waeup_edit_form.pt

    r1028 r1737  
    1 <tal:block define="
    2     rendered_main python:context.getContent().render(layout_mode='edit',
     1<metal:defineblock tal:define="rendered_main python:context.getContent().render(layout_mode='edit',
    32           cluster=None,
    43           request=request,
    … …  
    109           is_allowed context/isSectionOfficer;
    1110           metadata metadata|nothing;
     11           template here/waeup_content_master/macros/master;
    1212           ">
    1313<metal:block define-macro="edit_form">
    14 <metal:block use-macro="here/content_lib_master/macros/master">
     14<metal:block use-macro=template>
    1515 
    1616  <metal:block fill-slot="header">
    … …  
    9595</metal:block>
    9696</metal:block>
    97 </tal:block>
     97</metal:defineblock>

  • WAeUP_SRP/trunk/skins/waeup_epayment/payment_receipt.pt

    r1634 r1737  
    1 <metal:body use-macro="here/main_template/macros/master">
     1<metal:body use-macro="here/slip_template/macros/master">
    22    <metal:main fill-slot="main"
    33                tal:define="info context/getStudentBaseInfo;

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

    r1302 r1737  
    1 <metal:body use-macro="here/main_template/macros/master">
     1<metal:body use-macro="here/slip_template/macros/master">
    22    <metal:main fill-slot="main"
    33                tal:define="info_acco context/getAccommodationInfo;

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

    r1096 r1737  
    44  </span>
    55<metal:block tal:condition="info">
    6   <metal:body use-macro="here/main_template/macros/master">
     6  <metal:body use-macro="here/slip_template/macros/master">
    77    <metal:main fill-slot="main">
    88    <span tal:condition="not: info">

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

    r1292 r1737  
    1 <metal:body use-macro="here/main_template/macros/master">
     1<metal:body use-macro="here/slip_template/macros/master">
    22    <metal:main fill-slot="main"
    33                tal:define="info context/getApplicationInfo">

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

    r1275 r1737  
    1 <metal:block define-macro="clearance_edit_form">
    2  <metal:block use-macro="here/waeup_content_master/macros/master">
    3   <metal:header fill-slot="header"
    4            tal:define="
    5                is_student context/isStudent;
    6                is_staff context/isStaff;
    7                is_so context/isSectionOfficer;
    8                info context/getClearanceInfo;">
    9     <metal:block use-macro="here/clearance_edit_lib/macros/header" />
    10   </metal:header>
     1<metal:definetemplate tal:define="template here/main_template/macros/master">
     2<metal:definemacro define-macro="clearance_edit_form">
     3<metal:usemacro use-macro=template>
     4
    115  <metal:main fill-slot="main"
    126           tal:define="
    13                info context/getClearanceInfo;
     7               info context/getClearanceInfo;">
     8               
     9      <metal:block tal:condition="not: info">
     10        <span tal:content="here/illegal_view" />
     11      </metal:block>
     12      <metal:block tal:condition="info">
     13      <metal:block tal:define="               
    1414               is_so context/isSectionOfficer;
    1515               is_staff context/isStaff;
    … …  
    2828               form_action string:clearance_edit;
    2929               creation python:False;">
     30
     31    <!--  Administration -->
     32    <tal:block condition="python: not(is_staff or is_so or is_student)">
     33      <metal:block use-macro="here/error_not_found/macros/not_found" />
     34    </tal:block>
     35    <tal:block condition="is_staff">
     36      <h3>
     37        <span tal:condition="info">
     38          <span tal:content="info/student/Title" />:
     39        </span>
     40        <span tal:content="here/title_or_id" />
     41      </h3>
     42      <br />   
     43    </tal:block>
     44    <!-- Student -->
     45    <tal:block condition="python: is_student">
     46      <a href=""
     47         tal:attributes="href string:${here/academicsParent}">
     48        <img tal:attributes="src string:${here/portal_url}/arrow_up.gif"/>
     49        Up one level
     50      </a>
     51      <h3>Fill Your Clearance/Eligibility Form!</h3>
     52      <br />   
     53    </tal:block>
     54
    3055               
    3156    <form action="ACTION" method="post" id="editForm"
    … …  
    4772        ajax feedback
    4873      </div>
     74    </metal:block>
     75    </metal:block>         
    4976  </metal:main>
    50  </metal:block>
    51 </metal:block>
     77
     78</metal:usemacro>
     79</metal:definemacro>
     80</metal:definetemplate>

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

    r1105 r1737  
    11<!--  clearance_edit_lib -->
    22<!-- $Id$ -->
    3 <!--  header -->
    4 <metal:block define-macro="header">
    5   <!--  Administration -->
    6   <tal:block condition="python: not(is_staff or is_so or is_student)">
    7     <metal:block use-macro="here/error_not_found/macros/not_found" />
    8   </tal:block>
    9   <tal:block condition="is_staff">
    10     <h3>
    11       <span tal:condition="info">
    12         <span tal:content="info/student/Title" />:
    13       </span>
    14       <span tal:content="here/title_or_id" />
    15     </h3>
    16     <br />   
    17   </tal:block>
    18   <!-- Student -->
    19   <tal:block condition="python: is_student">
    20     <a href=""
    21        tal:attributes="href string:${here/academicsParent}">
    22       <img tal:attributes="src string:${here/portal_url}/arrow_up.gif"/>
    23       Up one level
    24     </a>
    25     <h3>Fill Your Clearance/Eligibility Form!</h3>
    26     <br />   
    27   </tal:block>
    28 </metal:block>
     3
    294<!--  buttons -->
    305<metal:block define-macro="buttons">

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

    r1575 r1737  
    1 <metal:body use-macro="here/main_template/macros/master">
     1<metal:body use-macro="here/slip_template/macros/master">
    22    <metal:main fill-slot="main"
    33                 tal:define="info context/getClearanceInfo">
    … …  
    55        <span tal:content="here/illegal_view" />
    66      </span>
    7       <span tal:condition="info">
     7      <span tal:omit-tag=""  tal:condition="info">
    88      <div style="text-align: right" tal:condition="info/penalty">
    99      <strong>Late Clearance!</strong></div>
    … …  
    2626          <td tal:content="sc/study_course" />
    2727        </tr>
    28         <span tal:define="f_id sc/faculty;
     28        <span  tal:omit-tag=""
     29               tal:define="f_id sc/faculty;
    2930                        d_id sc/department;
    3031                        f_title context/academics/?f_id/Title|string:Faculty not yet in Prospectus;

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

    r1595 r1737  
     1<metal:definetemplate tal:define="template here/waeup_content_master/macros/master">
    12<metal:block define-macro="contact_student_form">
    2 <metal:body use-macro="here/main_template/macros/master">
     3<metal:body use-macro=template>
    34    <metal:main fill-slot="main"
    45                tal:define="member python:context.portal_membership.getAuthenticatedMember();
    … …  
    8081</metal:body>
    8182</metal:block>
     83</metal:definetemplate>

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

    r1612 r1737  
    1 <metal:body use-macro="here/main_template/macros/master">
     1<metal:body use-macro="here/slip_template/macros/master">
    22    <metal:main fill-slot="main"
    33                tal:define="info context/getStudyLevelInfo;

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

    r1292 r1737  
    1 <metal:body use-macro="here/main_template/macros/master">
     1<metal:body use-macro="here/slip_template/macros/master">
    22    <metal:main fill-slot="main"
    33                tal:define="pume python:context.portal_pumeresults(jamb_reg_no=request.get('nr'))[0]">

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

    r894 r1737  
    1 <metal:block use-macro="here/clearance_edit_form/macros/clearance_edit_form" />
     1<metal:definetemplate tal:define="template here/slip_template/macros/master">
     2  <metal:block use-macro="here/clearance_edit_form/macros/clearance_edit_form" />
     3</metal:definetemplate>
     4 
     5

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

    r1588 r1737  
    1 <metal:block use-macro="here/contact_student_form/macros/contact_student_form" />
     1<metal:definetemplate tal:define="template here/slip_template/macros/master">
     2  <metal:block use-macro="here/contact_student_form/macros/contact_student_form" />
     3</metal:definetemplate>

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

    r1590 r1737  
    11<metal:html>
    2   <metal:body use-macro="here/waeup_content_master/macros/master">
     2  <metal:body use-macro="here/slip_template/macros/master">
    33    <metal:block fill-slot="header"
    44                 tal:define="global info context/getStudyLevelInfo;

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

    r1360 r1737  
    1 <metal:body use-macro="here/main_template/macros/master">
     1<metal:body use-macro="here/slip_template/macros/master">
    22  <metal:main fill-slot="main"
    33              tal:define="info context/getTransferInfo">

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

    r1360 r1737  
    1 <metal:body use-macro="here/main_template/macros/master">
     1<metal:body use-macro="here/slip_template/macros/master">
    22  <metal:main fill-slot="main"
    33              tal:define="info context/getTransferInfo">

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

    r1360 r1737  
    1 <metal:body use-macro="here/main_template/macros/master">
     1<metal:body use-macro="here/slip_template/macros/master">
    22  <metal:main fill-slot="main"
    33              tal:define="info context/getTransferInfo">

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

    r1360 r1737  
    1 <metal:body use-macro="here/main_template/macros/master">
     1<metal:body use-macro="here/slip_template/macros/master">
    22  <metal:main fill-slot="main"
    33              tal:define="info context/getTransferInfo">

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

    r1360 r1737  
    1 <metal:body use-macro="here/main_template/macros/master">
     1<metal:body use-macro="here/slip_template/macros/master">
    22  <metal:main fill-slot="main"
    33              tal:define="info context/getTransferInfo">

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

    r1360 r1737  
    1 <metal:body use-macro="here/main_template/macros/master">
     1<metal:body use-macro="here/slip_template/macros/master">
    22  <metal:main fill-slot="main"
    33              tal:define="info context/getTransferInfo">

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

    r1061 r1737  
    77                                 >
    88  <table>
    9     <span tal:repeat="row layout/rows">
    10         <span tal:repeat="cell row">
    11           <span tal:condition="python:cell['widget_rendered']
     9    <span tal:omit-tag=""  tal:repeat="row layout/rows">
     10        <span  tal:omit-tag="" tal:repeat="cell row">
     11          <span tal:omit-tag="" tal:condition="python:cell['widget_rendered']
    1212                               and not cell['widget_rendered'] in ('None','-',)
    1313                               or cell['widget_id'] == 'birth_certificate'">
    14           <span tal:define="widget cell/widget"
     14          <span tal:omit-tag=""  tal:define="widget cell/widget"
    1515                tal:condition="python:cell['widget_id'] not in fields_not_displayed">
    1616            <div tal:omit-tag=""
    … …  
    2222            <tr>                         
    2323            <tal:block condition="widget/label">
    24             <td width="180px" valign="top" nowrap>
     24            <td width="180px" valign="top">
    2525              <span i18n:translate="" tal:condition="widget/is_i18n">
    2626                  <span tal:content="widget/label" />:</span>

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

    r1276 r1737  
    1 <metal:body use-macro="here/waeup_content_master/macros/master">
    2     <metal:block fill-slot="header"
    3                   tal:define="info context/getPersonalInfo">
    4       <a href=""
    5          tal:attributes="href string:${here/academicsParent}">
    6         <img tal:attributes="src string:${here/portal_url}/arrow_up.gif"/>
    7         Up one level
    8       </a>
    9       <h3>Update Your Personal Data!</h3>
    10       <br />
    11     </metal:block> 
    12  
     1<metal:body use-macro="here/main_template/macros/master">
     2
     3
    134    <metal:main fill-slot="main"
    14                   tal:define="info context/getPersonalInfo;
    15                               rendered_main python:info['per_doc'].render(
     5                  tal:define="info context/getPersonalInfo;">
     6      <metal:block tal:condition="not: info">
     7        <span tal:content="here/illegal_view" />
     8      </metal:block>
     9      <metal:block tal:condition="info">
     10      <metal:block tal:define="rendered_main python:info['per_doc'].render(
    1611                              layout_mode='edit',
    1712                              schema_id = 'student_personal',
    … …  
    2318           metadata nothing;
    2419            ">
     20    <a href=""
     21       tal:attributes="href string:${here/academicsParent}">
     22      <img tal:attributes="src string:${here/portal_url}/arrow_up.gif"/>
     23      Up one level
     24    </a>
     25    <h3>Update Your Personal Data!</h3>
     26    <br />           
     27           
    2528    <form action="ACTION" method="post" id="editForm"
    2629          enctype="multipart/form-data" class="workflow"
    … …  
    3740             id="cpsdocument_edit_button"/>
    3841    </form>
     42    </metal:block>
     43    </metal:block>   
    3944    </metal:main>
    4045</metal:body>

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

    r1304 r1737  
    22           info item/getStudentWorkflowInfo;"
    33           condition="context/isStudent">       
     4
     5           
     6<table>           
     7<tr><td style="padding: 1em 0em 0.2em 0em;">
     8   <strong>Registration Status:</strong>
     9</td></tr>
     10</table>
    411
    512<table class="registration" tal:condition="not:info/cr">

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

    r805 r1737  
    11<metal:html tal:define="info context/getStudentInfo">
    2   <metal:body use-macro="here/main_template/macros/master">
     2  <metal:body use-macro="here/slip_template/macros/master">
    33    <metal:main fill-slot="main">
    44      <span tal:condition="not: info">

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

    r1679 r1737  
    1 <metal:body use-macro="here/main_template/macros/master">
     1<metal:body use-macro="here/slip_template/macros/master">
    22    <metal:main fill-slot="main"
    33                tal:define="info context/getSessionResults">

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

    r1571 r1737  
    8484dc['clr_ac_date'] = current
    8585dc['entry_date'] = current
    86 dc['entry_session'] = "2006/2007"
     86#dc['entry_session'] = "2006/2007"
    8787wf.doActionFor(info['app'],'close')
    8888info['clear_doc'].edit(mapping = dc)

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

    r1527 r1737  
    11<metal:body use-macro="here/main_template/macros/master">
    22    <metal:main fill-slot="main"
    3            tal:define="info context/getStudentFolderInfo;
    4                 is_so info/is_sectionofficer|nothing;
    5                 is_staff info/is_staff|nothing;
    6                 is_student info/is_student">
    7       <span tal:condition="not: info">
     3           tal:define="info context/getStudentFolderInfo;">
     4      <metal:block tal:condition="not: info">
    85        <span tal:content="here/illegal_view" />
    9       </span>
    10       <span tal:condition="info"
    11             tal:define="review_state info/review_state;
    12                         rows python: info['items']">
     6      </metal:block>
     7      <metal:block tal:condition="info">
     8      <metal:block tal:define="review_state info/review_state;
     9                        rows python: info['items'];
     10                        is_so info/is_sectionofficer|nothing;
     11                        is_staff info/is_staff|nothing;
     12                        is_student info/is_student">
    1313
    1414      <a href="" tal:condition="is_staff"
    … …  
    103103    </table>
    104104       
    105     </span>
     105    </metal:block>
     106    </metal:block>
    106107    </metal:main>
    107108</metal:body>
Note: See TracChangeset for help on using the changeset viewer.