Updated organization handling.

-Added ACLs
-Added seperate template.

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

diff --git a/gosa-core/plugins/admin/departments/class_organizationGeneric.inc b/gosa-core/plugins/admin/departments/class_organizationGeneric.inc
index 467aa85e5b1a12e68db0241d2043a3ed57147db0..5a1219c2a885d89f6a1f38a9e44392680a252e91 100644 (file)
--- a/gosa-core/plugins/admin/departments/class_organizationGeneric.inc
+++ b/gosa-core/plugins/admin/departments/class_organizationGeneric.inc
@@ -34,27 +34,27 @@ class organization extends department
 
   /* Attributes 
    */ 
-  var $st                       ="c";
-  var $l                        ="c";
-  var $description              ="c";
-  var $userPassword             ="c";
-  var $searchGuide              ="c";
-  var $seeAlso                  ="c";
-  var $businessCategory         ="c";
-  var $x121Address              ="c";
-  var $registeredAddress        ="c";
-  var $destinationIndicator     ="c";
-  var $preferredDeliveryMethod  ="c";
-  var $telexNumber              ="c";
-  var $telephoneNumber          ="c";
-  var $internationaliSDNNumber  ="c";
-  var $facsimileTelephoneNumber ="c";
-  var $street                   ="c";
-  var $postOfficeBox            ="c";
-  var $postalCode               ="c";
-  var $postalAddress            ="c";
-  var $teletexTerminalIdentifier="c";
-  var $physicalDeliveryOfficeName="c";
+  var $st                       ="";
+  var $l                        ="";
+  var $description              ="";
+  var $userPassword             ="";
+  var $searchGuide              ="";
+  var $seeAlso                  ="";
+  var $businessCategory         ="";
+  var $x121Address              ="";
+  var $registeredAddress        ="";
+  var $destinationIndicator     ="";
+  var $preferredDeliveryMethod  ="";
+  var $telexNumber              ="";
+  var $telephoneNumber          ="";
+  var $internationaliSDNNumber  ="";
+  var $facsimileTelephoneNumber ="";
+  var $street                   ="";
+  var $postOfficeBox            ="";
+  var $postalCode               ="";
+  var $postalAddress            ="";
+  var $teletexTerminalIdentifier="";
+  var $physicalDeliveryOfficeName="";
 
   /* Naming attributes 
    */
@@ -68,6 +68,49 @@ class organization extends department
     $message = plugin::check();
     return($message);
   }
+
+
+  /* Return plugin informations for acl handling */
+  static function plInfo()
+  {
+    return (array("plShortName"   => _("Organization"),
+          "plDescription" => _("Organization"),
+          "plSelfModify"  => FALSE,
+          "plPriority"    => 0,
+          "plDepends"     => array(),
+          "plSection"     => array("admin"),
+          "plCategory"    => array("department"),
+
+          "plProvidedAcls" => array(
+#            "userPassword"               => _("Password"),
+#            "searchGuide"                => _("Search guide"),
+#            "seeAlso"                    => _("See also"),
+#            "x121Address"                => _("No idea"),
+#            "registeredAddress"          => _("Registered address"),
+#            "teletexTerminalIdentifier"  => _("Teletext terminal identifier"),
+#            "physicalDeliveryOfficeName" => _("Physical delivery office name"),
+#            "internationaliSDNNumber"    => _("International ISDN number"),
+#            "preferredDeliveryMethod"    => _("Prefered delivery mode"),
+#            "telexNumber"                => _("Telex number"),
+
+
+            "o"                       => _("Organization name"),
+            "description"             => _("Description"),
+            "destinationIndicator"    => _("Destination indicatior"),
+            "telephoneNumber"         => _("Phone number"),
+            "street"                  => _("Street"),
+            "postOfficeBox"           => _("Post office box "),
+            "postalCode"              => _("Postal code"),
+            "postalAddress"           => _("Postal address"),
+            "base"                    => _("Base"),
+            "businessCategory"        => _("Category"),
+            "st"                      => _("State"),
+            "l"                       => _("Location"),
+            "gosaUnitTag"             => _("Administrative settings"),
+            "facsimileTelephoneNumber"=> _("Fax"))
+          ));
+  }
+
 }
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:

diff --git a/gosa-core/plugins/admin/departments/organization.tpl b/gosa-core/plugins/admin/departments/organization.tpl
index 25b79dcdb8666624c7a4e69431d96d791c435e46..26ddc581c95c4cb4127c19c80e7cbb415a5b71cf 100644 (file)
--- a/gosa-core/plugins/admin/departments/organization.tpl
+++ b/gosa-core/plugins/admin/departments/organization.tpl
@@ -1,17 +1,17 @@
 <!--////////////////////
        //      ORGANIZATION (o)
     //////////////////// -->
-
 <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4>
  <tr>
    <td style="vertical-align:top; width:50%">
      <h2><img class="center" alt="" align="middle" src="images/rightarrow.png"> {t}Properties{/t}</h2>
+     
      <table summary="">
       <tr>
-       <td><LABEL for="o">{t}Organization name{/t}</LABEL>{$must}</td>
+       <td><LABEL for="o">{t}Name of organization{/t}</LABEL>{$must}</td>
        <td>
-{render acl=$ouACL}
-       <input id="o" name="o" size=25 maxlength=60 value="{$o}" title="{t}Name of organization to create{/t}">
+{render acl=$oACL}
+       <input id="o" name="o" size=25 maxlength=60 value="{$o}" title="{t}Name of organization to create{/t}">
 {/render}
        </td>
       </tr>
@@ -23,8 +23,20 @@
 {/render}
        </td>
       </tr>
+      <tr>
+       <td><LABEL for="businessCategory">{t}Category{/t}</LABEL></td>
+       <td>
+{render acl=$businessCategoryACL}
+        <input id="businessCategory" name="businessCategory" size=25 maxlength=80 value="{$businessCategory}" title="{t}Category for this subtree{/t}">
+{/render}
+       </td>
+      </tr>
+      <tr>
+        <td colspan="2"><br></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 department in{/t}"> 
@@ -35,9 +47,11 @@
 {render acl=$baseACL disable_picture='images/lists/folder_grey.png'}
         <input type="image" name="chooseBase" src="images/lists/folder.png" class="center" title="{t}Select a base{/t}">
 {/render}
-         </td>
-       </tr>
-       </table>
+       </td>
+       </tr>
+     </table>
+
+   </td>
    <td style="border-left:1px solid #A0A0A0">
     &nbsp;
    </td>
@@ -84,12 +98,14 @@
 {/render}
        </td>
       </tr>
-        </tr>
-       </table>
-  </td>
+     </table>
+
+   </td>
  </tr>
 </table>
+
 <p class='seperator'>&nbsp;</p>
+
 <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4>
  <tr>
    <td style="vertical-align:top; width:100%">
@@ -100,3 +116,11 @@
    </td>
   </tr>
 </table>
+
+<!-- Place cursor -->
+<input type='hidden' name='dep_generic_posted' value='1'>
+<script language="JavaScript" type="text/javascript">
+  <!-- // First input field on page
+       focus_field('o');
+  -->
+</script>