X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fglpi.tpl;h=3224eccaceabff360a082c74acfd1a15e8bead41;hb=49866d5f3a99b5675b11310ffba4c2e50d967eb7;hp=70e87c5c5a2cf292c08a54c650ff561681774795;hpb=f08acbf34d0c0a0c2760e382e42435f3768c2306;p=gosa.git

diff --git a/plugins/admin/systems/glpi.tpl b/plugins/admin/systems/glpi.tpl
index 70e87c5c5..3224eccac 100644
--- a/plugins/admin/systems/glpi.tpl
+++ b/plugins/admin/systems/glpi.tpl
@@ -1,6 +1,6 @@
 <table summary="" style="width:100%;">
 	<tr>
-		<td style="width:50%;">
+		<td style="width:50%;vertical-align:top;" >
 			<!--Upper left-->	
 			
 			<h2>{t}Generic{/t}</h2>
@@ -35,6 +35,19 @@
 						<input type="submit" value="{t}edit{/t}" name="edit_manufacturer" {$FK_glpi_enterpriseACL}>	
 					</td>
 				</tr>
+			<!--</table>
+			<p class="seperator">&nbsp;</p>
+			<h2>{t}Contacts{/t}</h2>
+			<table summary="" width="100%">-->
+				<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>
 				<tr>
 					<td>{t}Technical responsible{/t}&nbsp;
 					</td>
@@ -46,25 +59,12 @@
 			</table>
 		</td>
 		<td style="border-left: 1px solid rgb(160, 160, 160); vertical-align: top; padding-right: 5px;">
-
 			<!--Upper right-->
-			<h2>{t}Contacts{/t}</h2>
+			<h2>{t}Comment{/t}</h2>
 			<table summary="" width="100%">
 				<tr>
-					<td>
-						{t}Contact person{/t}
-					</td>
-					<td width="100%">
-						<i>{$contact_num}&nbsp; </i>&nbsp;
-						<input {$contact_numACL} type="submit" name="SelectContactPerson" value="{t}Edit{/t}">
-					</td>
-				</tr>
-				<tr>
-					<td valign="top">
-						{t}Comments{/t}
-					</td>
-					<td>
-						<textarea name="comments" style="width:100%;height:110px;" {$commentsACL}>{$comments}</textarea>
+					<td valign="top" colspan="2">
+						<textarea name="comments" style="width:100%;height:180px;" {$commentsACL}>{$comments}</textarea>
 					</td>
 				</tr>
 			</table>
@@ -79,28 +79,25 @@
 			<table summary="" width="100%">	
 				<tr>
 					<td>
-						<select name="InstalledDevices" {$InstalledDevicesACL} style="height:120px;width:100%;" multiple>
+						<select name="InstalledDevices" {$InstalledDevicesACL} style="height:130px;width:100%;" multiple>
 							{html_options values=$InstalledDeviceKeys output=$InstalledDevices}
 						</select>
 						<input name="AddDevice" value="{t}Edit{/t}" type="submit" {$InstalledDevicesACL}>	
 					</td>
 				</tr>
 			</table>
-			<p class="seperator" >&nbsp;</p>
+<!--			<p class="seperator" >&nbsp;</p>
 			<input type="submit" value="{t}Trading{/t}" name="Trading">	
 			<input type="submit" value="{t}Software{/t}" name="Software">	
-			<input type="submit" value="{t}Contracts{/t}" name="Contracts">	
+			<input type="submit" value="{t}Contracts{/t}" name="Contracts">	-->
 		</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>
 					<td>
-						<select name="Attachments[]" {$AttachmentsACL} style="height:120px;width:100%;" multiple>
-							{html_options values=$AttachmentKeys output=$Attachments}
-						</select>
+						{$AttachmentsDiv}
 						<input name="AddAttachment" 	value="{t}Add{/t}" type="submit" {$AttachmentsACL}>	
-						<input name="RemoveAttachment" 	value="{t}Remove{/t}" type="submit" {$AttachmentsACL}>	
 					</td>
 				</tr>
 			</table>
@@ -109,3 +106,8 @@
 	</tr>
 </table>
 <input type="hidden" name="glpi_tpl_posted" value="1">
+<script language="JavaScript" type="text/javascript">
+  <!-- // First input field on page
+	focus_field('type');
+  -->
+</script></td></tr></table><p style="text-align:right">