# HG changeset patch
# User casties
# Date 1370597525 -7200
# Node ID 07beb979e7e40169afea7dba8996e483fd92db66
# Parent  9e4001404792549a2b67e3ba3a8929f599f4df48# Parent  6e0bea9510c9c28db9c8cc44e8bb9b51bff7168b
Merge with 6e0bea9510c9c28db9c8cc44e8bb9b51bff7168b

diff -r 9e4001404792 -r 07beb979e7e4 css/mpiwg.css
--- a/css/mpiwg.css	Fri Jun 07 11:31:31 2013 +0200
+++ b/css/mpiwg.css	Fri Jun 07 11:32:05 2013 +0200
@@ -140,6 +140,16 @@
     display: inline;
 }
 
+.hasright {
+	position: relative;
+}
+
+.hasright .right {
+	position: absolute;
+	right: 0;
+	margin-right: 0.5em;
+}
+
 .clear {
     clear: both;
 }
diff -r 9e4001404792 -r 07beb979e7e4 zpt/staff/edit_basic.zpt
--- a/zpt/staff/edit_basic.zpt	Fri Jun 07 11:31:31 2013 +0200
+++ b/zpt/staff/edit_basic.zpt	Fri Jun 07 11:32:05 2013 +0200
@@ -8,11 +8,11 @@
   <table>
   	<tr>
   		<td><b>Name</b></td>
-  		<td><input size="30" tal:attributes="value here/content/last_name" name="last_name"></td>
+  		<td><input size="30" tal:attributes="value here/content/last_name" name="last_name"/></td>
   	</tr>
   	<tr>
   		<td><b>First Name</b></td>
-  		<td><input size="30" tal:attributes="value here/content/first_name" name="first_name"></td>
+  		<td><input size="30" tal:attributes="value here/content/first_name" name="first_name"/></td>
   	</tr>
   	<tr>
   	 	<td><b>Academic degrees and position</b></td>
@@ -33,7 +33,7 @@
   		</td>
   	<tr>
   		<td><b>Funded by (external funding)</b></td>
-  		<td><input size="30" tal:attributes="value here/content/funded_by" name="funded_by"></td>
+  		<td><input size="30" tal:attributes="value here/content/funded_by" name="funded_by"/></td>
   	</tr>
   	
 <!--  	<tr>
@@ -52,14 +52,14 @@
 	</tr>
  	<tr>
  		<td><b>email (additional)</b></td>
- 		<td><input size="30" name="e_mail2" tal:attributes="value here/content/e_mail2"></td>
+ 		<td><input size="30" name="e_mail2" tal:attributes="value here/content/e_mail2"/></td>
         <td valign="top" tal:define="name string:e_mail2_p; value here/content/e_mail2_p;">
           <span metal:use-macro="here/common_template/macros/yesno_input_radio"/>
         </td>
  	</tr>
  	<tr>
  		<td><b>Room</b></td>
- 		<td><input size="30" name="room_no" tal:attributes="value here/content/room_no"></td>
+ 		<td><input size="30" name="room_no" tal:attributes="value here/content/room_no"/></td>
  		<td>(never published)</td>
  	</tr>
  	
@@ -71,20 +71,20 @@
  -->	
  	<tr>
  		<td><b>Telephone</b></td>
- 		<td><input size="30" name="telefon" tal:attributes="value here/content/telefon"></td>
+ 		<td><input size="30" name="telefon" tal:attributes="value here/content/telefon"/></td>
         <td valign="top" tal:define="name string:telefon_p; value here/content/telefon_p;">
           <span metal:use-macro="here/common_template/macros/yesno_input_radio"/>
         </td>
  	</tr>
  	<tr>
  		<td><b>Fax</b></td>
- 		<td><input size="30" name="fax" tal:attributes="value here/content/fax"></td>
+ 		<td><input size="30" name="fax" tal:attributes="value here/content/fax"/></td>
         <td valign="top" tal:define="name string:fax_p; value here/content/fax_p;">
           <span metal:use-macro="here/common_template/macros/yesno_input_radio"/>
         </td>
  	</tr>
  </table>
- <input type="submit" value="submit">
+ <input type="submit" value="submit"/>
  </form>
  <p>To add references to your homepage at other institutions please use <a href="editAdditionalLinks">the additional links tab</a></p>
  </tal:block>