Index: openacs-4/contrib/packages/project-manager/www/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/one.tcl,v
diff -u -r1.30 -r1.31
--- openacs-4/contrib/packages/project-manager/www/one.tcl	12 Mar 2004 13:44:45 -0000	1.30
+++ openacs-4/contrib/packages/project-manager/www/one.tcl	27 Apr 2004 00:49:29 -0000	1.31
@@ -28,9 +28,11 @@
     {orderby_subproject ""}
     {orderby_tasks ""}
     {orderby_versions ""}
+    {status_type "o"}
 
 } -properties {
     categories:onelist
+    my_title:onevalue
     context:onevalue
     project:multirow
     tasks:multirow
@@ -64,10 +66,18 @@
                                 -project_item_id $project_item_id]
         }
     }
+    status_type_exists {
+        if {![string equal $status_type "o"] && ![string equal $status_type "c"]} {
+            set status_type "o"
+        }
+    }
 }
 
 set original_project_id $project_id
 
+# for edits of tasks. We want to come back to here.
+set return_url "[ad_conn url]?[ad_conn query]"
+
 # --------------------------------------------------------------- #
 
 # the unique identifier for this package
@@ -107,6 +117,11 @@
 }
 
 db_1row project_query { } -column_array project
+
+set richtext_list [list $project(description) $project(mime_type)]
+
+set project(description) [template::util::richtext::get_property html_value $richtext_list]
+
 set project_root [db_exec_plsql get_root_folder { }]
 
 set project(planned_start_date) [lc_time_fmt $project(planned_start_date) "%x"]
@@ -124,11 +139,12 @@
 set log_note "Last 30 days"
 
 
+set my_title "$project_term \#$project_item_id: $project(project_name)"
 
+
 set edit_url "[ad_conn package_url]add-edit?[export_url_vars project_item_id]"
 
 # set up context bar, needs parent_id
-
 if {[string equal $project(parent_id) $project_root]} {
     set context [list "View"]
 } else {
@@ -168,15 +184,15 @@
         }
         slack_time {
             label "Slack"
-            display_template "<font size=\"-2\" color=\"grey\"><if @tasks.slack_time@>@tasks.slack_time@</if></font>"
+            display_template "<font size=\"-2\" color=\"777777\"><if @tasks.slack_time@>@tasks.slack_time@</if></font>"
         }
         earliest_start {
             label "Earliest Start"
-            display_template "<if @tasks.days_to_earliest_start@ gt 1>@tasks.earliest_start_pretty@</if><else><font color=\"green\">@tasks.earliest_start_pretty@</font></else>"
+            display_template "<if @tasks.days_to_earliest_start@ gt 1>@tasks.earliest_start_pretty@</if><else><font color=\"00ff00\">@tasks.earliest_start_pretty@</font></else>"
         }
         earliest_finish {
             label "Earliest Finish"
-            display_template "<if @tasks.days_to_earliest_finish@ gt 1>@tasks.earliest_finish_pretty@</if><else><font color=\"green\">@tasks.earliest_finish_pretty@</font></else>"
+            display_template "<if @tasks.days_to_earliest_finish@ gt 1>@tasks.earliest_finish_pretty@</if><else><font color=\"00ff00\">@tasks.earliest_finish_pretty@</font></else>"
         }
         latest_start {
             label "Latest Start"
@@ -202,23 +218,42 @@
         project_item_id
         project_id
         {my_key 1}
+        {return_url}
     } \
     -sub_class {
         narrow
     } \
     -filters {
-        project_item_id {}
-        orderby_subproject {}
-        orderby_versions {}
-        orderby_people {}
+        status_type {
+            label "Status" 
+            values {{"Open" "o"} {"Closed" "c"}}
+            where_clause {s.status_type = :status_type}
+        }
+        project_item_id {
+            hide_p 1
+        }
+        orderby_subproject {
+            hide_p 1
+        }
+        orderby_versions {
+            hide_p 1
+        }
+        orderby_people {
+            hide_p 1
+        }
     } \
     -orderby {
-        title {orderby title}
+        default_value latest_start,asc
+        title {
+            label "Subject"
+            orderby_asc "title asc"
+            orderby_desc "title desc"
+            default_direction asc
+        }
         earliest_start {orderby earliest_start}
         earliest_finish {orderby earliest_finish}
         latest_start {orderby latest_start}
         latest_finish {orderby latest_finish}
-        default_value latest_start,asc
     } \
     -orderby_name orderby_tasks \
     -html {
@@ -385,10 +420,10 @@
 
 db_1row custom_query { } -column_array custom 
 
+set customer_link "[site_node::get_package_url -package_key organizations]one?organization_id=$custom(customer_id)"
 
 # end of customizations
 
-
 # -----------------------------------------------------------------
 # Logger forms and so on - shows time logged, and allows you to log
 # other time