Index: openacs-4/packages/project-manager/www/task-add-edit-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/task-add-edit-one.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/project-manager/www/task-add-edit-one.adp	26 May 2005 09:34:29 -0000	1.1
+++ openacs-4/packages/project-manager/www/task-add-edit-one.adp	27 Jul 2005 19:01:57 -0000	1.2
@@ -1,4 +1,4 @@
-<master>
+<master src="lib/master">
   <property name="title">@title;noquote@</property>
   <property name="context">@context@</property>
 
Index: openacs-4/packages/project-manager/www/task-calendar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/task-calendar.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/project-manager/www/task-calendar.adp	26 May 2005 09:34:29 -0000	1.2
+++ openacs-4/packages/project-manager/www/task-calendar.adp	27 Jul 2005 19:01:57 -0000	1.3
@@ -1,49 +1,2 @@
 <master src="lib/master">
-
-  <property name="title">@title@</property>
-  <property name="context">@context@</property>
-  <property name="header_stuff">@header_stuff;noquote@</property>
-
-  <a href="#viewoptions" class="button">#project-manager.View_options#</a>
-  <a href="#key" class="button">#project-manager.Key#</a>
-
-  <form method="post" action="task-add-edit">
-    <input type="submit" value="Edit Tasks" />
-    @edit_hidden_vars;noquote@
-      
-    @calendar;noquote@
-    
-  </form>
-
-  <a name="viewoptions"><h3>#project-manager.View_options#</h3></a>
-
-  <a href="@here;noquote@" class="button">@hide_show_closed;noquote@</a>
-
-  <a name="key"><h3>#project-manager.Key#</h3></a>
-
-  <dl>
-    <multiple name="roles">
-      <dt>@roles.abbreviation;noquote@</dt>
-      <dd>@roles.role;noquote@</dd>
-    </multiple>
-  </dl>
-
-  <h3>#project-manager.Users_to_view#</h3>
-
-  <form method="post" name="users_to_view" action="calendar-users-update">
-    <multiple name="users">
-
-      <if @users.checked_p@ true>
-        <input type="checkbox" checked="checked" name="party_id" value="@users.party_id@" />
-        @users.name@ <br />
-      </if>
-      <else>
-        <input type="checkbox" name="party_id" value="@users.party_id;noquote@" />
-        @users.name@ <br />
-      </else>
-
-    </multiple>
-
-    <input type="submit" value="Save" />
-  </form>
-
+<include src="../lib/task-calendar" date="@date@" julian_date="@julian_date@" hide_closed_p="@hide_closed_p@" display_p="t" view="@view@">
\ No newline at end of file
Index: openacs-4/packages/project-manager/www/task-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/task-one.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/project-manager/www/task-one.adp	6 Jun 2005 07:56:13 -0000	1.5
+++ openacs-4/packages/project-manager/www/task-one.adp	27 Jul 2005 19:01:57 -0000	1.6
@@ -274,7 +274,7 @@
                 @variable_widget;noquote@
                 @variable_exports;noquote@
                 @day_widget;noquote@
-                <input type="submit" name="submit" value="View" />
+                <input type="submit" name="submit" value="#project-manager.View#" />
               </form>
             </td>
             <td class="list-right-bg">&nbsp;</td>
Index: openacs-4/packages/project-manager/www/task-one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/www/task-one.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/project-manager/www/task-one.tcl	17 Jun 2005 09:26:59 -0000	1.7
+++ openacs-4/packages/project-manager/www/task-one.tcl	27 Jul 2005 19:01:57 -0000	1.8
@@ -217,7 +217,7 @@
 set nextyear_ansi [clock format [clock scan "+ 365 day"] -format "%Y-%m-%d"]
 set then_ansi [clock format [clock scan "-$logger_days days"] -format "%Y-%m-%d"]
 
-set day_widget "Last <input type=\"text\" name=\"logger_days\" value=\"$logger_days\" size=\"5\" /> Days"
+set day_widget "[_ project-manager.Last] <input type=\"text\" name=\"logger_days\" value=\"$logger_days\" size=\"5\" /> [_ project-manager.Days]"
 
 set variable_widget [logger::ui::variable_select_widget \
                          -project_id $logger_project \
@@ -265,7 +265,7 @@
     -elements {
         first_names {
             label {
-                Who
+                "[_ project-manager.Who]"
             }
             display_template {
                 <if @people.is_lead_p@><i></if>@people.user_info@<if @people.is_lead_p@></i></if>