Index: openacs-4/packages/logger/logger.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/logger.info,v
diff -u -r1.9.2.9 -r1.9.2.10
--- openacs-4/packages/logger/logger.info	8 Feb 2006 21:20:26 -0000	1.9.2.9
+++ openacs-4/packages/logger/logger.info	10 Feb 2006 00:47:22 -0000	1.9.2.10
@@ -7,24 +7,24 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="1.2b4" url="http://openacs.org/repository/download/apm/logger-1.2b4.apm">
-        <owner url="mailto:lars@collaboraid.biz">Lars Pind</owner>
-        <owner url="mailto:peter@collaboraid.biz">Peter Marklund</owner>
+    <version name="1.2b5" url="http://openacs.org/repository/download/apm/logger-1.2b5.apm">
         <owner url="mailto:jade@rubick.com">Jade Rubick</owner>
+        <owner url="mailto:peter@collaboraid.biz">Peter Marklund</owner>
+        <owner url="mailto:lars@collaboraid.biz">Lars Pind</owner>
         <summary>Time and expenses reporting.</summary>
-        <release-date>2006-02-08</release-date>
+        <release-date>2006-02-09</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;
-
+        <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>
 
-        <provides url="logger" version="1.2b4"/>
+        <provides url="logger" version="1.2b5"/>
         <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="before-uninstall"  proc="logger::apm::before_uninstall"/>
+            <callback type="after-install"  proc="logger::apm::after_install"/>
             <callback type="before-uninstantiate"  proc="logger::apm::before_uninstantiate"/>
         </callbacks>
         <parameters>
Index: openacs-4/packages/logger/lib/entries.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/lib/entries.tcl,v
diff -u -r1.10.2.6 -r1.10.2.7
--- openacs-4/packages/logger/lib/entries.tcl	27 Jun 2005 20:38:10 -0000	1.10.2.6
+++ openacs-4/packages/logger/lib/entries.tcl	10 Feb 2006 00:47:23 -0000	1.10.2.7
@@ -153,14 +153,16 @@
         label {}
         display_template {
            <if @entries.edit_p@ true>
-            <a href="@entries.edit_url@" title="[_ logger.Edit_this_log_entry]"
+            <a href="@entries.edit_url@" title="\#logger.Edit_this_log_entry\#"
             ><img src="/shared/images/Edit16.gif" height="16" width="16" 
-            alt="[_ logger.Edit]" border="0"></a>
+            alt="\#logger.Edit\#" border="0"></a>
             </if>        
         }
     }
     project_id {
-        display_template {<a href="@entries.project_url@">@entries.project_name@</a>}
+        display_template {
+	    <if @entries.project_url@ not nil><a href="@entries.project_url@">@entries.project_name@</a></if><else>@entries.project_name@</else>
+	}
         label "[_ logger.Project]"
         hide_p {[ad_decode [exists_and_not_null project_id] 1 1 0]}
     }
@@ -554,9 +556,13 @@
 
     set my_base_url $base_url 
     set my_project_manager_url $project_manager_url
+    if { [logger::util::project_manager_linked_p] } {
+	set project_item_id [logger::util::project_manager_project_id -project_id $project_id]
+	set project_url [export_vars -base "[logger::util::project_manager_url]one" {project_item_id}]
+    } else {
+	set project_url ""
+    }
 
-    set project_item_id [logger::util::project_manager_project_id -project_id $project_id]
-    set project_url [export_vars -base "[logger::util::project_manager_url]one" {project_item_id}]
     if { ![empty_string_p $tree_id] && ![empty_string_p $category_id] } {
         lappend row_categories($tree_id) $category_id
     }