Fixed some issues

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

diff --git a/TODO b/TODO
index 0ccd189388cc6cb7cfd2a0ce979dc5e112ccf487..04e4a57b166cb44880ce5a476bb19c0ce013f472 100644 (file)
--- a/TODO
+++ b/TODO
@@ -4,10 +4,6 @@ Things to fix before 2.4:
 Showed up by a small review. Since we've time until the doc is ready,
 face these:
 
-* When selecting who can manage printers the list of the windows pc is show with the users
-
-* In system, server nfs export the text is still in german "Freigabe bearbeiten" and the icon is a phone
-
 * When using help with gosa in english with gosa.conf lang="en_EN" but my browser said fr_FR 
   i got gosa in english but the help in french
   

diff --git a/plugins/admin/systems/class_selectUserToPrinterDialog.inc b/plugins/admin/systems/class_selectUserToPrinterDialog.inc
index d07f482daa435e107e1e8849fbe3e6cc16453c41..6bde4054494bd7b64a31285b24328112480bd3e0 100644 (file)
--- a/plugins/admin/systems/class_selectUserToPrinterDialog.inc
+++ b/plugins/admin/systems/class_selectUserToPrinterDialog.inc
@@ -27,7 +27,7 @@ class selectUserToPrinterDialog extends plugin
 
     switch($type){
       case "AddUser" : 
-        $this->searchObjects = "(objectClass=person)(objectClass=inetOrgPerson)";
+        $this->searchObjects = "(objectClass=person)(objectClass=inetOrgPerson)(!(uid=*$))";
         $this->searchAttrs   = array("cn","uid");
         $this->searchAppend  = "uid"; 
           ;break;
@@ -37,7 +37,7 @@ class selectUserToPrinterDialog extends plugin
         $this->searchAppend  = "cn"; 
           ;break;
       case "AddAdminUser" : 
-        $this->searchObjects = "(objectClass=person)(objectClass=inetOrgPerson)";
+        $this->searchObjects = "(objectClass=person)(objectClass=inetOrgPerson)(!(uid=*$))";
         $this->searchAttrs   = array("cn","uid");
         $this->searchAppend  = "uid"; 
           ;break;

diff --git a/plugins/admin/systems/servnfs.tpl b/plugins/admin/systems/servnfs.tpl
index 5c66c26f5652561ae6ab1d48d57ef63379002e27..d9d279973b8555854c05cc460e150808f26d0d65 100644 (file)
--- a/plugins/admin/systems/servnfs.tpl
+++ b/plugins/admin/systems/servnfs.tpl
@@ -1,4 +1,4 @@
-<h2><img alt="" src="images/select_phone.png" align="middle">&nbsp;Freigabe bearbeiten</h2>
+<h2><img alt="" src="images/fai_partitionTable.png" align="middle">&nbsp;{t}Edit share{/t}</h2>
 <table summary="{t}NFS setup{/t}" width="100%">
        <tr>
                <td width="45%">
@@ -17,12 +17,20 @@
                                                {t}Description{/t}
                                        </td>
                                        <td>
-                                               <input type="text" name="description" value="{$description}">
+                                               <input type="text" size="40" name="description" value="{$description}">
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td>
+                                               {t}Path{/t}
+                                       </td>
+                                       <td>
+                                               <input type="text" size="40" name="path" value="{$path}">
                                        </td>
                                </tr>
                        </table>
                </td>
-               <td>
+               <td style="border-left:1px solid #A0A0A0">
 
                <!--Table right-top-->
                        <table>
@@ -46,40 +54,16 @@
                                                </select>       
                                        </td>
                                </tr>
-                       </table>
-               </td>
-       </tr>
-       <tr>
-               <td colspan=2>
-                       <p class="seperator">&nbsp;</p>
-               </td>
-       </tr>
-       <tr>
-               <td>
-               <!--Table bottom-->
-                       <table>
                                <tr>
-                                       <td>
-                                               {t}Path{/t}
-                                       </td>
-                                       <td>
-                                               <input type="text" name="path" value="{$path}">
-                                       </td>
+                                   <td>
+                                       {t}Option{/t}
+                                   </td>
+                                   <td>
+                                                               <input type="text" name="option" value="{$option}">
+                                   </td>
                                </tr>
                        </table>
                </td>
-               <td>
-                       <table>
-                <tr>
-                    <td>
-                        {t}Option{/t}
-                    </td>
-                    <td>
-                                               <input type="text" name="option" value="{$option}">
-                    </td>
-                </tr>
-            </table>
-               </td>
        </tr>
        <tr>
                <td colspan=2>