Index: openacs-4/packages/dotlrn/lib/toolbar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/lib/toolbar.adp,v
diff -u -r1.4.4.3 -r1.4.4.4
--- openacs-4/packages/dotlrn/lib/toolbar.adp	29 Aug 2008 16:45:55 -0000	1.4.4.3
+++ openacs-4/packages/dotlrn/lib/toolbar.adp	29 Aug 2008 17:18:54 -0000	1.4.4.4
@@ -15,36 +15,34 @@
 	  <a href="@dotlrn_admin_url@/departments" title="#dotlrn.departments_pretty_plural#">#dotlrn.departments_pretty_plural#</a>
 	  <span style="color: #cccccc;">|</span>
 	  
-	  <a href="@dotlrn_admin_url@/classes" title=""#dotlrn.classes_pretty_plural#">#dotlrn.classes_pretty_plural#</a>
+	  <a href="@dotlrn_admin_url@/classes" title="#dotlrn.classes_pretty_plural#">#dotlrn.classes_pretty_plural#</a>
 	  <span style="color: #cccccc;">|</span>
 	  
-	  <a href="@dotlrn_admin_url@/term?term_id=-1" title="#dotlrn.Classes#">#dotlrn.Classes#
+	  <a href="@dotlrn_admin_url@/term?term_id=-1" title="#dotlrn.Classes#">#dotlrn.Classes#</a>
 	  <span style="color: #cccccc;">|</span>
 	  
 	  <a href="@dotlrn_admin_url@/clubs" title="#dotlrn.clubs_pretty_plural#">#dotlrn.clubs_pretty_plural#</a>
 	  <span style="color: #cccccc;">|</span>
 
-	  <a href="@dotlrn_admin_url@/users" title=""#dotlrn.Users#">#dotlrn.Users#</a>
+	  <a href="@dotlrn_admin_url@/users" title="#dotlrn.Users#">#dotlrn.Users#</a>
 	  <span style="color: #cccccc;">|</span>
 
 	  <a href="@dotlrn_admin_url@/" title="Dotlrn admin">#dotlrn.Admin#</a>
 	  <span style="color: #cccccc;">|</span>
   
-	  <a href="@dotlrn_admin_url@/toolbar-actions?action=@info_action@&return_url=@return_url@" title="@info_title@">@info_title@</a>
+	  <a href="@dotlrn_admin_url@/<% export_vars -base "toolbar-actions" {{action $info_action} return_url} %>" title="@info_title@">@info_title@</a>
 	</td>
-	
     <td id="search">
-	<form action="@dotlrn_admin_url@/toolbar-actions" method="POST">
-	  <input type="hidden" name="action" value="search">
-	      Search:
-	      <input name="keyword" onfocus="if(this.value=='.LRN Search')this.value='';" onblur="if(this.value=='')this.value='.LRN Search';" value=".LRN Search">
-		in:<select name="search_type"><option value="users">Users</option><option value="departments">Departments</option><option value="subjects">Subjects</option><option value="classes">Classes</option></select>
-		<input type="submit" value="Search">
-	</form>
-</td>
-
+        <form action="@dotlrn_admin_url@/toolbar-actions" method="POST">
+          <input type="hidden" name="action" value="search" />
+          <label for="keyword">#dotlrn.Search#</label>
+          <input id="keyword" name="keyword" onfocus="if(this.value=='#dotlrn.Search_Text#')this.value='';" onblur="if(this.value=='')this.value='#dotlrn.Search_Text#';" value="#dotlrn.Search_Text#" />
+        in:<select name="search_type"><option value="users">#dotlrn.Users#</option><option value="departments">#dotlrn.departments_pretty_plural#</option><option value="subjects">#dotlrn.classes_pretty_plural#</option><option value="classes">#dotlrn.Classes#</option></select>
+            <input type="submit" value="#dotlrn.Search#" />
+        </form>
+    </td>
 	<td>
-	  <a href="@dotlrn_admin_url@/toolbar-actions?action=hide&return_url=@return_url@" style="font-size:80%;" title="Hide me">Hide me</a>
+	  <a href="@dotlrn_admin_url@/<% export_vars -base "toolbar-actions" {{action hide} return_url} %>" style="font-size:80%;" title="Hide me">Hide me</a>
 	</td>	
       </tr>