X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fgofon%2Fphoneaccount%2Fgeneric.tpl;h=e61865f2d270aca0d9208f84010e679722288a32;hb=704e9727a48d7451a8810c274f38a2e5038428d4;hp=4375af155c2963cc06512e0624627043aaecbddd;hpb=066fdcea2d4d31c9d92474c17186366de9e62dde;p=gosa.git

diff --git a/plugins/gofon/phoneaccount/generic.tpl b/plugins/gofon/phoneaccount/generic.tpl
index 4375af155..e61865f2d 100644
--- a/plugins/gofon/phoneaccount/generic.tpl
+++ b/plugins/gofon/phoneaccount/generic.tpl
@@ -1,10 +1,12 @@
 <table summary="{t}Phone numbers{/t}" style="width:100%">
  <tr>
   <td style="vertical-align:top; border-right:1px solid #A0A0A0; width:50%">
-   <h2><img alt="" align="middle" src="images/banana.png"> {t}Phone numbers{/t}</h2>
-      <select style="width:380px; height:120px;" name="phonenumber_list[]" size=6 multiple {$telephoneNumberACL}>
+   <h2><img class="center" alt="" align="middle" src="images/banana.png" />&nbsp;{t}Phone numbers{/t}</h2>
+      <select style="width:100%;" name="phonenumber_list[]" size=7 multiple {$telephoneNumberACL}>
        {html_options options=$phoneNumbers}
-		<option disabled>&nbsp;</option>
+		<option disabled>
+			&nbsp;
+			</option>
       </select>
       <br>
       <input name="phonenumber" size=20 align=middle maxlength=60 {$telephoneNumberACL} value="">
@@ -18,33 +20,34 @@
 <table summary="" style="width:100%" border=0>
  <tr>
 
-  <td>
-   <h2><img alt="" align="middle" src="images/hardware.png"> {t}Telephone hardware{/t}</h2>
+  <td style="vertical-align:top;">
+   <h2><img class="center" alt="" align="middle" src="images/hardware.png" />&nbsp;{t}Telephone hardware{/t}</h2>
 
-   <table summary="{t}Telephone{/t}" style="width:100%" border=0>
+   <table summary="{t}Telephone{/t}" border=0>
     <tr>
-     <td>{t}Telephone{/t}&nbsp;
-      {$hardware_list}
-     </td>
+     <td>{t}Telephone{/t}</td>
+     <td>{$hardware_list}</td>
     </tr>
+			<tr>
+				<td>
+					<label for="goFonVoicemailPIN">{t}Voicemail PIN{/t}{$must}</label>
+				</td>
+				<td>
+					<input type="password" id="goFonVoicemailPIN" name="goFonVoicemailPIN" value="{$goFonVoicemailPIN}" {$goFonVoicemailPINACL}>
+			</td>
+			</tr>
+			<tr>
+				<td>
+					<label for="goFonPIN">{t}Phone PIN{/t}{$must}</label>
+				</td>
+				<td>
+					<input type="password" id="goFonPIN" name="goFonPIN" value="{$goFonPIN}" {$goFonPINACL}>
+			</td>
+			</tr>
    </table>
   </td>
  </tr>
 </table>
-
-   <table summary="">
-	<tr>
-    <td>
-     <h2><img alt="" align="middle" src="images/rightarrow.png"> {t}Forward calls to{/t}</h2>
-
-     <table summary="{t}Phone number{/t}">
-      <tr> 
-       <td>{t}Phone number{/t}</td><td>{t}Timeout (s){/t}</td><td>&nbsp;</td>
-      </tr>
-      {$forwarder_list}
-     </table>
-    </td>
-   </table>
   </td>
 
  </tr>
@@ -52,34 +55,29 @@
 	<td style="vertical-align:top; border-top:1px solid #A0A0A0; width:50%" colspan="2">&nbsp;</td>
  </tr>
  <tr style="vertical-align:top; border-top:1px solid #A0A0A0;">
-	<td  style="vertical-align:top; border-right:1px solid #A0A0A0; width:50%">
-		<br>
+	<td colspan=2 style="vertical-align:top;width:50%">
+		<h2><img class="center" alt="" src="images/select_macro.png" align="middle" />&nbsp;{t}Phone macro{/t}</h2>
 		<table summary="{t}Phone macro{/t}">
 			<tr>
-				<td colspan=2><img alt="" src="images/select_macro.png" align="middle">&nbsp;{t}Phone macro{/t}
-					 <select name="macro" onchange="document.mainform.submit()" {$telephoneNumberACL}>
+				<td colspan=2>
+					 <select name="macro" onchange="document.mainform.submit()" {$goFonMacroACL}>
 					   {html_options options=$macros selected=$macro}
 				<option disabled>&nbsp;</option>
 					 </select>
-					 <input type="submit" name="refresh" value="{t}refresh{/t}" {$goFonMacroACL}>
+					 <input type="submit" name="refresh" value="{t}Refresh{/t}" {$goFonMacroACL}>
 				</td>
 			</tr>
 		</table>
 		<br>
 		{$macrotab}
 	</td>
-	<td valign="top" style="vertical-align:top; border-right:1px solid #A0A0A0; width:50%">
-		<table summary="">
-			<tr>
-				<td>
-					{t}Telefon PIN{/t}
-				</td>
-				<td>
-					<input type="password" name="goFonPIN" value="{$goFonPIN}">
-				</td>
-			</tr>
-		</table>
-	</td>
  </tr>
 </table>
 <input type="hidden" name="phoneTab" value="phoneTab">
+
+
+<script language="JavaScript" type="text/javascript">
+  <!-- // First input field on page
+  document.mainform.phonenumber.focus();
+  -->
+</script>