X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fglpi.tpl;h=eea99fdf2d7a024c573f9b1fab16114dea538f55;hb=96e561f68b807338f5f8923b665eb96376bd2f11;hp=f3c3511a0b82d18ed35db23993a0b7472a13a2a6;hpb=dff5bd9c49897c772bf4ca140042504c69df5252;p=gosa.git

diff --git a/plugins/admin/systems/glpi.tpl b/plugins/admin/systems/glpi.tpl
index f3c3511a0..eea99fdf2 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>
@@ -9,30 +9,57 @@
 					<td >{t}System type{/t}
 					</td>
 					<td>
-						<select name="type" {$typeACL}>
+{render acl=$typeACL}
+						<select name="type">
 							{html_options values=$SystemTypeKeys output=$SystemTypes selected=$type}
 						</select>
-						<input type="submit" value="{t}edit{/t}" name="edit_type" {$typeACL}>	
+{/render}
+{render acl=$typeACL}
+						<input type="submit" value="{t}edit{/t}" name="edit_type">	
+{/render}
 					</td>
 				</tr>
 				<tr>
 					<td>{t}Operating system{/t}
 					</td>
 					<td>
-						<select name="os" {$osACL}>
+{render acl=$osACL}
+						<select name="os">
 							{html_options values=$OSKeys output=$OSs selected=$os}
 						</select>	
-						<input type="submit" value="{t}edit{/t}" name="edit_os" {$osACL}>	
+{/render}
+{render acl=$osACL}
+						<input type="submit" value="{t}edit{/t}" name="edit_os">	
+{/render}
 					</td>
 				</tr>
 				<tr>
 					<td>{t}Manufacturer{/t}
 					</td>
 					<td>
-						<select name="FK_glpi_enterprise" {$FK_glpi_enterpriseACL}>
+{render acl=$FK_glpi_enterpriseACL}
+						<select name="FK_glpi_enterprise">
 							{html_options values=$ManufacturerKeys output=$Manufacturers selected=$FK_glpi_enterprise}
 						</select>	
-						<input type="submit" value="{t}edit{/t}" name="edit_manufacturer" {$FK_glpi_enterpriseACL}>	
+{/render}
+{render acl=$FK_glpi_enterpriseACL}
+						<input type="submit" value="{t}edit{/t}" name="edit_manufacturer">	
+{/render}
+					</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;
+{render acl=$contact_numACL}
+						<input type="submit" name="SelectContactPerson" value="{t}Edit{/t}">
+{/render}
 					</td>
 				</tr>
 				<tr>
@@ -40,31 +67,22 @@
 					</td>
 					<td>
 						<i>{$tech_num}&nbsp; </i>&nbsp;
-						<input type="submit" value="{t}Edit{/t}" name="SelectTechPerson" {$tech_numACL}>
+{render acl=$tech_numACL}
+						<input type="submit" value="{t}Edit{/t}" name="SelectTechPerson">
+{/render}
 					</td>
 				</tr>
 			</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">
+{render acl=$commentsACL}
+						<textarea name="comments" style="width:100%;height:180px;">{$comments}</textarea>
+{/render}
 					</td>
 				</tr>
 			</table>
@@ -79,30 +97,42 @@
 			<table summary="" width="100%">	
 				<tr>
 					<td>
-						<select name="InstalledDevices" {$InstalledDevicesACL} style="height:120px;width:100%;" multiple>
+{render acl=$DevicesACL}
+						<select name="InstalledDevices" style="height:130px;width:100%;" multiple>
 							{html_options values=$InstalledDeviceKeys output=$InstalledDevices}
 						</select>
-						<input name="AddDevice" value="{t}Edit{/t}" type="submit" {$InstalledDevicesACL}>	
+{/render}
+{render acl=$DevicesACL}
+						<input name="AddDevice" value="{t}Edit{/t}" type="submit">	
+{/render}
 					</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>
+{render acl=$AttachmentsACL}
 						{$AttachmentsDiv}
-						<input name="AddAttachment" 	value="{t}Add{/t}" type="submit" {$AttachmentsACL}>	
+{/render}
+{render acl=$AttachmentsACL}
+						<input name="AddAttachment" 	value="{t}Add{/t}" type="submit">	
+{/render}
 					</td>
 				</tr>
 			</table>
-			
 		</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><p style="text-align:right">