Index: openacs-4/packages/project-manager/project-manager.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/project-manager.info,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/project-manager/project-manager.info	28 Aug 2005 14:51:56 -0000	1.20
+++ openacs-4/packages/project-manager/project-manager.info	4 Sep 2005 12:25:26 -0000	1.21
@@ -35,7 +35,7 @@
             <callback type="before-uninstantiate"  proc="pm::install::package_uninstantiate"/>
         </callbacks>
         <parameters>
-	    <parameter datatype="string" min_n_values="1"  max_n_values="1"  name="DefaultPortletLayoutP"  default="/packages/project-manager/lib/portlet" description="The src path for the layout to user on project manager portlets master tag" section_name="Layout"/>
+	    <parameter datatype="string" min_n_values="1"  max_n_values="1"  name="DefaultPortletLayoutP"  default="/packages/project-manager/lib/sloan-portlet" description="The src path for the layout to user on project manager portlets master tag" section_name="Layout"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="HideDoneTaskP"  default="1" description="If set to 1, tasks
             that are done will be hidden" section_name="projects"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="OngoingByDefaultP"  default="f" description="If set to t, then projects are by default ongoing (no deadline), unless the user selects otherwise. If set to f, then projects by default have a deadline." section_name="projects"/>
Index: openacs-4/packages/project-manager/catalog/project-manager.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/catalog/project-manager.de_DE.ISO-8859-1.xml,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/project-manager/catalog/project-manager.de_DE.ISO-8859-1.xml	30 Aug 2005 11:19:41 -0000	1.10
+++ openacs-4/packages/project-manager/catalog/project-manager.de_DE.ISO-8859-1.xml	4 Sep 2005 12:25:26 -0000	1.11
@@ -26,6 +26,7 @@
   <msg key="Comments">Kommentare</msg>
   <msg key="Complete">Fertig:</msg>
   <msg key="create_project">Projekt erzeugen</msg>
+  <msg key="Creation_date">Erstellt am</msg>
   <msg key="CSV">CSV</msg>
   <msg key="Customer">Kunde</msg>
   <msg key="Customers">Kunden</msg>
@@ -38,7 +39,7 @@
   <msg key="Deadline_Time">Liefertermin Uhrzeit</msg>
   <msg key="Dep">Abt.</msg>
   <msg key="Dependency">Abh�ngigkeiten:</msg>
-  <msg key="Description">Projekt-Beschreibung</msg>
+  <msg key="Description">Interne Projekt-Beschreibung</msg>
   <msg key="Description_1">Beschreibung:</msg>
   <msg key="Done_1">Erledigt</msg>
   <msg key="Earliest_finish">Fr�hestes Ende</msg>
@@ -98,17 +99,19 @@
   <msg key="New_task_term">Neue %task_term%</msg>
   <msg key="No">Nein</msg>
   <msg key="number">#</msg>
+  <msg key="Observer">Beobachter?</msg>
   <msg key="OK">OK</msg>
   <msg key="Open">Offen</msg>
   <msg key="Percent_complete">% komplett</msg>
   <msg key="Plain_Text">Nur Text</msg>
-  <msg key="Planned_end_date">Lieferdatum</msg>
+  <msg key="Planned_end_date">Interne Deadline</msg>
   <msg key="Player">Bearbeiter</msg>
   <msg key="Priority">Priorit�t:</msg>
   <msg key="Priority_1">Priorit�t</msg>
   <msg key="Processes">Prozesse</msg>
   <msg key="Project">Job</msg>
   <msg key="Project_1">Projekt</msg>
+  <msg key="Project_code">Jobnummer</msg>
   <msg key="Project_is_ongoing">Laufendes Projekt?</msg>
   <msg key="Project_name">Names des Projekts</msg>
   <msg key="Project_Search">Suche nach Projekt:</msg>
Index: openacs-4/packages/project-manager/lib/subprojects.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/subprojects.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/project-manager/lib/subprojects.tcl	26 Aug 2005 20:59:12 -0000	1.4
+++ openacs-4/packages/project-manager/lib/subprojects.tcl	4 Sep 2005 12:25:26 -0000	1.5
@@ -24,6 +24,13 @@
     }
 }
 
+if {![exists_and_not_null fmt]} {
+    set fmt "%x"
+}
+if {![exists_and_not_null row_list]} {
+    set row_list {project_name {} planned_end_date {} actual_hours_completed {}}
+}
+
 set user_id [auth::require_login]
 set default_layout_url [parameter::get -parameter DefaultPortletLayoutP]
 # Subprojects, using list-builder ---------------------------------
@@ -32,12 +39,16 @@
     -name subproject \
     -multirow subproject \
     -key item_id \
+    -selected_format table \
     -elements {
 	project_name {
 	    label "[_ project-manager.Subject]"
 	    link_url_col item_url
 	    link_html {title "[_ project-manager._View]" }
 	}
+	planned_end_date {
+	    label "[_ project-manager.Deadline]"
+	}
 	actual_hours_completed {
 	    label "[_ project-manager._Hours]"
 	}
@@ -52,9 +63,16 @@
     -orderby_name orderby_subproject \
     -html {
 	width 100%
+    } -formats {
+	table {
+	    label "[_ project-manager.Table]"
+	    layout table
+	    row $row_list
+	}
     }
 
 db_multirow -extend {item_url} subproject project_subproject_query {} {
+    set planned_end_date [lc_time_fmt $planned_end_date $fmt]
 
     set item_url [export_vars \
 		      -base "$base_url/one" -override {{project_item_id $item_id}} {project_item_id}]
Index: openacs-4/packages/project-manager/lib/subprojects.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/subprojects.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/project-manager/lib/subprojects.xql	26 May 2005 09:34:27 -0000	1.1
+++ openacs-4/packages/project-manager/lib/subprojects.xql	4 Sep 2005 12:25:26 -0000	1.2
@@ -16,8 +16,8 @@
 	p.object_type as content_type,
 	p.title as project_name,
 	p.project_code,
-	to_char(p.planned_start_date, 'Mon DD') as planned_start_date,
-	to_char(p.planned_end_date, 'Mon DD') as planned_end_date,
+	to_char(p.planned_start_date, 'YYYY-MM-DD HH24:MI:SS') as planned_start_date,
+	to_char(p.planned_end_date, 'YYYY-MM-DD HH24:MI:SS') as planned_end_date,
 	p.ongoing_p,
         p.actual_hours_completed,
         p.estimated_hours_total
Index: openacs-4/packages/project-manager/lib/tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/tasks.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/project-manager/lib/tasks.tcl	23 Aug 2005 16:37:50 -0000	1.15
+++ openacs-4/packages/project-manager/lib/tasks.tcl	4 Sep 2005 12:25:26 -0000	1.16
@@ -83,18 +83,19 @@
 
 set context [list "[_ project-manager.Tasks]"]
 
-# Get the currently available Status
 
-set status_list [db_list_of_lists get_status_values "select description, status_id from pm_task_status order by status_type desc, description"]
+set status_list [lang::util::localize_list_of_lists -list [db_list_of_lists get_status_values "select description, status_id from pm_task_status order by status_type desc, description"]]
 
+set status_list [linsert $status_list 0 [list "All" "-1"]]
+
 # the unique identifier for this package
 
 set package_id [ad_conn package_id]
 set user_id [ad_maybe_redirect_for_registration]
 
 # status defaults to open
 
-if {![exists_and_not_null status_id]} {
+if {![exists_and_not_null status_id] || $status_id == "-1"} {
     set status_where_clause ""
 } else {
     set status_where_clause {ti.status = :status_id}
Index: openacs-4/packages/project-manager/tcl/project-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/tcl/project-procs.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/project-manager/tcl/project-procs.tcl	28 Aug 2005 14:54:36 -0000	1.15
+++ openacs-4/packages/project-manager/tcl/project-procs.tcl	4 Sep 2005 12:25:26 -0000	1.16
@@ -364,7 +364,7 @@
      "]
 
     if {!$no_callback_p} {
-	callback pm::project_edit -package_id $package_id -project_id $project_item_id
+	callback pm::project_edit -package_id $package_id -project_id $project_item_id -data [list organization_id $organization_id]
     }
 
     return $returnval
Index: openacs-4/packages/project-manager/templates/project-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/templates/project-ae.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/project-manager/templates/project-ae.tcl	11 Aug 2005 21:09:30 -0000	1.1
+++ openacs-4/packages/project-manager/templates/project-ae.tcl	4 Sep 2005 12:25:26 -0000	1.2
@@ -21,6 +21,9 @@
     set project_id [pm::project::get_project_id -project_item_id $project_item_id]
 }
 
+if {[empty_string_p $project_name]} {
+    set project_name [db_nextval pm_project_title_seq]
+}
 
 if {[exists_and_not_null project_id]} {
     set title "[_ project-manager.lt_Edit_a_project_term_l]"
@@ -67,6 +70,7 @@
             {label "[_ project-manager.lt_set_project_term_name]"}
             {value $project_name}
             {html {size 50}}
+	    {mode display}
         }
         {ongoing_p:text(hidden)
             {value "f"}
@@ -116,16 +120,27 @@
 	}
 }
 
+if {[exists_and_not_null customer_id]} {
+    set dynamic_params(customer_id) $customer_id
+} elseif {[exists_and_not_null project_item_id]} {
+    set dynamic_params(customer_id) [db_string get_customer_id {}]
+} else {
+    set dynamic_params(customer_id) ""
+}
+
+dtype::form::add_elements -dform $dform -prefix pm -object_type pm_project -object_id [value_if_exists project_id] -form add_edit -exclude_static -cr_widget none -variables [array get dynamic_params]
+
+set status_options [lang::util::localize [pm::status::project_status_select]]
+
 ad_form -extend -name add_edit \
     -form {
-	{planned_start_date:text(text)
-            {label "[_ project-manager.Starts]"}
-	    {html {id sel1}}
-	    {after_html {<input type='reset' value=' ... ' onclick=\"return showCalendar('sel1', 'y-m-d');\"> \[<b>d.m.y </b>\]
-	    }}
+        {status_id:text(select)
+            {label "[_ project-manager.Status_1]"}
+	    {options $status_options}
         }
-    
 
+	{planned_start_date:text(hidden)}
+
         {planned_end_date:text(text)
             {label "[_ project-manager.Deadline_1]"}
 	    {html {id sel2}}
@@ -173,19 +188,8 @@
     }
 }
 
-if {[exists_and_not_null customer_id]} {
-    set dynamic_params(customer_id) $customer_id
-} elseif {[exists_and_not_null project_item_id]} {
-    set dynamic_params(customer_id) [db_string get_customer_id {}]
-} else {
-    set dynamic_params(customer_id) ""
-}
-
-dtype::form::add_elements -dform $dform -prefix pm -object_type pm_project -object_id [value_if_exists project_id] -form add_edit -exclude_static -cr_widget none -variables [array get dynamic_params]
-
 ad_form -extend -name add_edit \
     -new_request {
-        
         if {[string equal $ongoing_by_default_p t]} {
             set ongoing_p t
         }
Index: openacs-4/packages/project-manager/templates/project-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/templates/project-one.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/project-manager/templates/project-one.adp	22 Aug 2005 11:37:47 -0000	1.7
+++ openacs-4/packages/project-manager/templates/project-one.adp	4 Sep 2005 12:25:26 -0000	1.8
@@ -31,6 +31,7 @@
       project_id="@project_id@"
       project_item_id="@project_item_id@" 
       base_url=@package_url@
+      fmt=@fmt@
       />
     <p />
   </if>
Index: openacs-4/packages/project-manager/templates/task-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/templates/task-one.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/project-manager/templates/task-one.adp	11 Aug 2005 21:09:30 -0000	1.1
+++ openacs-4/packages/project-manager/templates/task-one.adp	4 Sep 2005 12:25:26 -0000	1.2
@@ -81,14 +81,6 @@
 	  use_days_p="@use_days_p@"
 	  pm_task_id="@task_id@" />
 
-        <P />
-	    <include src="/packages/project-manager/lib/task-dependency-portlet"
-
-	         task_id="@task_id@"
-		 task_term="@task_term@"
-		 return_url="@return_url@" 
-	         fmt= @fmt@ />
-        
       </td>
     </tr>
   </table>
Index: openacs-4/packages/project-manager/www/rate-project.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/rate-project.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/project-manager/www/rate-project.tcl	15 Aug 2005 10:13:43 -0000	1.4
+++ openacs-4/packages/project-manager/www/rate-project.tcl	4 Sep 2005 12:25:26 -0000	1.5
@@ -6,13 +6,17 @@
     @author Miguel Marin (miguelmarin@viaro.net)
     @author Viaro Networks www.viaro.net
 } {
-    project_id:integer,notnull
+    project_id:integer,optional
     project_item_id:integer,notnull
 }
 
 set page_title [_ project-manager.rate_this_project]
 set context [list [list "one?project_id=$project_id" "One Project"] $page_title]
 
+if {![exists_and_not_null project_id]} {
+    set project_id [pm::project::get_project_id -project_item_id $project_item_id]
+}
+
 set user_id [ad_conn user_id]
 set context_object_id $project_id
 
@@ -76,7 +80,7 @@
 	set object_id [lindex $element_info 0]
 	set dimension_key [lindex $element_info 1]
 	set rating_id [ratings::rate -dimension_key $dimension_key \
-			   -object_id $object_id \
+			   -object_id $project_id \
 			   -user_id $user_id \
 			   -rating $rating \
 			   -nomem_p "t"]
Index: openacs-4/packages/project-manager/www/task-close.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/task-close.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/project-manager/www/task-close.tcl	4 Aug 2005 09:50:08 -0000	1.1
+++ openacs-4/packages/project-manager/www/task-close.tcl	4 Sep 2005 12:25:26 -0000	1.2
@@ -16,10 +16,17 @@
 } -errors {
 }
 
-pm::task::close -task_item_id $task_item_id
-set revision_id [pm::task::get_revision_id -task_item_id $task_item_id]
-db_dml complete_task "update pm_tasks_revisions set percent_complete = '100' where task_revision_id = :revision_id"
-ad_returnredirect $return_url
+db_transaction {
+    pm::task::close -task_item_id $task_item_id
+    set revision_id [pm::task::get_revision_id -task_item_id $task_item_id]
 
+    db_dml complete_task {
+	update pm_tasks_revisions
+	set percent_complete = '100'
+	where task_revision_id = :revision_id
+    }
 
+    callback pm::task_edit -package_id [ad_conn package_id] -task_id $task_item_id
+}
 
+ad_returnredirect $return_url
Index: openacs-4/packages/project-manager/www/lib/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/lib/master.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/project-manager/www/lib/master.adp	30 Jul 2005 18:32:36 -0000	1.4
+++ openacs-4/packages/project-manager/www/lib/master.adp	4 Sep 2005 12:25:26 -0000	1.5
@@ -4,9 +4,7 @@
 <if @focus@ not nil><property name="focus">@focus;noquote@</property></if>
 <property name="header_stuff">
   @header_stuff;noquote@
-  <style type="text/css">
-    @import url(@package_url@style.css) all;
-  </style>
+  <link rel="stylesheet" type="text/css" href="@package_url@style.css" media="all" />
 </property>
 <property name="doc_type">
 <?xml version="1.0"?>