Changeset 538

Timestamp:

20 Sep 2006, 08:38:35 (18 years ago)

Author:

joachim

Message:

fixed typo WAeUP Image Widget
introduced academicx_index and modified all types

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/layouts/student_application.xml (modified) (1 diff)
• profiles/default/layouts/student_application_fe.xml (modified) (1 diff)
• profiles/default/types/AcademicsFolder.xml (modified) (2 diffs)
• profiles/default/types/Certificate.xml (modified) (1 diff)
• profiles/default/types/CertificateCourse.xml (modified) (1 diff)
• profiles/default/types/CertificatesFolder.xml (modified) (2 diffs)
• profiles/default/types/Course.xml (modified) (1 diff)
• profiles/default/types/CoursesFolder.xml (modified) (2 diffs)
• profiles/default/types/Department.xml (modified) (2 diffs)
• profiles/default/types/Faculty.xml (modified) (2 diffs)
• profiles/default/types/StudyLevel.xml (modified) (2 diffs)
• skins/waeup_academics/academics_index.py (added)
• skins/waeup_default/.cpsskins_theme.py (added)
• skins/waeup_default/portlet_session_info.pt (modified) (1 diff)
• skins/waeup_student/getStudentInfo.py (modified) (1 diff)
• skins/waeup_student/student_index.py (modified) (1 diff)

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

@@ -219 +219 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
- <widget name="passport" meta_type="WAeUPImage Widget">
+ <widget name="passport" meta_type="WAeUP Image Widget">
   <property name="title">Passport Picture</property>
   <property name="fields">

WAeUP_SRP/trunk/profiles/default/layouts/student_application_fe.xml

@@ -160 +160 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
- <widget name="passport" meta_type="WAeUPImage Widget">
+ <widget name="passport" meta_type="WAeUP Image Widget">
   <property name="title">Passport Picture</property>
   <property name="fields">

WAeUP_SRP/trunk/profiles/default/types/AcademicsFolder.xml

@@ -8 +8 @@
  <property name="product">WAeUP_SRP</property>
  <property name="factory">addAcademicsFolder</property>
- <property name="immediate_view">academics_contents</property>
+ <property name="immediate_view">academics_index</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
@@ -30 +30 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="academics_contents"/>
- <alias from="view" to="academics_contents"/>
+ <alias from="(Default)" to="academics_index"/>
+ <alias from="view" to="academics_index"/>
  <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/academics_contents" visible="True">
+    url_expr="string:${object_url}/academics_index" visible="True">
   <permission value="View"/>
  </action>

WAeUP_SRP/trunk/profiles/default/types/Certificate.xml

@@ -32 +32 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="academics_contents"/>
+ <alias from="(Default)" to="academics_index"/>
  <alias from="create_do" to="waeup_document_create_do"/>
- <alias from="view" to="academics_contents"/>
+ <alias from="view" to="academics_index"/>
  <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/academics_contents" visible="True">
+    url_expr="string:${object_url}/academics_index" visible="True">
   <permission value="View"/>
  </action>

WAeUP_SRP/trunk/profiles/default/types/CertificateCourse.xml

@@ -30 +30 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="academics_contents"/>
+ <alias from="(Default)" to="academics_index"/>
  <alias from="create_do" to="waeup_document_create_do"/>
  <alias from="view" to="cpsdocument_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/academics_contents" visible="True">
+    url_expr="string:${object_url}/academics_index" visible="True">
   <permission value="View"/>
  </action>

WAeUP_SRP/trunk/profiles/default/types/CertificatesFolder.xml

@@ -8 +8 @@
  <property name="product">CPSDefault</property>
  <property name="factory">addFolder</property>
- <property name="immediate_view">academics_contents</property>
+ <property name="immediate_view">academics_index</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
@@ -29 +29 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="academics_contents"/>
- <alias from="view" to="academics_contents"/>
+ <alias from="(Default)" to="academics_index"/>
+ <alias from="view" to="academics_index"/>
  <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/academics_contents" visible="True">
+    url_expr="string:${object_url}/academics_index" visible="True">
   <permission value="View"/>
  </action>

WAeUP_SRP/trunk/profiles/default/types/Course.xml

@@ -30 +30 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="academics_contents"/>
+ <alias from="(Default)" to="academics_index"/>
  <alias from="create_do" to="waeup_document_create_do"/>
  <alias from="view" to="cpsdocument_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/academics_contents" visible="True">
+    url_expr="string:${object_url}/academics_index" visible="True">
   <permission value="View"/>
  </action>

WAeUP_SRP/trunk/profiles/default/types/CoursesFolder.xml

@@ -8 +8 @@
  <property name="product">CPSDefault</property>
  <property name="factory">addFolder</property>
- <property name="immediate_view">academics_contents</property>
+ <property name="immediate_view">academics_index</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
@@ -29 +29 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="academics_contents"/>
- <alias from="view" to="academics_contents"/>
+ <alias from="(Default)" to="academics_index"/>
+ <alias from="view" to="academics_index"/>
  <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/academics_contents" visible="True">
+    url_expr="string:${object_url}/academics_index" visible="True">
   <permission value="View"/>
  </action>

WAeUP_SRP/trunk/profiles/default/types/Department.xml

@@ -8 +8 @@
  <property name="product">WAeUP_SRP</property>
  <property name="factory">addDepartment</property>
- <property name="immediate_view">academics_contents</property>
+ <property name="immediate_view">academics_index</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
@@ -33 +33 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="academics_contents"/>
+ <alias from="(Default)" to="academics_index"/>
  <alias from="created" to="department_created"/>
- <alias from="view" to="academics_contents"/>
+ <alias from="view" to="academics_index"/>
  <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/academics_contents" visible="True">
+    url_expr="string:${object_url}/academics_index" visible="True">
   <permission value="View"/>
  </action>

WAeUP_SRP/trunk/profiles/default/types/Faculty.xml

@@ -8 +8 @@
  <property name="product">WAeUP_SRP</property>
  <property name="factory">addFaculty</property>
- <property name="immediate_view">academics_contents</property>
+ <property name="immediate_view">academics_index</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
@@ -32 +32 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="academics_contents"/>
+ <alias from="(Default)" to="academics_index"/>
  <alias from="create_do" to="waeup_document_create_do"/>
  <alias from="edit" to=""/>
  <alias from="edit_form" to=""/>
- <alias from="view" to="academics_contents"/>
+ <alias from="view" to="academics_index"/>
  <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/academics_contents" visible="True">
+    url_expr="string:${object_url}/academics_index" visible="True">
   <permission value="View"/>
  </action>

WAeUP_SRP/trunk/profiles/default/types/StudyLevel.xml

@@ -8 +8 @@
  <property name="product">WAeUP_SRP</property>
  <property name="factory">addStudyLevel</property>
- <property name="immediate_view">academics_contents</property>
+ <property name="immediate_view">academics_index</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
@@ -28 +28 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="academics_contents"/>
+ <alias from="(Default)" to="academics_index"/>
  <alias from="create_do" to="waeup_document_create_do"/>
  <alias from="created" to="level_created"/>
- <alias from="view" to="academics_contents"/>
+ <alias from="view" to="academics_index"/>
  <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/academics_contents" visible="True">
+    url_expr="string:${object_url}/academics_index" visible="True">
   <permission value="View"/>
  </action>

WAeUP_SRP/trunk/skins/waeup_default/portlet_session_info.pt

@@ -8 +8 @@
            >
   <tal:block condition="not:isAnon">
-       <strong> <span tal:condition="info" tal:content="python:info['per_doc'].lastname" /> 
+       <strong> <span tal:condition="info" tal:content="python:info['student_doc'].Title()" /> 
        <span tal:condition="not: info" tal:content="python:member.getProperty('fullname',None)" /> 
        </strong>

WAeUP_SRP/trunk/skins/waeup_student/getStudentInfo.py

@@ -33 +33 @@
 #info['wf_state'] = 'keiner'
 info['student'] = student
+info['student_doc'] = student.getContent()
 info['app'] = student.application
 info['app_doc'] = student.application.getContent()

WAeUP_SRP/trunk/skins/waeup_student/student_index.py

@@ -32 +32 @@
 elif state == 'application_pin_entered':
     return redirect("%s/passport_entry_view" % student.absolute_url())
-    
-