From ea787cb737c985c6477155440f45d0d13e49ffed Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 17 Mar 2010 16:25:55 +0000 Subject: [PATCH] Updated department templates git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16830 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../admin/departments/class_departmentManagement.inc | 2 +- gosa-core/plugins/admin/departments/country.tpl | 9 ++++++--- gosa-core/plugins/admin/departments/dcObject.tpl | 9 ++++++--- .../plugins/admin/departments/dep_move_confirm.tpl | 3 ++- gosa-core/plugins/admin/departments/domain.tpl | 9 ++++++--- gosa-core/plugins/admin/departments/generic.tpl | 12 ++++++++---- gosa-core/plugins/admin/departments/locality.tpl | 9 ++++++--- gosa-core/plugins/admin/departments/organization.tpl | 12 ++++++++---- 8 files changed, 43 insertions(+), 22 deletions(-) diff --git a/gosa-core/plugins/admin/departments/class_departmentManagement.inc b/gosa-core/plugins/admin/departments/class_departmentManagement.inc index adf3ee14d..37c7a9562 100644 --- a/gosa-core/plugins/admin/departments/class_departmentManagement.inc +++ b/gosa-core/plugins/admin/departments/class_departmentManagement.inc @@ -29,7 +29,7 @@ class departmentManagement extends management // Tab definition protected $tabClass = "deptabs"; protected $tabType = "DEPTABS"; - protected $aclCategory = "departement"; + protected $aclCategory = "department"; protected $aclPlugin = "generic"; protected $objectName = "department"; diff --git a/gosa-core/plugins/admin/departments/country.tpl b/gosa-core/plugins/admin/departments/country.tpl index de53f9323..10aa1c51c 100644 --- a/gosa-core/plugins/admin/departments/country.tpl +++ b/gosa-core/plugins/admin/departments/country.tpl @@ -43,14 +43,17 @@ title='{$manager}'> {/render} {render acl=$managerACL} - + {image path="images/lists/edit.png" action="editManager"} + {/render} {if $manager!=""} {render acl=$managerACL} - + {image path="images/info_small.png" title="{$manager}"} + {/render} {render acl=$managerACL} - + {image path="images/lists/trash.png" action="removeManager"} + {/render} {/if} diff --git a/gosa-core/plugins/admin/departments/dcObject.tpl b/gosa-core/plugins/admin/departments/dcObject.tpl index 9a0176186..3685a5d16 100644 --- a/gosa-core/plugins/admin/departments/dcObject.tpl +++ b/gosa-core/plugins/admin/departments/dcObject.tpl @@ -43,14 +43,17 @@ title='{$manager}'> {/render} {render acl=$managerACL} - + {image path="images/lists/edit.png" action="editManager"} + {/render} {if $manager!=""} {render acl=$managerACL} - + {image path="images/info_small.png" title="{$manager}"} + {/render} {render acl=$managerACL} - + {image path="images/lists/trash.png" action="removeManager"} + {/render} {/if} diff --git a/gosa-core/plugins/admin/departments/dep_move_confirm.tpl b/gosa-core/plugins/admin/departments/dep_move_confirm.tpl index 2c8689cf9..979c2062e 100644 --- a/gosa-core/plugins/admin/departments/dep_move_confirm.tpl +++ b/gosa-core/plugins/admin/departments/dep_move_confirm.tpl @@ -1,5 +1,6 @@
-  {t}Warning{/t} - {t}You are currently moving/renaming this department.{/t} + {image path="images/warning.png" align="top"} {t}Warning{/t} - {t}You are currently moving/renaming this department.{/t} +

{t}Modifying a departments naming attribute 'ou' or base may corrupt acls and snapshot entries for all entire objects.{/t} diff --git a/gosa-core/plugins/admin/departments/domain.tpl b/gosa-core/plugins/admin/departments/domain.tpl index 10d173c26..eb77358d8 100644 --- a/gosa-core/plugins/admin/departments/domain.tpl +++ b/gosa-core/plugins/admin/departments/domain.tpl @@ -43,14 +43,17 @@ title='{$manager}'> {/render} {render acl=$managerACL} - + {image path="images/lists/edit.png" action="editManager"} + {/render} {if $manager!=""} {render acl=$managerACL} - + {image path="images/info_small.png" title="{$manager}"} + {/render} {render acl=$managerACL} - + {image path="images/lists/trash.png" action="removeManager"} + {/render} {/if} diff --git a/gosa-core/plugins/admin/departments/generic.tpl b/gosa-core/plugins/admin/departments/generic.tpl index bd8f9d5a9..52da6b31b 100644 --- a/gosa-core/plugins/admin/departments/generic.tpl +++ b/gosa-core/plugins/admin/departments/generic.tpl @@ -55,14 +55,17 @@ title='{$manager}'> {/render} {render acl=$managerACL} - + {image path="images/lists/edit.png" action="editManager"} + {/render} {if $manager!=""} {render acl=$managerACL} - + {image path="images/info_small.png" title="{$manager}"} + {/render} {render acl=$managerACL} - + {image path="images/lists/trash.png" action="removeManager"} + {/render} {/if} @@ -72,7 +75,8 @@ - + +   diff --git a/gosa-core/plugins/admin/departments/locality.tpl b/gosa-core/plugins/admin/departments/locality.tpl index 565958b16..bb19aa6f3 100644 --- a/gosa-core/plugins/admin/departments/locality.tpl +++ b/gosa-core/plugins/admin/departments/locality.tpl @@ -43,14 +43,17 @@ title='{$manager}'> {/render} {render acl=$managerACL} - + {image path="images/lists/edit.png" action="editManager"} + {/render} {if $manager!=""} {render acl=$managerACL} - + {image path="images/info_small.png" title="{$manager}"} + {/render} {render acl=$managerACL} - + {image path="images/lists/trash.png" action="removeManager"} + {/render} {/if} diff --git a/gosa-core/plugins/admin/departments/organization.tpl b/gosa-core/plugins/admin/departments/organization.tpl index 6894cde52..5f5480ba1 100644 --- a/gosa-core/plugins/admin/departments/organization.tpl +++ b/gosa-core/plugins/admin/departments/organization.tpl @@ -55,14 +55,17 @@ title='{$manager}'> {/render} {render acl=$managerACL} - + {image path="images/lists/edit.png" action="editManager"} + {/render} {if $manager!=""} {render acl=$managerACL} - + {image path="images/info_small.png" title="{$manager}"} + {/render} {render acl=$managerACL} - + {image path="images/lists/trash.png" action="removeManager"} + {/render} {/if} @@ -71,7 +74,8 @@ - + +   -- 2.30.2