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 -N -r1.37 -r1.38
--- openacs-4/packages/forums/www/message-view.adp	30 Jan 2008 07:08:08 -0000	1.37
+++ openacs-4/packages/forums/www/message-view.adp	22 Feb 2008 07:17:42 -0000	1.38
@@ -11,7 +11,8 @@
 
   <div class="displayLinks" style="float: right;"> 
     #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>
+    <a href="#" onclick="setActiveStyleSheet('expand'); return false;" title="'#forums.display_full_posts#" class="button" id="expand">#forums.expand#</a>
+  &nbsp;
   </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 -N -r1.42 -r1.43
--- openacs-4/packages/forums/www/message-view.tcl	30 Jan 2008 07:08:08 -0000	1.42
+++ openacs-4/packages/forums/www/message-view.tcl	22 Feb 2008 07:17:42 -0000	1.43
@@ -109,8 +109,8 @@
 # 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/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/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
  
 # js scripts
Index: openacs-4/packages/forums/www/resources/forums.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/resources/forums.css,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/forums/www/resources/forums.css	15 May 2007 20:14:41 -0000	1.4
+++ openacs-4/packages/forums/www/resources/forums.css	22 Feb 2008 07:17:42 -0000	1.5
@@ -26,10 +26,12 @@
         padding-top: 3px;
         padding-bottom: 3px;
         border: 0px;
+	display: inline;
 }
 
 #forum-thread .dyncollapsed {
         padding: 0px;
+	display: none;
 }
 
 #forum-thread .subject {
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 -N -r1.2 -r1.3
--- openacs-4/packages/forums/www/resources/forums.js	30 Jan 2008 07:08:08 -0000	1.2
+++ openacs-4/packages/forums/www/resources/forums.js	22 Feb 2008 07:17:42 -0000	1.3
@@ -21,11 +21,11 @@
         var s;
     	if(state != null)
 	    	s = state;
-        else if (content.className == "dynexpanded")
+        else if (content.className == "dynexpanded") {
             s = 0;
-        else
+	} else {
             s = 1;
-        alert(targetId + content + link + s);
+	}
         if (s) {
             content.className = "dynexpanded";
             symbol = collapse_symbol;
@@ -53,30 +53,41 @@
 // switch styles
 
 function setActiveStyleSheet(title) {
-  var i, a, main;
-  for (i=0; (a = document.getElementsByTagName("link")[i]); i++) {
-    if (a.getAttribute("rel") &&
-        a.getAttribute("rel").indexOf("style") != -1 &&
-        a.getAttribute("title")) {
-      a.disabled = true;
-      if(a.getAttribute("title") == title) a.disabled = false;
-    }
-  }
+  var i, a, msg_id, state;
+  //for (i=0; (a = document.getElementsByTagName("link")[i]); i++) {
+  //  if (a.getAttribute("rel") &&
+  //      a.getAttribute("rel").indexOf("style") != -1 &&
+  //      a.getAttribute("title")) {
+  //    a.disabled = true;
+  //    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';}
+	state = 1;
 	break;
   case 'collapse':
 	a = document.getElementById('expand');
 	if (a) {a.style.display = 'inline';}
 	a = document.getElementById('collapse');
 	if (a) {a.style.display = 'none';}
-        break;
+        state = 0;
+	break;
   }
+	
+  for (i=0; (a = document.getElementsByTagName("div")[i]); i++) {
+    if (a.getAttribute("id") && a.getAttribute("id").substring(0,4) == "msg_") {
+	  msg_id = a.getAttribute("id").substring(4);
+	  toggle(msg_id, state);
+	}
+  }
+
+
 }
 
 function getActiveStyleSheet() {