Changeset 84 for waeup_product/trunk/skins

Timestamp:

25 Oct 2005, 16:18:40 (19 years ago)

Author:

joachim

Message:

=Roles and Facultymanagement, new themes used

Location:

waeup_product/trunk/skins

Files:

• waeup_default/getWAeUPLayouts.py (modified) (5 diffs)
• waeup_default/getWAeUPTypes.py (modified) (10 diffs)
• waeup_default/portlet_main_navigation.pt (moved) (moved from waeup_product/trunk/skins/waeup_default/portlet_studentnavigation.pt) (1 diff)
• waeup_default/portlet_session_info.pt (modified) (1 diff)
• waeup_default/university_view.py (modified) (1 diff)
• waeup_faculty/course_index_html.py~ (deleted)
• waeup_faculty/department_index_html.py (modified) (1 diff)
• waeup_faculty/department_index_html.py~ (modified) (2 diffs)
• waeup_faculty/faculty_index_html.py (modified) (1 diff)

waeup_product/trunk/skins/waeup_default/getWAeUPLayouts.py

@@ -85 +85 @@
     },
     'layout': {
-        'style_prefix': 'layout_default_',
+        'style_prefix': 'layout_waeup_',
         'rows': [
-            [{'widget_id': 'LanguageSelector'}],
+            #[{'widget_id': 'LanguageSelector'}],
             [{'widget_id': 'Title'},],
             [{'widget_id': 'Description'},],
-            [{'widget_id': 'LanguageSelectorCreation'}],
+            #[{'widget_id': 'LanguageSelectorCreation'}],
             ],
         },
@@ -790 +790 @@
 ###)
 
+department = { ###(
+   'widgets': {},
+   'layout': {
+        'style_prefix': 'layout_waeup_',
+        'flexible_widgets': (),
+        'ncols': 1,
+        'rows': [],
+    },
+}
+###)
+waeup_default = { ###(
+   'widgets': {},
+   'layout': {
+        'style_prefix': 'layout_waeup_',
+        'flexible_widgets': (),
+        'ncols': 1,
+        'rows': [],
+    },
+}
+###)
+
 course = { ###(
     'widgets': {
@@ -888 +909 @@
     },
    'layout': {
-        'style_prefix': 'layout_default_',
+        'style_prefix': 'layout_waeup_',
         'flexible_widgets': (),
         'ncols': 1,
@@ -904 +925 @@
 
 layouts = {}
+layouts['university'] = waeup_default
 layouts['waeup_common'] = common_layout
 layouts['student'] = student_layout
@@ -911 +933 @@
 layouts['jambcreate'] = jamb_layoutcreate
 layouts['jamb'] = jamb_layout
+layouts['faculty'] = waeup_default
+layouts['department'] = waeup_default
 layouts['course'] = course
 layouts['admission_status'] = admission_status

waeup_product/trunk/skins/waeup_default/getWAeUPTypes.py

@@ -6 +6 @@
 from Products.CMFCore.permissions import ModifyPortalContent
 from Products.CMFCore.permissions import AddPortalContent
+from Products.WAeUP.WAeUPPermissions import UniversityManage, StudentManage,FacultyManage,\
+                                            DepartmentManage,CourseManage
 ChangePermissions = 'Change permissions'
 
@@ -24 +26 @@
     'cps_proxy_type': 'folder',
     'schemas': ['metadata', 'common', 'folder'],
-    'layouts': ['waeup_common', 'folder'],
-    'layout_clusters': ['metadata:metadata'],
-    'cps_section_wf': 'waeup_section_wf',
-    'actions': ({'id': 'view',
+    'layouts': ['common', 'university'],
+    'layout_clusters': ['metadata:metadata'],
+    'cps_section_wf': 'waeup_section_wf',
+    'actions_add': ({'id': 'view',
                  'name': 'action_view',
                  'action': 'university_view',
-                 'permissions': (View,)},
-                {'id': 'new_content',
-                 'name': 'action_new_content',
+                 'permissions': (UniversityManage,)},
+                {'id': 'addFaculty',
+                 'name': 'Add a Faculty',
                  'action': 'folder_factories',
-                 'permissions': (AddPortalContent,)},
+                 'permissions': (UniversityManage,)},
                 {'id': 'contents',
                  'name': 'action_folder_contents',
                  'action': 'folder_contents',
-                 'permissions': (ModifyPortalContent,)},
+                 'permissions': (UniversityManage,)},
                 {'id': 'edit',
                  'name': 'action_edit',
                  'action': 'cpsdocument_edit_form',
-                 'permissions': (ModifyPortalContent,)},
+                 #'action': 'cpsdocument_edit_form',
+                 'permissions': (UniversityManage,)},
                 {'id': 'metadata',
                  'name': 'action_metadata',
@@ -79 +82 @@
                  'name': 'Students',
                  'action': 'students_folder_view',
-                 'permissions': (View,)},
+                 'permissions': (UniversityManage,)},
                 {
                 'id'        : 'add_content',
                 'name'      : 'Add Content',
                 'action'    : 'string:${object/absolute_url}/folder_factories',
-                'condition' : 'python: member and "Manager" in member.getRoles()',
-                'permissions': (AddPortalContent,)},
+                'permissions': (StudentManage,)},
                 {
                 'id'        : 'add_jamb',
                 'name'      : 'Add Student JAMB',
                 'action'    : 'string:${object/absolute_url}/create_jamb',
-                'condition' : 'python: member and "StudentManager" in member.getGroups()',
-                'permissions': (AddPortalContent,)},
+                'permissions': (UniversityManage,)},
                 {'id': 'contents',
                  'name': 'action_folder_contents',
                  'action': 'folder_contents',
-                 'permissions': (ModifyPortalContent,)},
+                 'permissions': (UniversityManage,)},
                 {'id': 'edit',
                  'name': 'action_edit',
                  'action': 'cpsdocument_edit_form',
-                 'permissions': (ModifyPortalContent,)},
+                 'permissions': (UniversityManage,)},
                 {'id': 'metadata',
                  'name': 'action_metadata',
                  'action': 'cpsdocument_metadata',
-                 'permissions': (ModifyPortalContent,)},
+                 'permissions': (UniversityManage,)},
                 {'id': 'localroles',
                  'name': 'action_local_roles',
                  'action': 'folder_localrole_form',
-                 'permissions': (ChangePermissions,)},
+                 'permissions': (UniversityManage,)},
     )
 }
@@ -139 +140 @@
           #'action': 'string:${object_url}/cpsdocument_view',
           'condition': '',
-          'permission': ('View',),
+          'permission': (View,),
           'category': 'object',
           'visible': True,},
@@ -294 +295 @@
     'cps_display_as_document_in_listing': True,
     'schemas': ['metadata','common','faculty'],
-    'layouts': ['waeup_common',],
+    'layouts': ['common','faculty'],
     'flexible_layouts': (),
     'layout_clusters': ['metadata:metadata'],
@@ -304 +305 @@
           'action': 'string:${object_url}/faculty_index_html',
           'condition': '',
-          'permission': ('View',),
+          'permission': (View,),
+          'category': 'object',
+          'visible': True,},
+         {'id': 'edit',
+          'name': 'action_edit',
+          'action': 'string:${object_url}/waeup_edit_form',
+          'condition': '',
+          'permission': (UniversityManage,),
           'category': 'object',
           'visible': True,},
@@ -327 +335 @@
     'cps_display_as_document_in_listing': True,
     'schemas': ['metadata','common','department'],
-    'layouts': ['waeup_common',],
+    'layouts': ['department','common',],
     'flexible_layouts': (),
     'layout_clusters': ['metadata:metadata'],
@@ -338 +346 @@
           'condition': '',
           'permission': ('View',),
+          'category': 'object',
+          'visible': True,},
+         {'id': 'edit',
+          'name': 'action_edit',
+          'action': 'string:${object_url}/waeup_edit_form',
+          'condition': '',
+          'permission': (FacultyManage,),
           'category': 'object',
           'visible': True,},
@@ -360 +375 @@
     'cps_display_as_document_in_listing': True,
     'schemas': ['metadata','common','course'],
-    'layouts': ['waeup_common','course'],
+    'layouts': ['common','course'],
     'flexible_layouts': (),
     'layout_clusters': ['metadata:metadata'],
@@ -371 +386 @@
           'condition': '',
           'permission': ('View',),
+          'category': 'object',
+          'visible': True,},
+         {'id': 'edit',
+          'name': 'action_edit',
+          'action': 'string:${object_url}/waeup_edit_form',
+          'condition': '',
+          'permission': (CourseManage,),
           'category': 'object',
           'visible': True,},

waeup_product/trunk/skins/waeup_default/portlet_main_navigation.pt

@@ -12 +12 @@
     <a href="" i18n:translate=""
        tal:attributes="href string:${here/portal_url}/sections/waeup/students"
-       >Student Administration</a>
+       >Studentadministration</a> | 
+    <a href="" i18n:translate=""
+       tal:attributes="href string:${here/portal_url}/sections/waeup/faculties"
+       >Faculties</a> 
   </tal:block>
   <tal:block condition="anonymous">

waeup_product/trunk/skins/waeup_default/portlet_session_info.pt

@@ -6 +6 @@
     <span i18n:translate="">You are currently logged in as
       <em i18n:name="member"
-          tal:content="member" /><br />
+          tal:content="member" /><br />with Basic Roles <span tal:content="member/getRoles" /><br />
+      <span tal:condition="python: 0" tal:content="python:mtool.getCPSCandidateLocalRoles(context)" />
       <a href="" tal:condition="python: 'Students' in member.getGroups()" 
          tal:attributes="href string:${here/portal_url}/sections/waeup/students/${member}">goto your personal area</a>

waeup_product/trunk/skins/waeup_default/university_view.py

@@ -12 +12 @@
         return context.students.students_folder_view_student(psm=psm,groups=groups)
     elif 'StudentManager' in member.getGroups():
-        return context.students.student_folder_view_manager(psm=psm,groups=groups)
+        return context.waeup_view_manager(psm=psm,groups=groups)
 return context.students.students_folder_view_anon(psm=psm,groups=groups)

waeup_product/trunk/skins/waeup_faculty/department_index_html.py

@@ -8 +8 @@
 #return context.student_view_manager()
 if member:
-    if 'Manager' in member.getRoles():
+    if 'StudentManager' in member.getGroups():
+    #if 'Manager' in member.getRoles():
         return context.department_view_manager()
     elif 'Students' in member.getGroups():

waeup_product/trunk/skins/waeup_faculty/department_index_html.py~

@@ -1 +1 @@
 ##parameters=post_id=None, REQUEST=None
 
-# $Id: student_index_html.py 48 2005-10-16 15:47:22Z joachim $
+# $Id: department_index_html.py 80 2005-10-22 13:43:45Z joachim $
 
 """Default view for a Faculty."""
@@ -9 +9 @@
 if member:
     if 'Manager' in member.getRoles():
-        return context.faculty_view_manager()
+        return context.department_view_manager()
     elif 'Students' in member.getGroups():
-        return context.faculty_view_student()
+        return context.department_view_student()

waeup_product/trunk/skins/waeup_faculty/faculty_index_html.py

@@ -7 +7 @@
 
 #return context.student_view_manager()
-if 'Manager' in member.getRoles():
+#if 'Manager' in member.getRoles():
+if 'StudentManager' in member.getGroups():
     return context.faculty_view_manager()
 elif 'Students' in member.getGroups():