Index: openacs-4/packages/acs-developer-support/lib/toolbar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/lib/toolbar.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-developer-support/lib/toolbar.adp	3 Feb 2005 11:42:29 -0000	1.12
+++ openacs-4/packages/acs-developer-support/lib/toolbar.adp	4 Feb 2005 15:26:11 -0000	1.13
@@ -7,11 +7,9 @@
 
       <td class="actions">
         <ul>
-          <li><a href="@user_switching_toggle_url@" class="@user_switching_on@" title="User switching">USR</a></li>
-          <li><a href="@db_toggle_url@" class="@db_on@" title="Database statistics">DB</a></li>
-          <li><a href="@translator_toggle_url@" class="@translator_on@" title="Translator mode">TRN</a></li>
-          <li><a href="@adp_toggle_url@" class="@adp_on@" title="ADP Reveal mode">ADP</a></li>
-          <li><a href="@foot_toggle_url@" class="@foot_on@" title="Show footer">FOOT</a></li>
+          <multiple name="ds_buttons">
+            <li><a href="@ds_buttons.toggle_url@" class="@ds_buttons.state@" title="@ds_buttons.title@">@ds_buttons.label@</a></li>
+          </multiple>
         </ul>
       </td>
 
Index: openacs-4/packages/acs-developer-support/lib/toolbar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/lib/toolbar.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-developer-support/lib/toolbar.tcl	3 Feb 2005 11:42:29 -0000	1.6
+++ openacs-4/packages/acs-developer-support/lib/toolbar.tcl	4 Feb 2005 15:26:11 -0000	1.7
@@ -7,33 +7,46 @@
 if { $show_p } {
     set ds_url [ds_support_url]
 
-    set comments_p [ds_comments_p]
-    set comments_toggle_url [export_vars -base "${ds_url}comments-toggle" { { return_url [ad_return_url] } }]
-    set comments_on [ad_decode $comments_p 1 "on" "off"]
-
     set num_comments [llength [ds_get_comments]]
 
-    set user_switching_p [ds_user_switching_enabled_p]
-    set user_switching_toggle_url [export_vars -base "${ds_url}set-user-switching-enabled" { { enabled_p {[expr !$user_switching_p]} } { return_url [ad_return_url] } }]
-    set user_switching_on [ad_decode $user_switching_p 1 "on" "off"]
+    multirow create ds_buttons label title toggle_url state
 
-    set db_p [ds_database_enabled_p]
-    set db_toggle_url [export_vars -base "${ds_url}set-database-enabled" { { enabled_p {[expr !$db_p]} } { return_url [ad_return_url] } }]
-    set db_on [ad_decode $db_p 1 "on" "off"]
+    # multirow append ds_buttons COM \
+        "Display comments inline" \
+        [export_vars -base "${ds_url}comments-toggle" { { return_url [ad_return_url] } }] \
+        [ad_decode [ds_comments_p]  1 "on" "off"]
 
-    set translator_p [lang::util::translator_mode_p]
-    set translator_toggle_url [export_vars -base "/acs-lang/admin/translator-mode-toggle" { { return_url [ad_return_url] } }]
-    set translator_on [ad_decode $translator_p 1 "on" "off"]
+    multirow append ds_buttons USR \
+        "Toggle user switching" \
+        [export_vars -base "${ds_url}set" { {field user} {enabled_p {[expr ![ds_user_switching_enabled_p]]}} {return_url [ad_return_url]} }] \
+        [ad_decode [ds_user_switching_enabled_p] 1 "on" "off"] 
 
-    set adp_p [ds_adp_reveal_enabled_p]
-    set adp_toggle_url {javascript:void(d=document);void(el=d.getElementsByTagName('span'));for(i=0;i<el.length;i++){if(el[i].className=='developer-support-adp-file-on'){void(el[i].className='developer-support-adp-file-off')}else{if(el[i].className=='developer-support-adp-file-off'){void(el[i].className='developer-support-adp-file-on')}}};void(el=d.getElementsByTagName('div'));for(i=0;i<el.length;i++){if(el[i].className=='developer-support-adp-box-on'){void(el[i].className='developer-support-adp-box-off')}else{if(el[i].className=='developer-support-adp-box-off'){void(el[i].className='developer-support-adp-box-on')}};if(el[i].className=='developer-support-adp-output-on'){void(el[i].className='developer-support-adp-output-off')}else{if(el[i].className=='developer-support-adp-output-off'){void(el[i].className='developer-support-adp-output-on')}};}}
+    multirow append ds_buttons DB \
+        "Toggle DB data collection" \
+        [export_vars -base "${ds_url}set" { {field db} {enabled_p {[expr ![ds_database_enabled_p]]}} {return_url [ad_return_url]} }] \
+        [ad_decode [ds_database_enabled_p] 1 "on" "off"]
 
-    set foot_toggle_url {javascript:void(d=document);void(el=d.getElementsByTagName('div'));for(i=0;i<el.length;i++){if(el[i].className=='developer-support-footer'){void(el[i].className='developer-support-footer-off')}else{if(el[i].className=='developer-support-footer-off'){void(el[i].className='developer-support-footer')}}};}
+    multirow append ds_buttons FRG \
+        "Toggle caching page fragments" \
+        [export_vars -base "${ds_url}set" { {field frag} {enabled_p {[expr ![ds_page_fragment_cache_enabled_p]]}} {return_url [ad_return_url]} }] \
+        [ad_decode [ds_page_fragment_cache_enabled_p] 1 "on" "off"]
 
-    set foot_on off
+    multirow append ds_buttons TRN \
+        "Toggle translation mode" \
+        [export_vars -base "/acs-lang/admin/translator-mode-toggle" { { return_url [ad_return_url] } }] \
+        [ad_decode [lang::util::translator_mode_p] 1 "on" "off"]
 
-    set adp_on [ad_decode $adp_p 1 "on" "off"]
+    multirow append ds_buttons ADP \
+        "Toggle ADP reveal" \
+        {javascript:void(d=document);void(el=d.getElementsByTagName('span'));for(i=0;i<el.length;i++){if(el[i].className=='developer-support-adp-file-on'){void(el[i].className='developer-support-adp-file-off')}else{if(el[i].className=='developer-support-adp-file-off'){void(el[i].className='developer-support-adp-file-on')}}};void(el=d.getElementsByTagName('div'));for(i=0;i<el.length;i++){if(el[i].className=='developer-support-adp-box-on'){void(el[i].className='developer-support-adp-box-off')}else{if(el[i].className=='developer-support-adp-box-off'){void(el[i].className='developer-support-adp-box-on')}};if(el[i].className=='developer-support-adp-output-on'){void(el[i].className='developer-support-adp-output-off')}else{if(el[i].className=='developer-support-adp-output-off'){void(el[i].className='developer-support-adp-output-on')}};}} \
+        [ad_decode [ds_adp_reveal_enabled_p] 1 "on" "off"]
 
+    multirow append ds_buttons FOT \
+        "Toggle Footer display" \
+        {javascript:void(d=document);void(el=d.getElementsByTagName('div'));for(i=0;i<el.length;i++){if(el[i].className=='developer-support-footer'){void(el[i].className='developer-support-footer-off')}else{if(el[i].className=='developer-support-footer-off'){void(el[i].className='developer-support-footer')}}};} \
+        off
+
+
     set oacs_shell_url "${ds_url}shell"
 
     set auto_test_url [site_node::get_package_url -package_key acs-automated-testing]
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-developer-support/www/comments-toggle.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-developer-support/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/index.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/acs-developer-support/www/index.tcl	3 Feb 2005 11:42:29 -0000	1.13
+++ openacs-4/packages/acs-developer-support/www/index.tcl	4 Feb 2005 15:26:12 -0000	1.14
@@ -27,8 +27,8 @@
 <li><a href=\"shell.tcl\">OpenACS Shell</a>
 <li>Developer support toolbar is currently
 [ad_decode $enabled_p 1 \
-    "on (<a href=\"set-enabled?enabled_p=0\">turn it off</a>)" \
-    "off (<a href=\"set-enabled?enabled_p=1\">turn it on</a>)"]
+     "on (<a href=\"set?field=ds&amp;enabled_p=0\">turn it off</a>)" \
+     "off (<a href=\"set?field=ds&amp;enabled_p=1\">turn it on</a>)"]
 
 <li>Developer support information is currently
 restricted to the following IP addresses:
@@ -69,18 +69,18 @@
 
 <li>User-switching is currently
 [ad_decode $user_switching_enabled_p 1 \
-    "on (<a href=\"set-user-switching-enabled?enabled_p=0\">turn it off</a>)" \
-    "off (<a href=\"set-user-switching-enabled?enabled_p=1\">turn it on</a>)"]
+     "on (<a href=\"set?field=user&amp;enabled_p=0\">turn it off</a>)" \
+     "off (<a href=\"set?field=user&amp;enabled_p=1\">turn it on</a>)"]
 
 <li>Database statistics is currently
 [ad_decode $database_enabled_p 1 \
-    "on (<a href=\"set-database-enabled?enabled_p=0\">turn it off</a>)" \
-    "off (<a href=\"set-database-enabled?enabled_p=1\">turn it on</a>)"]
+     "on (<a href=\"set?field=db&amp;enabled_p=0\">turn it off</a>)" \
+     "off (<a href=\"set?field=db&amp;enabled_p=1\">turn it on</a>)"]
 
 <li>ADP reveal is currently
 [ad_decode $adp_reveal_enabled_p 1 \
-    "on (<a href=\"set-adp-reveal-enabled?enabled_p=0\">turn it off</a>)" \
-    "off (<a href=\"set-adp-reveal-enabled?enabled_p=1\">turn it on</a>)"]
+     "on (<a href=\"set?field=adp&amp;enabled_p=0\">turn it off</a>)" \
+     "off (<a href=\"set?field=adp&amp;enabled_p=1\">turn it on</a>)"]
 
 <p>
 <li> Help on <a href=\"doc/editlocal\">edit and code links</a>.
Index: openacs-4/packages/acs-developer-support/www/request-info.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/request-info.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-developer-support/www/request-info.tcl	4 Feb 2005 13:34:40 -0000	1.12
+++ openacs-4/packages/acs-developer-support/www/request-info.tcl	4 Feb 2005 15:26:12 -0000	1.13
@@ -16,15 +16,20 @@
 set page_title "Request Information"
 set context [list $page_title]
 
+if { [ns_cache get ds_page_bits $request dummy] } { 
+    set page_fragment_cache_p 1
+} else { 
+    set page_fragment_cache_p 0
+}
+
+
 foreach name [nsv_array names ds_request] {
     ns_log Debug "DS: Checking request $request, $name."
     if { [regexp {^([0-9]+)\.([a-z]+)$} $name "" m_request key] && $m_request == $request } {
 	set property($key) [nsv_get ds_request $name]
     }
 }
 
-set page_fragment_cache_p [ds_page_fragment_cache_enabled_p]
-
 if { [info exists property(start)] } {
     append body "
 <h3>Parameters</h3>
Index: openacs-4/packages/acs-developer-support/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/search.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-developer-support/www/search.adp	4 Feb 2005 13:34:40 -0000	1.1
+++ openacs-4/packages/acs-developer-support/www/search.adp	4 Feb 2005 15:26:12 -0000	1.2
@@ -7,7 +7,7 @@
   <if @gone_p@ false> 
     <if @matches:rowcount@ gt 0>
       <multiple name="matches">
-        <div style="border-bottom: 1px solid black;"><p>@matches.file_links;noquote@ <b>@matches.page@</b> @matches.size@ bytes</p><pre>@matches.excerpt@</pre></div>
+        <div style="border-bottom: 1px solid black;"><p>@matches.file_links;noquote@ <b>@matches.page@</b> @matches.size@ bytes</p><pre>@matches.excerpt;noquote@</pre></div>
       </multiple>
     </if>
     <else> 
Index: openacs-4/packages/acs-developer-support/www/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/search.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-developer-support/www/search.tcl	4 Feb 2005 13:34:40 -0000	1.1
+++ openacs-4/packages/acs-developer-support/www/search.tcl	4 Feb 2005 15:26:12 -0000	1.2
@@ -26,8 +26,9 @@
                 append file_links " <a href=\"send?code=[ns_urlencode $page]\" title=\"compiled code\">c</a>"
                 append file_links " <a href=\"send?output=$request:[ns_urlencode $page]\" title=\"output\">o</a>"
                 set size [string length $content]
+                set highlight "...[ad_quotehtml [string trimleft [string range $content [expr [lindex $offset 0] - 50] [expr [lindex $offset 0] - 1]]]]<b>[ad_quotehtml [string range $content [lindex $offset 0] [lindex $offset 1]]]</b>[ad_quotehtml [string trimright [string range $content [expr [lindex $offset 1] + 1] [expr [lindex $offset 1] + 50]]]]..."
 
-                multirow append matches $page "...[string trim [string range $content [expr [lindex $offset 0] - 50] [expr [lindex $offset 1] + 50]]]..." $file_links $size
+                multirow append matches $page $highlight $file_links $size
             } 
             set matched($page) 1
         }
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-developer-support/www/set-adp-reveal-enabled.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/acs-developer-support/www/set-database-enabled.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-developer-support/www/set-enabled.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/acs-developer-support/www/set-user-switching-enabled.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-developer-support/www/set.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/set.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-developer-support/www/set.tcl	4 Feb 2005 15:26:12 -0000	1.1
@@ -0,0 +1,39 @@
+ad_page_contract {
+    Consolidated the various toggle pages into one.
+    
+    @author Lars Pind (lars@pinds.com)
+    @author Jeff Davis <davis@xarg.net>
+    @creation-date 2003-10-28
+    @cvs-id $Id: set.tcl,v 1.1 2005/02/04 15:26:12 jeffd Exp $
+} {
+    field 
+    enabled_p
+    {return_url "."}
+}
+
+ds_require_permission [ad_conn package_id] "admin"
+
+switch -- $field {
+    com {
+        parameter::set_value -package_id [ds_instance_id] -parameter ShowCommentsInlineP -value $enabled_p
+    }
+    adp {
+        ds_set_adp_reveal_enabled $enabled_p
+    }
+    db {
+        ds_set_database_enabled $enabled_p
+    }
+    ds {
+        nsv_set ds_properties enabled_p $enabled_p
+    }
+    frag {
+        nsv_set ds_properties page_fragment_cache_p $enabled_p
+    }
+    user {
+        ds_set_user_switching_enabled $enabled_p
+    }
+    default { 
+        ns_return 200 text/plain "bad field $field"
+    }
+}
+ad_returnredirect $return_url
Index: openacs-4/packages/acs-developer-support/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/admin/index.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-developer-support/www/admin/index.tcl	4 Feb 2005 15:26:12 -0000	1.1
@@ -0,0 +1 @@
+ad_returnredirect ..