Index: openacs-4/packages/theme-selva/tcl/selva-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/tcl/selva-procs.tcl,v
diff -u -r1.5.2.2 -r1.5.2.3
--- openacs-4/packages/theme-selva/tcl/selva-procs.tcl	22 Apr 2006 12:22:07 -0000	1.5.2.2
+++ openacs-4/packages/theme-selva/tcl/selva-procs.tcl	4 May 2006 14:16:27 -0000	1.5.2.3
@@ -191,11 +191,13 @@
 	#as a ul instead of a table, which portal::navbar returns.  Obviously we shouldn't be letting display-level
 	#stuff decide where we put our code, but first we'll need to mod the portal package accordingly.
 
-	set page_num [ns_queryget page_num]
-	#Strip out extra anchors and other crud.
-	#page_num will be empty_string for special pages like
-	#My Space and Control Panel
-	regsub -all {[^0-9]} $page_num {} page_num
+	if { [catch {set page_num [ad_get_client_property dotlrn page_num]}] || $page_num eq "" || ![string is integer $page_num] } {
+	    set page_num [ns_queryget page_num]
+	    #Strip out extra anchors and other crud.
+	    #page_num will be empty_string for special pages like
+	    #My Space and Control Panel
+	    regsub -all {[^0-9]} $page_num {} page_num
+	}
 	
 	set navbar "<ul>\n"
 	
@@ -207,12 +209,21 @@
 		 # We are looking at the active tab
 		# append navbar "\n<li class=\"current\"><a href=\"#\">$pretty_name</a></li>"
 	     #} else {
-		 append navbar "\n<li><a href=\"$link?page_num=$sort_key\">$pretty_name</a> </li>"
+	    if {[string equal $page_num $sort_key]} {
+		append navbar "\n<li class=\"active\"><a href=\"$link?page_num=$sort_key\">$pretty_name</a> </li>"
+	    } else {
+		append navbar "\n<li><a href=\"$link?page_num=$sort_key\">$pretty_name</a> </li>"
+	    }
+#		 append navbar "\n<li><a href=\"$link?page_num=$sort_key\">$pretty_name</a> </li>"
 	     #}
 	 }
 
 	if  {[regexp {dotlrn/(clubs|classes)/*} [ad_conn url]]} { 
-	    append navbar "\n<li><a href=\"$control_panel_url\">Admin</a></li>"
+	    if {[string match "*/one-community-admin" [ad_conn url]]} {
+		append navbar "\n<li class=\"active\"><a href=\"${link}one-community-admin\">Admin</a></li>"
+	    } else {
+		append navbar "\n<li><a href=\"${link}one-community-admin\">Admin</a></li>"
+	    }
 	}
 
 	append navbar "</ul>"
Index: openacs-4/packages/theme-selva/www/resources/Selva/brown/Selva.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/resources/Selva/brown/Selva.css,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/theme-selva/www/resources/Selva/brown/Selva.css	18 Sep 2005 12:01:57 -0000	1.2
+++ openacs-4/packages/theme-selva/www/resources/Selva/brown/Selva.css	4 May 2006 14:16:27 -0000	1.2.2.1
@@ -141,6 +141,20 @@
 	list-style: none;
 	padding: 0px 10px 0px 10px ; }
 			
+	#portal-subnavigation-links li a:link,
+	#portal-subnavigation-links li a:visited {
+        color: #ffffff;
+        }
+
+	#portal-subnavigation-links li a:hover {
+        color: #000000;
+        }
+
+	#portal-subnavigation-links li.active a:link,
+	#portal-subnavigation-links li.active a:visited {
+        color: #000000;
+        }
+
 #portal {
 	border-bottom:0.1px solid #F5F4E4;
 	background: #F5F4E4 url(images/portal_rightShadow.gif) repeat-y top right;
Index: openacs-4/packages/theme-selva/www/resources/Selva/default/Selva.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/resources/Selva/default/Selva.css,v
diff -u -r1.4.2.1 -r1.4.2.2
--- openacs-4/packages/theme-selva/www/resources/Selva/default/Selva.css	24 Feb 2006 11:20:24 -0000	1.4.2.1
+++ openacs-4/packages/theme-selva/www/resources/Selva/default/Selva.css	4 May 2006 14:16:26 -0000	1.4.2.2
@@ -45,6 +45,19 @@
 	background: #95adc8 url(images/subnav_corner.gif) no-repeat top right;
 	 padding: 2px 0px 0px 0px;}
 	
+	#portal-subnavigation-links li a:link,
+	#portal-subnavigation-links li a:visited {
+        color: #ffffff;
+        }
+
+	#portal-subnavigation-links li a:hover {
+        color: #000000;
+        }
+
+	#portal-subnavigation-links li.active a:link,
+	#portal-subnavigation-links li.active a:visited {
+        color: #000000;
+        }
 			
 	
 	
Index: openacs-4/packages/theme-selva/www/resources/Selva/green/Selva.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/resources/Selva/green/Selva.css,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/theme-selva/www/resources/Selva/green/Selva.css	25 Sep 2005 08:14:46 -0000	1.4
+++ openacs-4/packages/theme-selva/www/resources/Selva/green/Selva.css	4 May 2006 14:16:26 -0000	1.4.2.1
@@ -45,6 +45,19 @@
 	background: #98c472 url(images/subnav_corner.gif) no-repeat top right;
 	 padding: 2px 0px 0px 0px;}
 	
+	#portal-subnavigation-links li a:link,
+	#portal-subnavigation-links li a:visited {
+        color: #ffffff;
+        }
+
+	#portal-subnavigation-links li a:hover {
+        color: #000000;
+        }
+
+	#portal-subnavigation-links li.active a:link,
+	#portal-subnavigation-links li.active a:visited {
+        color: #000000;
+        }
 			
 	
 	
Index: openacs-4/packages/theme-selva/www/resources/Selva/orange/Selva.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/resources/Selva/orange/Selva.css,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/theme-selva/www/resources/Selva/orange/Selva.css	18 Sep 2005 12:15:04 -0000	1.2
+++ openacs-4/packages/theme-selva/www/resources/Selva/orange/Selva.css	4 May 2006 14:16:26 -0000	1.2.2.1
@@ -141,6 +141,20 @@
 	list-style: none;
 	padding: 0px 10px 0px 10px ; }
 			
+	#portal-subnavigation-links li a:link,
+	#portal-subnavigation-links li a:visited {
+        color: #ffffff;
+        }
+
+	#portal-subnavigation-links li a:hover {
+        color: #000000;
+        }
+
+	#portal-subnavigation-links li.active a:link,
+	#portal-subnavigation-links li.active a:visited {
+        color: #000000;
+        }
+
 #portal {
 	border-bottom:0.1px solid #F5F4E4;
 	background: #F5F4E4 url(images/portal_rightShadow.gif) repeat-y top right;
Index: openacs-4/packages/theme-selva/www/resources/Selva/turquoise/Selva.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/resources/Selva/turquoise/Selva.css,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/theme-selva/www/resources/Selva/turquoise/Selva.css	25 Sep 2005 08:14:46 -0000	1.4
+++ openacs-4/packages/theme-selva/www/resources/Selva/turquoise/Selva.css	4 May 2006 14:16:26 -0000	1.4.2.1
@@ -45,6 +45,19 @@
 	background: #4b83a8 url(images/subnav_corner.gif) no-repeat top right;
 	 padding: 2px 0px 0px 0px;}
 	
+	#portal-subnavigation-links li a:link,
+	#portal-subnavigation-links li a:visited {
+        color: #ffffff;
+        }
+
+	#portal-subnavigation-links li a:hover {
+        color: #000000;
+        }
+
+	#portal-subnavigation-links li.active a:link,
+	#portal-subnavigation-links li.active a:visited {
+        color: #000000;
+        }