X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Ftemplates%2Fweek.tpl;h=8eaa5fa888143105c30deb252a826ae6ea5d4ec2;hb=f8202dca930de9e3cc70cbc8084e10a0f346f389;hp=f51447547f4a1e13c3c10df821dea12fa26c686f;hpb=19e183c61f684ff92f5b7c95f09a0a6ca7d7bffe;p=timetracker.git

diff --git a/WEB-INF/templates/week.tpl b/WEB-INF/templates/week.tpl
index f5144754..8eaa5fa8 100644
--- a/WEB-INF/templates/week.tpl
+++ b/WEB-INF/templates/week.tpl
@@ -1,5 +1,20 @@
 {include file="time_script.tpl"}
 
+<script>
+// This is here because fillDropdowns() in time_script.tpl uses a different form name.
+// Perhaps a better fix would be to provide form name as paramater to fillDropdowns()?
+// TODO: try to fix it properly.
+//
+// The fillDropdowns function populates the "project" and "task" dropdown controls
+// with relevant values.
+function fillDropdowns() {
+  if(document.body.contains(document.weekTimeForm.client))
+    fillProjectDropdown(document.weekTimeForm.client.value);
+
+  fillTaskDropdown(document.weekTimeForm.project.value);
+}
+</script>
+
 <style>
 .not_billable td {
   color: #ff6666;
@@ -50,6 +65,12 @@
           <td align="right">{$i18n.label.task}:</td>
           <td>{$forms.weekTimeForm.task.control}</td>
         </tr>
+{/if}
+{if $user->isPluginEnabled('wvn')}
+        <tr>
+          <td align="right">{$i18n.label.week_note}:</td>
+          <td>{$forms.weekTimeForm.note.control}</td>
+        </tr>
 {/if}
       </table>
     </td>
@@ -73,6 +94,7 @@
   <tr><td>&nbsp;</td></tr>
 </table>
 
+{if $user->isPluginEnabled('wvl')}
 <table width="720">
 <tr>
   <td valign="top">
@@ -135,12 +157,16 @@
   </td>
 </tr>
 </table>
+{/if}
+
 {if $time_records}
 <table cellpadding="3" cellspacing="1" width="720">
+  {if $user->isPluginEnabled('wvl')}
   <tr>
     <td align="left">{$i18n.label.week_total}: {$week_total}</td>
     <td></td>
   </tr>
+  {/if}
   {if $user->isPluginEnabled('mq')}
   <tr>
     <td align="left">{$i18n.label.month_total}: {$month_total}</td>