X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fadmin%2Fsystems%2Fglpi.tpl;h=b71261a25e446622a7ffd3285fa5d7d8c7f87971;hb=bcd990bd4ee1bbd8abfd2093f0879e8afdd8ca0b;hp=7e13cfd8a0fbbf5f798b9c70a2070655af3ba2d0;hpb=f7e3a84c4ba2adc45e1a73eafa065ac21a95ac82;p=gosa.git

diff --git a/plugins/admin/systems/glpi.tpl b/plugins/admin/systems/glpi.tpl
index 7e13cfd8a..b71261a25 100644
--- a/plugins/admin/systems/glpi.tpl
+++ b/plugins/admin/systems/glpi.tpl
@@ -1,12 +1,12 @@
 <table summary="" style="width:100%;">
 	<tr>
-		<td style="width:50%;">
+		<td style="width:50%;vertical-align:top;" >
 			<!--Upper left-->	
 			
 			<h2>{t}Generic{/t}</h2>
 			<table summary="" cellpadding=5>
 				<tr>
-					<td width="150">{t}System type{/t}
+					<td >{t}System type{/t}
 					</td>
 					<td>
 						<select name="type" {$typeACL}>
@@ -35,64 +35,69 @@
 						<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}Technical responsible{/t}&nbsp;
+					<td>
+						{t}Contact person{/t}
 					</td>
 					<td>
-						<i>{$tech_num}&nbsp; </i>&nbsp;
-						<input type="submit" value="{t}Choose{/t}" name="SelectTechPerson" {$tech_numACL}>
+						<i>{$contact_num}&nbsp; </i>&nbsp;
+						<input {$contact_numACL} type="submit" name="SelectContactPerson" value="{t}Edit{/t}">
 					</td>
 				</tr>
-			</table>
-			<p class="seperator" >&nbsp;</p>
-			<h2>{t}Installed devices{/t}</h2>
-			<table summary="" width="100%">	
 				<tr>
+					<td>{t}Technical responsible{/t}&nbsp;
+					</td>
 					<td>
-						<select name="InstalledDevices" {$InstalledDevicesACL} style="height:120px;width:100%;" multiple>
-							{html_options values=$InstalledDeviceKeys output=$InstalledDevices}
-						</select>
-						<input name="AddDevice" value="{t}Edit{/t}" type="submit" {$InstalledDevicesACL}>	
+						<i>{$tech_num}&nbsp; </i>&nbsp;
+						<input type="submit" value="{t}Edit{/t}" name="SelectTechPerson" {$tech_numACL}>
 					</td>
 				</tr>
 			</table>
-			<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">	
 		</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 valign="top" colspan="2">
+						<textarea name="comments" style="width:100%;height:180px;" {$commentsACL}>{$comments}</textarea>
 					</td>
 				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
+<p class="seperator" >&nbsp;</p>
+<table summary="" style="width:100%;">
+	<tr>
+		<td style="width:50%;">
+			<h2>{t}Installed devices{/t}</h2>
+			<table summary="" width="100%">	
 				<tr>
-					<td valign="top">
-						{t}Comments{/t}
-					</td>
 					<td>
-						<textarea name="comments" style="width:100%;height:110px;" {$commentsACL}>{$comments}</textarea>
+						<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">	-->
+		</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>
@@ -100,3 +105,9 @@
 		</td>
 	</tr>
 </table>
+<input type="hidden" name="glpi_tpl_posted" value="1">
+<script language="JavaScript" type="text/javascript">
+  <!-- // First input field on page
+  document.mainform.type.focus();
+  -->
+</script></td></tr></table><p style="text-align:right">