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.14 -r1.15
--- openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	19 Nov 2007 12:30:35 -0000	1.14
+++ openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	7 Dec 2007 14:25:04 -0000	1.15
@@ -77,7 +77,7 @@
    <a href='#' onclick='document.getElementById("do_search").style.display="inline";document.getElementById("do_search_q").focus(); return false;'>#xowiki.search#</a> &middot;
   <if @index_link@ not nil><a href="@index_link@" accesskey='i'>#xowiki.index#</a></if>
 <div id='do_search' style='display: none'> 
-  <FORM action='/search/search'><INPUT  id='do_search_q' name='q' type='text'><INPUT type="hidden" name="search_package_id" value="@package_id@" /></FORM> 
+  <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> 
 </div>
 </div>}
   }
Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -r1.44 -r1.45
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	3 Dec 2007 11:54:04 -0000	1.44
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	7 Dec 2007 14:25:04 -0000	1.45
@@ -486,6 +486,7 @@
       } else {
         set link_label $v
       }
+      regsub -all & $v "&amp;" v
       return "<a href='$v'>$link_label</a>"
     }
   }
@@ -505,6 +506,7 @@
     }
     if {$v ne ""} {
       set link_label [my localize [my link_label]]
+      regsub -all & $v "&amp;" v
       return " <span class='more'>\[ <a href='$v'>$link_label</a> \]</span>"
     }
   }
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.5 -r1.6
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	30 Nov 2007 12:32:21 -0000	1.5
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	7 Dec 2007 14:25:04 -0000	1.6
@@ -381,6 +381,7 @@
   rss-button instproc render {} {
     my get_parameters
     set href [export_vars -base [$package_id package_url] {{rss $span} name_filter title entries_of}]
+    regsub -all & $href "&amp;" href
     ::xo::Page requireLink -rel alternate -type application/rss+xml -title RSS -href $href
     return "<a href=\"$href \" class='rss'>RSS</a>"
   }
@@ -412,6 +413,7 @@
                     'scrollbars=yes,width=700,height=575,status=yes,resizable=yes,scrollbars=yes'))
     }]
     regsub -all {[\n ]+} $href " " href
+    regsub -all & $href "&amp;" href
     return "<a href=\"$href \" title='$label' class='rss'>$label</a>"
   }
 
@@ -1080,7 +1082,7 @@
         <INPUT name='new_tags' type='text' value="$tags">
       </FORM>
       </span>
-      <span id='[my id]-popular_tags' style='display: none'></span><br />
+      <span id='[my id]-popular_tags' style='display: none'></span><br >
     }]
     return $content
   }
@@ -1179,7 +1181,8 @@
       {title     "[string range [$__including_page title] 0 74]"}
       {body_text "[string range $description 0 349]"}
     }]
-    return "<a href='$digg_link'><img src='http://digg.com/img/badges/100x20-digg-button.png' width='100' height='20' alt='Digg!' border='1'/></a>"
+    regsub -all & $digg_link "&amp;" digg_link
+    return "<a class='image-button' href='$digg_link'><img src='http://digg.com/img/badges/100x20-digg-button.png' width='100' height='20' alt='Digg!'></a>"
   }
 
   ::xowiki::IncludeletClass create delicious \
@@ -1210,7 +1213,8 @@
       {notes "[string range $description 0 199]"}
       tags
     }]
-    return "<a href='$delicious_link'><img src='http://i.i.com.com/cnwk.1d/i/ne05/fmwk/delicious_14x14.gif' width='14' height='14' border='0' alt='Add to your del.icio.us' />del.icio.us</a>"
+    regsub -all & $delicious_link "&amp;" delicious_link
+    return "<a class='image-button' href='$delicious_link'><img src='http://i.i.com.com/cnwk.1d/i/ne05/fmwk/delicious_14x14.gif' width='14' height='14' alt='Add to your del.icio.us' />del.icio.us</a>"
   }
 
 
@@ -1233,7 +1237,7 @@
     set rssurl    [ad_urlencode $rssurl]
     set my_yahoo_link "http://us.rd.yahoo.com/my/atm/$publisher/$feedname/*http://add.my.yahoo.com/rss?url=$rssurl"
 
-    return "<a href='$my_yahoo_link'><img src='http://us.i1.yimg.com/us.yimg.com/i/us/my/addtomyyahoo4.gif' width='91' height='17' border='0' align='middle' alt='Add to My Yahoo!'></a>"
+    return "<a class='image-button' href='$my_yahoo_link'><img src='http://us.i1.yimg.com/us.yimg.com/i/us/my/addtomyyahoo4.gif' width='91' height='17' align='middle' alt='Add to My Yahoo!'></a>"
   }
 
   ::xowiki::IncludeletClass create my-references \
@@ -1931,7 +1935,7 @@
     }
 
     if {$link ne ""} {
-      set html "<a href=\"$link\"><image src='$src' border='0' alt=\"$alt\" title=\"$title\"></a>"
+      set html "<a class='image-button' href=\"$link\"><img src='$src' alt=\"$alt\" title=\"$title\"></a>"
     }
     return $html
   }
Index: openacs-4/packages/xowiki/tcl/weblog-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/weblog-procs.tcl,v
diff -u -r1.31 -r1.32
--- openacs-4/packages/xowiki/tcl/weblog-procs.tcl	22 Nov 2007 10:32:57 -0000	1.31
+++ openacs-4/packages/xowiki/tcl/weblog-procs.tcl	7 Dec 2007 14:25:04 -0000	1.32
@@ -273,9 +273,10 @@
     [my set __parent] instvar weblog_obj
 
     set link [::$package_id pretty_link $name]
+    regsub -all & $link "&amp;" link
     set more [expr {[$weblog_obj summary] ? 
                     " <span class='more'> \[<a href='$link'>#xowiki.weblog-more#</a>\]</span>" : ""}]
-    append more "<p></p>"
+    #append more "<p></p>"
 
     append content "<DIV class='post' style='clear: both;'>" \
         "<h2><a href='$link'>$title</a></h2>" \
Index: openacs-4/packages/xowiki/www/prototypes/news.page
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/prototypes/news.page,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/xowiki/www/prototypes/news.page	22 Nov 2007 10:33:25 -0000	1.6
+++ openacs-4/packages/xowiki/www/prototypes/news.page	7 Dec 2007 14:25:22 -0000	1.7
@@ -44,9 +44,10 @@
     set link [::xowiki::Includelet detail_link \
                   -package_id $package_id -name $name \
                   -instance_attributes [my get_instance_attributes]]
+    regsub -all & $link "&amp;" link
     set more [expr {[$weblog_obj summary] ? 
                     " <span class='more'> \[<a href='$link'>#xowiki.weblog-more#</a>\]</span>" : ""}]
-    append more "<p></p>"
+    #append more "<p></p>"
     set day [lc_time_fmt [my set publish_date] "%x"]
     set my_footer [my htmlFooter]
 
Index: openacs-4/packages/xowiki/www/resources/xowiki.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/xowiki.css,v
diff -u -r1.27 -r1.28
--- openacs-4/packages/xowiki/www/resources/xowiki.css	4 Dec 2007 22:57:36 -0000	1.27
+++ openacs-4/packages/xowiki/www/resources/xowiki.css	7 Dec 2007 14:25:04 -0000	1.28
@@ -172,4 +172,5 @@
     border-top: 1px solid; border-color: #c8c8c8; 
     color: #555555; 
 }
-div.xowiki-content .content-chunk-footer {clear: both;}
\ No newline at end of file
+div.xowiki-content .content-chunk-footer {clear: both;}
+div.xowiki-content .image-button img {border: 0px;}
\ No newline at end of file