Updated

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

diff --git a/plugins/admin/systems/class_glpiAccount.inc b/plugins/admin/systems/class_glpiAccount.inc
index 71036a3ac0e99a27c6a6a0a252c49430880a298e..a72f7005c957413499578d32658c73b95107ef7f 100644 (file)
--- a/plugins/admin/systems/class_glpiAccount.inc
+++ b/plugins/admin/systems/class_glpiAccount.inc
@@ -551,7 +551,7 @@ class glpiAccount extends plugin
     */
 
     $divlist = new divSelectBox("glpiAttachmentsList");
-    $divlist-> SetHeight(150); 
+    $divlist-> SetHeight(120); 
     $atts = $this->getUsedAttachments(true);
     $downlink = "<a href='get_attachment.php?id=%s' target='_blank'>%s</a>";
     $del_link = "<input type='image' src='images/edittrash.png' name='delAttachment_%s'>";

diff --git a/plugins/admin/systems/class_glpiPrinterAccount.inc b/plugins/admin/systems/class_glpiPrinterAccount.inc
index af76ba9ccc21e5abeb951b3b0c14608fc3f21e51..0a6fa9a1d88ba6793c2523ef7acd5340503803bf 100644 (file)
--- a/plugins/admin/systems/class_glpiPrinterAccount.inc
+++ b/plugins/admin/systems/class_glpiPrinterAccount.inc
@@ -506,7 +506,7 @@ class glpiPrinterAccount extends plugin
     */
 
     $divlist = new divSelectBox("glpiAttachmentsList");
-    $divlist-> SetHeight(150);
+    $divlist-> SetHeight(120);
     $atts = $this->getUsedAttachments(true);
     $downlink = "<a href='get_attachment.php?id=%s' target='_blank'>%s</a>";
     $del_link = "<input type='image' src='images/edittrash.png' name='delAttachment_%s'>";

diff --git a/plugins/admin/systems/glpiPrinter.tpl b/plugins/admin/systems/glpiPrinter.tpl
index 960420b769a62147d22c827dbd0146cb333612c8..b222b051922bf155b72e487bf156a01e56693581 100644 (file)
--- a/plugins/admin/systems/glpiPrinter.tpl
+++ b/plugins/admin/systems/glpiPrinter.tpl
@@ -26,37 +26,6 @@
                                        </td>
                                </tr>
                        </table>
-                       <p class="seperator" >&nbsp;</p>
-                       <h2>{t}Contacts{/t}</h2>
-                       <table summary="" cellpadding=5>
-                               <tr>
-                                       <td>{t}Technical responsible{/t}&nbsp;
-                                       </td>
-                                       <td>
-                                               <i>{$tech_num}&nbsp; </i>&nbsp;
-                                               <input type="submit" value="{t}Choose{/t}" name="SelectTechPerson" {$tech_numACL}>
-                                       </td>
-                               </tr>
-                               <tr>
-                                       <td>
-                                               {t}Contact person{/t}
-                                       </td>
-                                       <td>
-                                               <i>{$contact_num}&nbsp; </i>&nbsp;
-                                               <input {$contact_numACL} type="submit" name="SelectContactPerson" value="{t}Edit{/t}">
-                                       </td>
-                               </tr>
-                       </table>
-<br>
-                       <p class="seperator" >&nbsp;</p>
-                       <h2>{t}Information{/t}</h2>
-                       <table summary="" width="100%">
-                               <tr>
-                                       <td width="100%">
-                                               <textarea name="comments" style="width:100%;height:100px;" {$commentsACL}>{$comments}</textarea>
-                                       </td>
-                               </tr>
-                       </table>
                </td>
                <td style="border-left: 1px solid rgb(160, 160, 160); vertical-align: top; padding-right: 5px;">
                        <h2>{t}Supported interfaces{/t}</h2>
@@ -87,7 +56,35 @@
                                </tr>
                        </table>
                        <input name="glpiPrinterFlagsPosted" value="1" type="hidden">
-                       <p class="seperator" >&nbsp;</p>
+               </td>
+       </tr>
+</table>
+<p class="seperator" >&nbsp;</p>
+<table summary="" style="width:100%;">
+       <tr>
+               <td style="width:50%;vertical-align: top;">
+                       <h2>{t}Contacts{/t}</h2>
+                       <table summary="" cellpadding=5>
+                               <tr>
+                                       <td>{t}Technical responsible{/t}&nbsp;
+                                       </td>
+                                       <td>
+                                               <i>{$tech_num}&nbsp; </i>&nbsp;
+                                               <input type="submit" value="{t}Choose{/t}" name="SelectTechPerson" {$tech_numACL}>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td>
+                                               {t}Contact person{/t}
+                                       </td>
+                                       <td>
+                                               <i>{$contact_num}&nbsp; </i>&nbsp;
+                                               <input {$contact_numACL} type="submit" name="SelectContactPerson" value="{t}Edit{/t}">
+                                       </td>
+                               </tr>
+                       </table>
+               </td>
+               <td style="border-left: 1px solid rgb(160, 160, 160); vertical-align: top; padding-right: 5px;">
                        <h2>{t}Attachments{/t}</h2>
                        <table summary="" width="100%"> 
                                <tr>
@@ -97,7 +94,23 @@
                                        </td>
                                </tr>
                        </table>
-                       <p class="seperator" >&nbsp;</p>
+               </td>
+       </tr>
+</table>
+<p class="seperator" >&nbsp;</p>
+<table summary="" style="width:100%;">
+       <tr>
+               <td style="width:50%;vertical-align: top;">
+                       <h2>{t}Information{/t}</h2>
+                       <table summary="" width="100%">
+                               <tr>
+                                       <td width="100%">
+                                               <textarea name="comments" style="width:100%;height:100px;" {$commentsACL}>{$comments}</textarea>
+                                       </td>
+                               </tr>
+                       </table>
+               </td>
+               <td style="border-left: 1px solid rgb(160, 160, 160); vertical-align: top; padding-right: 5px;">
                        <h2>{t}Installed cartridges{/t}</h2>
                        <table summary="" width="100%"> 
                                <tr>