Index: openacs-4/packages/dotlrn/lib/toolbar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/lib/toolbar.adp,v
diff -u -N -r1.9.6.1 -r1.9.6.2
--- openacs-4/packages/dotlrn/lib/toolbar.adp	22 Jun 2016 08:25:00 -0000	1.9.6.1
+++ openacs-4/packages/dotlrn/lib/toolbar.adp	6 Nov 2016 14:01:50 -0000	1.9.6.2
@@ -36,7 +36,7 @@
         <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#" />
+          <input id="keyword" name="keyword" placeholder="#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>
Index: openacs-4/packages/dotlrn/www/admin/class.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class.adp,v
diff -u -N -r1.36.2.1 -r1.36.2.2
--- openacs-4/packages/dotlrn/www/admin/class.adp	22 Jun 2016 08:25:00 -0000	1.36.2.1
+++ openacs-4/packages/dotlrn/www/admin/class.adp	6 Nov 2016 14:01:50 -0000	1.36.2.2
@@ -54,8 +54,7 @@
       <br><br>
 	  <form action="class" method="GET">
             #dotlrn.Search_classes_with#
-            
-		  <input name="keyword" onfocus="if(this.value=='#dotlrn.Please_type_a_keyword#')this.value='';" onblur="if(this.value=='')this.value='#dotlrn.Please_type_a_keyword#';" value="#dotlrn.Please_type_a_keyword#">
+            <input name="keyword" placeholder="#dotlrn.Please_type_a_keyword#">
             <input type="hidden" name="class_key" value="@class_key@">
             <input type="hidden" name="term_id" value="@term_id@">
             <input type="submit" value="#dotlrn.Go#">
Index: openacs-4/packages/dotlrn/www/admin/classes-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/classes-chunk.adp,v
diff -u -N -r1.23.6.1 -r1.23.6.2
--- openacs-4/packages/dotlrn/www/admin/classes-chunk.adp	22 Jun 2016 08:25:00 -0000	1.23.6.1
+++ openacs-4/packages/dotlrn/www/admin/classes-chunk.adp	6 Nov 2016 14:01:50 -0000	1.23.6.2
@@ -33,8 +33,7 @@
 	<div style="text-align:center;">
 	  <form action="classes" method="GET">
 	    #dotlrn.Search_subjects_with#
-		  <input name="keyword" onfocus="if(this.value=='#dotlrn.Please_type_a_keyword#')this.value='';" onblur="if(this.value=='')this.value='#dotlrn.Please_type_a_keyword#';" value="#dotlrn.Please_type_a_keyword#">
-
+            <input name="keyword" placeholder="#dotlrn.Please_type_a_keyword#">
             <input type="hidden" name="department_key" value="@department_key@">
             <input type="hidden" name="page" value="@page@">
             <input type="submit" value="#dotlrn.Go#">
Index: openacs-4/packages/dotlrn/www/admin/departments.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/departments.adp,v
diff -u -N -r1.25 -r1.25.2.1
--- openacs-4/packages/dotlrn/www/admin/departments.adp	3 Jul 2015 10:43:57 -0000	1.25
+++ openacs-4/packages/dotlrn/www/admin/departments.adp	6 Nov 2016 14:01:50 -0000	1.25.2.1
@@ -25,7 +25,7 @@
     <center>
       <form action="departments" method="GET">
         #dotlrn.Search_departments_with# 
-		  <input name="keyword" onfocus="if(this.value=='#dotlrn.Please_type_a_keyword#')this.value='';" onblur="if(this.value=='')this.value='#dotlrn.Please_type_a_keyword#';" value="#dotlrn.Please_type_a_keyword#">
+	  <input name="keyword" placeholder="#dotlrn.Please_type_a_keyword#">
           <input type="submit" value="#dotlrn.Go#">
       </form>
     </center>
Index: openacs-4/packages/dotlrn/www/admin/term.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term.adp,v
diff -u -N -r1.28.2.1 -r1.28.2.2
--- openacs-4/packages/dotlrn/www/admin/term.adp	22 Jun 2016 08:25:00 -0000	1.28.2.1
+++ openacs-4/packages/dotlrn/www/admin/term.adp	6 Nov 2016 14:01:50 -0000	1.28.2.2
@@ -80,7 +80,7 @@
 	  <div style="text-align:center;">
 	    <form action="term" method="GET">
 	      #dotlrn.Search_classes_with# 
-			  <input name="keyword" onfocus="if(this.value=='#dotlrn.Please_type_a_keyword#')this.value='';" onblur="if(this.value=='')this.value='#dotlrn.Please_type_a_keyword#';" value="#dotlrn.Please_type_a_keyword#">
+              <input name="keyword" placeholder="#dotlrn.Please_type_a_keyword#">
               <input type="hidden" name="term_id" value="@term_id@">
 	      <input type="hidden" name="department_key" value="@department_key@">
               <input type="submit" value="#dotlrn.Go#">