Fixed printer dialog layout

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@1748 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/admin/systems/class_printGeneric.inc b/plugins/admin/systems/class_printGeneric.inc
index 1e66617693e9ad6fab2a6872fd45951dae6ca5a5..0cf8e3872808342bfdf21011d3e8f8b691363b47 100644 (file)
--- a/plugins/admin/systems/class_printGeneric.inc
+++ b/plugins/admin/systems/class_printGeneric.inc
@@ -350,7 +350,7 @@ class printgeneric extends plugin
     if(!empty($this->gotoPrinterPPD)){
       $smarty->assign("driverInfo", $ppdManager->loadDescription($this->gotoPrinterPPD));
     }else{
-      $smarty->assign("driverInfo", _("Undefined"));
+      $smarty->assign("driverInfo", _("not defined"));
     }
 
     $list=$this->generateList();

diff --git a/plugins/admin/systems/printer.tpl b/plugins/admin/systems/printer.tpl
index 9511a61d566c14889da36b349bee3d737459632b..f876a41226587dbbc5467643a088a73f5f6c250f 100644 (file)
--- 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%;">
+               <td style="vertical-align:top; width:50%; border-right:1px solid #B0B0B0">
 {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>
@@ -18,10 +13,6 @@
                          <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>
@@ -34,19 +25,12 @@
                          </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>
@@ -58,7 +42,7 @@
                                <tr>    
                                        <td>
                                                <br>
-                                               {t}PPD{/t} : {$driverInfo}<br>
+                                               {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>
@@ -70,16 +54,15 @@
 
 <p class="plugbottom" style="margin-bottom:0px; padding:0px;">&nbsp;</p>
 
-<h2>{t}Permissions{/t}</h2>
+<h2><img 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%">
                                <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="{t}Add user{/t}"  name="AddUser">
@@ -91,16 +74,15 @@
        
                </td>
                <td>
-                       
-                       <table>
+                       <table style="width:100%">
                                <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="{t}Add admin user{/t}"  name="AddAdminUser">
-                                                       <input type="submit" value="{t}Add admin group{/t}" name="AddAdminGroup">
+                                                       <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>

diff --git a/plugins/admin/systems/printerPPDDialog.tpl b/plugins/admin/systems/printerPPDDialog.tpl
index 0a8fe89b620c3d6fa3468197bb648c12f392b20b..da21f72a6552ad577c33dca34b50cee0e5e509a8 100644 (file)
--- a/plugins/admin/systems/printerPPDDialog.tpl
+++ b/plugins/admin/systems/printerPPDDialog.tpl
@@ -19,6 +19,6 @@
 {$properties}
 <p class="plugbottom">
        <input type="hidden" name="PPDDisSubmitted" value="1">
-       <input type="submit" name="SavePPD" value="{t}Use{/t}">
-       <input type="submit" name="ClosePPD" value="{t}Close{/t}">
+       <input type="submit" name="SavePPD" value="{t}Apply{/t}">
+       <input type="submit" name="ClosePPD" value="{t}Cancel{/t}">
 </p>