X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fprinter.tpl;h=49ed25737938119ecad36e3769801ca2e2ace6b6;hb=30827656c010419d41e5249cee16edf2d01969b9;hp=9b58d29a3b9bc42df959584b7589212805159eac;hpb=d80f358924f6ec57e9464ff26f6380a4e9408caa;p=gosa.git

diff --git a/plugins/admin/systems/printer.tpl b/plugins/admin/systems/printer.tpl
index 9b58d29a3..49ed25737 100644
--- a/plugins/admin/systems/printer.tpl
+++ b/plugins/admin/systems/printer.tpl
@@ -1,15 +1,10 @@
 
 <table summary="" width="100%">
 	<tr>
-		<td style="vertical-align:top; width:50%;">
-{if $is_terminal ne 'true'}
+		<td style="vertical-align:top; width:50%; border-right:1px solid #B0B0B0">
+{if $StandAlone }
 			<h2>{t}General{/t}</h2>
 			<table summary="">
-			 <tr>
-			  <td colspan=2>
-			   {$desc}
-			  </td>
-			 </tr>
 			 <tr>
 			  <td><LABEL for="cn" >{t}Printer name{/t}</LABEL>{$must}</td>
 			  <td><input name="cn" id="cn" size=20 maxlength=60 value="{$cn}" {$cnACL}></td>
@@ -18,39 +13,34 @@
 			  <td><LABEL for="description">{t}Description{/t}</LABEL></td>
 			  <td><input id="description" name="description" size=25 maxlength=80 value="{$description}"></td>
 			 </tr>
-			</table>
-		</td>
-		<td valign="top">
-			<table summary="">
 			 <tr>
 				  <td colspan=2>&nbsp;</td>
 			 </tr>
 			 <tr>
 			  <td><LABEL for="base">{t}Base{/t}</LABEL>{$must}</td>
 			  <td>
-			   <select size="1" name="base" title="{t}Choose subtree to place terminal in{/t}">
+			   <select size="1" name="base" title="{t}Choose subtree to place terminal in{/t}" {$baseACL}>
 				{html_options options=$bases selected=$base_select}
 			   </select>
+				{if $baseACL == ""}
+					<input type="image" name="chooseBase" src="images/folder.png" class="center" title="{t}Select a base{/t}">
+				{else}
+					<img src="images/folder_gray.png" class="center" title="{t}Select a base{/t}">
+				{/if}
+				</td>
 			  </tr>
 			</table>
 		</td>
-	</tr>
-	<tr>
-		<td colspan="2">
-			<p class="seperator">&nbsp;</p>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="2">
+		<td>
 {/if}
 			<h2>{t}Details{/t}</h2>
 			<table summary="">
 			 	<tr>
-			  		<td><LABEL for="l">{t}Location{/t}</LABEL></td>
+			  		<td><LABEL for="l">{t}Printer location{/t}</LABEL></td>
 			  		<td><input id="l" name="l" size=25 maxlength=80 value="{$l}"></td>
 			 	</tr>
 			 	<tr>
-			  		<td><LABEL for="labeledURI">{t}Printer URL{/t}</LABEL></td>
+			  		<td><LABEL for="labeledURI">{t}Printer URL{/t}</LABEL>{$must}</td>
 			  		<td><input id="labeledURI" name="labeledURI" size=25 maxlength=80 value="{$labeledURI}"></td>
 			 	</tr>
 			</table>
@@ -58,7 +48,9 @@
 				<tr>	
 					<td>
 						<br>
-						{t}PPD{/t} : {$driverInfo}<br><input type="submit" name="EditDriver" value="{t}Edit{/t}">
+						{t}Driver{/t}: <i>{$driverInfo}</i>&nbsp;
+							<input type="submit" name="EditDriver" value="{t}Edit{/t}">
+							<input type="submit" name="RemoveDriver" value="{t}Remove{/t}">
 					</td>
 				</tr>
 			</table>
@@ -68,38 +60,36 @@
 
 <p class="plugbottom" style="margin-bottom:0px; padding:0px;">&nbsp;</p>
 
-<h2>{t}Permissions{/t}</h2>
+<h2><img class="center" alt="" align="middle" src="images/closedlock.png"> {t}Permissions{/t}</h2>
 <table summary="" width="100%">
 	<tr>
-		<td>
-
-			<table>
+		<td style="border-right:1px solid #B0B0B0; width:50%">
+			<table style="width:100%" summary=''>
 				<tr>
 					<td>
-						{t}Following objects are assigned as user.{/t}<br>
-		     				<select size="1" name="UserMember" title="{t}Users{/t}" style="width:350px;height:120px;"  multiple>
+						{t}Users which are allowed to use this printer{/t}<br>
+		     				<select size="1" name="UserMember[]" title="{t}Users{/t}" style="width:100%;height:120px;"  multiple>
                 				{html_options options=$UserMembers values=$UserMemberKeys}
                				</select><br>
-							<input type="submit" value="Add user"  name="AddUser">
-							<input type="submit" value="Add group" name="AddGroup">
-							<input type="submit" value="Delete" name="DelUser">
+							<input type="submit" value="{t}Add user{/t}"  name="AddUser">
+							<input type="submit" value="{t}Add group{/t}" name="AddGroup">
+							<input type="submit" value="{t}Delete{/t}" name="DelUser">
 					</td>
 				</tr>
 			</table>	
 	
 		</td>
 		<td>
-			
-			<table>
+			<table style="width:100%" summary=''>
 				<tr>
 					<td>
-						{t}Following objects are assigned as admin.{/t}<br>
-		     				<select size="1" name="AdminMember" title="{t}Admins{/t}" style="width:350px;height:120px;"  multiple>
+						{t}Users which are allowed to administrate this printer{/t}<br>
+		     				<select size="1" name="AdminMember[]" title="{t}Admins{/t}" style="width:100%;height:120px;"  multiple>
                 				{html_options options=$AdminMembers values=$AdminMemberKeys}
                				</select><br>
-							<input type="submit" value="Add admin user"  name="AddAdminUser">
-							<input type="submit" value="Add admin group" name="AddAdminGroup">
-							<input type="submit" value="Delete" name="DelAdmin">
+							<input type="submit" value="{t}Add user{/t}"  name="AddAdminUser">
+							<input type="submit" value="{t}Add group{/t}" name="AddAdminGroup">
+							<input type="submit" value="{t}Delete{/t}" name="DelAdmin">
 		
 					</td>
 				</tr>
@@ -109,9 +99,10 @@
 	</tr>
 </table>
 
-
+{if $netconfig ne ''}
 <p class="plugbottom" style="margin-bottom:0px; padding:0px;">&nbsp;</p>
-{include file="$netconfig"}
+{$netconfig}
+{/if}
 
 <!-- Place cursor -->
 <script language="JavaScript" type="text/javascript">