Index: openacs-4/packages/forums/www/message-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view.adp,v
diff -u -r1.36 -r1.37
--- openacs-4/packages/forums/www/message-view.adp	23 Dec 2007 14:50:15 -0000	1.36
+++ openacs-4/packages/forums/www/message-view.adp	30 Jan 2008 07:08:08 -0000	1.37
@@ -10,9 +10,8 @@
   </if>
 
   <div class="displayLinks" style="float: right;"> 
-    #forums.display_as# <a href="#" onclick="setActiveStyleSheet('collapse'); return false;" title="#forums.just_display_subjects#" class="button">#forums.collapse#</a>
-    <a href="#" onclick="setActiveStyleSheet('expand'); return false;" title="'#forums.display_full_posts#" class="button">#forums.expand#</a>
-    <a href="#" onclick="setActiveStyleSheet('print'); return false;" title="#forums.printable_view#" class="button">#forums.print#</a>
+    #forums.display_as# <a href="#" onclick="setActiveStyleSheet('collapse'); return false;" title="#forums.just_display_subjects#" class="button" id="collapse" style="display: none;">#forums.collapse#</a>
+    <a href="#" onclick="setActiveStyleSheet('expand'); return false;" title="'#forums.display_full_posts#" class="button" id="expand" style="display: none;">#forums.expand#</a>
   </div>
   <ul class="action-links">
     <li><a href="@thread_url@" title="#forums.Back_to_thread_label#">#forums.Back_to_thread_label#</a></li>
Index: openacs-4/packages/forums/www/message-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view.tcl,v
diff -u -r1.41 -r1.42
--- openacs-4/packages/forums/www/message-view.tcl	23 Dec 2007 14:50:15 -0000	1.41
+++ openacs-4/packages/forums/www/message-view.tcl	30 Jan 2008 07:08:08 -0000	1.42
@@ -109,8 +109,6 @@
 # stylesheets
 set lang [ad_conn language]
 template::head::add_css -href /resources/forums/forums.css -media all -lang $lang
-template::head::add_css -alternate -href /resources/forums/flat.css -media all -lang $lang -title "flat"
-template::head::add_css -alternate -href /resources/forums/flat-collapse.css -media all -lang $lang -title "flat-collapse"
 template::head::add_css -alternate -href /resources/forums/collapse.css -media all -lang $lang -title "collapse"
 template::head::add_css -alternate -href /resources/forums/expand.css -media all -lang $lang -title "expand"
 template::head::add_css -alternate -href /resources/forums/print.css -media print -lang $lang
Index: openacs-4/packages/forums/www/resources/forums.js
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/resources/forums.js,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/forums/www/resources/forums.js	27 Jan 2005 22:12:08 -0000	1.1
+++ openacs-4/packages/forums/www/resources/forums.js	30 Jan 2008 07:08:08 -0000	1.2
@@ -25,7 +25,7 @@
             s = 0;
         else
             s = 1;
-        
+        alert(targetId + content + link + s);
         if (s) {
             content.className = "dynexpanded";
             symbol = collapse_symbol;
@@ -62,6 +62,21 @@
       if(a.getAttribute("title") == title) a.disabled = false;
     }
   }
+
+  switch (title) {
+  case 'expand':
+	a = document.getElementById('expand');
+	if (a) {a.style.display = 'none';}
+	a = document.getElementById('collapse');
+	if (a) {a.style.display = 'inline';}
+	break;
+  case 'collapse':
+	a = document.getElementById('expand');
+	if (a) {a.style.display = 'inline';}
+	a = document.getElementById('collapse');
+	if (a) {a.style.display = 'none';}
+        break;
+  }
 }
 
 function getActiveStyleSheet() {