Index: openacs-4/packages/calendar-portlet/calendar-portlet.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/calendar-portlet.info,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/calendar-portlet/calendar-portlet.info	23 Jan 2002 05:09:37 -0000	1.4
+++ openacs-4/packages/calendar-portlet/calendar-portlet.info	11 Feb 2002 05:00:52 -0000	1.5
@@ -22,19 +22,24 @@
         <files>
             <file type="package_spec" path="calendar-portlet.info"/>
             <file type="data_model" db_type="oracle" path="sql/oracle/calendar-admin-portlet-create.sql"/>
+            <file type="data_model" db_type="oracle" path="sql/oracle/calendar-full-portlet-create.sql"/>
             <file type="data_model_create" db_type="oracle" path="sql/oracle/calendar-portlet-create.sql"/>
             <file type="data_model_drop" db_type="oracle" path="sql/oracle/calendar-portlet-drop.sql"/>
             <file type="tcl_procs" path="tcl/calendar-admin-portlet-procs.tcl"/>
+            <file type="tcl_procs" path="tcl/calendar-full-portlet-procs.tcl"/>
             <file type="tcl_procs" path="tcl/calendar-portlet-procs.tcl"/>
             <file type="content_page" path="www/calendar-admin-portlet.adp"/>
             <file type="content_page" path="www/calendar-admin-portlet.tcl"/>
+            <file type="content_page" path="www/calendar-full-portlet.adp"/>
+            <file type="content_page" path="www/calendar-full-portlet.tcl"/>
             <file type="content_page" path="www/calendar-portlet-extra.tcl"/>
             <file type="query_file" db_type="oracle" path="www/calendar-portlet-oracle.xql"/>
             <file type="content_page" path="www/calendar-portlet.adp"/>
             <file type="content_page" path="www/calendar-portlet.tcl"/>
         </files>
         <parameters>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="pretty_name"  default="Calendar" description="Pretty Name"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="full_portlet_pretty_name"  default="Full Calendar" description="Description of Full Calendar Pretty Name"/>
         </parameters>
 
     </version>
Index: openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp	11 Feb 2002 03:48:42 -0000	1.1
+++ openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp	11 Feb 2002 05:00:52 -0000	1.2
@@ -1,4 +1,14 @@
 <if @config.shaded_p@ ne "t">
+<table border=0 width=100%>
+<tr>
+<td valign=top width=180>
+@cal_nav@
+<p>
+<li> <a href=calendar/?date=@current_date@&action=add&start_time=&end_time=>Add a personal item</a>
+</td>
+<td valign=top>
 @cal_stuff@
+</td>
+</tr>
+</table>
 </if>
-<b>@list_of_calendar_ids@</b>
Index: openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl	11 Feb 2002 03:48:42 -0000	1.1
+++ openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl	11 Feb 2002 05:00:52 -0000	1.2
@@ -4,33 +4,66 @@
 
     @author Arjun Sanyal (arjun@openforce.net)
     @cvs_id $Id$
+} {
+    {view ""}
+    {page_num ""}
+    {date ""}
+    {julian_date ""}
 } -properties {
     
 }
 
 # get stuff out of the config array
 array set config $cf
-set view $config(default_view)
+if {[empty_string_p $view]} {
+    set view $config(default_view)
+}
 set list_of_calendar_ids $config(calendar_id)
 
 # set up some vars
-set date [ns_queryget date]
 if {[empty_string_p $date]} {
-    set date [dt_sysdate]
+    if {[empty_string_p $julian_date]} {
+        set date [dt_sysdate]
+    } else {
+        set date [db_string select_from_julian "select to_date(:julian_date ,'J') from dual"]
+    }
 }
+
 set current_date $date
 set date_format "YYYY-MM-DD HH24:MI"
 
-# big switch on the view var
-if { $view == "day" } {
-    
+set cal_nav [dt_widget_calendar_navigation "" $view $date "page_num=$page_num"]
+
+if {$view == "day"} {
     set cal_stuff [calendar::one_day_display \
             -item_template {<a href=calendar/?action=edit&cal_item_id=$item_id>$item</a>} \
             -hour_template "<a href=calendar/?date=$current_date&action=add&return_url=../&start_time=\$start_time&end_time=\$start_time>\$hour</a>" \
             -date $current_date -start_hour 7 -end_hour 22 \
             -calendar_id_list $list_of_calendar_ids]
-    
+} 
+
+if {$view == "week"} {
+    set cal_stuff [calendar::one_week_display \
+            -item_template {<a href=calendar/?action=edit&cal_item_id=$item_id>$item</a>} \
+            -date $current_date \
+            -calendar_id_list $list_of_calendar_ids]
 }
 
+if {$view == "month"} {
+    set cal_stuff [calendar::one_month_display \
+            -item_template {<a href=calendar/?action=edit&cal_item_id=$item_id>$item</a>} \
+            -day_template "<a href=?julian_date=\$julian_date&page_num=$page_num>\$day_number</a>" \
+            -date $current_date \
+            -item_add_template "<a href=calendar/?action=add&start_time=&end_time=&julian_date=\$julian_date>ADD</a>" \
+            -calendar_id_list $list_of_calendar_ids]
+}
 
+if {$view == "list"} {
+    set cal_stuff "This will eventually just list the items for today"
+}
+
+if {$view == "year"} {
+    set cal_stuff "yeah, this view is boring"
+}
+
 ad_return_template
Index: openacs-4/packages/calendar-portlet/www/calendar-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-portlet.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/calendar-portlet/www/calendar-portlet.adp	11 Feb 2002 03:35:14 -0000	1.3
+++ openacs-4/packages/calendar-portlet/www/calendar-portlet.adp	11 Feb 2002 05:00:52 -0000	1.4
@@ -1,4 +1,3 @@
 <if @config.shaded_p@ ne "t">
 @cal_stuff@
 </if>
-<b>@list_of_calendar_ids@</b>