X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Ftemplates%2Fgroup_edit.tpl;h=be8c46c1052a736a7f6b25c7e8fd5e8abfdd89d8;hb=5bf42f1ee383f9be9707927f56b3c16753b81c45;hp=d15944899ce00379cd9a707853d0c27c7cbfdb18;hpb=e19990636073ca1aa353a67033dc0cec311fdab9;p=timetracker.git

diff --git a/WEB-INF/templates/group_edit.tpl b/WEB-INF/templates/group_edit.tpl
index d1594489..be8c46c1 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -17,41 +17,27 @@ function handleTaskRequiredCheckbox() {
 </script>
 
 {$forms.groupForm.open}
-
-{if $user->can('manage_basic_settings')}
 {include file="datetime_format_preview.tpl"}
-{/if}
 
 <table cellspacing="4" cellpadding="7" border="0">
     <tr>
       <td>
         <table cellspacing="1" cellpadding="2" border="0">
-{if $user->can('manage_basic_settings')}
-          <tr>
-            <td align="right" nowrap>{$i18n.label.group_name}:</td>
-            <td>{$forms.groupForm.group_name.control}</td>
-          </tr>
+{if $user->can('manage_subgroups') && $group_dropdown}
           <tr>
-            <td align = "right">{$i18n.label.description}:</td>
-            <td>{$forms.groupForm.description.control}</td>
+            <td align="right" nowrap>{$i18n.label.group}:</td>
+            <td>{$forms.groupForm.group.control}</td>
           </tr>
+{/if}
           <tr>
             <td align="right">{$i18n.label.currency}:</td>
             <td>{$forms.groupForm.currency.control}</td>
           </tr>
-  {if $user->can('manage_roles')}
+{if $user->can('manage_roles')}
           <tr>
             <td align="right" nowrap>{$i18n.label.roles}:</td>
             <td><a href="roles.php">{$i18n.label.configure}</a></td>
           </tr>
-  {/if}
-{if $smarty.const.SUBGROUP_DEBUG == 'true'}
-  {if $user->can('manage_subgroups')}
-          <tr>
-            <td align="right" nowrap>{$i18n.label.subgroups}:</td>
-            <td><a href="groups.php">{$i18n.label.configure}</a></td>
-          </tr>
-  {/if}
 {/if}
           <tr>
            <td align="right" nowrap>{$i18n.label.language}:</td>
@@ -73,8 +59,12 @@ function handleTaskRequiredCheckbox() {
             <td>{$forms.groupForm.start_week.control}</td>
           </tr>
           <tr>
-            <td align="right" nowrap>{$i18n.form.group_edit.show_holidays}:</td>
-            <td>{$forms.groupForm.show_holidays.control} <a href="https://www.anuko.com/lp/tt_14.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+            <td align="right" nowrap>{$i18n.form.group_edit.display_options}:</td>
+            <td><a href="display_options.php">{$i18n.label.configure}</a></td>
+          </tr>
+          <tr>
+            <td align="right" nowrap>{$i18n.form.group_edit.holidays}:</td>
+            <td>{$forms.groupForm.holidays.control} <a href="https://www.anuko.com/lp/tt_36.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
           </tr>
           <tr>
             <td align="right" nowrap>{$i18n.form.group_edit.tracking_mode}:</td>
@@ -100,16 +90,20 @@ function handleTaskRequiredCheckbox() {
             <td align="right" nowrap>{$i18n.form.group_edit.uncompleted_indicators}:</td>
             <td>{$forms.groupForm.uncompleted_indicators.control} <a href="https://www.anuko.com/lp/tt_15.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
           </tr>
-  {if $user->can('manage_advanced_settings')}
           <tr>
-            <td align="right" nowrap>{$i18n.label.bcc}:</td>
-            <td>{$forms.groupForm.bcc_email.control} <a href="https://www.anuko.com/lp/tt_10.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+            <td align="right" nowrap>{$i18n.form.group_edit.confirm_save}:</td>
+            <td>{$forms.groupForm.confirm_save.control} <a href="https://www.anuko.com/lp/tt_26.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+          </tr>
+{if $user->can('manage_advanced_settings')}
+          <tr>
+            <td align="right" nowrap>{$i18n.form.group_edit.advanced_settings}:</td>
+            <td><a href="group_advanced_edit.php">{$i18n.label.configure}</a></td>
           </tr>
+{/if}
           <tr>
-            <td align="right" nowrap>{$i18n.form.group_edit.allow_ip}:</td>
-            <td>{$forms.groupForm.allow_ip.control} <a href="https://www.anuko.com/lp/tt_21.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+            <td></td>
+            <td>{$i18n.label.required_fields}</td>
           </tr>
-  {/if}
           {* initialize preview text *}
           <script>
             MakeFormatPreview("date_format_preview", document.getElementById("date_format"));
@@ -123,7 +117,6 @@ function handleTaskRequiredCheckbox() {
             }
             adjustDecimalPreview();
           </script>
-{/if}
 
           <tr>
             <td colspan="2">&nbsp;</td>