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.12 -r1.12.2.1
--- openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp	9 Aug 2002 18:39:31 -0000	1.12
+++ openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp	17 Oct 2002 09:39:37 -0000	1.12.2.1
@@ -23,9 +23,9 @@
     <tr>
       <td valign=top width=180>
         @cal_nav@
-        <p>
-        <ul>
-          <if @create_p@><li> <a href="calendar/cal-item-new?date=@current_date@&start_time=&end_time=">Add an item</a></if>
+        <p align="left">
+        <ul align="left">
+          <if @create_p@><li> <a href="calendar/cal-item-new?date=@current_date@&start_time=&end_time=&time_p=1">Add an item</a></if>
           <if @admin_p@><li> <a href="calendar/calendar-item-types?calendar_id=@force_calendar_id@">Manage Item Types</a></if>
         </ul>
       </td>
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.21 -r1.21.2.1
--- openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl	9 Aug 2002 18:39:31 -0000	1.21
+++ openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl	17 Oct 2002 09:39:37 -0000	1.21.2.1
@@ -70,24 +70,21 @@
 
 set cal_nav [dt_widget_calendar_navigation "" $view $date "page_num=$page_num"]
 
-if {$create_p} {
-    set item_template "<a href=\${url_stub}cal-item-view?show_cal_nav=0&return_url=$encoded_return_url&action=edit&cal_item_id=\$item_id>\$item</a>"
-} else {
-    set item_template "\$item"
-}
+set item_template "<a href=\${url_stub}cal-item-view?show_cal_nav=0&return_url=$encoded_return_url&action=edit&cal_item_id=\$item_id>\$item</a>"
 
+
 if {$create_p} {
     set hour_template "<a href=calendar/cal-item-new?date=$current_date&start_time=\$start_time&end_time=\$end_time>\$hour</a>"
-    set item_add_template "<a href=calendar/cal-item-new?start_time=&end_time=&julian_date=\$julian_date>ADD</a>"
+    set item_add_template " <a href=calendar/cal-item-new?start_time=&time_p=1&end_time=&julian_date=\$julian_date><img align=\"right\" border=0 width=\"7\" height=\"7\" src=\"/graphics/add.gif\" alt=\"Add Item\"></a>"
 } else {
     set hour_template "\$hour"
     set item_add_template ""
 }
 
 if {$view == "day"} {
     set cal_stuff [calendar::one_day_display \
-            -prev_nav_template "<a href=\"?page_num=$page_num&date=\$yesterday\">&lt;</a>" \
-            -next_nav_template "<a href=\"?page_num=$page_num&date=\$tomorrow\">&gt;</a>" \
+            -prev_nav_template "<a href=\"?page_num=$page_num&date=\$yesterday\"><img border=0 src=[dt_left_arrow] alt=\"back one day\"></a>" \
+            -next_nav_template "<a href=\"?page_num=$page_num&date=\$tomorrow\"><img border=0 src=[dt_right_arrow] alt=\"forward one day\"></a>" \
             -item_template $item_template \
             -hour_template $hour_template \
             -date $current_date -start_hour 7 -end_hour 22 \
@@ -99,12 +96,12 @@
 if {$view == "week"} {
     set cal_stuff [calendar::one_week_display \
             -item_template $item_template \
-            -day_template "<font size=-1><b>\$day</b> - <a href=\"?date=\$date&page_num=$page_num&return_url=$encoded_return_url\">\$pretty_date</a> &nbsp; &nbsp; <a href=\"calendar/cal-item-new?date=\$date&start_time=&end_time=\">(Add Item)</a></font>" \
+            -day_template "<a href=\"calendar/cal-item-new?date=\$date&time_p=1&start_time=&end_time=\"><img border=0 align=right height=\"7\" width=\"7\" src=\"/graphics/add.gif\" alt=\"Add Item\"></a><font size=-1><b>\$day</b> - </font><a href=\"?date=\$date&page_num=$page_num&return_url=$encoded_return_url\">\$pretty_date</a>" \
             -date $current_date \
             -calendar_id_list $list_of_calendar_ids \
             -url_stub_callback "calendar_portlet_display::get_url_stub" \
-            -prev_week_template "<a href=\"?date=\$last_week&view=week&page_num=$page_num\">&lt;</a>" \
-            -next_week_template "<a href=\"?date=\$next_week&view=week&page_num=$page_num\">&gt;</a>" \
+            -prev_week_template "<a href=\"?date=\$last_week&view=week&page_num=$page_num\"><img border=0 src=[dt_left_arrow] alt=\"back one week\"></a>" \
+            -next_week_template "<a href=\"?date=\$next_week&view=week&page_num=$page_num\"><img border=0 src=[dt_right_arrow] alt=\"forward one week\"></a>" \
             -show_calendar_name_p $show_calendar_name_p
     ]
 }
@@ -117,17 +114,23 @@
             -item_add_template "<font size=-3>$item_add_template</font>" \
             -calendar_id_list $list_of_calendar_ids \
             -url_stub_callback "calendar_portlet_display::get_url_stub" \
-            -prev_month_template "<a href=?view=month&date=\$ansi_date&page_num=$page_num>&lt;</a>" \
-            -next_month_template "<a href=?view=month&date=\$ansi_date&page_num=$page_num>&gt;</a>" \
+            -prev_month_template "<a href=?view=month&date=\$ansi_date&page_num=$page_num><img border=0 src=[dt_left_arrow] alt=\"back one month\"></a>" \
+            -next_month_template "<a href=?view=month&date=\$ansi_date&page_num=$page_num><img border=0 src=[dt_right_arrow] alt=\"forward one month\"></a>" \
             -show_calendar_name_p $show_calendar_name_p]
 }
 
 if {$view == "list"} {
     set sort_by [ns_queryget sort_by]
 
+    set thirty_days [expr 60*60*24*30]
+    set start_date [ns_fmttime [expr [ns_time] - $thirty_days] "%Y-%m-%d 00:00"]
+    set end_date [ns_fmttime [expr [ns_time] + $thirty_days] "%Y-%m-%d 00:00"]
+
     set cal_stuff [calendar::list_display \
             -item_template $item_template \
             -date $current_date \
+            -start_date $start_date \
+            -end_date $end_date \
             -calendar_id_list $list_of_calendar_ids \
             -sort_by $sort_by \
             -url_template "?view=list&sort_by=\$order_by&page_num=$page_num" \
@@ -140,3 +143,11 @@
 }
 
 ad_return_template
+
+
+
+
+
+
+
+
Index: openacs-4/packages/calendar-portlet/www/calendar-list-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-list-portlet.tcl,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/calendar-portlet/www/calendar-list-portlet.tcl	9 Aug 2002 18:39:31 -0000	1.2
+++ openacs-4/packages/calendar-portlet/www/calendar-list-portlet.tcl	17 Oct 2002 09:39:37 -0000	1.2.2.1
@@ -74,9 +74,15 @@
 
 set item_template "<a href=\${url_stub}cal-item-view?show_cal_nav=0&return_url=$encoded_return_url&action=edit&cal_item_id=\$item_id>\$item</a>"
 
+set thirty_days [expr 60*60*24*30]
+set start_date [ns_fmttime [expr [ns_time] - $thirty_days] "%Y-%m-%d 00:00"]
+set end_date [ns_fmttime [expr [ns_time] + $thirty_days] "%Y-%m-%d 00:00"]
+
 set cal_list [calendar::list_display \
         -item_template $item_template \
         -date $current_date \
+	-start_date $start_date \
+	-end_date $end_date \
         -calendar_id_list $list_of_calendar_ids \
         -sort_by $sort_by \
         -url_template "?sort_by=\$order_by&page_num=$page_num" \
Index: openacs-4/packages/new-portal/tcl/portal-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v
diff -u -r1.156 -r1.156.2.1
--- openacs-4/packages/new-portal/tcl/portal-procs.tcl	9 Aug 2002 20:56:29 -0000	1.156
+++ openacs-4/packages/new-portal/tcl/portal-procs.tcl	17 Oct 2002 09:39:44 -0000	1.156.2.1
@@ -346,6 +346,7 @@
     ad_proc -public configure {
         {-referer ""}
         {-template_p f}
+	{-allow_theme_change_p 1}
         portal_id
         return_url
     } {
@@ -429,14 +430,18 @@
         }
 
         append theme_chunk "<input type=submit name=op value=\"Change Theme\"></form>"
+	if {$allow_theme_change_p} {
         append template "$theme_chunk"
+	}
 
         #
         # Per-page template chunks
         #
 
         set list_of_page_ids [list_pages_tcl_list -portal_id $portal_id]
 
+	set last_page [lindex $list_of_page_ids [expr [llength $list_of_page_ids] - 1]]
+	ns_log warning "last_page is $last_page"
         foreach page_id $list_of_page_ids {
 
             set first_page_p [portal::first_page_p -portal_id $portal_id -page_id $page_id]
@@ -448,18 +453,20 @@
             #
             # Page rename chunk
             #
-
-            set page_name_chunk "
-            <a name=$page_id></a>
-            <form method=post action=@action_string@>
+            set page_name_chunk "<table border=0 width=\"100%\" class=\"portal-page-config\" cellpadding=0 cellspacing=0 border=0>
+	    <tr><td align=\"center\"><a name=$page_id><h2 class=\"portal-page-name\">$page_name</h2></a></td>
+            <td align=right><name=$page_id></a>
+            <form method=post align=right action=@action_string@>
             <input type=hidden name=portal_id value=@portal_id@>
             <input type=hidden name=page_id value=$page_id>
-            <input type=hidden name=return_url value=@return_url@>
+            <input type=hidden name=return_url value=@return_url@#$page_id>
             <input type=hidden name=anchor value=$page_id>
-            <br><strong>Page:</strong>
-            <input type=text name=pretty_name value=\"$page_name\">
             <input type=submit name=op value=\"Rename Page\">
-            </form>"
+            <input type=text name=pretty_name value=\"$page_name\">
+            </form> 
+	    <tr height=1><td colspan=2 class=\"bottom-border\" height=\"1\"><img src=\"/graphics/spacer.gif\" height=1></td></tr>
+	    </td></tr>"
+
             append template "$page_name_chunk"
 
             if {[portal::non_hidden_elements_p -page_id $page_id] || $first_page_p} {
@@ -478,7 +485,7 @@
                 set element_list [array get fake_element_ids]
 
                 append template "
-                <table bgcolor=#eeeeee border=0 width=\"100%\">
+                <table class=\"portal-page-config\" bgcolor=#eeeeee border=0 width=\"100%\">
                 <tr valign=middle><td valign=middle>
                 <include src=\"$portal(template)\"
                 element_list=\"$element_list\"
@@ -504,7 +511,16 @@
                 # Remove page chunk - don't allow removal of the first page
                 #
 
-                if {!$first_page_p} {
+		append template "<tr><td><include src=\"show-here\" portal_id=$portal_id
+		    action_string=@action_string@
+		    region=@region@
+		    page_id=$page_id
+		    anchor=$page_id
+		    return_url=@return_url@></tr></td>"
+
+
+
+                if { $page_id == $last_page } {
                     append template "
                     <tr valign=middle><td valign=middle>
                     <center>
@@ -564,7 +580,7 @@
 
 
             # close the page's table
-            append template "</table>"
+            append template "</table><p>"
 
         }
 
@@ -575,30 +591,38 @@
         set new_page_num [expr [page_count -portal_id $portal_id] + 1]
 
         append template "
-        <a name=add_a_new_page></a>
+	<p>
+        <table class=\"portal-page-config\" border=0 cellspacing=0 cellpadding=0>
+            <tr><td><h2 class=\"portal-page-name\">Create a new page</h2></tr></td>
+	<tr><td>
+	<a name=add_a_new_page></a>
         <form method=post action=@action_string@>
         <input type=hidden name=portal_id value=@portal_id@>
-        <input type=hidden name=return_url value=@return_url@>
+        <input type=hidden name=return_url value=@return_url@#$page_id>
         <input type=hidden name=anchor value=add_a_new_page>
-        <b>Add a new page:</b>
+        <center>
          <input type=text name=pretty_name value=\"Page $new_page_num\">
         <input type=submit name=op value=\"Add Page\">
+	<center>
         </form>
+	</td></tr></table>
         "
 
         #
         # Revert page chunk
         #
 
         if {![empty_string_p [get_portal_template_id $portal_id]]} {
-            append template "
-            <br>
-            <form method=post action=@action_string@>
+            append template "<p>
+            <table class=\"portal-page-config\" width=100% cellpadding=0 border=0 cellspacing=0><tr><td>
+	    <form method=post action=@action_string@>
             <input type=hidden name=portal_id value=@portal_id@>
             <input type=hidden name=return_url value=@return_url@>
-            <b>Revert to the default arrangement:</b>
+            <h2 class=\"portal-page-name\">Revert the entire portal to the default arrangement</h2>
+	    <center>
             <input type=submit name=op value=\"Revert\">
-            </form>"
+            </form></center>
+	    </td></tr></table>"
         }
 
         #
@@ -641,69 +665,70 @@
 
         switch $op {
             "Revert" {
-                db_transaction {
-                    set template_id [get_portal_template_id $portal_id]
+		#Transaction here was causeing uncaught deadlocks so it was removed. - CM 9-11-02
+		#It doesn't seem necessary to have a transaction here. Its not a big deal if this fails in the the middle. The user can just revert again.
 
-                    # revert theme
-                    set theme_id [get_theme_id -portal_id $template_id]
-                    db_dml revert_theme_update {}
+		set template_id [get_portal_template_id $portal_id]
 
-                    # revert pages
-                    # first equalize number of pages in the target
-                    set template_page_count [page_count -portal_id $template_id]
-                    set target_page_count [page_count -portal_id $portal_id]
-                    set difference [expr $template_page_count - $target_page_count]
-
-                    if {$difference > 0} {
-                        # less pages in target
-                        for {set x 0} {$x < $difference} {incr x} {
-
-                            set pretty_name "portal revert dummy page $x"
-                            page_create \
-                                    -pretty_name $pretty_name \
-                                    -portal_id $portal_id
-                        }
-                    } elseif {$difference < 0} {
-                        # more pages in target, delete them from the end,
-                        # putting any elements on them on the first page,
-                        # we put them in the right place later
-                        for {set x 0} {$x < [expr abs($difference)]} {incr x} {
-
-                            set max_page_id [db_string revert_max_page_id_select {}]
-                            set page_id [db_string revert_min_page_id_select {}]
-                            set region 1
-
-                            db_foreach revert_move_elements_for_del {} {
-                                portal::move_element_to_page \
+		# revert theme
+		set theme_id [get_theme_id -portal_id $template_id]
+		db_dml revert_theme_update {}
+		
+		# revert pages
+		# first equalize number of pages in the target
+		set template_page_count [page_count -portal_id $template_id]
+		set target_page_count [page_count -portal_id $portal_id]
+		set difference [expr $template_page_count - $target_page_count]
+		
+		if {$difference > 0} {
+		    # less pages in target
+		    for {set x 0} {$x < $difference} {incr x} {
+			
+			set pretty_name "portal revert dummy page $x"
+			page_create \
+				-pretty_name $pretty_name \
+				-portal_id $portal_id
+		    }
+		} elseif {$difference < 0} {
+		    # more pages in target, delete them from the end,
+		    # putting any elements on them on the first page,
+		    # we put them in the right place later
+		    for {set x 0} {$x < [expr abs($difference)]} {incr x} {
+			
+			set max_page_id [db_string revert_max_page_id_select {}]
+			set page_id [db_string revert_min_page_id_select {}]
+			set region 1
+			
+			db_foreach revert_move_elements_for_del {} {
+			    portal::move_element_to_page \
                                     -page_id $page_id \
                                     -element_id $element_id \
                                     -region 1
-                            }
+			}
 
-                            page_delete -page_id $max_page_id
-                        }
-                    }
+			page_delete -page_id $max_page_id
+		    }
+		}
+		
+		# now that they have the same number of pages, get to it
+		foreach source_page_id \
+			[list_pages_tcl_list -portal_id $template_id] {
+		    
+		    db_1row revert_get_source_page_info {}
 
-                    # now that they have the same number of pages, get to it
-                    foreach source_page_id \
-                            [list_pages_tcl_list -portal_id $template_id] {
-
-                        db_1row revert_get_source_page_info {}
-
-                        set target_page_id [db_string revert_get_target_page_id {}]
-
-                        db_dml revert_page_update {}
-
-                        # revert elements in two steps like "swap"
-                        db_foreach revert_get_source_elements {} {
-                            # the element might not be on the target page...
-                            set target_element_id \
-                                    [db_string revert_get_target_element {}]
-
-                            db_dml revert_element_update {}
-                        }
-                    }
-                }
+		    set target_page_id [db_string revert_get_target_page_id {}]
+		    
+		    db_dml revert_page_update {}
+		    
+		    # revert elements in two steps like "swap"
+		    db_foreach revert_get_source_elements {} {
+			# the element might not be on the target page...
+			set target_element_id \
+				[db_string revert_get_target_element {}]
+			
+			db_dml revert_element_update {}
+		    }
+		}
             }
             "Rename" {
                 portal::update_name $portal_id [ns_set get $form new_name]
@@ -987,6 +1012,7 @@
         {-link_all 0}
         {-extra_td_html ""}
         {-table_html_args ""}
+	{-extra_td_selected_p 0}
     } {
         Wraps portal::dimensional to create a dotlrn navbar
 
@@ -1010,6 +1036,7 @@
                 -pre_html $pre_html \
                 -post_html $post_html \
                 -extra_td_html $extra_td_html \
+		-extra_td_selected_p $extra_td_selected_p \
                 -table_html_args $table_html_args \
                 $ad_dim_struct \
                 $link]
@@ -1358,6 +1385,8 @@
 
         db_dml update {}
 
+	util_memoize_flush "portal::element_params_not_cached $element_id"
+
         # ns_log notice "aks81 [get_element_param $element_id $key]"
         return 1
     }
@@ -1399,6 +1428,9 @@
         @author ben@openforce
     } {
         db_dml insert {}
+
+	util_memoize_flush "portal::element_params_not_cached $element_id"
+
     }
 
     ad_proc -private remove_element_param_value {
@@ -1409,6 +1441,10 @@
         removes a value for a param
     } {
         db_dml delete {}
+
+        # DRB: Remove the cached copy of this element, too.
+	util_memoize_flush "portal::element_params_not_cached $element_id"
+
     }
 
     ad_proc -private remove_all_element_param_values {
@@ -1437,6 +1473,12 @@
         }
     }
 
+    ad_proc -private element_params_not_cached element_id {
+	Return a list of lists of key value pairs for this portal element.
+    } {
+	return [db_list_of_lists params_select {}]
+    }
+
     ad_proc -private get_element_id_from_unique_param {
         {-portal_id:required}
         {-key:required}
@@ -1473,9 +1515,14 @@
         db_1row element_select {} -column_array element
 
         # get the element's params
-        db_foreach params_select {} {
-            lappend config($key) $value
-        } if_no_rows {
+	set element_params [util_memoize "portal::element_params_not_cached $element_id" 86400]
+	if [llength $element_params] {
+	    foreach param $element_params {
+		set key [lindex $param 0]
+		set value [lindex $param 1]
+		lappend config($key) $value
+	    }
+        } else {
             # this element has no config, set up some defaults
             set config(shaded_p) "f"
             set config(shadeable_p) "f"
@@ -2142,17 +2189,20 @@
     } {
         return [db_list_of_ns_sets get_theme_info_select {}]
     }
-
+    
     ad_proc dimensional {
         {-no_header:boolean}
         {-no_bars:boolean}
         {-link_all 0}
+        {-names_in_cells_p 1}
         {-th_bgcolor "#ECECEC"}
         {-td_align "center"}
         {-extra_td_html ""}
         {-table_html_args "border=0 cellspacing=0 cellpadding=3 width=100%"}
+	{-class_html ""}
         {-pre_html ""}
         {-post_html ""}
+	{-extra_td_selected_p 0}
         option_list
         {url {}}
         {options_set ""}
@@ -2163,31 +2213,53 @@
         if {[empty_string_p $option_list]} {
             return
         }
-
+	
         if {[empty_string_p $options_set]} {
             set options_set [ns_getform]
         }
-
+	
         if {[empty_string_p $url]} {
             set url [ad_conn url]
         }
-
-        set html "\n<table $table_html_args>\n <tr>\n"
-
+	
+        set html "\n<table $table_html_args>\n"
+	
         if {!$no_header_p} {
             foreach option $option_list {
-                append html "    <th bgcolor=\"$th_bgcolor\">[lindex $option 1]</th>\n"
+                append html "<tr>    <th bgcolor=\"$th_bgcolor\">[lindex $option 1]</th>\n"
             }
         }
-
-        append html "  </tr>\n  <tr>\n"
-
+    
+        append html "  <tr>\n"
+	
         foreach option $option_list {
-            append html "    <td align=$td_align>"
-
+	    
             if {!$no_bars_p} {
                 append html "\["
             }
+	    
+	    
+	    if { $names_in_cells_p } {
+		set pre_td_html "<td class=\"navbar\">"
+		set pre_selected_td_html "<td class=\"navbar-selected\">"
+		set post_html "$post_html</a></td>"
+		set end_html ""
+		set break_html ""
+		set post_selected_html "$post_html"
+	    } else {
+		append html "    <td align=$td_align>"
+		set td_html ""
+		set pre_selected_td_html "<strong>"
+		set post_selected_html "</strong>$post_html"
+		set end_html ""
+		set td_html ""
+		post_html "$post_html</a>"
+		if {!$no_bars_p} {
+		    set break_html " | "
+		} else {
+		    append break_html " &nbsp; "
+		}
+	    }
 
             # find out what the current option value is.
             # check if a default is set otherwise the first value is used
@@ -2196,7 +2268,7 @@
             if {![empty_string_p $options_set]} {
                 set option_val [ns_set get $options_set $option_key]
             }
-
+	    
             set first_p 1
             foreach option_value [lindex $option 3] {
                 set thisoption_name [lindex $option_value 0]
@@ -2208,29 +2280,33 @@
 
                 if {$first_p} {
                     set first_p 0
-                } else {
-                    if {!$no_bars_p} {
-                        append html " | "
-                    } else {
-                        append html " &nbsp; "
-                    }
+		} else {
+		    append html $break_html
                 }
-
+		
                 if {([string equal $option_val $thisoption_name] == 1 && !$link_all) || !$thisoption_link_p} {
-                    append html "${pre_html}<strong>${thisoption_value}</strong>${post_html}"
+                    append html "${pre_selected_td_html}${pre_html}${thisoption_value}${post_selected_html}\n"
                 } else {
-                    append html "<a href=\"$url?[export_ns_set_vars url $option_key $options_set]&[ns_urlencode $option_key]=[ns_urlencode $thisoption_name]\">${pre_html}${thisoption_value}${post_html}</a>"
+                    append html "${pre_td_html}<a href=\"$url?[export_ns_set_vars url $option_key $options_set]&[ns_urlencode $option_key]=[ns_urlencode $thisoption_name]\">${pre_html}${thisoption_value}${post_html}\n"
                 }
             }
 
             if {!$no_bars_p} {
                 append html "\]"
             }
-
-            append html "$extra_td_html</td>\n"
+	    if {$extra_td_selected_p} {
+		append html "${pre_selected_td_html}${pre_html}$extra_td_html${post_html}\n"
+	    } else {
+		append html "${pre_td_html}$extra_td_html${post_html}\n"
+	    }
         }
 
-        append html "  </tr>\n</table>\n"
+        append html "  </tr>\n$end_html</table>\n"
     }
 
 }
+ 
+
+
+
+
Index: openacs-4/packages/new-portal/tcl/portal-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.xql,v
diff -u -r1.41 -r1.41.2.1
--- openacs-4/packages/new-portal/tcl/portal-procs.xql	21 Aug 2002 15:22:39 -0000	1.41
+++ openacs-4/packages/new-portal/tcl/portal-procs.xql	17 Oct 2002 09:39:44 -0000	1.41.2.1
@@ -515,7 +515,7 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="portal::evaluate_element.params_select">
+    <fullquery name="portal::element_params_not_cached.params_select">
         <querytext>
             select key,
                    value
Index: openacs-4/packages/new-portal/www/place-element.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/place-element.adp,v
diff -u -r1.36 -r1.36.2.1
--- openacs-4/packages/new-portal/www/place-element.adp	9 Aug 2002 20:56:29 -0000	1.36
+++ openacs-4/packages/new-portal/www/place-element.adp	17 Oct 2002 09:39:44 -0000	1.36.2.1
@@ -23,42 +23,46 @@
 <input type=hidden name=region value=@region@>
 <input type=hidden name=page_id value=@page_id@>
 
-<table border=1 width="100%">
-<tr>
-<td align=center>
+<table border=0 width="100%">
+<tr><td>
 
 <multiple name=element_multi>
-  
-<if @element_multi.rownum@ gt 1>
-  <hr>
-</if>
+<center>  
+<table class="portlet-config" cellpadding=0 cellspacing=0 border="0" bground="white" width="95%">
+    <tr><td class="element-header-text">@element_multi.name@</td>
+    <td align=right>	
 
-    @element_multi.name@
-
     <if @element_multi.state@ ne "pinned">
 
     <!-- hide/remove link and arrows begin - refactor with tempate? -->
 
-      <small>[<a href="@action_string@?portal_id=@portal_id@&op=hide&element_id=@element_multi.element_id@&return_url=@return_url@&anchor=@page_id@">remove</a>]</small>
+      <a href="@action_string@?anchor=@page_id@&portal_id=@portal_id@&op=hide&element_id=@element_multi.element_id@&return_url=@return_url@">
+	<img src=@imgdir@/delete.gif border=0 alt="remove portlet"></a>
 
     <if @element_multi:rowcount gt 1>
       <if @element_multi.rownum@ gt 1>
-        <a href="@action_string@?portal_id=@portal_id@&region=@region@&op=swap&element_id=@element_multi.element_id@&direction=up&page_id=@page_id@&return_url=@return_url@&anchor=@page_id@"><img border=0 src="@imgdir@/arrow-up.gif" alt="move up"></a>
+        <a href="@action_string@?anchor=@page_id@&portal_id=@portal_id@&region=@region@&op=swap&element_id=@element_multi.element_id@&direction=up&page_id=@page_id@&return_url=@return_url@">
+	<img border=0 src="@imgdir@/arrow-up.gif" alt="move up"></a>
       </if>
       <if @element_multi:rowcount@ gt @element_multi.rownum@>
-        <a href="@action_string@?portal_id=@portal_id@&region=@region@&op=swap&element_id=@element_multi.element_id@&direction=down&page_id=@page_id@&return_url=@return_url@&anchor=@page_id@"><img border=0 src="@imgdir@/arrow-down.gif" alt="move down"></a>
+        <a href="@action_string@?anchor=@page_id@&portal_id=@portal_id@&region=@region@&op=swap&element_id=@element_multi.element_id@&direction=down&page_id=@page_id@&return_url="@return_url@">
+	<img border=0 src="@imgdir@/arrow-down.gif" alt="move down"></a>
       </if>
     </if>
 
     <if @num_regions@ gt 1>
 	<if @region@ eq 1>
-	<a href="@action_string@?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=right&region=@region@&return_url=@return_url@&anchor=@page_id@"><img border=0 src="@imgdir@/arrow-right.gif" alt="move right"></a>
+	<a href="@action_string@?anchor=@page_id@&portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=right&region=@region@&return_url=@return_url@">
+	<img border=0 src="@imgdir@/arrow-right.gif" alt="move right"></a>
 	</if>
 	<if @region@ gt 1 and @region@ lt @num_regions@>
-	<a href="@action_string@?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=left&region=@region@&return_url=@return_url@&anchor=@page_id@"><img border=0 src="@imgdir@/arrow-left.gif" alt="move left"></a>
+	<a href="@action_string@?anchor=@page_id@&portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=left&region=@region@&return_url=@return_url@">
+	<img border=0 src="@imgdir@/arrow-left.gif" alt="move left"></a>
 	<a href="@action_string@?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=right&region=@region@"><img border=0 src="@imgdir@/arrow-right.gif" alt="move right"></a>
 	</if>
-	<if @region@ eq @num_regions@><a href="@action_string@?portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=left&region=@region@&return_url=@return_url@&anchor=@page_id@"><img border=0 src="@imgdir@/arrow-left.gif" alt="move left"></a>
+	<if @region@ eq @num_regions@>
+	<a href="@action_string@?anchor=@page_id@&portal_id=@portal_id@&op=move&element_id=@element_multi.element_id@&direction=left&region=@region@&return_url=@return_url@">
+	<img border=0 src="@imgdir@/arrow-left.gif" alt="move left"></a>
 	</if>
     </if>
 
@@ -67,36 +71,33 @@
     </if>
 
     <!-- hide/remove link and arrows end -->
-
+</td></tr>
+<tr><td colspan=2 class="bottom-border" height="0"><img src="/graphics/spacer.gif"></td></tr>
+<tr><td></td></tr>
+<tr><td colspan=2 valign=bottom align=center>
 </form>
 
     <include src=place-element-other-page &="element_multi" 
              portal_id=@portal_id@
              page_id=@page_id@
              action_string=@action_string@
+	     anchor=@page_id@
              return_url=@return_url@>
+</td></tr></table></center>
+<p>
 </multiple>
 
 </if>
 
+	<include src="show-here" portal_id=@portal_id@
+		action_string=@action_string@
+		region=@region@
+		page_id=@page_id@
+		anchor=@page_id@
+		return_url=@return_url@>
 
-<!-- refactor show with template? -->
-
-<if @show_avail_p@ ne 0>
-<form method=post action=@action_string@>
-<input type=hidden name=portal_id value=@portal_id@>
-<input type=hidden name=region value=@region@>
-<input type=hidden name=page_id value=@page_id@>
-<input type=hidden name=return_url value=@return_url@>
-@show_html@
-</select>
-<input type=submit name="op" value="Show Here">
-</if>
-
-<!-- refactor show with template? -->
-
 </td>
 </tr>
 </table>
 
-</form>
+
Index: openacs-4/packages/new-portal/www/admin/portal-config.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/admin/portal-config.adp,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/new-portal/www/admin/portal-config.adp	9 Aug 2002 20:56:30 -0000	1.6
+++ openacs-4/packages/new-portal/www/admin/portal-config.adp	17 Oct 2002 09:39:44 -0000	1.6.2.1
@@ -23,4 +23,12 @@
 <property name=referer>@referer@</property>
 <property name=name>@name@</property>
 
+<a href=@page_url@?&portal_id=@portal_id@&referer=@referer@&anchor=#custom>Manage Custom Portlets</a>
+
 @rendered_page@
+<hr>
+
+<a name="custom"><h2></a>Custom Portlets</h2> - Note custom portlets for portal templates are very fragile right now. Only use this during system set up before any portlets have been created with this template.  Better solution coming soon.
+<include src="/packages/static-portlet/www/static-admin-portlet" package_id="@portal_id@" template_portal_id="@portal_id@" return_url="@return_url@">
+
+
Index: openacs-4/packages/new-portal/www/admin/portal-config.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/admin/portal-config.tcl,v
diff -u -r1.9 -r1.9.2.1
--- openacs-4/packages/new-portal/www/admin/portal-config.tcl	9 Aug 2002 20:56:30 -0000	1.9
+++ openacs-4/packages/new-portal/www/admin/portal-config.tcl	17 Oct 2002 09:39:44 -0000	1.9.2.1
@@ -23,14 +23,24 @@
     @creation-date 10/20/2001
     @cvs-id $Id$
 } {
-    {referer:notnull}
+    {referer:optional ""}
     portal_id:naturalnum,notnull
 }
 
+set page_url [ad_conn url]
 set name ""
 set rendered_page [portal::configure \
         -referer $referer \
         -template_p f \
         $portal_id ""
 ]
 set name [portal::get_name $portal_id]
+set return_url "$page_url?portal_id=$portal_id"
+
+
+
+
+
+
+
+
Index: openacs-4/packages/static-portlet/tcl/static-admin-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-portlet/tcl/static-admin-portlet-procs.tcl,v
diff -u -r1.13 -r1.13.2.1
--- openacs-4/packages/static-portlet/tcl/static-admin-portlet-procs.tcl	9 Aug 2002 18:39:33 -0000	1.13
+++ openacs-4/packages/static-portlet/tcl/static-admin-portlet-procs.tcl	17 Oct 2002 09:39:47 -0000	1.13.2.1
@@ -49,12 +49,14 @@
     } {
 	Adds a static admin PE to the given portal
     } {
+	ns_log notice "portal id is $portal_id. package id is $package_id. portlet name is [get_my_name]"
         return [portal::add_element_parameters \
             -portal_id $portal_id \
             -portlet_name [get_my_name] \
             -key package_id \
             -value $package_id
         ]
+	ns_log notice "end of add_self_to_page"
     }
 
     ad_proc -public remove_self_from_page {
Index: openacs-4/packages/static-portlet/tcl/static-portal-content-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-portlet/tcl/static-portal-content-procs.tcl,v
diff -u -r1.14 -r1.14.2.1
--- openacs-4/packages/static-portlet/tcl/static-portal-content-procs.tcl	9 Aug 2002 18:39:33 -0000	1.14
+++ openacs-4/packages/static-portlet/tcl/static-portal-content-procs.tcl	17 Oct 2002 09:39:47 -0000	1.14.2.1
@@ -48,6 +48,7 @@
     } {
         This is a bit different from other add_self_to_page procs.
     } {
+	ns_log notice "portal is is $portal_id. package_id is $package_id. content_id is $content_id. template_id = $template_id"
 
         if {![empty_string_p $template_id]} {
             # we got a template_id, so we know that (1) that we are
@@ -62,8 +63,10 @@
                                     $template_id \
                                     [static_portlet::get_my_name]
             ]
+	    ns_log notice "old element id is $old_element_id"
             set old_content_id [portal::get_element_param $old_element_id content_id]
 
+	    ns_log notice "old content id is $old_content_id"
             # clone the template's content
             set new_content_id [static_portal_content::new \
                                     -package_id $package_id \
@@ -76,6 +79,7 @@
                                     $portal_id \
                                     [static_portlet::get_my_name]
             ]
+	    ns_log notice "new element id is $new_element_id"
             portal::set_element_param $new_element_id "package_id" $package_id
             portal::set_element_param $new_element_id "content_id" $new_content_id
 
@@ -89,6 +93,8 @@
             # since it dosen't do the right thing for multiple elements with
             # the same datasource on a page. so we just use the more low level
             # portal::add_element
+	    ns_log notice "before bad proc. portal id is $portal_id"
+	    ns_log notice "before bad proc. content id $content_id"
             set element_id [portal::add_element \
                     -portal_id $portal_id \
                     -portlet_name [static_portlet::get_my_name] \
Index: openacs-4/packages/static-portlet/www/element-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-portlet/www/Attic/element-new.adp,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/static-portlet/www/element-new.adp	9 Aug 2002 18:39:33 -0000	1.4
+++ openacs-4/packages/static-portlet/www/element-new.adp	17 Oct 2002 09:39:47 -0000	1.4.2.1
@@ -20,13 +20,18 @@
 
 <master>
 <property name="title">@title@</property>
+<property name="community_id">@community_id@</property>
+<p>
+<blockquote>
+Use this form to create a new @element_pretty_name@.  The @element_pretty_name@ will be created and automatically placed on the first page of @portal_name@ portal. Goto the @control_panel_text@ and select Customize Layout to move the this @element_pretty_name@.
 
-Create a new @element_pretty_name@:
-
 <P>
-
 <strong>Note</strong>: You can use plain text or HTML in the Content area.
-
+</blockquote>
 <P>
 
 <formtemplate id="new_static_element"></formtemplate>
+
+
+
+
Index: openacs-4/packages/static-portlet/www/element-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-portlet/www/Attic/element-new.tcl,v
diff -u -r1.9 -r1.9.2.1
--- openacs-4/packages/static-portlet/www/element-new.tcl	9 Aug 2002 18:39:33 -0000	1.9
+++ openacs-4/packages/static-portlet/www/element-new.tcl	17 Oct 2002 09:39:47 -0000	1.9.2.1
@@ -32,6 +32,15 @@
 
 set title "New $element_pretty_name"
 
+#these are set for display and instructions.
+set community_id $package_id
+
+set portal_name [portal::get_name $portal_id]
+
+if {![info exists control_panel_text]} {
+    set control_panel_text "Control Panel"
+}
+
 form create new_static_element
 
 element create new_static_element pretty_name \
@@ -85,3 +94,14 @@
     ad_returnredirect $referer
     ad_script_abort
 }
+
+
+
+
+
+
+
+
+
+
+
Index: openacs-4/packages/static-portlet/www/element.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-portlet/www/element.tcl,v
diff -u -r1.7 -r1.7.2.1
--- openacs-4/packages/static-portlet/www/element.tcl	9 Aug 2002 18:39:33 -0000	1.7
+++ openacs-4/packages/static-portlet/www/element.tcl	17 Oct 2002 09:39:47 -0000	1.7.2.1
@@ -74,12 +74,18 @@
     form get_values static_element \
         pretty_name content content_id portal_id referer
     
-    static_portal_content::update \
-        -portal_id $portal_id \
-        -content_id $content_id \
-        -pretty_name $pretty_name \
-        -content $content
-    
+    db_transaction {
+        static_portal_content::update \
+		-portal_id $portal_id \
+                -content_id $content_id \
+                -pretty_name $pretty_name \
+                -content $content
+        
+        # Must update portal element title
+        # db_dml update_element_pretty_name "update portal_element_map set pretty_name= :pretty_name where element_id= :element_id"
+    }
+
+    # redirect and abort
     ad_returnredirect $referer
     ad_script_abort
 }
Index: openacs-4/packages/static-portlet/www/static-admin-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-portlet/www/static-admin-portlet.tcl,v
diff -u -r1.12 -r1.12.2.1
--- openacs-4/packages/static-portlet/www/static-admin-portlet.tcl	9 Aug 2002 18:39:33 -0000	1.12
+++ openacs-4/packages/static-portlet/www/static-admin-portlet.tcl	17 Oct 2002 09:39:47 -0000	1.12.2.1
@@ -20,20 +20,43 @@
     @author arjun (arjun@openforce)
     @author Ben Adida (ben@openforce)    
     @cvs_id $Id$
-} -properties {
+} {
+    package_id:optional
+    template_portal_id:optional
+    referer:optional
+    return_url:optional
 }
 
+if {![exists_and_not_null package_id]} {
+    set package_id [dotlrn_community::get_community_id]
+}
+
+if {![exists_and_not_null template_portal_id]} {
+    set template_portal_id [dotlrn_community::get_portal_id]
+}
+
+if {[exists_and_not_null return_url]} {
+    set referer $return_url
+}
+
+if {![exists_and_not_null referer]} {
+    set referer [ad_conn url]
+}
+
 set element_pretty_name [ad_parameter static_admin_portlet_element_pretty_name static-portlet "Custom Portlet"]
 set element_pretty_plural [ad_parameter static_admin_portlet_element_pretty_plural static-portlet "Custom Portlets"]
-set package_id [dotlrn_community::get_community_id]
 
+ns_log notice "package_id = $package_id"
 db_multirow content select_content {
     select content_id,
            pretty_name
     from static_portal_content
     where package_id = :package_id
 }
 
-set template_portal_id [dotlrn_community::get_portal_id]
+
 set applet_url "[dotlrn_applet::get_url]/[static_portlet::my_package_key]"
-set referer [ad_conn url]
+
+
+
+