Changeset 542


Ignore:
Timestamp:
24 Sep 2006, 06:03:25 (18 years ago)
Author:
Henrik Bettermann
Message:

index pages reorganized (part 1)

Location:
WAeUP_SRP/trunk
Files:
5 added
4 deleted
11 edited
1 moved

Legend:

Unmodified
Added
Removed

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

    r508 r542  
    132132   <permission>View</permission>
    133133  </action>
    134   <action title="Home" action_id="student_home" category="student_navigation"
    135      condition_expr="member" url_expr="string:${portal_url}" visible="True">
     134  <action title="Home" action_id="students_home" category="student_navigation"
     135     condition_expr="member" url_expr="string:${portal_url}/students_home" visible="True">
    136136   <permission>View</permission>
    137137  </action>
    … …  
    141141   <permission>View</permission>
    142142  </action>
    143   <action title="Registration" action_id="registration"
     143  <action title="My Registration" action_id="registration"
    144144     category="student_navigation" condition_expr="member"
    145145     url_expr="string:${portal_url}/campus/students" visible="True">

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

    r538 r542  
    22<object name="student_application" meta_type="CPS Layout">
    33 <property name="layout_create_method"></property>
    4  <property name="layout_edit_method">layout_application_print</property>
    5  <property name="layout_view_method"></property>
     4 <property name="layout_edit_method"></property>
     5 <property name="layout_view_method">layout_application_print</property>
    66 <property name="style_prefix">layout_waeup_</property>
    77 <property name="flexible_widgets"/>

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

    r535 r542  
    88 <property name="product">WAeUP_SRP</property>
    99 <property name="factory">addStudentsFolder</property>
    10  <property name="immediate_view">student_index</property>
     10 <property name="immediate_view">students_index</property>
    1111 <property name="global_allow">True</property>
    1212 <property name="filter_content_types">True</property>
    … …  
    3030 <property name="storage_methods"/>
    3131 <property name="cps_is_portlet">False</property>
    32  <alias from="(Default)" to="student_index"/>
    33  <alias from="view" to="student_index"/>
     32 <alias from="(Default)" to="students_index"/>
     33 <alias from="view" to="students_index"/>
    3434 <action title="View" action_id="view" category="object" condition_expr=""
    35     url_expr="string:${object_url}/student_index" visible="True">
     35    url_expr="string:${object_url}/students_index" visible="True">
    3636  <permission value="View"/>
    3737 </action>

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

    r535 r542  
    88 <property name="product">WAeUP_SRP</property>
    99 <property name="factory">addUniversity</property>
    10  <property name="immediate_view">home_index</property>
     10 <property name="immediate_view">campus_index</property>
    1111 <property name="global_allow">True</property>
    1212 <property name="filter_content_types">True</property>
    … …  
    3434 <property name="storage_methods"/>
    3535 <property name="cps_is_portlet">False</property>
    36  <alias from="(Default)" to="home_index"/>
    37  <alias from="view" to="home_index"/>
     36 <alias from="(Default)" to="campus_index"/>
     37 <alias from="view" to="campus_index"/>
    3838 <action title="View" action_id="view" category="object" condition_expr=""
    39     url_expr="string:${object_url}/home_index" visible="True">
     39    url_expr="string:${object_url}/campus_index" visible="True">
    4040  <permission value="Modify portal content"/>
    4141 </action>

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

    r538 r542  
    1 ## Script (Python) "cpsdocument_edit"
     1## Script (Python) "academics_index"
    22##bind container=container
    33##bind context=context
    … …  
    1010# $Id: student_edit.py 486 2006-09-06 10:09:39Z joachim $
    1111"""
    12 return the appropriate page in the academics section 
     12return the appropriate page in the academics section
    1313"""
    1414
    1515request = context.REQUEST
    1616redirect = request.RESPONSE.redirect
     17pm = context.portal_membership
     18
     19if pm.isAnonymousUser():
     20    return redirect("%s/academics_contents" % context.absolute_url())
     21
    1722campus = context.portal_catalog(meta_type = "University")[-1].getObject()
    18 pm = context.portal_membership
    1923member = pm.getAuthenticatedMember()
    2024roles = member.getRoles()
    2125isManager = "Manager" in roles or "SectionManager" in roles
    2226isStudent = "Student" in roles
     27
    2328if isManager:
    2429    return redirect("%s/academics_contents" % context.absolute_url())
    2530if isStudent:
    2631    return redirect("%s/academics_contents" % context.absolute_url())
    27 if pm.isAnonymousUser():
    28     return redirect("%s/acacemics_contents" % context.absolute_url())
    29    
    30 info = context.getStudentInfo()
    31 student = info['student']
    32 doc = info['app_doc']
    33 state = context.getStudentInfo()['review_state']
    34 if state == 'admission_applied':
    35     return redirect("%s/application_view" % student.absolute_url())
    36 elif state == 'application_pin_entered':
    37     return redirect("%s/passport_entry_view" % student.absolute_url())
    38    
    3932

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

    r486 r542  
    66      tal:define="username request/username | request/__ac_name | nothing">
    77
    8   <h1 i18n:translate="heading_login_form">Log in</h1>
     8  <h3>Sorry,</h3>
    99
    10   <form id="loginForm" action="" method="post"
    11         tal:attributes="action string:${base_url}logged_in">
    12 
    13   <table id="login" class="form"
    14          summary="Table for entering login information">
    15     <tbody>
    16     <tr>
    17     <th>
    18         <label for="username"
    19                i18n:translate="label_user_name">User name</label></th>
    20     <td>
    21         <input type="text" id="username" name="__ac_name"
    22                class="focus" size="20" value=""
    23                tal:attributes="value username" /></td>
    24     </tr>
    25     <tr>
    26     <th>
    27         <label for="password"
    28                i18n:translate="label_password">Password</label></th>
    29     <td>
    30         <input type="password" id="password" name="__ac_password" size="20"
    31                value="" /></td>
    32     </tr>
    33     </tbody>
    34   </table>
    35 
    36   <p class="buttonArea">
    37     <!-- ****** Enable the automatic redirect ***** -->
    38     <input type="hidden" name="came_from" value=""
    39            tal:condition="exists: request/came_from"
    40            tal:attributes="value request/came_from" />
    41     <!-- ****** Enable the automatic redirect ***** -->
    42     <input i18n:attributes="value" class="standalone"
    43            type="submit" name="submit" value="button_login" />
     10  <p> you are not authorized to access this resource.
    4411  </p>
    4512
    46   </form>
    47 
    48   <p i18n:translate="help_login_aware_logout">
    49     Don't forget to logout or exit your browser when you're done.
    50   </p>
    51   <p i18n:translate="help_login_troubles_cookies">
    52     Having trouble logging in? Make sure to enable cookies in
    53     your web browser.
    54   </p>
    55   <p i18n:translate="">
    56     help_password_forgotten
    57     <tal:block i18n:name="link_password_forgotten"
    58                replace="string:${base_url}account_lost_password_form"/>
    59   </p>
    60 
    61 </metal:main>
     13  </metal:main>
    6214</metal:body>
    6315</metal:html>

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

    r531 r542  
    44<!-- macro library for rendering specific error messages per error type -->
    55<metal:block define-macro="not_found">
    6   <h1>Not Found</h1>
     6  <h3>Not Found</h3>
    77
    88  <p>The resource you asked was not found.

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

    r531 r542  
    33
    44<metal:block define-macro="other">
    5   <h1>WAeUP encountered an error</h1>
     5  <h3>WAeUP encountered an error</h3>
    66
    77  <p>We apologize for the incovenience.</p>

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

    r537 r542  
    77      <span tal:condition="info"
    88            tal:define="review_state info/review_state">
     9        <h3>Post UME Acknowledegement Slip</h3>
     10        <br />     
    911        <span tal:omit-tag=""
    1012              tal:content="structure python: info['app_doc'].render(proxy=info['app_doc'],

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

    r535 r542  
    77      <span tal:condition="info"
    88            tal:define="review_state info/review_state">
    9         <h3 tal:content="info/review_state|nothing"></h3>
     9        <h3>My Application Record</h3>
     10        <br />
    1011        <span tal:omit-tag=""
    1112              tal:content="structure python: info['app_doc'].render(proxy=info['app_doc'],

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

    r537 r542  
    44             widgets python:context.getRenderedWidgets(layout);"
    55             >
    6   <h3>Post UME Acknowledegement Slip</h3>
    7   <br />
     6
    87  <table cellpadding="10em" cellspacing="">
    98    <tr>

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

    r540 r542  
    1 ## Script (Python) "cpsdocument_edit"
     1## Script (Python) "students_indext"
    22##bind container=container
    33##bind context=context
    … …  
    1010# $Id: student_edit.py 486 2006-09-06 10:09:39Z joachim $
    1111"""
    12 return the current student_index_html
     12return the current students_index_html
    1313"""
    1414
    1515request = context.REQUEST
    1616redirect = request.RESPONSE.redirect
     17pm = context.portal_membership
     18
     19
     20if pm.isAnonymousUser():
     21    return redirect("%s/campus_anonymous_view" % context.campus.absolute_url())
     22
     23
    1724campus = context.portal_catalog(meta_type = "University")[-1].getObject()
    18 pm = context.portal_membership
    19 if pm.isAnonymousUser():
    20     return redirect("%s/students_anonymous_view" % campus.students.absolute_url())
    2125member = pm.getAuthenticatedMember()
    2226roles = member.getRoles()
    23 if "Manager" in roles or "SectionManager" in roles:
    24     return redirect("%s/students_manager_view" % campus.students.absolute_url())
    25    
    26 info = context.getStudentInfo()
    27 student = info['student']
    28 doc = info['app_doc']
    29 state = context.getStudentInfo()['review_state']
    30 if state == 'admission_applied':
    31     return redirect("%s/application_view" % student.absolute_url())
    32 elif state == 'application_pin_entered':
    33     return redirect("%s/passport_entry_view" % student.absolute_url())
     27isManager = "Manager" in roles or "SectionManager" in roles
     28isStudent = "Student" in roles
     29
     30if isManager:
     31    return redirect("%s/academics_contents" % campus.students.absolute_url())
     32if isStudent:
     33    info = context.getStudentInfo()
     34    student = info['student']
     35    doc = info['app_doc']
     36    state = context.getStudentInfo()['review_state']
     37    if state == 'admission_applied':
     38        return redirect("%s/application_view" % student.absolute_url())
     39    elif state == 'application_pin_entered':
     40        return redirect("%s/passport_entry_view" % student.absolute_url())
Note: See TracChangeset for help on using the changeset viewer.