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/skins/waeup_student
Files:
25 edited

Legend:

Unmodified
Added
Removed

  • 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.