Index: WAeUP_SRP/trunk/skins/waeup_student/application_pin_form.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/application_pin_form.pt	(revision 485)
+++ WAeUP_SRP/trunk/skins/waeup_student/application_pin_form.pt	(revision 486)
@@ -1,3 +1,3 @@
-<tal:block define="rendered_main options/rendered_main;
+<tal:block define="rendered_main options/rendered;
                    portal_status_message options/psm;
                    data_storage options/ds;
@@ -6,5 +6,5 @@
                    >
 <metal:block define-macro="edit_form">
-<metal:block use-macro="here/content_lib_master/macros/master">
+  <metal:block use-macro="here/content_lib_master/macros/master">
   <metal:block fill-slot="header"
     tal:define="creation creation|nothing;
Index: WAeUP_SRP/trunk/skins/waeup_student/apply_admission.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/apply_admission.py	(revision 485)
+++ WAeUP_SRP/trunk/skins/waeup_student/apply_admission.py	(revision 486)
@@ -1,4 +1,4 @@
 ##parameters=REQUEST
-# $Id: apply_admission.py 173 2005-11-15 16:28:29Z joachim $
+# $Id$
 """
 process the Application Form
Index: WAeUP_SRP/trunk/skins/waeup_student/layout_application_create.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/layout_application_create.pt	(revision 486)
+++ WAeUP_SRP/trunk/skins/waeup_student/layout_application_create.pt	(revision 486)
@@ -0,0 +1,3 @@
+<tal:block define="global creation python:1;
+                   global formaction string:apply_admission" />
+<metal:block use-macro="here/layout_application_edit/macros/default_edit" />
Index: WAeUP_SRP/trunk/skins/waeup_student/layout_application_edit.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/layout_application_edit.pt	(revision 486)
+++ WAeUP_SRP/trunk/skins/waeup_student/layout_application_edit.pt	(revision 486)
@@ -0,0 +1,81 @@
+<!-- a layout_lib macro -->
+<!-- $Id$ -->
+<metal:block define-macro="default_edit"
+  tal:define="layout options/layout;
+  ds options/datastructure;
+  dm ds/getDataModel;
+  formaction formaction|string:student_edit;
+  creation creation|nothing;
+  metadata metadata|nothing;
+  type_name request/type_name|nothing;
+  ti python:type_name and getattr(here.portal_types,type_name,None) or getattr(here.portal_types,here.portal_type,None);
+  cpsmcat nocall:here/translation_service;
+  ">
+
+  <form action="" id="editForm" method="post" 
+        enctype="multipart/form-data" class="workflow"
+        tal:attributes="action formaction"
+        >
+  <table width="200" cellpadding="2" cellspacing="2" summary="Form layout"
+         tal:condition="layout/rows">
+    <tr tal:repeat="row layout/rows" valign="top">
+      <td tal:repeat="cell row"
+          tal:attributes="colspan cell/ncols">
+        <tal:block define="widget cell/widget;
+        wid widget/getWidgetId;
+        err python:ds.getError(wid);
+        err_mapping python:ds.getErrorMapping(wid);
+        is_required python: widget.is_required and creation and ('create' not in widget.readonly_layout_modes);
+        tooltip_id python:wid + '_help';
+        widget_css_class cell/widget_css_class|nothing;
+        css_class python:test(err, 'row error','row')"
+        >
+          <div tal:attributes="class widget_css_class;
+          id python:widget.getHtmlWidgetId()+'_widget';"
+          >
+            <div class="label" tal:condition="widget/label_edit"
+                 tal:attributes="class python:test(is_required, 'label required','label')">
+              <label tal:content="widget/label_edit"
+                     tal:attributes="for cell/widget_input_area_id|nothing;">label</label>
+            </div>
+            <button type="button" class="tooltipControl"
+                    tal:condition="widget/help"
+                    tal:attributes="onclick python:'toggleElementVisibility(\'%s\')' % tooltip_id;"> ? </button>
+            <div class="field">
+              <div tal:replace="structure cell/widget_rendered"/>
+            </div>
+            <div class="tooltipArea" style="visibility: hidden;"
+                 tal:condition="widget/help"
+                 tal:attributes="id tooltip_id;
+                 onclick python:'showElement(false, \'%s\')' % tooltip_id;"
+                 >
+              <tal:block tal:content="widget/help">This is the help for this field
+              </tal:block>
+            </div>
+            <tal:block condition="err">
+              <tal:block define="msg python:cpsmcat(err, mapping=err_mapping)">
+                <br /><em style="color: red"
+                          tal:content="msg">err</em>
+              </tal:block>
+            </tal:block>
+          </div>
+        </tal:block>
+       </td>
+      </tr>
+    </table>
+
+  <input type="submit" class="standalone" name="cpsdocument_edit_button"
+    value="button_change" i18n:attributes="value" id="cpsdocument_edit_button"
+    tal:condition="not:creation" />
+  <input type="submit" class="standalone" name="cpsdocument_edit_and_view_button"
+    value="button_change_and_view" i18n:attributes="value"
+    id="cpsdocument_edit_and_view_button"
+    tal:condition="python:0 and not creation" />
+  <input type="submit" 
+         class="standalone" 
+         name="cpsdocument_create_button"
+         value="apply" 
+         i18n:attributes="value" tal:condition="creation" />
+
+</form>                             
+</metal:block>
Index: WAeUP_SRP/trunk/skins/waeup_student/layout_student_edit.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/layout_student_edit.pt	(revision 485)
+++ WAeUP_SRP/trunk/skins/waeup_student/layout_student_edit.pt	(revision 486)
@@ -1,4 +1,4 @@
 <!-- a layout_lib macro -->
-<!-- $Id: layout_lib_default_edit.pt 34052 2006-03-06 14:59:24Z atchertchian $ -->
+<!-- $Id$ -->
 <metal:block define-macro="default_edit"
   tal:define="layout options/layout;
Index: WAeUP_SRP/trunk/skins/waeup_student/scratch_card_batch_create_do.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/scratch_card_batch_create_do.py	(revision 485)
+++ WAeUP_SRP/trunk/skins/waeup_student/scratch_card_batch_create_do.py	(revision 486)
@@ -1,4 +1,4 @@
 ##parameters=type_name, datamodel
-# $Id: cpsdocument_create_do.py 34091 2006-03-06 18:37:08Z atchertchian $
+# $Id$
 """
 Create an empty object in the context according to the datamodel.
Index: WAeUP_SRP/trunk/skins/waeup_student/scratch_card_batch_created.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/scratch_card_batch_created.py	(revision 485)
+++ WAeUP_SRP/trunk/skins/waeup_student/scratch_card_batch_created.py	(revision 486)
@@ -1,4 +1,4 @@
 ##parameters=
-# $Id: cpsdocument_create_do.py 34091 2006-03-06 18:37:08Z atchertchian $
+# $Id$
 
 return
Index: WAeUP_SRP/trunk/skins/waeup_student/student_edit.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/student_edit.py	(revision 485)
+++ WAeUP_SRP/trunk/skins/waeup_student/student_edit.py	(revision 486)
@@ -8,5 +8,5 @@
 ##title=
 ##
-# $Id: cpsdocument_edit.py 33302 2006-02-22 15:57:11Z tziade $
+# $Id$
 """
 Called when a document form is posted.
@@ -30,5 +30,5 @@
 
 # Check flexible controls
-context.editLayouts(REQUEST=REQUEST)
+#context.editLayouts(REQUEST=REQUEST)
 
 # Validate the document and write it if it's valid
