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 -N -r1.8 -r1.9
--- openacs-4/packages/project-manager/catalog/project-manager.de_DE.ISO-8859-1.xml	15 Aug 2005 08:22:32 -0000	1.8
+++ openacs-4/packages/project-manager/catalog/project-manager.de_DE.ISO-8859-1.xml	15 Aug 2005 10:00:20 -0000	1.9
@@ -21,7 +21,7 @@
   <msg key="Close">Schlie�en</msg>
   <msg key="Close_project">Projekt schlie�en</msg>
   <msg key="Closed">Abgeschlossen</msg>
-  <msg key="Code_1">Code:</msg>
+  <msg key="Code_1">Jobnummer:</msg>
   <msg key="Comment">Kommentar:</msg>
   <msg key="Comments">Kommentare</msg>
   <msg key="Complete">Fertig:</msg>
@@ -64,7 +64,7 @@
   <msg key="Latest_finish">Sp�testes Ende</msg>
   <msg key="Latest_Start">Sp�tester Start</msg>
   <msg key="Latest_start">Sp�tester Start</msg>
-  <msg key="Lead">Lead</msg>
+  <msg key="Lead">Verantwortlicher</msg>
   <msg key="LF">LF</msg>
   <msg key="Link_task">Aufgabe verbinden:</msg>
   <msg key="Log">Log</msg>
@@ -82,9 +82,9 @@
   <msg key="lt_projectactual_hours_c">%project.actual_hours_completed% von %project.estimated_hours_total%</msg>
   <msg key="lt_Send_email_to_assigne">e-Mail an Beteiligte schicken?</msg>
   <msg key="lt_set_according_to_task">Von den Aufgabenzuteilungen aus zuteilen</msg>
-  <msg key="lt_set_project_term_code">%project_term%code</msg>
+  <msg key="lt_set_project_term_code">%project_term%nummer</msg>
   <msg key="lt_set_project_term_goal">%project_term%ziel</msg>
-  <msg key="lt_set_project_term_name">%project_term%name</msg>
+  <msg key="lt_set_project_term_name">%project_term%ID</msg>
   <msg key="lt_Set_to_100_to_close_t">Auf 100 setzen, um diese Aufgabe zu schlie�en.</msg>
   <msg key="lt_task_terms_depending_">%task_term%n die von dieser %task_term% abh�ngen</msg>
   <msg key="lt_task_terms_this_depen">%task_term%n von denen diese Aufgabe  abh�ngt.</msg>
@@ -93,7 +93,7 @@
   <msg key="Max">Max:</msg>
   <msg key="Min">Min:</msg>
   <msg key="na">n/a</msg>
-  <msg key="Name_1">Name:</msg>
+  <msg key="Name_1">Job ID:</msg>
   <msg key="New_project_term">Neues %project_term%</msg>
   <msg key="New_task_term">Neue %task_term%</msg>
   <msg key="No">Nein</msg>
@@ -102,11 +102,11 @@
   <msg key="Open">Offen</msg>
   <msg key="Percent_complete">% komplett</msg>
   <msg key="Plain_Text">Nur Text</msg>
-  <msg key="Player">Player</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">Projekt</msg>
+  <msg key="Project">Job</msg>
   <msg key="Project_1">Projekt</msg>
   <msg key="Project_is_ongoing">Laufendes Projekt?</msg>
   <msg key="Project_name">Names des Projekts</msg>
Index: openacs-4/packages/project-manager/catalog/project-manager.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/catalog/project-manager.en_US.ISO-8859-1.xml,v
diff -u -N -r1.20 -r1.21
--- openacs-4/packages/project-manager/catalog/project-manager.en_US.ISO-8859-1.xml	15 Aug 2005 08:22:32 -0000	1.20
+++ openacs-4/packages/project-manager/catalog/project-manager.en_US.ISO-8859-1.xml	15 Aug 2005 10:00:20 -0000	1.21
@@ -556,12 +556,14 @@
   <msg key="View">View</msg>
   <msg key="View_all_tasks">View all tasks</msg>
   <msg key="View_customers">View customers</msg>
+  <msg key="View_only_Observer">View only tasks where you are an observer</msg>
   <msg key="View_options">View options</msg>
   <msg key="View_project_changes">View project changes</msg>
   <msg key="View_Revisions">View Revisions</msg>
   <msg key="View_task_changes">View task changes</msg>
   <msg key="View_this_revision">View this revision</msg>
   <msg key="View_this_task">View this task</msg>
+  <msg key="View_Watcher">View Watcher tasks</msg>
   <msg key="Watcher">Watcher</msg>
   <msg key="Who">Who</msg>
   <msg key="Work">Work</msg>
Index: openacs-4/packages/project-manager/lib/project-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/project-portlet.adp,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/project-manager/lib/project-portlet.adp	15 Aug 2005 08:22:59 -0000	1.10
+++ openacs-4/packages/project-manager/lib/project-portlet.adp	15 Aug 2005 10:00:20 -0000	1.11
@@ -1,18 +1,6 @@
   <master src="/packages/project-manager/lib/portlet" />
 <property name="portlet_title">
-  <if @project.write_p@ eq t>
-    <a href="@edit_url@">
-      <img border="0" src="/shared/images/Edit16.gif"
-	alt="#acs-kernel.common_Edit#" />
-    </a>
-  </if>
-  <if @project.create_p@ eq t>
-    <a href="@permissions_url@">
-      <img border="0" src="resources/padlock.gif" alt="#project-manager.Set_permissions#" />
-    </img>
-    </a>
-  </if>
-  &nbsp;&nbsp;@project_term@ @project.project_name@
+  @write_html;noquote@&nbsp;&nbsp;@project_term@ @project.project_name@
   </property>
 <table width="100%">
   <tr>
Index: openacs-4/packages/project-manager/lib/project-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/project-portlet.tcl,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/project-manager/lib/project-portlet.tcl	15 Aug 2005 08:22:59 -0000	1.11
+++ openacs-4/packages/project-manager/lib/project-portlet.tcl	15 Aug 2005 10:00:20 -0000	1.12
@@ -85,3 +85,22 @@
 
 set project_links ""
 callback pm::project_links -project_id $project_item_id
+
+# Admin Link  
+
+set write_html ""
+if {$project(write_p) == "t"} {
+    append write_html "
+    <a href=\"$edit_url\">
+      <img border=\"0\" src=\"/shared/images/Edit16.gif\"
+	alt=\"#acs-kernel.common_Edit#\" />
+    </a>"
+}
+
+if {$project(create_p) == "t"} {
+    append write_html "<a href=\"@permissions_url@\">
+      <img border=\"0\" src=\"resources/padlock.gif\" alt=\"#project-manager.Set_permissions#\" />
+    </img>
+    </a>"
+}
+
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 -N -r1.13 -r1.14
--- openacs-4/packages/project-manager/lib/tasks.tcl	11 Aug 2005 17:07:24 -0000	1.13
+++ openacs-4/packages/project-manager/lib/tasks.tcl	15 Aug 2005 10:00:20 -0000	1.14
@@ -66,9 +66,9 @@
     set days_string "hours"
 }
 
-set exporting_vars {status_id party_id orderby}
+set exporting_vars {status_id party_id orderby page_num}
 set hidden_vars [export_vars \
-		     -form $exporting_vars]
+		     -no_empty -form $exporting_vars]
 
 # how to get back here
 
@@ -158,6 +158,15 @@
 			     ] \
 		]
 
+# Setup the actions, so we can append the rest later on
+if {$actions_p == 1} {
+    set actions [list "[_ project-manager.Add_task]" [export_vars \
+							  -base "${base_url}task-select-project" {return_url}] "[_ project-manager.Add_a_task]"]
+} else {
+    set actions [list]
+}
+
+
 foreach element $elements {
 
     # Special treatement for days / hours
@@ -169,7 +178,6 @@
 	set element "actual_${days_string}_worked"
     }
 
-
     # We need to filter by the user if a party_id is given
     if {[exists_and_not_null party_id]} {
 	set party_where_clause "and t.party_id = :party_id"
@@ -225,13 +233,6 @@
     set bulk_action_export_vars [list]
 }
 
-if {$actions_p == 1} {
-#    set actions [list "[_ project-manager.Add_task]" [export_vars \
-							  -base "${base_url}task-select-project" {return_url}] "[_ project-manager.Add_a_task]"]
-} else {
-#    set actions [list "[_ project-manager.Watcher]" [export_vars -base "[ad_conn url]" {{watcher_p 1} page_num}] "[_ project_manager.Watcher]"]
-}
-
 template::list::create \
     -name tasks \
     -multirow tasks \
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 -N -r1.4 -r1.5
--- openacs-4/packages/project-manager/templates/project-one.adp	11 Aug 2005 21:08:35 -0000	1.4
+++ openacs-4/packages/project-manager/templates/project-one.adp	15 Aug 2005 10:00:20 -0000	1.5
@@ -1,5 +1,4 @@
 <master src="../www/lib/master" />
-
 <if @project.status_type@ eq c>
   <property name="title">@my_title;noquote@ -- #project-manager.Closed#</property>
 </if>
@@ -11,27 +10,19 @@
 <if @project.live_revision@ ne @project.project_id@>
   <h4>#project-manager.lt_not_current_set_live#</h4>
 </if>
+
 <include
   src="/packages/project-manager/lib/project-portlet"
   project_id="@project_id@"
   project_item_id="@project_item_id@" 
   fmt=@fmt@ />
-<p />
+<p/>
 <include
-  src="/packages/project-manager/lib/date-portlet"
-  project_id="@project_id@"
-  project_item_id="@project_item_id@" />
-<p />
-<include
   src=/packages/project-manager/lib/assignee-portlet
   project_id="@project_id@"
   project_item_id="@project_item_id@"
   return_url="@return_url@" />
   <p />
-  <include
-    src="/packages/project-manager/lib/categories-portlet"
-    item_id="@project_id@" />
-  <p />
   <if @use_subprojects_p@>
     <include
       src="/packages/project-manager/lib/subprojects"
@@ -129,6 +120,3 @@
 	  src="/packages/project-manager/lib/fs-portlet"
 	  folder_id="@folder_id@" />
       </if>
-    </td>
-  </tr>
-</table>
\ No newline at end of file