X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Ftemplates%2Fweek.tpl;h=34edf9201ebd8309aa32c3bc3e74003e71ddd1b5;hb=ee5e708bbc30bbca24d77c4e3b0e75214c1296f8;hp=0d279ec6b7de5edad94988621007afa2aa7cf854;hpb=bdbadef4880db22d573cc3f154af3eb833942d56;p=timetracker.git

diff --git a/WEB-INF/templates/week.tpl b/WEB-INF/templates/week.tpl
index 0d279ec6..34edf920 100644
--- a/WEB-INF/templates/week.tpl
+++ b/WEB-INF/templates/week.tpl
@@ -8,13 +8,11 @@
 
 {$forms.weekTimeForm.open}
 <table cellspacing="4" cellpadding="0" border="0">
-{if defined(WEEK_VIEW_DEBUG)}
   <tr>
     <td align="center" colspan=2">
       <a href="time.php?date={$selected_date->toString()}">{$i18n.label.day_view}</a>&nbsp;/&nbsp;<a href="week.php?date={$selected_date->toString()}">{$i18n.label.week_view}</a>
     </td>
   </tr>
-{/if}
   <tr>
     <td valign="top">
       <table>
@@ -24,6 +22,39 @@
           <td>{$forms.weekTimeForm.onBehalfUser.control}</td>
         </tr>
 {/if}
+{if $user->isPluginEnabled('cl')}
+        <tr>
+          <td align="right">{$i18n.label.client}{if $user->isPluginEnabled('cm')} (*){/if}:</td>
+          <td>{$forms.weekTimeForm.client.control}</td>
+        </tr>
+{/if}
+{if $user->isPluginEnabled('iv')}
+        <tr>
+          <td align="right">&nbsp;</td>
+          <td><label>{$forms.weekTimeForm.billable.control}{$i18n.form.time.billable}</label></td>
+        </tr>
+{/if}
+{if ($custom_fields && $custom_fields->fields[0])}
+        <tr>
+          <td align="right">{$custom_fields->fields[0]['label']|escape}{if $custom_fields->fields[0]['required']} (*){/if}:</td><td>{$forms.weekTimeForm.cf_1.control}</td>
+        </tr>
+{/if}
+{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+        <tr>
+          <td align="right">{$i18n.label.project} (*):</td>
+          <td>{$forms.weekTimeForm.project.control}</td>
+        </tr>
+{/if}
+{if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+        <tr>
+          <td align="right">{$i18n.label.task}:</td>
+          <td>{$forms.weekTimeForm.task.control}</td>
+        </tr>
+{/if}
+        <tr>
+          <td align="right">{$i18n.label.note}:</td>
+          <td align="left">{$forms.weekTimeForm.note.control}</td>
+        </tr>
       </table>
     </td>
     <td valign="top">
@@ -38,70 +69,10 @@
     <td>{$forms.weekTimeForm.week_durations.control}</td>
   </tr>
 </table>
-
-<table width="720">
-<tr>
-  <td valign="top">
-{if $grouped_records}
-      <table border="0" cellpadding="3" cellspacing="1" width="100%">
-      <tr>
-  {if ($user->isPluginEnabled('cl') || ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode))}
-        <td class="tableHeader"></td>
-  {/if}
-  {if ($user->isPluginEnabled('cf') || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
-        <td class="tableHeader"></td>
-  {/if}
-        <td class="tableHeader">{$day_header_0}</td>
-        <td class="tableHeader">{$day_header_1}</td>
-        <td class="tableHeader">{$day_header_2}</td>
-        <td class="tableHeader">{$day_header_3}</td>
-        <td class="tableHeader">{$day_header_4}</td>
-        <td class="tableHeader">{$day_header_5}</td>
-        <td class="tableHeader">{$day_header_6}</td>
-      </tr>
-  {foreach $grouped_records as $record}
-      <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}" {if !$record.billable} class="not_billable" {/if}>
-    {if ($user->isPluginEnabled('cl') || ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode))}
-        <td valign="top">{$record.project|escape}<p>{$record.client|escape}</td>
-    {/if}
-    {if ($user->isPluginEnabled('cf') || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
-        <td valign="top">{$record.task|escape}<p>{$record.cf_1_value|escape}</td>
-    {/if}
-        <td valign="top">{$record.$date_0.duration}</td>
-        <td valign="top">{$record.$date_1.duration}</td>
-        <td valign="top">{$record.$date_2.duration}</td>
-        <td valign="top">{$record.$date_3.duration}</td>
-        <td valign="top">{$record.$date_4.duration}</td>
-        <td valign="top">{$record.$date_5.duration}</td>
-        <td valign="top">{$record.$date_6.duration}</td>
-      </tr>
-  {/foreach}
-      <tr>
-  {if ($user->isPluginEnabled('cl') || ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode))}
-        <td class="tableHeader"></td>
-  {/if}
-  {if ($user->isPluginEnabled('cf') || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
-        <td class="tableHeader"></td>
-  {/if}
-        <td class="tableHeader">{$grouped_records_totals.$date_0}</td>
-        <td class="tableHeader">{$grouped_records_totals.$date_1}</td>
-        <td class="tableHeader">{$grouped_records_totals.$date_2}</td>
-        <td class="tableHeader">{$grouped_records_totals.$date_3}</td>
-        <td class="tableHeader">{$grouped_records_totals.$date_4}</td>
-        <td class="tableHeader">{$grouped_records_totals.$date_5}</td>
-        <td class="tableHeader">{$grouped_records_totals.$date_6}</td>
-      </tr>
-    </table>
-{/if}
-  </td>
-</tr>
-</table>
-<!--
-{if $time_records}
 <table cellpadding="3" cellspacing="1" width="720">
   <tr>
     <td align="left">{$i18n.label.week_total}: {$week_total}</td>
-    <td align="right">{$i18n.label.day_total}: {$day_total}</td>
+    <td></td>
   </tr>
   {if $user->isPluginEnabled('mq')}
   <tr>
@@ -114,8 +85,6 @@
   </tr>
   {/if}
 </table>
-{/if}
--->
 <table>
   <tr>
     <td align="center" colspan="2">{$forms.weekTimeForm.btn_submit.control}</td>