Index: /waeup_product/trunk/Workflows/WAeUPWorkflow.py
===================================================================
--- /waeup_product/trunk/Workflows/WAeUPWorkflow.py	(revision 26)
+++ /waeup_product/trunk/Workflows/WAeUPWorkflow.py	(revision 27)
@@ -62,6 +62,6 @@
     s = wf.states.get('work')
 
-    s.setPermission(View, 1, ('Student',))
-    s.setPermission(ModifyPortalContent, 1, ('StudentAdmin',))
+    s.setPermission(View, 1, ('Students',))
+    s.setPermission(ModifyPortalContent, 1, ('StudentManager',))
 
     s.setInitialState('work')
Index: /waeup_product/trunk/skins/waeup_default/getWAeUPLayouts.py
===================================================================
--- /waeup_product/trunk/skins/waeup_default/getWAeUPLayouts.py	(revision 26)
+++ /waeup_product/trunk/skins/waeup_default/getWAeUPLayouts.py	(revision 27)
@@ -109,14 +109,14 @@
 layouts['student'] = student_layout
 
-checkadmission = {
+scratch_card = {
     'widgets': {
-        'reg_nr': {
-            'type': 'StudentId Widget',
-            'data': {
-                'title': 'Student ID',
-                'fields': ('reg_nr',),
+        'sc_id': {
+            'type': 'String Widget',
+            'data': {
+                'title': 'SC ID',
+                'fields': ('sc_id',),
                 'is_required': True,
-                'label': 'Student ID',
-                'label_edit': 'Student ID',
+                'label': 'Scratch card ID',
+                'label_edit': 'Scratch card ID',
                 'description': '',
                 'help': '',
@@ -157,5 +157,5 @@
     },
    'layout': {
-        'style_prefix': 'layout_admission_',
+        'style_prefix': 'layout_default_',
         'flexible_widgets': (),
         'ncols': 1,
@@ -167,5 +167,5 @@
 }
 
-layouts['checkadmission'] = checkadmission
+layouts['scratch_card'] = scratch_card
 
 jamb_layout = {
Index: /waeup_product/trunk/skins/waeup_default/getWAeUPSchemas.py
===================================================================
--- /waeup_product/trunk/skins/waeup_default/getWAeUPSchemas.py	(revision 26)
+++ /waeup_product/trunk/skins/waeup_default/getWAeUPSchemas.py	(revision 27)
@@ -302,5 +302,5 @@
 schemas['student'] = student_schema
 schemas['jamb'] = jamb_schema
-schemas['scratchcard'] = scratch_card
+schemas['scratch_card'] = scratch_card
 
 return schemas
Index: /waeup_product/trunk/skins/waeup_default/getWAeUPTypes.py
===================================================================
--- /waeup_product/trunk/skins/waeup_default/getWAeUPTypes.py	(revision 26)
+++ /waeup_product/trunk/skins/waeup_default/getWAeUPTypes.py	(revision 27)
@@ -18,5 +18,6 @@
     'global_allow': 1,
     'filter_content_types': 1,
-    'allowed_content_types': ('Student','ScratchCard'),
+    'allowed_content_types': ('Student'),
+    #'allowed_content_types': ('Student','ScratchCard'),
     'allow_discussion': 0,
     'cps_is_searchable': 1,
@@ -24,5 +25,5 @@
     'cps_proxy_type': 'folder',
     'schemas': ['metadata', 'common', 'folder'],
-    'layouts': ['common', 'folder'],
+    'layouts': ['folder'],
     'layout_clusters': ['metadata:metadata'],
     'cps_section_wf': 'waeup_section_wf',
@@ -70,5 +71,5 @@
     'cps_display_as_document_in_listing': True,
     'schemas': ('metadata', 'student'),
-    'layouts': ('common', 'student'),
+    'layouts': ('student'),
     'cps_workspace_wf': 'waeup_workspace_wf',
     'cps_section_wf': 'waeup_section_wf',
@@ -119,6 +120,6 @@
     'cps_proxy_type': 'document',
     'cps_display_as_document_in_listing': True,
-    'schemas': ('metadata', 'scratch_card'),
-    'layouts': ('common', 'scratch_card'),
+    'schemas': ('scratch_card'),
+    'layouts': ('scratch_card'),
     'cps_workspace_wf': 'waeup_workspace_wf',
     'cps_section_wf': 'waeup_section_wf',
