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 -r1.16 -r1.17
--- openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	18 Dec 2007 09:00:11 -0000	1.16
+++ openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	8 Jan 2008 16:22:05 -0000	1.17
@@ -216,6 +216,11 @@
   #
   ADP_Generator create oacs-view3 -master 1 -footer 1 \
     -extra_header_stuff {
+      <style type='text/css'>
+         table.mini-calendar {width: 227px ! important;font-size: 80%;}
+         div.tags h3 {font-size: 80%;}
+         div.tags blockquote {font-size: 80%; margin-left: 20px; margin-right: 20px;}
+      </style>
       <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' />
       <link rel='stylesheet' href='/resources/calendar/calendar.css' media='all' />
       <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
@@ -226,12 +231,8 @@
     -proc content_part {} {
        return [subst -novariables -nobackslashes \
 {<div style="float:left; width: 245px; font-size: 85%;">
-<style type='text/css'>
-table.mini-calendar {width: 227px ! important;font-size: 80%;}
-div.tags h3 {font-size: 80%;}
-div.tags blockquote {font-size: 80%; margin-left: 20px; margin-right: 20px;}
-</style>
 
+
 <div style="background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
      margin-left: 2px; margin-top: 2px; padding: 0px 6px 6px 0px;			    
 ">
Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	28 Dec 2007 16:49:29 -0000	1.8
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	8 Jan 2008 16:22:05 -0000	1.9
@@ -1075,13 +1075,11 @@
     if {![my exists id]} {my set id [::xowiki::Includelet html_id [self]]}
     set content [subst -nobackslashes {
       #xowiki.your_tags_label#: $tags_with_links
-      (<a href='#' onclick='document.getElementById("[my id]-edit_tags").style.display="inline";return false;'>#xowiki.edit_link#</a>,
+      (<a href='#' onclick='document.getElementById("[my id]-edit_tags").style.display="block";return false;'>#xowiki.edit_link#</a>,
        <a href='#' onclick='get_popular_tags("$popular_tags_link","[my id]");return false;'>#xowiki.popular_tags_link#</a>)
-      <span id='[my id]-edit_tags' style='display: none'>
-      <FORM action="$save_tag_link" method='POST'>
+      <FORM id='[my id]-edit_tags' style='display: none' action="$save_tag_link" method='POST'>
         <INPUT name='new_tags' type='text' value="$tags">
       </FORM>
-      </span>
       <span id='[my id]-popular_tags' style='display: none'></span><br >
     }]
     return $content
Index: openacs-4/packages/xowiki/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v
diff -u -r1.106 -r1.107
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	8 Jan 2008 10:48:01 -0000	1.106
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	8 Jan 2008 16:22:06 -0000	1.107
@@ -218,6 +218,7 @@
       lappend args [list m $method]
       set computed_link [uplevel export_vars -base [list $base] [list $args]]
     }
+    regsub -all & $computed_link "&amp;" computed_link
 
     set party_id [::xo::cc user_id]
     if {[info exists privilege]} {
Index: openacs-4/packages/xowiki/www/oacs-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/oacs-view.adp,v
diff -u -r1.45 -r1.46
--- openacs-4/packages/xowiki/www/oacs-view.adp	18 Dec 2007 09:00:11 -0000	1.45
+++ openacs-4/packages/xowiki/www/oacs-view.adp	8 Jan 2008 16:22:06 -0000	1.46
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Tue Dec 18 09:52:20 CET 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Di Jan 08 17:17:19 CET 2008 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
Index: openacs-4/packages/xowiki/www/oacs-view2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/oacs-view2.adp,v
diff -u -r1.24 -r1.25
--- openacs-4/packages/xowiki/www/oacs-view2.adp	18 Dec 2007 09:00:11 -0000	1.24
+++ openacs-4/packages/xowiki/www/oacs-view2.adp	8 Jan 2008 16:22:06 -0000	1.25
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Tue Dec 18 09:52:20 CET 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Di Jan 08 17:17:19 CET 2008 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
Index: openacs-4/packages/xowiki/www/oacs-view3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/oacs-view3.adp,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/xowiki/www/oacs-view3.adp	18 Dec 2007 09:00:11 -0000	1.19
+++ openacs-4/packages/xowiki/www/oacs-view3.adp	8 Jan 2008 16:22:06 -0000	1.20
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Tue Dec 18 09:52:20 CET 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Di Jan 08 17:17:19 CET 2008 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -7,6 +7,11 @@
   <property name="header_stuff">
   <link rel="stylesheet" type="text/css" href="/resources/xowiki/xowiki.css" media="all" >
   @header_stuff;noquote@
+      <style type='text/css'>
+         table.mini-calendar {width: 227px ! important;font-size: 80%;}
+         div.tags h3 {font-size: 80%;}
+         div.tags blockquote {font-size: 80%; margin-left: 20px; margin-right: 20px;}
+      </style>
       <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' />
       <link rel='stylesheet' href='/resources/calendar/calendar.css' media='all' />
       <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
@@ -33,6 +38,11 @@
   <property name="head">
   <link rel="stylesheet" type="text/css" href="/resources/xowiki/xowiki.css" media="all" >
   @header_stuff;noquote@
+      <style type='text/css'>
+         table.mini-calendar {width: 227px ! important;font-size: 80%;}
+         div.tags h3 {font-size: 80%;}
+         div.tags blockquote {font-size: 80%; margin-left: 20px; margin-right: 20px;}
+      </style>
       <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' />
       <link rel='stylesheet' href='/resources/calendar/calendar.css' media='all' />
       <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
@@ -74,12 +84,8 @@
 </div>
 </div>
 <div style="float:left; width: 245px; font-size: 85%;">
-<style type='text/css'>
-table.mini-calendar {width: 227px ! important;font-size: 80%;}
-div.tags h3 {font-size: 80%;}
-div.tags blockquote {font-size: 80%; margin-left: 20px; margin-right: 20px;}
-</style>
 
+
 <div style="background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
      margin-left: 2px; margin-top: 2px; padding: 0px 6px 6px 0px;			    
 ">
Index: openacs-4/packages/xowiki/www/view-default.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-default.adp,v
diff -u -r1.41 -r1.42
--- openacs-4/packages/xowiki/www/view-default.adp	18 Dec 2007 09:00:11 -0000	1.41
+++ openacs-4/packages/xowiki/www/view-default.adp	8 Jan 2008 16:22:06 -0000	1.42
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Tue Dec 18 09:52:20 CET 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Di Jan 08 17:17:19 CET 2008 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
Index: openacs-4/packages/xowiki/www/view-links.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-links.adp,v
diff -u -r1.31 -r1.32
--- openacs-4/packages/xowiki/www/view-links.adp	18 Dec 2007 09:00:11 -0000	1.31
+++ openacs-4/packages/xowiki/www/view-links.adp	8 Jan 2008 16:22:06 -0000	1.32
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Tue Dec 18 09:52:20 CET 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Di Jan 08 17:17:19 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'>
Index: openacs-4/packages/xowiki/www/view-plain.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-plain.adp,v
diff -u -r1.27 -r1.28
--- openacs-4/packages/xowiki/www/view-plain.adp	18 Dec 2007 09:00:11 -0000	1.27
+++ openacs-4/packages/xowiki/www/view-plain.adp	8 Jan 2008 16:22:06 -0000	1.28
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Tue Dec 18 09:52:20 CET 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Di Jan 08 17:17:19 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'>