gofon tidy

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

diff --git a/plugins/gofon/macro/class_gofonMacroParameters.inc b/plugins/gofon/macro/class_gofonMacroParameters.inc
index 7f99782fc1eb9a0630232895fdd0c49d04a868e5..a6c328ac95f402806cad28e131272a09d4708f05 100755 (executable)
--- a/plugins/gofon/macro/class_gofonMacroParameters.inc
+++ b/plugins/gofon/macro/class_gofonMacroParameters.inc
@@ -191,14 +191,15 @@ class macroParameter extends plugin
 
       /* Assemble output table */
       $vars .="<tr>
+        <td>
         <input name=\"number".$key."\" value='".$key."' type='hidden'>
         <td><input name='var".$key."' type='hidden'   value='".$para['var']."'>ARG".$key."</td>
         <td><input size=\"45\" name='varname".$key."'  value='".$para['name']."'></td>
         <td>
         <select name='vartype".$key."'>
-        <option name='vartype".$key."' value='string' ".$sel1.">"._("String")."</option>
-        <option name='vartype".$key."' value='combo'   ".$sel2.">"._("Combobox")."</option>
-        <option name='vartype".$key."' value='bool'   ".$sel3.">"._("Bool")."</option>
+        <option  value='string' ".$sel1.">"._("String")."&nbsp;</option>
+        <option  value='combo'   ".$sel2.">"._("Combobox")."&nbsp;</option>
+        <option  value='bool'   ".$sel3.">"._("Bool")."&nbsp;</option>
         </select>
         </td>
         <td><input size=\"45\" name='default".$key."'   value='".$para['default']."'></td>

diff --git a/plugins/gofon/macro/generic.tpl b/plugins/gofon/macro/generic.tpl
index 3bb53c26e62601230b753da631b214a566fd895c..ce7e001d32369b98798b6d1848a70948e6debdd2 100755 (executable)
--- a/plugins/gofon/macro/generic.tpl
+++ b/plugins/gofon/macro/generic.tpl
@@ -13,7 +13,7 @@
                                </td>
                        </tr>
                        <tr>
-                                       <td colspan=2><div style="height:15px;">
+                                       <td colspan=2>
                                        </td>
                                </tr>
                        <tr>

diff --git a/plugins/gofon/macro/headpage.tpl b/plugins/gofon/macro/headpage.tpl
index 8d273056bfa0d08ac494a395b298fd589a3f9788..b6f774f5df1c1625f87dcd48e7abec8baa81fe51 100755 (executable)
--- a/plugins/gofon/macro/headpage.tpl
+++ b/plugins/gofon/macro/headpage.tpl
@@ -48,6 +48,7 @@
                    <td>
                                <select name="depselect" size=1 onChange="mainform.submit()" title="{t}Choose the department the search will be based on{/t}">
                                  {html_options options=$deplist selected=$depselect}
+                                       <option disabled>&nbsp;</option>
                                </select>
                        </td>
                </tr>

diff --git a/plugins/gofon/phoneaccount/class_phoneAccount.inc b/plugins/gofon/phoneaccount/class_phoneAccount.inc
index f3b8a76b8370d00e624d1203d3903f2ab1de42f3..a3ad38706a4d8ff68e5cb6c73761b0629bbd532b 100644 (file)
--- a/plugins/gofon/phoneaccount/class_phoneAccount.inc
+++ b/plugins/gofon/phoneaccount/class_phoneAccount.inc
@@ -241,9 +241,9 @@ class phoneAccount extends plugin
             $str= "<select name='".$var."' ".chkacl($this->acl, "goFonMacro").">";
             foreach(split(":",$default) as $choice){
               if($choosen==$choice){
-                $str.= "\n<option value='".$choice."' selected>".$choice."</option>";
+                $str.= "\n<option value='".$choice."' selected>".$choice."&nbsp;</option>";
               }else{
-                $str.= "\n<option value='".$choice."'>".$choice."</option>";
+                $str.= "\n<option value='".$choice."'>".$choice."&nbsp;</option>";
               }
             }
             $str.="</select>";