Index: openacs-4/packages/logger/logger.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/logger.info,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/logger/logger.info	5 Oct 2005 13:31:02 -0000	1.15
+++ openacs-4/packages/logger/logger.info	14 Oct 2005 22:41:15 -0000	1.16
@@ -7,28 +7,28 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="1.1b3" url="http://openacs.org/repository/download/apm/logger-1.1b3.apm">
-        <owner url="mailto:lars@collaboraid.biz">Lars Pind</owner>
+    <version name="1.1b4" url="http://openacs.org/repository/download/apm/logger-1.1b4.apm">
+        <owner url="mailto:alexk@bread.com">Alex Kroman</owner>
         <owner url="mailto:peter@collaboraid.biz">Peter Marklund</owner>
-        <owner url="mailto:jade@rubick.com">Jade Rubick</owner>
+        <owner url="mailto:lars@collaboraid.biz">Lars Pind</owner>
         <summary>Time and expenses reporting.</summary>
-        <release-date>2005-10-04</release-date>
+        <release-date>2005-10-14</release-date>
         <vendor url="http://www.collaboraid.biz">Collaboraid</vendor>
         <description format="text/html">Logger lets you keep track of measurements over time. The primary use case is time and expenses reporting, an area where we are being guided by the HR-XML Time Expense Reporting 2.0 standard. However, the intention is to allow for reporting of arbitrary types of numerical data such as financial results - account balance, revenue etc. You could even use this application to monitor your weight.  The full specification is here: &lt;a href=&quot;http://www.collaboraid.biz/developer/logger-spec&quot;&gt;http://www.collaboraid.biz/developer/logger-spec&lt;a&gt;
 
 Logger can be optionally integrated with project-manager, for logging of time against projects and tasks.</description>
         <maturity>1</maturity>
 
-        <provides url="logger" version="1.1b3"/>
+        <provides url="logger" version="1.1b4"/>
         <requires url="acs-tcl" version="4.6.2"/>
         <requires url="categories" version="1.0d3"/>
 
         <callbacks>
             <callback type="after-install"  proc="logger::apm::after_install"/>
             <callback type="after-instantiate"  proc="logger::apm::after_instantiate"/>
+            <callback type="after-upgrade"  proc="logger::apm::after_upgrade"/>
             <callback type="before-uninstall"  proc="logger::apm::before_uninstall"/>
             <callback type="before-uninstantiate"  proc="logger::apm::before_uninstantiate"/>
-            <callback type="after-upgrade"  proc="logger::apm::after_upgrade"/>
         </callbacks>
         <parameters>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultDescriptionList"  description="A list of default descriptions separeted by &quot;;&quot; to use when adding a log entry."/>
Index: openacs-4/packages/logger/catalog/logger.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/catalog/logger.en_US.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/logger/catalog/logger.en_US.ISO-8859-1.xml	5 Oct 2005 07:42:27 -0000	1.8
+++ openacs-4/packages/logger/catalog/logger.en_US.ISO-8859-1.xml	14 Oct 2005 22:41:15 -0000	1.9
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="logger" package_version="1.1b3" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="logger" package_version="1.1b4" locale="en_US" charset="ISO-8859-1">
 
   <msg key="A">A</msg>
   <msg key="Add_Entry">Add Entry</msg>
   <msg key="Add_Log_Entry">Add Log Entry</msg>
   <msg key="additive">additive</msg>
   <msg key="Cancel_do_not_delete">Cancel, do not delete</msg>
+  <msg key="Closed">Closed</msg>
   <msg key="Custom_description">Custom Description</msg>
   <msg key="Date">Date</msg>
+  <msg key="Day">Day</msg>
   <msg key="Default_description">Default Description</msg>
   <msg key="Delete">Delete</msg>
   <msg key="Description">Description</msg>
@@ -18,6 +20,7 @@
   <msg key="Help">Help</msg>
   <msg key="hours">hours</msg>
   <msg key="in_different">in different</msg>
+  <msg key="Last_month">Last month</msg>
   <msg key="Log_entry_modified">Log entry modified</msg>
   <msg key="Logger_Application">Logger Application</msg>
   <msg key="Logger_entries">Logger Entries</msg>
@@ -60,6 +63,7 @@
   <msg key="lt_instances_of_the_logg">instances of the logger
     application</msg>
   <msg key="lt_is_something_you_wish">is something you wish to track, for example:</msg>
+  <msg key="lt_Log_entry_for_value_v">Log entry added</msg>
   <msg key="lt_Logger_Application_In">Logger Application Instance</msg>
   <msg key="lt_map_variables_to____p">map variables to
     projects</msg>
@@ -81,6 +85,7 @@
   <msg key="name_Expense">Expense</msg>
   <msg key="name_Time">Time</msg>
   <msg key="non-additive">non-additive</msg>
+  <msg key="Open">Open</msg>
   <msg key="Project">Project</msg>
   <msg key="Projection">Projection:</msg>
   <msg key="Projects">Projects</msg>
@@ -101,5 +106,7 @@
   <msg key="Variables">Variables</msg>
   <msg key="variables">variables</msg>
   <msg key="Variables_are">Variables are</msg>
+  <msg key="Week">Week</msg>
+  <msg key="Yesterday">Yesterday</msg>
   <msg key="You_can_either">You can either use &quot;Default Description&quot; or &quot;Custom Description&quot;, but not both</msg>
 </message_catalog>
Index: openacs-4/packages/logger/lib/entries.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/lib/entries.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/logger/lib/entries.adp	5 Oct 2005 07:43:26 -0000	1.3
+++ openacs-4/packages/logger/lib/entries.adp	14 Oct 2005 22:41:16 -0000	1.4
@@ -1,10 +1,10 @@
 <if @filters_p@ true>
-  <table cellpadding="3" cellspacing="3" width="100%">
+  <table cellpadding="3" cellspacing="3" width="100%" border="0">
     <tr>
       <td class="list-filter-pane" valign="top" width="200">
         <listfilters name="entries"></listfilters>
       </td>
-      <td class="list-list-pane" valign="top">
+      <td valign="top">
 </if>
       <if @projection_id@ not nil>
         <div style="border-top: 1px dotted black; border-bottom: 1px dotted black; margin-bottom: 8px;">
Index: openacs-4/packages/logger/lib/entries.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/lib/entries.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/logger/lib/entries.tcl	16 Sep 2005 12:14:08 -0000	1.16
+++ openacs-4/packages/logger/lib/entries.tcl	14 Oct 2005 22:41:16 -0000	1.17
@@ -357,10 +357,10 @@
 
 
 set groupby_values {
-    { "[_ logger.Day]" { { groupby time_stamp } { orderby time_stamp,desc } } }
-    { "[_ logger.Week]" { { groupby time_stamp_week } { orderby time_stamp,desc } }  }
-    { "[_ logger.Project]" { { groupby project_name } { orderby project_id,asc } } }
-    { "[_ logger.User]" { { groupby user_id } { orderby user_id,asc } } }
+    { "#logger.Day#" { { groupby time_stamp } { orderby time_stamp,desc } } }
+    { "#logger.Week#" { { groupby time_stamp_week } { orderby time_stamp,desc } }  }
+    { "#logger.Project#" { { groupby project_name } { orderby project_id,asc } } }
+    { "#logger.User#" { { groupby user_id } { orderby user_id,asc } } }
 }
 
 set normal_row {
@@ -403,9 +403,10 @@
         [list label \$tree_name_${id} multirow_cols c_${id}_category_id]
 
     # Groupby
-    lappend groupby_values [list [category_tree::get_name $id] \
+    set groupby_values [list [category_tree::get_name $id] \
                                 [list [list groupby c_${id}_category_id] \
                                      [list orderby c_${id}_category_id]]]
+    
 }
 
 
Index: openacs-4/packages/logger/www/log.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/log.adp,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/logger/www/log.adp	5 Oct 2005 07:43:26 -0000	1.17
+++ openacs-4/packages/logger/www/log.adp	14 Oct 2005 22:41:16 -0000	1.18
@@ -21,7 +21,7 @@
     <table border="0" cellspacing="0" cellpadding="2" width="150">
       <tr>
         <td colspan="2" class="logger_filter_header">
-          <#Add_Entry Add Entry#>
+          #logger.Add_Entry#
         </td>
       </tr>
       <multiple name="variables">
@@ -41,9 +41,7 @@
   </div>
 </if>
 
-<blockquote>
-  <formtemplate id="log_entry_form"></formtemplate>
-</blockquote>
+<formtemplate id="log_entry_form"></formtemplate>
 
 <if @show_log_history_p@ true>
   <h3 class="logger" style="clear: left;">#logger.Recent_Entries#</h3>
Index: openacs-4/packages/logger/www/log.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/log.tcl,v
diff -u -r1.33 -r1.34
--- openacs-4/packages/logger/www/log.tcl	4 Oct 2005 22:53:18 -0000	1.33
+++ openacs-4/packages/logger/www/log.tcl	14 Oct 2005 22:41:16 -0000	1.34
@@ -79,7 +79,8 @@
 # We need project and variable names
 logger::project::get -project_id $project_id -array project_array
 logger::variable::get -variable_id $variable_id -array variable_array
-set unit $variable_array(unit)
+set unit "[_ [regsub -all {#} $variable_array(unit) ""]]"
+    
 # get the project_manager_url if this is related to project manager
 set project_manager_url [logger::util::project_manager_url]