Fixed layout for phone plugin

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@1125 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/gofon/phoneaccount/generic.tpl b/plugins/gofon/phoneaccount/generic.tpl
index 133d6cae384abb55055fca7d0bc6d17f185befb2..5e26d81093b030050cd9963d5981134b9c1a6505 100644 (file)
--- a/plugins/gofon/phoneaccount/generic.tpl
+++ b/plugins/gofon/phoneaccount/generic.tpl
@@ -23,12 +23,19 @@
   <td>
    <h2><img alt="" align="middle" src="images/hardware.png"> {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="goFonPIN">{t}Phone PIN{/t}{$must}</LABEL>
+                               </td>
+                               <td>
+                                       <input type="password" id="goFonPIN" name="goFonPIN" value="{$goFonPIN}" {$goFonPINACL}>
+                               </td>
+                       </tr>
    </table>
   </td>
  </tr>
@@ -54,35 +61,23 @@
        <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%">
+               <img alt="" src="images/select_macro.png" align="middle">&nbsp;{t}Phone macro{/t}
                <table summary="{t}Phone macro{/t}">
                        <tr>
-                               <td colspan=2><img alt="" src="images/select_macro.png" align="middle">&nbsp;{t}Phone macro{/t}
+                               <td colspan=2>
                                         <select name="macro" onchange="document.mainform.submit()" {$telephoneNumberACL}>
                                           {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="fillout" value="{t}fill out{/t}" {$goFonMacroACL}>
+                                        <input type="submit" name="refresh" value="{t}Refresh{/t}" {$goFonMacroACL}>
+                                        <input type="submit" name="fillout" value="{t}Complete{/t}" {$goFonMacroACL}>
                                </td>
                        </tr>
                </table>
                <br>
                {$macrotab}
        </td>
-       <td valign="top" style="vertical-align:top; width:50%">
-               <table summary="">
-                       <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>
 <input type="hidden" name="phoneTab" value="phoneTab">