Removed show holidays config option.

[timetracker.git] / WEB-INF / templates / group_edit.tpl

diff --git a/WEB-INF/templates/group_edit.tpl b/WEB-INF/templates/group_edit.tpl
index d159448..0da797f 100644 (file)
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -26,9 +26,15 @@ function handleTaskRequiredCheckbox() {
     <tr>
       <td>
         <table cellspacing="1" cellpadding="2" border="0">
+{if $user->can('manage_subgroups') && $group_dropdown}
+          <tr>
+            <td align="right" nowrap>{$i18n.label.group}:</td>
+            <td>{$forms.groupForm.group.control}</td>
+          </tr>
+{/if}
 {if $user->can('manage_basic_settings')}
           <tr>
-            <td align="right" nowrap>{$i18n.label.group_name}:</td>
+            <td align="right" nowrap>{$i18n.label.group_name} (*):</td>
             <td>{$forms.groupForm.group_name.control}</td>
           </tr>
           <tr>
@@ -45,14 +51,6 @@ function handleTaskRequiredCheckbox() {
             <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>
            <td>{$forms.groupForm.lang.control}</td>
@@ -73,8 +71,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,6 +102,10 @@ 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>
+          <tr>
+            <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.label.bcc}:</td>
@@ -109,6 +115,10 @@ function handleTaskRequiredCheckbox() {
             <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>
           </tr>
+          <tr>
+            <td></td>
+            <td>{$i18n.label.required_fields}</td>
+          </tr>
   {/if}
           {* initialize preview text *}
           <script>