X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fplugins%2Fadmin%2Fdepartments%2Forganization.tpl;h=9a8df1818f665853ea3b0e9c28bb0faba6457170;hb=f4a6588f33b5886afaa20db8b01517b8eafbafed;hp=7a955f3f550066c95d1975b329f255796a5c428b;hpb=ebccb3e4a50b3038a0f985fedb4fc87f7cd250c0;p=gosa.git

diff --git a/gosa-core/plugins/admin/departments/organization.tpl b/gosa-core/plugins/admin/departments/organization.tpl
index 7a955f3f5..9a8df1818 100644
--- 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>
+<table summary="{t}Organization{/t}" style="width:100%" 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>
+   <td style="width:50%">
+     <h3>{t}Properties{/t}</h3>
      
-     <table summary="">
+     <table summary="{t}Properties{/t}">
       <tr>
        <td><LABEL for="o">{t}Name of organization{/t}</LABEL>{$must}</td>
        <td>
 {render acl=$oACL}
-	<input id="o" name="o" size=25 maxlength=60 value="{$o}" title="{t}Name of organization to create{/t}">
+	<input type='text' id="o" name="o" size=25 maxlength=60 value="{$o}" title="{t}Name of organization to create{/t}">
 {/render}
        </td>
       </tr>
@@ -19,7 +19,7 @@
        <td><LABEL for="description">{t}Description{/t}</LABEL>{$must}</td>
        <td>
 {render acl=$descriptionACL}
-        <input id="description" name="description" size=25 maxlength=80 value="{$description}" title="{t}Descriptive text for department{/t}">
+        <input type='text' id="description" name="description" size=25 maxlength=80 value="{$description}" title="{t}Descriptive text for department{/t}">
 {/render}
        </td>
       </tr>
@@ -27,7 +27,7 @@
        <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}">
+        <input type='text' id="businessCategory" name="businessCategory" size=25 maxlength=80 value="{$businessCategory}" title="{t}Category for this subtree{/t}">
 {/render}
        </td>
       </tr>
@@ -40,32 +40,53 @@
 
         <td>
 {render acl=$baseACL}
-         <select id="base" size="1" name="base" title="{t}Choose subtree to place department in{/t}"> 
-          {html_options options=$bases selected=$base_select}
-         </select>
-{/render}
-
-{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}">
+          {$base}
 {/render}
 	</td>
        </tr>
 	{/if}
+
+  {if $manager_enabled}
+    <tr>
+     <td><label for="manager">{t}Manager{/t}</label></td>
+     <td>
+{render acl=$managerACL}
+        <input type='text' name='manager_name' id='manager_name' value='{$manager_name}' disabled
+          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}
+     </td>
+    </tr>
+  {/if}
      </table>
 
    </td>
-   <td style="border-left:1px solid #A0A0A0">
+   <td class='left-border'>
+
     &nbsp;
    </td>
    <td>
-     <h2><img class="center" alt="" align="middle" src="plugins/departments/images/department.png"> {t}Location{/t}</h2>
+     <h3>{t}Location{/t}</h3>
 
      <table summary="" style="width:100%">
       <tr>
        <td><LABEL for="st">{t}State{/t}</LABEL></td>
        <td>
 {render acl=$stACL}
-	<input id="st" name="st" size=25 maxlength=60 value="{$st}" title="{t}State where this subtree is located{/t}">
+	<input type='text' id="st" name="st" size=25 maxlength=60 value="{$st}" title="{t}State where this subtree is located{/t}">
 {/render}
        </td>
       </tr>
@@ -73,12 +94,12 @@
        <td><LABEL for="l">{t}Location{/t}</LABEL></td>
        <td>
 {render acl=$lACL}
-	<input id="l" name="l" size=25 maxlength=60 value="{$l}" title="{t}Location of this subtree{/t}">
+	<input type='text' id="l" name="l" size=25 maxlength=60 value="{$l}" title="{t}Location of this subtree{/t}">
 {/render}
        </td>
       </tr>
       <tr>
-       <td style="vertical-align:top;"><LABEL for="postalAddress">{t}Address{/t}</LABEL></td>
+       <td><LABEL for="postalAddress">{t}Address{/t}</LABEL></td>
        <td>
 {render acl=$postalAddressACL}
 	<textarea id="postalAddress" name="postalAddress" style="width:100%" rows=3 cols=22 title="{t}Postal address of this subtree{/t}">{$postalAddress}</textarea>
@@ -88,7 +109,7 @@
        <td><LABEL for="telephoneNumber">{t}Phone{/t}</LABEL></td>
        <td>
 {render acl=$telephoneNumberACL}
-	<input id="telephoneNumber" name="telephoneNumber" size=25 maxlength=60 value="{$telephoneNumber}" title="{t}Base telephone number of this subtree{/t}">
+	<input type='text' id="telephoneNumber" name="telephoneNumber" size=25 maxlength=60 value="{$telephoneNumber}" title="{t}Base telephone number of this subtree{/t}">
 {/render}
        </td>
       </tr>
@@ -96,7 +117,7 @@
        <td><LABEL for="facsimileTelephoneNumber">{t}Fax{/t}</LABEL></td>
        <td>
 {render acl=$facsimileTelephoneNumberACL}
-	<input id="facsimileTelephoneNumber" name="facsimileTelephoneNumber" size=25 maxlength=60 value="{$facsimileTelephoneNumber}" title="{t}Base facsimile telephone number of this subtree{/t}">
+	<input type='text' id="facsimileTelephoneNumber" name="facsimileTelephoneNumber" size=25 maxlength=60 value="{$facsimileTelephoneNumber}" title="{t}Base facsimile telephone number of this subtree{/t}">
 {/render}
        </td>
       </tr>
@@ -106,18 +127,13 @@
  </tr>
 </table>
 
-<p class='seperator'>&nbsp;</p>
+<hr>
 
-<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4>
- <tr>
-   <td style="vertical-align:top; width:100%">
-     <h2><img class="center" alt="" align="middle" src="images/lists/locked.png"> {t}Administrative settings{/t}</h2>
+<h3>{t}Administrative settings{/t}</h3>
 {render acl=$gosaUnitTagACL}
-     <input id="is_administrational_unit" type=checkbox name="is_administrational_unit" value="1" {$gosaUnitTag}><label for="is_administrational_unit">{t}Tag department as an independent administrative unit{/t}</label>
+ <input id="is_administrational_unit" type=checkbox name="is_administrational_unit" value="1" {$gosaUnitTag}>
+ <label for="is_administrational_unit">{t}Tag department as an independent administrative unit{/t}</label>
 {/render}
-   </td>
-  </tr>
-</table>
 
 <!-- Place cursor -->
 <input type='hidden' name='dep_generic_posted' value='1'>