X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fpersonal%2Fgeneric%2Fgeneric.tpl;h=0f02daef40dd1d361fc74989531e759c2db5d911;hb=ac7e7a5abc44277b8fcbe3f4a2220af9cd82d469;hp=1614fa0cb404a75c60b4b84969928b70f5162c60;hpb=930e81b9f07b2bd5737d28c3a26b5451e61d3e43;p=gosa.git

diff --git a/plugins/personal/generic/generic.tpl b/plugins/personal/generic/generic.tpl
index 1614fa0cb..0f02daef4 100644
--- a/plugins/personal/generic/generic.tpl
+++ b/plugins/personal/generic/generic.tpl
@@ -1,9 +1,9 @@
-<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4 border=0>
+<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding="4" border="0">
 
  <!-- Headline container -->
  <tr>
-  <td colspan=4>
-   <h2><img alt="" align="middle" src="images/head.png"> {t}Personal information{/t}</h2>
+  <td colspan="4">
+   <h2><img alt="" align="middle" src="images/head.png" class="center"> {t}Personal information{/t}</h2>
   </td>
  </tr>
 
@@ -11,23 +11,48 @@
  <tr>
 
   <!-- Image container -->
+	<!-- Image container -->
+	<td style="vertical-align:top">
+	  <table>
+	   <tr>
+		<td width="147" height="200" bgcolor="gray">
+		 <img align="middle" border="0" width="100%" src="getbin.php?rand={$rand}" alt="{t}Personal picture{/t}">
+		</td>
+	   </tr>
+	   <tr>
+		<td>
+		 <input type="submit" name="edit_picture" {$jpegPhotoACL} value="{t}Change picture{/t}...">
+		</td>
+	   </tr>
+	  </table>
+	</td>
+	<!--
+	Old image container, with incorrect image scaling.
   <td style="vertical-align:top">
-   <img align="bottom" border="1" width="145" height="200" src="getpic.php?rand={$rand}" alt="{t}Personal picture{/t}">
+   <img align="bottom" border="1" width="145" height="200" src="getbin.php?rand={$rand}" alt="{t}Personal picture{/t}">
    <br>
-   <input type=submit name="edit_picture" {$jpegPhotoACL} value="{t}Change picture{/t}...">
+   <input type="submit" name="edit_picture" {$jpegPhotoACL} value="{t}Change picture{/t}...">
   </td>
+	-->
 
   <!-- Name, ... -->
   <td style="vertical-align:top;">
    <table summary=""> 
+    {if $is_template ne "true"}
     <tr>
-     <td><label for="sn">{t}Name{/t}{$must}</label></td>
+     <td><label for="sn">{t}Last name{/t}{$must}</label></td>
      <td><input id="sn" name="sn" size=25 maxlength=60 {$snACL} value="{$sn}"></td>
     </tr>
+    {else}
+    <tr>
+     <td><label for="sn">{t}Template name{/t}{$must}</label></td>
+     <td><input id="sn" name="sn" size=25 maxlength=60 {$snACL} value="{$sn}"></td>
+    </tr>
+    {/if}
 
     {if $is_template ne "true"}
     <tr>
-     <td><label for="givenName">{t}Given name{/t}{$must}</label></td>
+     <td><label for="givenName">{t}First name{/t}{$must}</label></td>
      <td><input id="givenName" name="givenName" size=25 maxlength=60 {$givenNameACL} value="{$givenName}"></td>
     </tr>
     <tr>
@@ -60,19 +85,19 @@
      <td>
       <div style="height:10px;"></div>
       {if $use_dob eq 1}
-      <select id="day" name=day onChange="createResult(this.form,this.form.dob);" {$dobACL}>
+      <select id="day" name=day onChange="createResult(this.form,this.form.dateOfBirth);" {$dateOfBirthACL}>
        {html_options values=$days output=$days selected=$day}
       </select>
-      <select name=month onChange="populate(this.form,this.form.dob);" {$dobACL}>
+      <select name=month onChange="populate(this.form,this.form.dateOfBirth);" {$dateOfBirthACL}>
        {html_options options=$months selected=$month}
       </select>
-      <select name=year onChange="populate(this.form,this.form.dob);" {$dobACL}>
+      <select name=year onChange="populate(this.form,this.form.dateOfBirth);" {$dateOfBirthACL}>
        {html_options values=$years output=$years selected=$year}
       </select>
-      <input type="hidden" name="dob" value="{$dob}">
-      <input type=submit name="set_dob" value="-" {$dobACL}>
+      <input type="hidden" name="dateOfBirth" value="{$dateOfBirth}">
+      <input type="submit" name="set_dob" value="-" {$dateOfBirthACL}>
       {else}
-      <input type=submit name="set_dob" value="{t}Set{/t}" {$dobACL}>
+      <input type="submit" name="set_dob" value="{t}Set{/t}" {$dateOfBirthACL}>
       {/if}
      </td>
     </tr>
@@ -88,7 +113,7 @@
     </tr>
     <tr>
      <td>
-      <label for="preferredLanguage">{t}Prefered langage{/t}</label>
+      <label for="preferredLanguage">{t}Preferred langage{/t}</label>
      </td>
      <td>
       <select size="1" id="preferredLanguage" name="preferredLanguage" {$preferredLanguageACL}>
@@ -106,6 +131,11 @@
       <select id="base" size="1" name="base" {$selectmode} title="{t}Choose subtree to place user in{/t}">
        {html_options options=$bases selected=$base_select}
       </select>
+		{if $selectmode == ""}
+			<input type="image" name="chooseBase" src="images/folder.png" class="center" title="{t}Select a base{/t}">
+		{else}
+			<img src="images/folder_gray.png" class="center" title="{t}Select a base{/t}" alt=''>
+		{/if}
      </td>
     </tr>
    </table>
@@ -116,10 +146,10 @@
   <td style="vertical-align:top;">
 
    <!-- Address, ... -->
-   <table summary=""> 
+   <table summary="" style="width:100%"> 
     <tr>
      <td style="vertical-align:top;"><label for="homePostalAddress">{t}Address{/t}</label></td>
-     <td><textarea id="homePostalAddress" name="homePostalAddress" rows=3 cols=22 {$homePostalAddressACL}>{$homePostalAddress}</textarea></td>
+     <td><textarea id="homePostalAddress" name="homePostalAddress" rows="3" style="width:100%" {$homePostalAddressACL}>{$homePostalAddress}</textarea></td>
     </tr>
     <tr>
      <td><label for="homePhone">{t}Private phone{/t}</label></td>
@@ -147,12 +177,12 @@
     <tr>
      <td><label for="edit_cert">{t}Certificates{/t}</label></td>
      <td>
-      <input id="edit_cert" type=submit name="edit_cert" {$certificatesACL} value="{t}Edit certificates{/t}...">
+      <input id="edit_cert" type="submit" name="edit_cert" {$certificatesACL} value="{t}Edit certificates{/t}...">
      </td>
     </tr>
     <tr>
      <td><label for="edit_krb">{t}Kerberos{/t}</label></td>
-     <td><input id="edit_krb" type=submit name="edit_krb" disabled value="{t}Edit properties{/t}..."></td>
+     <td><input id="edit_krb" type="submit" name="edit_krb" disabled value="{t}Edit properties{/t}..."></td>
     </tr>
     {/if}
 
@@ -163,12 +193,12 @@
 
 <p class="seperator">&nbsp;</p>
 
-<table summary="" class="line" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4 border=0>
+<table summary="" class="line" style="width:100%; vertical-align:top; text-align:left;" cellpadding="4" border="0">
 
  <!-- Headline container -->
  <tr>
-  <td colspan=3>
-   <h2><img alt="" align="middle" src="images/house.png"> {t}Organizational information{/t}</h2>
+  <td colspan="3">
+   <h2><img alt="" align="middle" src="images/house.png" class="center">&nbsp;{t}Organizational information{/t}</h2>
   </td>
  </tr>
 
@@ -252,9 +282,9 @@
 
   <!-- Location, ... -->
   <td style="vertical-align:top;">
-   <table summary=""> 
+   <table summary="" style="width:100%"> 
     <tr>
-     <td><label for="l">{t}Location{/t}</l></td>
+     <td><label for="l">{t}Location{/t}</label></td>
      <td><input id="l" name="l" size=22 maxlength=60 {$lACL} value="{$l}"></td>
     </tr>
     <tr>
@@ -264,7 +294,7 @@
     <tr>
      <td style="vertical-align:top;"><label for="postalAddress">{t}Address{/t}</label></td>
      <td>
-      <textarea id="postalAddress" name="postalAddress" rows=3 cols=22 {$postalAddressACL}>{$postalAddress}</textarea>
+      <textarea id="postalAddress" name="postalAddress" rows=3 style="width:100%" {$postalAddressACL}>{$postalAddress}</textarea>
      </td>
     </tr>
    </table>
@@ -273,7 +303,7 @@
   {else} 
 
   <!-- Beschreibung, ... -->
-  <td style="vertical-align:top;">
+  <td style="vertical-align:top;border-right:1px solid #b0b0b0">
    <table summary=""> 
     <tr>
      <td><label for="vocation">{t}Vocation{/t}</label></td>
@@ -312,7 +342,7 @@
   </td>
   
   <!-- Phone, ... -->
-  <td style="vertical-align:top;">
+  <td style="vertical-align:top;border-right:1px solid #b0b0b0">
    <table summary=""> 
     <tr>
      <td><label for="gouvernmentOrganizationalPersonLocality">{t}Person locality{/t}</label></td>
@@ -404,7 +434,7 @@
   <!-- // First input field on page
   document.mainform.sn.focus();
   	if (document.mainform.yearSel != "")
-				populate(document.mainform,document.mainform.dob);
+				populate(document.mainform,document.mainform.dateOfBirth);
   -->
 </script>