Index: openacs-4/packages/acs-templating/tcl/richtext-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/richtext-procs.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-templating/tcl/richtext-procs.tcl	12 Sep 2003 09:47:19 -0000	1.7
+++ openacs-4/packages/acs-templating/tcl/richtext-procs.tcl	22 Sep 2003 14:53:37 -0000	1.8
@@ -174,9 +174,9 @@
 if (document.selection) {
     document.write('<table border="0" cellspacing="0" cellpadding="0" width="80">');
     document.write('<tr>');
-    document.write('<td width="24"><a href="javascript:formatStr(\'b\')" tabIndex="-1"><img src="/shared/images/bold-button.gif" alt="bold" width="24" height="18" border="0"></a></td>');
-    document.write('<td width="24"><a href="javascript:formatStr(\'i\')" tabIndex="-1"><img src="/shared/images/italic-button.gif" alt="italic" width="24" height="18" border="0"></a></td>');
-    document.write('<td width="26"><a href="javascript:insertLink()" tabIndex="-1"><img src="/shared/images/url-button.gif" alt="link" width="26" height="18" border="0"></a></td>');
+    document.write('<td width="24"><a href="javascript:formatStr(\'b\')" tabIndex="-1"><img src="/resources/acs-subsite/bold-button.gif" alt="bold" width="24" height="18" border="0"></a></td>');
+    document.write('<td width="24"><a href="javascript:formatStr(\'i\')" tabIndex="-1"><img src="/resources/acs-subsite/italic-button.gif" alt="italic" width="24" height="18" border="0"></a></td>');
+    document.write('<td width="26"><a href="javascript:insertLink()" tabIndex="-1"><img src="/resources/acs-subsite/url-button.gif" alt="link" width="26" height="18" border="0"></a></td>');
     document.write('</tr>');
     document.write('</table>');
 }
Index: openacs-4/packages/acs-templating/tcl/widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/widget-procs.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/acs-templating/tcl/widget-procs.tcl	28 Aug 2003 09:41:45 -0000	1.21
+++ openacs-4/packages/acs-templating/tcl/widget-procs.tcl	22 Sep 2003 14:53:37 -0000	1.22
@@ -161,7 +161,7 @@
     switch $type {
       checkbox - radio {
         # There's a 'subst' done on the contents here
-        append output "<img src=\"/shared/images/${type}\$checked\" width=\"13\" height=\"13\">"
+        append output "<img src=\"/resources/acs-subsite/${type}\${checked}.gif\" width=\"13\" height=\"13\">"
         # This is ugly, but it works: Only export the value when we're on a selected option
         append output "\[ad_decode \$checked \"checked\" \"<input type=\\\"hidden\\\" name=\\\"$element(name)\\\" value=\\\"\$value\\\">\" \"\"\]"
       }
@@ -323,11 +323,7 @@
       set label [lindex $option 0]
       set value [lindex $option 1]
 
-      if {![string equal $label $value]} {
-        append output " <option value=\"[template::util::quote_html $value]\""
-      } else { 
-        append output " <option"
-      }
+      append output " <option value=\"[template::util::quote_html $value]\""
         
       if { [info exists values($value)] } {
         append output " selected=\"selected\""