X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2FglpiPrinter.tpl;h=f47f88b5c1aa2328d8e02657d690d9fd8d01ebe5;hb=868f556da0e7c0003fb3ae735559e6500e5bc3ed;hp=3d8731c256724a07aabfbb64b8a065c9d1755b41;hpb=3c7276438051e6a326443ade780b12b8e276ccfb;p=gosa.git

diff --git a/plugins/admin/systems/glpiPrinter.tpl b/plugins/admin/systems/glpiPrinter.tpl
index 3d8731c25..f47f88b5c 100644
--- a/plugins/admin/systems/glpiPrinter.tpl
+++ b/plugins/admin/systems/glpiPrinter.tpl
@@ -26,78 +26,100 @@
 					</td>
 				</tr>
 			</table>
-			<p class="seperator" >&nbsp;</p>
-			<h2>{t}Contacts{/t}</h2>
-			<table summary="" cellpadding=5>
+		</td>
+		<td style="border-left: 1px solid rgb(160, 160, 160); vertical-align: top; padding-right: 5px;">
+			<h2>{t}Supported interfaces{/t}</h2>
+			<table summary="" width="100%">
 				<tr>
-					<td>{t}Technical responsible{/t}&nbsp;
+					<td width="20">
+						<input type="checkbox" name="flags_serial" {if $flags_serial=="1"} checked {/if} value="1" {$flags_serialACL}>
 					</td>
 					<td>
-						<i>{$tech_num}&nbsp; </i>&nbsp;
-						<input type="submit" value="{t}Choose{/t}" name="SelectTechPerson" {$tech_numACL}>
+						{t}Serial{/t}
 					</td>
 				</tr>
 				<tr>
-					<td>
-						{t}Contact person{/t}
+					<td width="20">
+						<input type="checkbox" name="flags_par" {if $flags_par=="1"} checked {/if} value="1" {$flags_parACL}>
 					</td>
 					<td>
-						<i>{$contact_num}&nbsp; </i>&nbsp;
-						<input {$contact_numACL} type="submit" name="SelectContactPerson" value="{t}Edit{/t}">
+						{t}Parallel{/t}
 					</td>
 				</tr>
-			</table>
-			<p class="seperator" >&nbsp;</p>
-			<h2>{t}Supported interfaces{/t}</h2>
-			<table summary="" width="100%">
 				<tr>
 					<td width="20">
-						<input type="checkbox" name="flags_serial" {if $flags_serial=="1"} checked {/if} value="1">
+						<input type="checkbox" name="flags_usb" {if $flags_usb=="1"} checked {/if} value="1" {$flags_usbACL}>
 					</td>
 					<td>
-						{t}Serial{/t}
+						{t}USB{/t}
 					</td>
 				</tr>
+			</table>
+			<input name="glpiPrinterFlagsPosted" value="1" type="hidden">
+		</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 width="20">
-						<input type="checkbox" name="flags_par" {if $flags_par=="1"} checked {/if} value="1">
+					<td>{t}Technical responsible{/t}&nbsp;
 					</td>
 					<td>
-						{t}Parallel{/t}
+						<i>{$tech_num}&nbsp; </i>&nbsp;
+						<input type="submit" value="{t}Edit{/t}" name="SelectTechPerson" {$tech_numACL}>
 					</td>
 				</tr>
 				<tr>
-					<td width="20">
-						<input type="checkbox" name="flags_usb" {if $flags_usb=="1"} checked {/if} value="1">
+					<td>
+						{t}Contact person{/t}
 					</td>
 					<td>
-						{t}USB{/t}
+						<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>
+					<td>
+						{$AttachmentsDiv}
+						<input name="AddAttachment" 	value="{t}Add{/t}" type="submit" {$AttachmentsACL}>	
+					</td>
+				</tr>
+			</table>
+		</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 style="vertical-align: top;">
-						{t}Comments{/t}
-					</td>
-					<td>
-						<textarea name="comments" style="width:100%;height:110px;" {$commentsACL}>{$comments}</textarea>
+					<td width="100%">
+						<textarea name="comments" style="width:100%;height:100px;" {$commentsACL}>{$comments}</textarea>
 					</td>
 				</tr>
 			</table>
-			<p class="seperator" >&nbsp;</p>
-			<h2>{t}Attachments{/t}</h2>
+		</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>
 					<td>
-						<select name="Attachments" {$AttachmentsACL} style="height:120px;width:100%;" multiple>
-							{html_options values=$AttachmentKeys output=$Attachments}
+						<select name="Cartridges[]" {$CartridgesACL} style="height:100px;width:100%;" multiple>
+							{html_options values=$CartridgeKeys output=$Cartridges}
 						</select>
-						<input name="AddAttachment" 	value="{t}Add{/t}" type="submit">	
-						<input name="RemoveAttachment" 	value="{t}Remove{/t}" type="submit">	
+						<input name="AddCartridge" 	value="{t}Add{/t}" type="submit" {$CartridgesACL}>	
+						<input name="RemoveCartridge" 	value="{t}Remove{/t}" type="submit" {$CartridgesACL}>	
 					</td>
 				</tr>
 			</table>