Index: openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl,v
diff -u -N -r1.25 -r1.26
--- openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	14 Sep 2008 17:31:38 -0000	1.25
+++ openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	30 Oct 2008 22:54:59 -0000	1.26
@@ -80,7 +80,7 @@
    <a href='#' onclick='document.getElementById("do_search").style.display="inline";document.getElementById("do_search_q").focus(); return false;'  title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
   <if @index_link@ not nil><a href="@index_link@" accesskey='i' title='#xowiki.index_title#'>#xowiki.index#</a></if>
 <div id='do_search' style='display: none'> 
-  <FORM action='/search/search'><div><INPUT id='do_search_q' name='q' type='text'><INPUT type="hidden" name="search_package_id" value="@package_id@" ></div></FORM> 
+  <FORM action='/search/search'><div><label for='do_search_q'>#xowiki.search#</label><<INPUT id='do_search_q' name='q' type='text'><INPUT type="hidden" name="search_package_id" value="@package_id@" ></div></FORM> 
 </div>
 </div>}
   }
Index: openacs-4/packages/xowiki/tcl/syndicate-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/syndicate-procs.tcl,v
diff -u -N -r1.30 -r1.31
--- openacs-4/packages/xowiki/tcl/syndicate-procs.tcl	24 Sep 2008 09:55:06 -0000	1.30
+++ openacs-4/packages/xowiki/tcl/syndicate-procs.tcl	30 Oct 2008 22:54:59 -0000	1.31
@@ -452,7 +452,9 @@
         
       }
       default {
-        error "Unssupported schema [RSS-client getRSSVersion $doc]"
+	my set errorMessage "Unsupported RSS schema [RSS-client getRSSVersion $doc]"
+	return
+        #error "Unsupported schema [RSS-client getRSSVersion $doc]"
       }
     }
 
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -N -r1.304 -r1.305
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	29 Oct 2008 14:14:21 -0000	1.304
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	30 Oct 2008 22:54:59 -0000	1.305
@@ -1991,6 +1991,9 @@
        {-extra_where_clause ""}
        {-h_where ""}
        {-always_queried_attributes {_name _last_modified _creation_user}}
+       {-orderby ""}
+       {-page_size 20}
+       {-page_number ""}
      } {
     #
     # Get query attributes for all tables (to allow e.g. sorting by time)
@@ -2041,9 +2044,8 @@
     }
     #my msg filter_clause=$filter_clause
 
-    set orderby ""; set page_size 20; set page_number ""
     # -parent_id empty means to get instances, regardless of 
-    # parent_id. Under the assumption, the page_template constrains
+    # parent_id. Under the assumption, page_template constrains
     # the query enough to make it fast...
     set sql  [::xowiki::FormPage instance_select_query \
 		    -select_attributes $sql_atts \
Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -N -r1.195 -r1.196
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	29 Oct 2008 15:17:19 -0000	1.195
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	30 Oct 2008 22:54:59 -0000	1.196
@@ -18,8 +18,6 @@
     set footer ""
     set description [my get_description $content]
     
-    #set ::META(description) $description
-
     if {[ns_conn isconnected]} {
       set url         "[ns_conn location][::xo::cc url]"
       set package_url "[ns_conn location][$package_id package_url]"
@@ -220,10 +218,18 @@
         set template_file [my query_parameter "template_file" \
                                [::$package_id get_parameter template_file view-default]]
 
+	# if the template_file does not have a path, assume it in xowiki/www
         if {![regexp {^[./]} $template_file]} {
           set template_file /packages/xowiki/www/$template_file
         }
+	
         set header_stuff [::xo::Page header_stuff]
+	if {[info command ::template::head::add_meta] ne ""} {
+	  template::head::add_meta -name language -content [my lang]
+	  template::head::add_meta -name description -content [my description]
+	  template::head::add_meta -name keywords -content [$package_id get_parameter keywords ""]
+	}
+
         #
         # pass variables for properties doc and body
         # example: ::xo::Page set_property body class "yui-skin-sam"
@@ -1504,14 +1510,18 @@
 
   Page instproc diff {} {
     my instvar package_id
+
     set compare_id [my query_parameter "compare_revision_id" 0]
     if {$compare_id == 0} {
       return ""
     }
-    set my_page [::xowiki::Package instantiate_page_from_id -revision_id [my set revision_id]]
+    ::xo::Page requireCSS /resources/xowiki/xowiki.css
+    set my_page [::xowiki::Package instantiate_page_from_id -revision_id [my revision_id]]
     $my_page volatile
 
-    set html1 [$my_page render]
+    if {[catch {set html1 [$my_page render]} errorMsg]} {
+      set html2 "Error rendering [my revision_id]: $errorMsg"
+    }
     set text1 [ad_html_text_convert -from text/html -to text/plain -- $html1]
     set user1 [::xo::get_user_name [$my_page set creation_user]]
     set time1 [$my_page set creation_date]
@@ -1522,7 +1532,9 @@
     $other_page volatile
     #$other_page absolute_links 1
 
-    set html2 [$other_page render]
+    if {[catch {set html2 [$other_page render]} errorMsg]} {
+      set html2 "Error rendering $compare_id: $errorMsg"
+    }
     set text2 [ad_html_text_convert -from text/html -to text/plain -- $html2]
     set user2 [::xo::get_user_name [$other_page set creation_user]]
     set time2 [$other_page set creation_date]
@@ -1531,12 +1543,16 @@
 
     set title "Differences for [my set name]"
     set context [list $title]
+
+    #set content [::util::html_diff -old $html2 -new $html1 -show_old_p t]
     set content [::xowiki::html_diff $text2 $text1]
+
     ::xo::Page set_property doc title $title
     array set property_doc [::xo::Page get_property doc]
+    set header_stuff [::xo::Page header_stuff]
 
     $package_id return_page -adp /packages/xowiki/www/diff -variables {
-      content title context
+      content title context header_stuff
       time1 time2 user1 user2 revision_id1 revision_id2 property_doc
     }
   }
Index: openacs-4/packages/xowiki/www/diff.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/diff.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/xowiki/www/diff.adp	5 Oct 2008 01:50:44 -0000	1.3
+++ openacs-4/packages/xowiki/www/diff.adp	30 Oct 2008 22:54:59 -0000	1.4
@@ -3,6 +3,7 @@
   <property name="&doc">property_doc</property>
   <property name="context">@context;noquote@</property>
   <property name="header_stuff">
+  @header_stuff;noquote@
 <style type='text/css'>
 .added {
   color: green;
@@ -12,9 +13,26 @@
   color: red;
   text-decoration: line-through;
 }
+span.diff-deleted {color: red; text-decoration: line-through;}
+span.diff-added {color: green;  text-decoration: underline;}
 </style>
 </property>
-  
+
+  <property name="head">
+  @header_stuff;noquote@
+<style type='text/css'>
+.added {
+  color: green;
+  text-decoration: underline;
+}
+.removed {
+  color: red;
+  text-decoration: line-through;
+}
+span.diff-deleted {color: red; text-decoration: line-through;}
+span.diff-added {color: green;  text-decoration: underline;}
+</style>
+</property>  
   <!-- The following DIV is needed for overlib to function! -->
   <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>	
 
Index: openacs-4/packages/xowiki/www/oacs-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/oacs-view.adp,v
diff -u -N -r1.52 -r1.53
--- openacs-4/packages/xowiki/www/oacs-view.adp	14 Sep 2008 17:31:38 -0000	1.52
+++ openacs-4/packages/xowiki/www/oacs-view.adp	30 Oct 2008 22:54:59 -0000	1.53
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sun Sep 14 19:19:13 CEST 2008 -->
+<!-- Generated by ::xowiki::ADP_Generator on Do Okt 30 22:59:55 CET 2008 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -69,7 +69,7 @@
    <a href='#' onclick='document.getElementById("do_search").style.display="inline";document.getElementById("do_search_q").focus(); return false;'  title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
   <if @index_link@ not nil><a href="@index_link@" accesskey='i' title='#xowiki.index_title#'>#xowiki.index#</a></if>
 <div id='do_search' style='display: none'> 
-  <FORM action='/search/search'><div><INPUT id='do_search_q' name='q' type='text'><INPUT type="hidden" name="search_package_id" value="@package_id@" ></div></FORM> 
+  <FORM action='/search/search'><div><label for='do_search_q'>#xowiki.search#</label><<INPUT id='do_search_q' name='q' type='text'><INPUT type="hidden" name="search_package_id" value="@package_id@" ></div></FORM> 
 </div>
 </div>
 <div style="float:left; width: 25%; font-size: 85%;
Index: openacs-4/packages/xowiki/www/oacs-view2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/oacs-view2.adp,v
diff -u -N -r1.31 -r1.32
--- openacs-4/packages/xowiki/www/oacs-view2.adp	14 Sep 2008 17:31:38 -0000	1.31
+++ openacs-4/packages/xowiki/www/oacs-view2.adp	30 Oct 2008 22:54:59 -0000	1.32
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sun Sep 14 19:19:13 CEST 2008 -->
+<!-- Generated by ::xowiki::ADP_Generator on Do Okt 30 22:59:55 CET 2008 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -71,7 +71,7 @@
    <a href='#' onclick='document.getElementById("do_search").style.display="inline";document.getElementById("do_search_q").focus(); return false;'  title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
   <if @index_link@ not nil><a href="@index_link@" accesskey='i' title='#xowiki.index_title#'>#xowiki.index#</a></if>
 <div id='do_search' style='display: none'> 
-  <FORM action='/search/search'><div><INPUT id='do_search_q' name='q' type='text'><INPUT type="hidden" name="search_package_id" value="@package_id@" ></div></FORM> 
+  <FORM action='/search/search'><div><label for='do_search_q'>#xowiki.search#</label><<INPUT id='do_search_q' name='q' type='text'><INPUT type="hidden" name="search_package_id" value="@package_id@" ></div></FORM> 
 </div>
 </div>
 <div style="float:left; width: 25%; font-size: 85%;
Index: openacs-4/packages/xowiki/www/oacs-view3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/oacs-view3.adp,v
diff -u -N -r1.26 -r1.27
--- openacs-4/packages/xowiki/www/oacs-view3.adp	14 Sep 2008 17:31:38 -0000	1.26
+++ openacs-4/packages/xowiki/www/oacs-view3.adp	30 Oct 2008 22:54:59 -0000	1.27
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sun Sep 14 19:19:13 CEST 2008 -->
+<!-- Generated by ::xowiki::ADP_Generator on Do Okt 30 22:59:55 CET 2008 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -81,7 +81,7 @@
    <a href='#' onclick='document.getElementById("do_search").style.display="inline";document.getElementById("do_search_q").focus(); return false;'  title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
   <if @index_link@ not nil><a href="@index_link@" accesskey='i' title='#xowiki.index_title#'>#xowiki.index#</a></if>
 <div id='do_search' style='display: none'> 
-  <FORM action='/search/search'><div><INPUT id='do_search_q' name='q' type='text'><INPUT type="hidden" name="search_package_id" value="@package_id@" ></div></FORM> 
+  <FORM action='/search/search'><div><label for='do_search_q'>#xowiki.search#</label><<INPUT id='do_search_q' name='q' type='text'><INPUT type="hidden" name="search_package_id" value="@package_id@" ></div></FORM> 
 </div>
 </div>
 <div style="float:left; width: 245px; font-size: 85%;">
Index: openacs-4/packages/xowiki/www/view-book-no-ajax.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-book-no-ajax.adp,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/xowiki/www/view-book-no-ajax.adp	14 Sep 2008 17:31:38 -0000	1.8
+++ openacs-4/packages/xowiki/www/view-book-no-ajax.adp	30 Oct 2008 22:54:59 -0000	1.9
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sun Sep 14 19:19:13 CEST 2008 -->
+<!-- Generated by ::xowiki::ADP_Generator on Do Okt 30 22:59:55 CET 2008 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
Index: openacs-4/packages/xowiki/www/view-book.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-book.adp,v
diff -u -N -r1.19 -r1.20
--- openacs-4/packages/xowiki/www/view-book.adp	14 Sep 2008 17:31:38 -0000	1.19
+++ openacs-4/packages/xowiki/www/view-book.adp	30 Oct 2008 22:54:59 -0000	1.20
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sun Sep 14 19:19:13 CEST 2008 -->
+<!-- Generated by ::xowiki::ADP_Generator on Do Okt 30 22:59:55 CET 2008 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
Index: openacs-4/packages/xowiki/www/view-default.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-default.adp,v
diff -u -N -r1.48 -r1.49
--- openacs-4/packages/xowiki/www/view-default.adp	14 Sep 2008 17:31:38 -0000	1.48
+++ openacs-4/packages/xowiki/www/view-default.adp	30 Oct 2008 22:54:59 -0000	1.49
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sun Sep 14 19:19:13 CEST 2008 -->
+<!-- Generated by ::xowiki::ADP_Generator on Do Okt 30 22:59:55 CET 2008 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -63,7 +63,7 @@
    <a href='#' onclick='document.getElementById("do_search").style.display="inline";document.getElementById("do_search_q").focus(); return false;'  title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
   <if @index_link@ not nil><a href="@index_link@" accesskey='i' title='#xowiki.index_title#'>#xowiki.index#</a></if>
 <div id='do_search' style='display: none'> 
-  <FORM action='/search/search'><div><INPUT id='do_search_q' name='q' type='text'><INPUT type="hidden" name="search_package_id" value="@package_id@" ></div></FORM> 
+  <FORM action='/search/search'><div><label for='do_search_q'>#xowiki.search#</label><<INPUT id='do_search_q' name='q' type='text'><INPUT type="hidden" name="search_package_id" value="@package_id@" ></div></FORM> 
 </div>
 </div>
 @top_includelets;noquote@
Index: openacs-4/packages/xowiki/www/view-links.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-links.adp,v
diff -u -N -r1.38 -r1.39
--- openacs-4/packages/xowiki/www/view-links.adp	14 Sep 2008 17:31:38 -0000	1.38
+++ openacs-4/packages/xowiki/www/view-links.adp	30 Oct 2008 22:54:59 -0000	1.39
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sun Sep 14 19:19:13 CEST 2008 -->
+<!-- Generated by ::xowiki::ADP_Generator on Do Okt 30 22:59:55 CET 2008 -->
 <!-- The following DIV is needed for overlib to function! -->
   <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>	
 <div class='xowiki-content'>
@@ -14,7 +14,7 @@
    <a href='#' onclick='document.getElementById("do_search").style.display="inline";document.getElementById("do_search_q").focus(); return false;'  title='#xowiki.search_title#'>#xowiki.search#</a> &middot;
   <if @index_link@ not nil><a href="@index_link@" accesskey='i' title='#xowiki.index_title#'>#xowiki.index#</a></if>
 <div id='do_search' style='display: none'> 
-  <FORM action='/search/search'><div><INPUT id='do_search_q' name='q' type='text'><INPUT type="hidden" name="search_package_id" value="@package_id@" ></div></FORM> 
+  <FORM action='/search/search'><div><label for='do_search_q'>#xowiki.search#</label><<INPUT id='do_search_q' name='q' type='text'><INPUT type="hidden" name="search_package_id" value="@package_id@" ></div></FORM> 
 </div>
 </div>
 @top_includelets;noquote@
Index: openacs-4/packages/xowiki/www/view-plain.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-plain.adp,v
diff -u -N -r1.34 -r1.35
--- openacs-4/packages/xowiki/www/view-plain.adp	14 Sep 2008 17:31:38 -0000	1.34
+++ openacs-4/packages/xowiki/www/view-plain.adp	30 Oct 2008 22:54:59 -0000	1.35
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Sun Sep 14 19:19:13 CEST 2008 -->
+<!-- Generated by ::xowiki::ADP_Generator on Do Okt 30 22:59:55 CET 2008 -->
 <!-- The following DIV is needed for overlib to function! -->
   <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>	
 <div class='xowiki-content'>