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

diff --git a/plugins/admin/systems/printer.tpl b/plugins/admin/systems/printer.tpl
index 9b58d29a3..e7f8d8d83 100644
--- a/plugins/admin/systems/printer.tpl
+++ b/plugins/admin/systems/printer.tpl
@@ -1,121 +1,150 @@
-
 <table summary="" width="100%">
-	<tr>
-		<td style="vertical-align:top; width:50%;">
-{if $is_terminal ne 'true'}
-			<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>
-			 </tr>
-			 <tr>
-			  <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}">
-				{html_options options=$bases selected=$base_select}
-			   </select>
-			  </tr>
-			</table>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="2">
-			<p class="seperator">&nbsp;</p>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="2">
+ <tr>
+  <td style="vertical-align:top; width:50%; border-right:1px solid #B0B0B0">
+{if $StandAlone }
+   <h2>{t}General{/t}</h2>
+   <table summary="">
+    <tr>
+     <td><LABEL for="cn" >{t}Printer name{/t}</LABEL>{$must}</td>
+     <td>
+{render acl=$cnACL}
+      <input name="cn" id="cn" size=20 maxlength=60 value="{$cn}">
+{/render}
+     </td>
+    </tr>
+    <tr>
+     <td><LABEL for="description">{t}Description{/t}</LABEL></td>
+     <td>
+{render acl=$descriptionACL}
+      <input id="description" name="description" size=25 maxlength=80 value="{$description}">
+{/render}
+     </td>
+    </tr>
+    <tr>
+      <td colspan=2>&nbsp;</td>
+    </tr>
+    <tr>
+     <td><LABEL for="base">{t}Base{/t}</LABEL>{$must}</td>
+     <td>
+{render acl=$baseACL}
+      <select id="base" size="1" name="base" title="{t}Choose subtree to place user in{/t}">
+       {html_options options=$bases selected=$base_select}
+      </select>
+{/render}
+{render acl=$baseACL disable_picture='images/folder_gray.png'}
+      <input type="image" name="chooseBase" src="images/folder.png" class="center" title="{t}Select a base{/t}">
+{/render}
+     </td>
+    </tr>
+   </table>
+  </td>
+  <td>
 {/if}
-			<h2>{t}Details{/t}</h2>
-			<table summary="">
-			 	<tr>
-			  		<td><LABEL for="l">{t}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><input id="labeledURI" name="labeledURI" size=25 maxlength=80 value="{$labeledURI}"></td>
-			 	</tr>
-			</table>
-			<table summary="">
-				<tr>	
-					<td>
-						<br>
-						{t}PPD{/t} : {$driverInfo}<br><input type="submit" name="EditDriver" value="{t}Edit{/t}">
-					</td>
-				</tr>
-			</table>
+   <h2>{t}Details{/t}</h2>
+   <table summary="">
+     <tr>
+       <td><LABEL for="l">{t}Printer location{/t}</LABEL></td>
+       <td>
+{render acl=$lACL}
+        <input id="l" name="l" size=25 maxlength=80 value="{$l}">
+{/render}
+       </td>
+     </tr>
+     <tr>
+       <td><LABEL for="labeledURI">{t}Printer URL{/t}</LABEL>{$must}</td>
+       <td>
+{render acl=$labeledURIACL}
+        <input id="labeledURI" name="labeledURI" size=25 maxlength=80 value="{$labeledURI}">
+{/render}
+       </td>
+     </tr>
+   </table>
+   <table summary="">
+    <tr> 
+     <td>
+      <br>
+      {t}Driver{/t}: <i>{$driverInfo}</i>&nbsp;
+{render acl=$gotoPrinterPPDACL mode=read_active}
+       <input type="submit" name="EditDriver" value="{t}Edit{/t}">
+{/render}
+{render acl=$gotoPrinterPPDACL}
+       <input type="submit" name="RemoveDriver" value="{t}Remove{/t}">
+{/render}
+     </td>
+    </tr>
+   </table>
   </td>
  </tr>
 </table>
 
 <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>
-				<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>
-                				{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">
-					</td>
-				</tr>
-			</table>	
-	
-		</td>
-		<td>
-			
-			<table>
-				<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>
-                				{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">
-		
-					</td>
-				</tr>
-			</table>
-			
-		</td>
-	</tr>
+ <tr>
+  <td style="border-right:1px solid #B0B0B0; width:50%">
+   <table style="width:100%" summary=''>
+    <tr>
+     <td>
+      {t}Users which are allowed to use this printer{/t}<br>
+{render acl=$gotoUserPrinterACL}
+      <select size="1" name="UserMember[]" title="{t}Users{/t}" style="width:100%;height:120px;"  multiple>
+       {html_options options=$UserMembers values=$UserMemberKeys}
+      </select><br>
+{/render}
+{render acl=$gotoUserPrinterACL}
+      <input type="submit" value="{t}Add user{/t}"  name="AddUser">
+{/render}
+{render acl=$gotoUserPrinterACL}
+      <input type="submit" value="{t}Add group{/t}" name="AddGroup">
+{/render}
+{render acl=$gotoUserPrinterACL}
+      <input type="submit" value="{t}Delete{/t}" name="DelUser">
+{/render}
+     </td>
+    </tr>
+   </table> 
+ 
+  </td>
+  <td>
+   <table style="width:100%" summary=''>
+    <tr>
+     <td>
+      {t}Users which are allowed to administrate this printer{/t}<br>
+{render acl=$gotoUserPrinterACL}
+           <select size="1" name="AdminMember[]" title="{t}Admins{/t}" style="width:100%;height:120px;"  multiple>
+                    {html_options options=$AdminMembers values=$AdminMemberKeys}
+                   </select><br>
+{/render}
+{render acl=$gotoUserPrinterACL}
+       <input type="submit" value="{t}Add user{/t}"  name="AddAdminUser">
+{/render}
+{render acl=$gotoUserPrinterACL}
+       <input type="submit" value="{t}Add group{/t}" name="AddAdminGroup">
+{/render}
+{render acl=$gotoUserPrinterACL}
+       <input type="submit" value="{t}Delete{/t}" name="DelAdmin">
+{/render}
+  
+     </td>
+    </tr>
+   </table>
+   
+  </td>
+ </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">
+
   <!-- // First input field on page
-  document.mainform.cn.focus();
+  if(document.mainform.cn)
+	  document.mainform.cn.focus();		
   -->
 </script>