Changeset 124


Ignore:
Timestamp:
29 Oct 2005, 10:45:10 (19 years ago)
Author:
Henrik Bettermann
Message:

bug fixes

Location:
waeup_product/trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • waeup_product/trunk/Extensions/install.py

    r119 r124  
    145145                        'id'        : 'student_administration',
    146146                        'name'      : 'Students',
    147                         'action'    : 'string:${portal_url}/sections/waeup/students',
     147                        'action'    : 'string:$folder_url/students',
    148148                        'permission': (View, ),
    149149                        'category'  : 'main_tabs',
    … …  
    153153                        'id'        : 'Academics',
    154154                        'name'      : 'Academics',
    155                         'action'    : 'string:${portal_url}/sections/waeup/academics/academics_view',
     155                        #'action'    : 'string:${portal_url}/sections/waeup/academics/academics_view',
     156                        'action'    : 'string:$folder_url/academics',
    156157                        'permission': (View ),
    157158                        'category'  : 'main_tabs',
    … …  
    161162                        'id'        : 'accomodation',
    162163                        'name'      : 'Accommodation',
    163                         'action'    : 'string:${portal_url}/sections/waeup/accommodation/accommodation_index_html',
     164                        #'action'    : 'string:${portal_url}/sections/waeup/accommodation/accommodation_index_html',
     165                        'action'    : 'string:$folder_url/accommodation',
    164166                        'permissions': (View),
    165167                        #'permissions': (ModifyPortalContent,UniversityManage,StudentManage),

  • waeup_product/trunk/VERSION

    r19 r124  
    1 0.1
     10.1-devel (SVN/Unreleased)

  • waeup_product/trunk/skins/waeup_default/getWAeUPTypes.py

    r119 r124  
    3030    'cps_section_wf': 'waeup_section_wf',
    3131    'actions': ({'id': 'view',
    32                  'name': 'action_view',
    33                  'action': 'university_view',
    34                  'condition': "python:member and 'Manager' in member.getRoles()",
     32                 'name': 'Standard View',
     33                 #'action': 'university_view',
     34                 'action': 'temporary_view_all',
     35                 #'condition': "python:member and 'Manager' in member.getRoles()",
    3536                 'permissions': (View,)},
    3637##                {'id': 'add_accommodation',
    … …  
    9394    'cps_section_wf': 'waeup_section_wf',
    9495    'actions': ({'id': 'view',
    95                  'name': 'Students',
    96                  'action': 'students_folder_view',
     96                 'name': 'Standard View',
     97                 #'action': 'students_folder_view',
     98                 'action': 'temporary_view_all',
    9799                 #'condition': "python:member and 'Manager' in member.getRoles()",
    98100                 'permissions': (View,)},
    … …  
    108110                'action'    : 'string:${object/absolute_url}/create_jamb',
    109111                'permissions': (UniversityManage,StudentManage)},
     112                {
     113                'id'        : 'my_admission',
     114                'name'      : 'My Admission Status',
     115                'action'    : 'string:${object/absolute_url}/check_admission',
     116                'condition':  'object/portal_membership/isAnonymousUser',
     117                'permission': (View,)},
     118                {
     119                'id'        : 'admission_list',
     120                'name'      : 'Admission List',
     121                'action'    : 'string:${object/absolute_url}/admission_status',
     122                'condition':  'object/portal_membership/isAnonymousUser',
     123                'permission': (View,)},
    110124                {
    111125                'id': 'localroles',
    … …  
    155169    'cps_section_wf': 'waeup_section_wf',
    156170    'actions': ({'id': 'view',
    157                  'name': 'Academics',
    158                  'action': 'academics_view',
     171                 'name': 'Standard View',
     172                 #'action': 'academics_view',
     173                 'action': 'temporary_view_all',
    159174                 'condition': "",
    160175                 'permissions': (View,)},
    … …  
    197212    'actions': (
    198213         {'id': 'view',
    199           'name': 'action_view',
    200           'action': 'string:${object_url}/student_index_html',
    201           #'action': 'string:${object_url}/cpsdocument_view',
     214          'name': 'Standard View',
     215          #'action': 'string:${object_url}/student_index_html',
     216          'action': 'temporary_view_all',
    202217          'condition': '',
    203218          'permission': (View,),
    … …  
    215230          'visible' : 0,
    216231          },
     232         {'id'        : 'JAMB',
     233          'name'      : 'JAMB Data',
     234          'action'    : 'string:${object/absolute_url}/JAMB',
     235          'condition':  '',
     236          'permission': (ModifyPortalContent,)},
     237          {
     238          'id'        : 'PERSONAL',
     239          'name'      : 'Personal Data',
     240          'action'    : 'string:${object/absolute_url}/PERSONAL',
     241          'condition':  '',
     242          'permission': (ModifyPortalContent,)},
     243          {
     244          'id'        : 'book_accomodation',
     245          'name'      : 'Book Accomodation',
     246          'action'    : 'string:${object/absolute_url}/book_accommodation',
     247          'condition':  '',
     248          'permission': (ModifyPortalContent,)},
    217249          )
    218250}
    … …  
    240272##    'actions': (
    241273##         {'id': 'view',
    242 ##          'name': 'action_view',
     274##          'name': 'Standard View',
    243275##          'action': 'string:${object_url}/document_view',
    244276##          'condition': '',
    … …  
    297329    'actions': (
    298330         {'id': 'view',
    299           'name': 'action_view',
    300           'action': 'string:${object_url}/jamb_index_html',
     331          'name': 'Standard View',
     332          #'action': 'string:${object_url}/jamb_index_html',
     333          'action': 'temporary_view_all',
    301334          'condition': '',
    302335          'permission': (View,),
    … …  
    306339          'action': 'string:${object_url}/waeup_edit_form',
    307340          'condition': '',
    308           'permission': (ModifyPortalContent,StudentManage),
     341          'permission': (StudentManage),
    309342          },
    310343         {'id': 'localroles',
    … …  
    353386    'actions': (
    354387         {'id': 'view',
    355           'name': 'action_view',
    356           'action': 'string:${object_url}/student_personal_index_html',
     388          'name': 'Standard View',
     389          #'action': 'string:${object_url}/student_personal_index_html',
    357390          #'action': 'string:${object_url}/cpsdocument_view',
    358           'permission': ('View',),
     391          'action': 'temporary_view_all',
     392          'permission': (View,),
    359393          'category': 'object',
    360394          'visible': True,},
    … …  
    363397          'action': 'string:${object_url}/student_personal_edit_form',
    364398          'condition': '',
    365           'permission': ('View',),
     399          'permission': (ModifyPortalContent,),
    366400          'category': 'object',
    367401          'visible': True,},
    … …  
    398432    'actions': (
    399433         {'id': 'view',
    400           'name': 'action_view',
    401           'action': 'string:${object_url}/faculty_index_html',
     434          'name': 'Standard View',
     435          #'action': 'string:${object_url}/faculty_index_html',
     436          'action': 'temporary_view_all',
    402437          'condition': '',
    403438          'permission': (View,),
    … …  
    412447          'name': 'Add Department',
    413448          'action'    : 'string:${object/absolute_url}/create_common?type_name=Department',
    414           'permissions': (ModifyPortalContent,UniversityManage,)},
     449          'permissions': (UniversityManage,)},
    415450          {'id': 'contents',
    416451          'name': 'action_folder_contents',
    417452          'action': 'folder_contents',
    418453          'condition': "python:member and 'Manager' in member.getRoles()",
    419           'permissions': (ModifyPortalContent,UniversityManage,)},
     454          'permissions': (ModifyPortalContent,)},
    420455          {'id': 'edit',
    421456          'name': 'action_edit',
    422457          'action': 'cpsdocument_edit_form',
    423458          'condition': "python:member and 'Manager' in member.getRoles()",
    424           'permissions': (ModifyPortalContent,UniversityManage,)},
     459          'permissions': (ModifyPortalContent,)},
    425460          {'id': 'metadata',
    426461          'name': 'action_metadata',
    … …  
    461496    'actions': (
    462497         {'id': 'view',
    463           'name': 'action_view',
    464           'action': 'string:${object_url}/department_index_html',
     498          'name': 'Standard View',
     499          #'action': 'string:${object_url}/department_index_html',
     500          'action': 'temporary_view_all',
    465501          'condition': '',
    466502          'permission': ('View',),
    … …  
    470506          'action': 'string:${object_url}/waeup_edit_form',
    471507          'condition': '',
    472           'permission': (FacultyManage,),
     508          'permission': (UniversityManage,),
    473509          'visible': True,},
    474510          {'id': 'create_course',
    475511          'name': 'Add Course',
    476512          'action'    : 'string:${object/absolute_url}/create_course',
    477           'permissions': (ModifyPortalContent,UniversityManage,)},
     513          'permissions': (UniversityManage,)},
    478514          {'id': 'contents',
    479515          'name': 'action_folder_contents',
    480516          'action': 'folder_contents',
    481517          'condition': "python:member and 'Manager' in member.getRoles()",
    482           'permissions': (ModifyPortalContent,UniversityManage,)},
     518          'permissions': (ModifyPortalContent,)},
    483519          {'id': 'edit',
    484520          'name': 'action_edit',
    485521          'action': 'cpsdocument_edit_form',
    486522          'condition': "python:member and 'Manager' in member.getRoles()",
    487           'permissions': (ModifyPortalContent,UniversityManage,)},
     523          'permissions': (ModifyPortalContent,)},
    488524          {'id': 'metadata',
    489525          'name': 'action_metadata',
    … …  
    524560    'actions': (
    525561         {'id': 'view',
    526           'name': 'action_view',
    527           'action': 'string:${object_url}/course_index_html',
     562          'name': 'Standard View',
     563          #'action': 'string:${object_url}/course_index_html',
     564          'action': 'temporary_view_all',
    528565          'condition': '',
    529566          'permission': ('View',),
    … …  
    585622    'actions': (
    586623         {'id': 'view',
    587           'name': 'action_view',
    588           'action': 'accommodation_index_html',
     624          'name': 'Standard View',
     625          #'action': 'accommodation_index_html',
     626          'action': 'temporary_view_all',
    589627          'condition': '',
    590628          'permission': (View,),
    … …  
    635673    'actions': (
    636674         {'id': 'view',
    637           'name': 'action_view',
    638           'action': 'string:${object_url}/accommodation_index_html',
     675          'name': 'Standard View',
     676          #'action': 'string:${object_url}/accommodation_index_html',
     677          'action': 'temporary_view_all',
    639678          'condition': '',
    640679          'permission': ('View',),
    … …  
    642681          'visible': True,},
    643682         {'id': 'edit',
    644           'name': 'edit',
     683          'name': 'action_edit',
    645684          'action': 'string:${object_url}/waeup_edit_form',
    646685          'permission': (UniversityManage,StudentManage),

  • waeup_product/trunk/skins/waeup_default/logged_out.pt

    r49 r124  
    88     i18n:translate="description_logout_success">
    99    You have been logged out. <br />
    10     <a href="" tal:attributes="href string:${base_url}/sections/unidemo/students/check_admission">check your admission</a>
    11 
    1210  </p>
    1311

  • waeup_product/trunk/skins/waeup_default/portlet_session_info.pt

    r106 r124  
    44           >
    55  <tal:block condition="not:anonymous">
    6     <span i18n:translate="">You are currently logged in as
     6    <div i18n:translate="">You are currently logged in as
    77      <em i18n:name="member"
    88          tal:content="member" /><br />with Basic Roles <span tal:content="member/getRoles" /><br />
    99      <span tal:condition="python: 0" tal:content="python:mtool.getCPSCandidateLocalRoles(context)" />
    10       <a href="" tal:condition="python: 'Students' in member.getGroups()"
    11          tal:attributes="href string:${here/portal_url}/sections/waeup/students/${member}">goto your personal area</a>
    12     </span><br />
     10    </div>
     11    <a href="" tal:condition="python: 'Student' in member.getGroups()"
     12         tal:attributes="href string:${here/portal_url}/students/${member}">
     13         Go to your personal area
     14    </a>
     15
    1316    <a href="" tal:condition="python: 0" tal:attributes="href string:${context/portal_url}/cpsdirectory_entry_view?dirname=members&id=${member}">Edit your Preferences</a><br />
    14    <br />
    15     (<a href="" i18n:translate=""
    16         tal:attributes="href string:${here/portal_url}/sections/waeup/logout">log out</a>)
     17
     18    <a href="" i18n:translate=""
     19        tal:attributes="href string:${here/portal_url}/logout">Log out</a>
    1720  </tal:block>
    1821  <tal:block condition="anonymous">
    19     <span >You are currently not logged in </span><br />
    20     <a href="" tal:attributes="href string:${here/portal_url}/sections/waeup/login_form">Login</a>
     22    <div>You are currently not logged in </div><br />
     23    <a href="" tal:attributes="href string:${here/portal_url}/login_form">Log in</a>
    2124  </tal:block>
    22   <br />
    23   <a tal:condition="python: 0" href="" i18n:translate=""
    24      tal:attributes="href string:${here/portal_url}/sections/waeup/students">Student Administration</a>
    2525</tal:block>

  • waeup_product/trunk/skins/waeup_default/temporary_view_all.pt

    r122 r124  
    1414
    1515  <metal:block fill-slot="main"
    16                tal:define="student_folder here/getContent;
    17                items here/contentValues"
     16               tal:define="folder here/getContent;
     17               items here/contentValues;
     18               attributes here/contentValues"
    1819               >
    19   This is the main text area of the object with id <em tal:content="here/title_or_id" /> which has to be filled with content.
     20  <h1> Title of the object '<em tal:content="here/id" />'</h1>             
     21               
     22  <p>This is the main text area of the object with id <em tal:content="here/id" /> which has to be filled with content.</p>
     23 
     24  <p>This is a list of attributes assigned to the <em tal:content="here/title_or_id" /> object which can be displayed in various ways: </p>
     25 
     26  <br />
     27   
     28  <p>(The attribute listing is not yet implemented.)</p>
     29 
     30  <br />
     31 
     32  <p>This is a list of items attached to the <em tal:content="here/title_or_id" /> object which can be listed in various ways: </p>
     33 
     34  <br />
     35 
     36  <table cellspacing="0" cellpadding="0">
     37  <tal:block condition="python: len(items)">
     38    <tr tal:repeat="item items">
     39      <td colspan="1">
     40        <a href="jamb"
     41           tal:attributes="href item/absolute_url"
     42           tal:content="item/title_or_id"></a>
     43      </td>
     44    </tr>
     45  </tal:block>
     46  <tal:block condition="python: not len(items)">
     47  (No items yet!)
     48  </tal:block>
     49  </table>
     50
     51 
    2052  </metal:block>
    2153  <metal:block fill-slot="sub">

  • waeup_product/trunk/skins/waeup_student/admission_status_form.pt

    r69 r124  
    1414    </metal:block>
    1515    <metal:block fill-slot="main">
    16         <center><h1>Admission Status!</h1></center>
     16        <h1>List admitted students!</h1>
    1717        <p>
    1818          You may be seeing a long list of names or just the name of the person of your interest below.

  • waeup_product/trunk/skins/waeup_student/book_accommodation.py

    r118 r124  
    3434elif psm == 'valid':
    3535    sf = context.getContent()
    36     halls = getattr(context,'Accommodation').contentValues()
     36    halls = getattr(context,'accommodation').contentValues()
    3737    beds = []
    3838    student = context.PERSONAL.getContent()
    … …  
    4343        bal = getattr(h,'beds_assigned_list',[])
    4444        nr_of_beds = int(h.nr_of_blocks) * int(h.nr_of_floors) * int(h.rooms_per_floor) * int(h.beds_per_room)
    45         if h.which_sex == student.sex and nr_of_beds > len(bal): 
     45        if h.which_sex == student.sex and nr_of_beds > len(bal):
    4646            break
    4747    dict = {'heading': h.heading,

  • waeup_product/trunk/skins/waeup_student/booked_accommodation.pt

    r114 r124  
    77               tal:define="acco options/v"
    88               >
    9     you have successfully booked bed nr <span tal:content="acco/beds_assigned" /> in <span tal:content="acco/heading" />
    10     of <span tal:content="acco/nr_of_free" /> now <span tal:content="acco/beds_assigned" /> assigned.
     9    You have successfully booked bed nr <span tal:content="acco/beds_assigned" /> in <span tal:content="acco/heading" />.
    1110  </metal:block>
    1211  <metal:block fill-slot="sub">

  • waeup_product/trunk/skins/waeup_student/check_admission_form.pt

    r48 r124  
    1515
    1616    <metal:block fill-slot="main">
    17         <h1>check your admission to the UniDemo !</h1>
     17        <h1>Check your admission status!</h1>
    1818      <div tal:replace="structure rendered_main" />
    1919    </metal:block>
Note: See TracChangeset for help on using the changeset viewer.