Index: WAeUP_SRP/trunk/skins/waeup_default/contact.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_default/contact.pt	(revision 823)
+++ WAeUP_SRP/trunk/skins/waeup_default/contact.pt	(revision 824)
@@ -5,5 +5,5 @@
       <br />
       <form id="form1" name="form1" method="post" action="mail2admin">
-      <table width="100%" border="0" cellspacing="0" cellpadding="0">
+      <table width="100%" border="0" cellspacing="5" cellpadding="0">
         <tr>
           <td width="150px">
@@ -12,12 +12,4 @@
           <td>
              <input name="fullname" type="text" id="fullname" />
-          </td>
-        </tr>
-        <tr>
-          <td>
-             <strong>Student ID: </strong>
-          </td>
-          <td>
-             <input name="regno" type="text" id="regno" />
           </td>
         </tr>
@@ -31,29 +23,6 @@
         </tr>
         <tr>
-          <td>
-             <strong>Problem Type: </strong>
-          </td>
-          <td>
-              <select name="probtype" class="boxgreen" id="probtype">
-                <option>-- Select Type --</option>
-                <option>Payment</option>
-                <option>Registration</option>
-                <option>Application</option>
-                <option>Login</option>
-                <option>Admission</option>
-              </select>        
-          </td>
-        </tr>
-        <tr>
-          <td>
-             <strong>Description: </strong>
-          </td>
-          <td>
-             <textarea name="descr" rows="10" cols="60" id="descr"></textarea>
-          </td>
-        </tr>
-        <tr>
-          <td>
-             <strong>Comments: </strong>
+          <td valign="top">
+             <strong>text: </strong>
           </td>
           <td>
@@ -61,5 +30,4 @@
           </td>
         </tr>
-      
         <tr>
           <td>&nbsp;</td>
Index: WAeUP_SRP/trunk/skins/waeup_student/contact_student.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/contact_student.pt	(revision 824)
+++ WAeUP_SRP/trunk/skins/waeup_student/contact_student.pt	(revision 824)
@@ -0,0 +1,70 @@
+<metal:html tal:define="info context/getStudentInfo;
+                is_manager info/is_manager|nothing;
+                is_student info/is_student|nothing">
+  <metal:body use-macro="here/main_template/macros/master">
+    <metal:main fill-slot="main">
+      <h3>Contact</h3>
+      <br />
+      <form id="form1" name="form1" method="post" action="mail2admin">
+      <input type="hidden" name="regno" type="text" id="regno"
+             tal:attributes="value info/id"/>
+      <table width="100%" border="0" cellspacing="5" cellpadding="0">
+        <tr>
+          <td width="150px">
+             <strong>Full Name: </strong>
+          </td>
+          <td>
+             <input name="fullname" type="text" id="fullname" 
+                    tal:attributes="value info/student/Title"/>
+          </td>
+        </tr>
+        <tr>
+          <td>
+             <strong>Email: </strong>
+          </td>
+          <td>
+             <input name="email" type="text" id="email" 
+                    tal:attributes="value info/app_doc/app_email"/>
+          </td>
+        </tr>
+        <tr>
+          <td>
+             <strong>Problem Type: </strong>
+          </td>
+          <td>
+              <select name="probtype" class="boxgreen" id="probtype">
+                <option>-- Select Type --</option>
+                <option>Payment</option>
+                <option>Registration</option>
+                <option>Application</option>
+                <option>Login</option>
+                <option>Admission</option>
+              </select>        
+          </td>
+        </tr>
+        <tr>
+          <td valign="top">
+             <strong>Description: </strong>
+          </td>
+          <td>
+             <textarea name="descr" rows="10" cols="60" id="descr"></textarea>
+          </td>
+        </tr>
+        <tr>
+          <td valign="top">
+             <strong>Comments: </strong>
+          </td>
+          <td>
+             <textarea name="commt" rows="10" cols="60" id="commt"></textarea>
+          </td>
+        </tr>
+      
+        <tr>
+          <td>&nbsp;</td>
+          <td><input name="Submit" type="submit" class="standalone" value="Submit" /><br /><br /></td>
+        </tr>
+      </table>
+      </form>
+    </metal:main>
+  </metal:body>
+</metal:html>
