--- loncom/interface/lonsearchcat.pm	2008/12/19 23:24:49	1.303
+++ loncom/interface/lonsearchcat.pm	2009/07/31 16:01:48	1.313
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.303 2008/12/19 23:24:49 raeburn Exp $
+# $Id: lonsearchcat.pm,v 1.313 2009/07/31 16:01:48 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -191,9 +191,9 @@ sub handler {
     &Apache::lonhtmlcommon::add_breadcrumb
        ({href=>'/adm/searchcat?'.
 	       &Apache::loncommon::inhibit_menu_check().
-               '&catalogmode='.$env{'form.catalogmode'}.
-               '&launch='.$env{'form.launch'}.
-               '&mode='.$env{'form.mode'},
+               '&catalogmode='.$env{'form.catalogmode'}.
+               '&launch='.$env{'form.launch'}.
+               '&mode='.$env{'form.mode'},
               text=>"$crumb_text",
               target=>'_top',
               bug=>'Searching',});
@@ -266,25 +266,25 @@ sub handler {
     ## Configure dynamic components of interface
     ##
     if ($env{'form.catalogmode'} eq 'interactive') {
-        $closebutton="<input type='button' name='close' value='".&mt('CLOSE')."' ";
+        $closebutton="<input type='button' name='close' value='".&mt('Close')."' ";
         if ($env{'form.phase'} =~ /(results|run_search)/) {
-	    $closebutton .="onClick='parent.close()'";
+	    $closebutton .="onclick='parent.close()'";
         } else {
-            $closebutton .="onClick='self.close()'";
+            $closebutton .="onclick='self.close()'";
         }
         $closebutton .=">\n";
     } elsif ($env{'form.catalogmode'} eq 'import') {
-        $closebutton="<input type='button' name='close' value='".&mt('CLOSE')."' ";
+        $closebutton="<input type='button' name='close' value='".&mt('Close')."' ";
         if ($env{'form.phase'} =~ /(results|run_search)/) {
-	    $closebutton .="onClick='parent.close()'";
+	    $closebutton .="onclick='parent.close()'";
         } else {
-            $closebutton .="onClick='self.close()'";
+            $closebutton .="onclick='self.close()'";
         }
         $closebutton .= ">";
         my $txt_import = &mt('IMPORT');
         $importbutton=<<END;
 <input type='button' name='import' value='$txt_import'
-onClick='javascript:select_group()'>
+onclick='javascript:select_group()'>
 END
     } else {
         $closebutton = '';
@@ -314,19 +314,19 @@ END
         }
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/searchcat?'.&Apache::loncommon::inhibit_menu_check().
-		  '&phase=disp_adv'.
-                  '&catalogmode='.$env{'form.catalogmode'}.
-                  '&launch='.$env{'form.launch'}.
-                  '&mode='.$env{'form.mode'},
+                  '&amp;phase=disp_adv'.
+                  '&amp;catalogmode='.$env{'form.catalogmode'}.
+                  '&amp;launch='.$env{'form.launch'}.
+                  '&amp;mode='.$env{'form.mode'},
                   text=>"Advanced $srchtype Search",
                   bug=>'Searching',});
     } elsif ($env{'form.searchmode'} eq 'course search') {
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/searchcat?'.&Apache::loncommon::inhibit_menu_check().
-		  '&phase=disp_adv'.
+                  '&amp;phase=disp_adv'.
                   'catalogmode='.$env{'form.catalogmode'}.
-                  '&launch='.$env{'form.launch'}.
-                  '&mode='.$env{'form.mode'},
+                  '&amp;launch='.$env{'form.launch'}.
+                  '&amp;mode='.$env{'form.mode'},
                   text=>"Course Search",
                   bug=>'Searching',});
     }
@@ -488,7 +488,20 @@ sub course_search {
     my $discuss=$env{'form.crsdiscuss'};
     my @allwords=($search_string,@New_Words);
     $totalfound=0;
-    $r->print(&Apache::loncommon::start_page('Course Search').
+
+    &Apache::lonhtmlcommon::add_breadcrumb
+        ({href=>'/adm/searchcat?'.&Apache::loncommon::inhibit_menu_check().
+              '&amp;phase=disp_adv'.
+              'catalogmode='.$env{'form.catalogmode'}.
+              '&amp;launch='.$env{'form.launch'}.
+              '&amp;mode='.$env{'form.mode'},
+              text=>"Course Search",
+              bug=>'Searching',});
+    $r->print(&Apache::loncommon::start_page('Course Search'));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',
+                        $env{'form.catalogmode'} ne 'import'));
+
+    $r->print(
 	      '<hr /><center><font size="+2" face="arial">'.
 	      $pretty_search_string.'</font></center>'.
 	      '<hr /><b>'.&mt('Course content').':</b><br />');
@@ -511,7 +524,7 @@ sub course_search {
         untie(%hash);
     }
     unless ($totalfound) {
-	$r->print('<p>'.&mt('No matches found in resources').'.</p>');
+	$r->print('<p class="LC_info">'.&mt('No matches found in resources.').'</p>');
     }
 
 # Check discussions if requested
@@ -566,12 +579,12 @@ sub course_search {
                         if ($url =~m#^adm/wrapper/adm/.*/bulletinboard$#) {
                             $url =~s#^adm/wrapper##;
                         }
-                        $disctype = &mt('bulletin board');
+                        $disctype = &mt('discussion board');
                     } else {
                         $url = '/res/'.$url;
                     }
                     if ($url =~ /\?/) {
-                        $url .= '&symb=';
+                        $url .= '&amp;symb=';
                     } else {
                         $url .= '?symb=';
                     }
@@ -586,7 +599,7 @@ sub course_search {
                 }
             }
             unless ($totaldiscussions) {
-                $r->print('<p>'.&mt('No matches found in postings').'.</p>');
+                $r->print('<p class="LC_info">'.&mt('No matches found in postings.').'</p>');
             }
         } else {
             $r->print('<div class="LC_error">'.&mt('An error occurred retrieving information about resources in the course.').'<br />'.&mt('It is recommended that you [_1]re-initialize the course[_2] and then try your search again.','<a href="/adm/roles">','</a>').'</div>');
@@ -690,7 +703,7 @@ sub print_basic_search_form {
     my $bread_crumb =
         &Apache::lonhtmlcommon::breadcrumbs('Searching','Search_Basic',
 					    $env{'form.catalogmode'} ne 'import');
-    my $scrout = &Apache::loncommon::start_page('Search').$bread_crumb;
+    my $scrout = &Apache::loncommon::start_page('Content Library').$bread_crumb;
 # Search form for resource space 
     if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'})) {
         $scrout .= &setup_basic_search($r,'res',$hidden_fields,$closebutton);
@@ -704,7 +717,7 @@ sub print_basic_search_form {
 	 'note' => 'Enter terms or phrases, then press "Search" below',
 	 'use' => 'use related words',
 	 'full' =>'fulltext search (time consuming)',
-         'disc' => 'search discussion postings (resources and bulletin boards)',
+         'disc' => 'search discussion postings (resources and discussion boards)',
 					   );
         $scrout.=(<<ENDCOURSESEARCH);
 <form name="loncapa_search" method="post" action="/adm/searchcat">
@@ -716,7 +729,6 @@ $hidden_fields
 <p>
 $lt{'note'}.
 </p>
-<p>
 <table>
 <tr><td>
 ENDCOURSESEARCH
@@ -737,8 +749,9 @@ ENDCOURSESEARCH
 <tr><td><label>$relcheckbox $lt{'use'}</label></td><td></td></tr>
 <tr><td><label>$crscheckbox $lt{'full'}</label></td><td></td></tr>
 <tr><td><label>$discheckbox $lt{'disc'}</label></td><td></td></tr>
-</table><p>
-&nbsp;<input type="submit" name="coursesubmit" value='$lt{'srch'}' />
+</table>
+<p>
+<input type="submit" name="coursesubmit" value='$lt{'srch'}' />
 </p>
 </center>
 </form>
@@ -767,14 +780,14 @@ sub setup_basic_search {
                         '</label>';
     $adv_search_link = '<a href="/adm/searchcat?'.
 	               &Apache::loncommon::inhibit_menu_check().
-		       '&phase=disp_adv'.
-                       '&catalogmode='.$env{'form.catalogmode'}.
-                       '&launch='.$env{'form.launch'}.
-                       '&mode='.$env{'form.mode'}.
-                       '&area='.$area.
-                       '&form='.$env{'form.form'}.
-                       '&titleelement='.$env{'form.titleelement'}.
-                       '&element='.$env{'form.element'}.
+		       '&amp;phase=disp_adv'.
+                       '&amp;catalogmode='.$env{'form.catalogmode'}.
+                       '&amp;launch='.$env{'form.launch'}.
+                       '&amp;mode='.$env{'form.mode'}.
+                       '&amp;area='.$area.
+                       '&amp;form='.$env{'form.form'}.
+                       '&amp;titleelement='.$env{'form.titleelement'}.
+                       '&amp;element='.$env{'form.element'}.
                        '">'.&mt('Advanced Search').'</a>';
     #
     $scrout.='<form name="loncapa_search" method="post" '.
@@ -785,7 +798,7 @@ sub setup_basic_search {
                  $scrout .= '<input type="hidden" name="area" value="'.$area.'" />';
              }
     #
-    $scrout .= '<center>'.$/;
+    $scrout .= '<div align="center">'.$/;
 #    if ($env{'request.course.id'}) {
         $scrout .= '<h1>'.$lt{$area}.'</h1>';
 #    } else {
@@ -797,23 +810,27 @@ sub setup_basic_search {
              &Apache::lonhtmlcommon::textbox('basicexp',
                                              $env{'form.basicexp'},50).
              '<br />'.
-            '<font size="-1">'.&searchhelp().'</font>'.'</td>'.
-            '<td><font size="-1">'.
+            '<span class="LC_fontsize_small">'.&searchhelp().'</span>'.'</td>'.
+            '<td>'.
             '<span class="LC_nobreak">'.('&nbsp;'x3).$adv_search_link.'</span>'.'<br />'.
             '<span class="LC_nobreak">'.('&nbsp;'x1).$userelatedwords.'</span>'.'<br />'.
             '<span class="LC_nobreak">'.('&nbsp;'x1).$onlysearchdomain.'</span>'.'<br />'.
             '<span class="LC_nobreak">'.('&nbsp;'x1).$inclext.'</span>'.'<br />'.
-             '</font></td>'.
-            '</tr>'.$/;
+             '</td>'.
+            '</tr>'.
+            '</table>'.$/;
+    #
+    $scrout .= '<p>'
+              .&viewoptions()
+              .'</p>'
+              .'<p>'
+              .'<input type="submit" name="basicsubmit" '
+              .'value="'.&mt('Search').'" />'
+              .' '
+              .$closebutton
+              .'</p>';
     #
-    $scrout .= '<tr><td align="center" colspan="2">'.
-               '<font size="-1">'.
-               '<input type="submit" name="basicsubmit" '.
-               'value="'.&mt('Search').'" />'.
-               ('&nbsp;'x2).$closebutton.('&nbsp;'x2). &viewoptions().
-               '</font>'.
-               '</td></tr>'.$/;
-    $scrout .= '</table>'.$/.'</center>'.'</form>';
+    $scrout .= '</div>'.'</form>';
     return $scrout;
 } 
 
@@ -848,6 +865,7 @@ END
     if ($env{'form.area'} eq 'portfolio') {
         $srchtype = 'Portfolio';
         $jscript = '<script type="text/javascript">
+// <![CDATA[
 function additional_metadata() {
     if (document.advsearch.newfield.checked) {
         document.advsearch.phase.value = "disp_adv";
@@ -855,6 +873,7 @@ function additional_metadata() {
         document.advsearch.submit();
     }
 }
+// ]]>
 </script>';
     }
     my $scrout= &Apache::loncommon::start_page("Advanced $srchtype Search",
@@ -926,7 +945,7 @@ ENDHEADER
 	&titlefield(&mt('Domains')).'</td><td colspan="2">'. 
 	    &Apache::loncommon::domain_select('domains',
 						   $env{'form.domains'},1).
-						   '<br /><label>';
+						   '<br />';
      $scrout .= '</td></tr>'.$/;
     #
     # Misc metadata
@@ -1159,21 +1178,23 @@ Outputs: text for box with view options
 ######################################################################
 ######################################################################
 sub viewoptions {
-    my $scrout = '<span class="LC_nobreak">';
+    my $scrout;
     if (! defined($env{'form.viewselect'})) { 
         $env{'form.viewselect'}='detailed'; 
     }
-    $scrout.=&Apache::lonmeta::selectbox('viewselect',
-			$env{'form.viewselect'},
-			\&viewoptiontext,
-			sort(keys(%Views)));
-    $scrout.= '&nbsp;&nbsp;';
+    $scrout .= '<span class="LC_nobreak">'
+              .&mt('Type:').' '
+              .&Apache::lonmeta::selectbox('viewselect',
+                   $env{'form.viewselect'},
+                   \&viewoptiontext,
+                   sort(keys(%Views)))
+              .'</span>';
     my $countselect = &Apache::lonmeta::selectbox('show',
                                                   $env{'form.show'},
                                                   undef,
                                                   (10,20,50,100,1000,10000));
-    $scrout .= ('&nbsp;'x2)
-              .&mt('[_1] Records per Page',$countselect)
+    $scrout .= ' <span class="LC_nobreak">'
+              .&mt('Records per Page:').' '.$countselect
               .'</span>'.$/;
     return $scrout;
 }
@@ -2154,9 +2175,13 @@ sub ensure_db_and_table {
     ## Sanity check the table id.
     ##
     if (! defined($table) || $table eq '' || $table =~ /\D/ ) {
-        $r->print("Unable to retrieve search results.  ".
-                  "Unable to determine the table results were saved in.  ".
-		  &Apache::loncommon::end_page());
+        $r->print(&Apache::loncommon::start_page(&mt('Error'))
+. '<p>table: |'.$table.'|</p>' # SB
+                 .'<p class="LC_error">'
+                 .&mt('Unable to retrieve search results. '
+                     .'Unable to determine the table results were saved in.')
+                 .&Apache::loncommon::end_page()
+        );
         return undef;
     }
     ##
@@ -2238,18 +2263,19 @@ sub print_sort_form {
     }
     my $js =<<END;
 <script type="text/javascript">
+// <![CDATA[
     function change_sort() {
         var newloc = "/adm/searchcat?phase=results";
-        newloc += "&persistent_db_id=$env{'form.persistent_db_id'}";
-        newloc += "&sortby=";
+        newloc += "&amp;persistent_db_id=$env{'form.persistent_db_id'}";
+        newloc += "&amp;sortby=";
         newloc += document.forms.statusform.elements.sortby.value;
         parent.resultsframe.location= newloc;
     }
+// ]]>
 </script>
 END
 
-    my $start_page = &Apache::loncommon::start_page('Results',$js,
-						    {'no_title' => 1});
+    my $start_page = &Apache::loncommon::start_page('Results',$js);
     my $breadcrumbs=
         &Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',
 					    $env{'form.catalogmode'} ne 'import');
@@ -2388,16 +2414,28 @@ Returns: Nothing.
 sub update_count_status {
     my ($r,$text) = @_;
     $text =~ s/\'/\\\'/g;
-    $r->print
-        ("<script>document.statusform.count.value = ' $text'</script>\n");
+    $r->print(<<SCRIPT);
+<script type="text/javascript">
+// <![CDATA[
+document.statusform.count.value = ' $text'
+// ]]>
+</script>
+SCRIPT
+
     $r->rflush();
 }
 
 sub update_status {
     my ($r,$text) = @_;
     $text =~ s/\'/\\\'/g;
-    $r->print
-        ("<script>document.statusform.status.value = ' $text'</script>\n");
+    $r->print(<<SCRIPT);
+<script type="text/javascript">
+// <![CDATA[
+document.statusform.status.value = ' $text'
+// ]]>
+</script>
+SCRIPT
+
     $r->rflush();
 }
 
@@ -2424,9 +2462,14 @@ sub update_seconds {
     my ($r) = @_;
     my $time = &time_left();
     if (($last_time-$time) > 0) {
-        $r->print("<script>".
-                  "document.statusform.seconds.value = '$time'".
-                  "</script>\n");
+        $r->print(<<SCRIPT);
+<script type="text/javascript">
+// <![CDATA[
+document.statusform.seconds.value = '$time'
+// ]]>
+</script>
+SCRIPT
+
         $r->rflush();
     }
     $last_time = $time;
@@ -2455,10 +2498,10 @@ sub revise_button {
     $revise_phase = 'disp_adv' if ($env{'form.searchmode'} eq 'advanced');
     my $newloc = '/adm/searchcat'.
         '?persistent_db_id='.$env{'form.persistent_db_id'}.
-            '&cleargroupsort=1'.
-            '&phase='.$revise_phase;
+            '&amp;cleargroupsort=1'.
+            '&amp;phase='.$revise_phase;
     my $result = qq{<input type="button" value="$revisetext" name="revise"} .
-        qq{ onClick="parent.location='$newloc';" /> };
+        qq{ onclick="parent.location='$newloc';" /> };
     return $result;
 }
 
@@ -2487,8 +2530,7 @@ sub run_search {
     #
     # Print run_search header
     #
-    my $start_page = &Apache::loncommon::start_page('Search Status',undef,
-						    {'no_title' => 1});
+    my $start_page = &Apache::loncommon::start_page('Search Status',undef);
     my $breadcrumbs =
 	&Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',
 					    $env{'form.catalogmode'} ne 'import');
@@ -2680,7 +2722,7 @@ END
         last if ($connection->aborted());
         &update_seconds($r);
     }
-    &update_status($r,&mt('Search Complete [_1]',$server));
+    &update_status($r,&mt('Search Complete on Server [_1]',$server));
     &update_seconds($r);
     #
     &Apache::lonmysql::disconnect_from_db(); # This is unneccessary
@@ -2690,11 +2732,11 @@ END
     # loaded from /adm/searchcat
     $r->print(&Apache::loncommon::end_page());
 #    if ($env{'form.catalogmode'} ne 'import') {
-        $r->print("<script>".
-                      "window.location='/adm/searchcat?".
-                      "phase=sort&".
-                      "persistent_db_id=$env{'form.persistent_db_id'}';".
-                  "</script>");
+         $r->print(<<SCRIPT);
+<script>
+window.location='/adm/searchcat?phase=sort&persistent_db_id=$env{'form.persistent_db_id'}';
+</script>
+SCRIPT
 #    }
     return;
 }
@@ -2717,15 +2759,15 @@ sub prev_next_buttons {
     return '' if ($show eq 'all'); # No links if you get them all at once.
     #
     # Create buttons
-    my $buttons = '<input type="submit" name="prev" value="'.&mt('Prev').'" ';
-    $buttons .= '/>';
-    $buttons .= '&nbsp;'x3;
-    $buttons .= '<input type="submit" name="reload" '.
-        'value="'.&mt('Reload').'" />';
-    $buttons .= '&nbsp;'x3;
-    $buttons .= '<input type="submit" name="next" value="'.&mt('Next').'" ';
-    $buttons .= '/>';
-    return $buttons;
+    return '<p class="LC_nobreak">'
+          .'<input type="submit" name="prev" value="&lt;"'
+          .' title="'.&mt('Previous').'" />'
+          .' '
+          .'<input type="submit" name="reload" value="'.&mt('Reload').'" />'
+          .' '
+          .'<input type="submit" name="next" value="&gt;"'
+          .' title="'.&mt('Next').'" />'
+          .'</p>';
 }
 
 ######################################################################
@@ -2750,7 +2792,9 @@ sub display_results {
     ##
     my $viewfunction = $Views{$env{'form.viewselect'}};
     if (!defined($viewfunction)) {
-        $r->print("Internal Error - Bad view selected.\n");
+        $r->print('<p class="LC_error">'
+                 .&mt('Internal Error - Bad view selected.')
+                 .'</p>'."\n");
         $r->rflush();
         return;
     }
@@ -2767,7 +2811,10 @@ sub display_results {
     if ($env{'form.catalogmode'} eq 'import') {
         if (! tie(%groupsearch_db,'GDBM_File',$diropendb,
                   &GDBM_WRCREAT(),0640)) {
-            $r->print('Unable to save import results.</form>'.
+            $r->print('<p class="LC_error">'.
+              &mt('Unable to save import results.').
+              '</p>'.
+              '</form>'.
 		      &Apache::loncommon::end_page());
             $r->rflush();
             return;
@@ -2781,7 +2828,10 @@ sub display_results {
     ## Get the number of results 
     my $total_results = &Apache::lonmysql::number_of_rows($table);
     if (! defined($total_results)) {
-        $r->print("A MySQL error has occurred.</form>".
+        $r->print('<p class="LC_error">'.
+          &mt('A MySQL error has occurred.').
+          '</p>'.
+          '</form>'.
 		  &Apache::loncommon::end_page());
         &Apache::lonnet::logthis("lonmysql was unable to determine the number".
                                  " of rows in table ".$table);
@@ -2886,37 +2936,40 @@ sub display_results {
 	    $env{'form.sortorder'}='asc';
 	}
     }
-    my $sortform = &mt('Sort by [_1] [_2]',
-                       &Apache::loncommon::select_form($env{'form.sortfield'},
+    my $sortform = '<span class="LC_nobreak">'
+                  .&mt('Sort by:').' '
+                  .&Apache::loncommon::select_form($env{'form.sortfield'},
                                                       'sortfield',
-                                                      %sort_fields),
-                       &Apache::loncommon::select_form($env{'form.sortorder'},
+                                                      %sort_fields)
+                  .' '
+                  .&Apache::loncommon::select_form($env{'form.sortorder'},
                                                       'sortorder',
                                                       (asc =>&mt('Ascending'),
                                                        desc=>&mt('Descending')
                                                        ))
-                       );
+                  .'</span>';
     ##
-    ## Output links (if necessary) for 'prev' and 'next' pages.
-    $r->print
-        ('<table width="100%"><tr><td width="25%" align="right">'.
-         '<span class="LC_nobreak">'.$sortform.'</span>'.
-         '</td><td width="25%" align="right">'.
-         &prev_next_buttons($min,$env{'form.show'},$total_results).
-         '</td><td align="right">'.
-         &viewoptions().'</td></tr></table>'
-         );
+    ## Display links for 'prev' and 'next' pages (if necessary) and Display Options
+    $r->print('<fieldset>'."\n"
+             .'<legend>'.&mt('Display Options').'</legend>'."\n"
+             .$sortform
+             .' '
+             .&viewoptions()
+             .'</fieldset>'
+             .&prev_next_buttons($min,$env{'form.show'},$total_results)
+    );
+
     if ($total_results == 0) {
         $r->print('<meta HTTP-EQUIV="Refresh" CONTENT="2" />'.
-                  '<h3>'.&mt('There are currently no results').'.</h3>'.
+                  '<p class="LC_info">'.&mt('There are currently no results.').'</p>'.
                   "</form>".
 		  &Apache::loncommon::end_page());
         return;
     } else {
-        $r->print('<center>'.
+        $r->print('<div>'.
                   mt('Results [_1] to [_2] out of [_3]',
                      $min,$max,$total_results).
-                  "</center>\n");
+                  "</div>\n");
     }
     ##
     ## Get results from MySQL table
@@ -2946,13 +2999,14 @@ sub display_results {
     if ($area eq 'portfolio') {
         $tabletype = 'portfolio_search';
     }
+    $r->print(&Apache::loncommon::start_data_table());
     foreach my $row (@Results) {
         if ($connection->aborted()) {
             &cleanup();
             return;
         }
         my %Fields = %{&parse_row($tabletype,@$row)};
-        my $output="<p>\n";
+        my $output;
         if (! defined($Fields{'title'}) || $Fields{'title'} eq '') {
             $Fields{'title'} = 'Untitled';
         }
@@ -2961,21 +3015,27 @@ sub display_results {
         # Render the result into html
         $output.= &$viewfunction($prefix,%Fields);
         # Print them out as they come in.
-        $r->print($output);
+        $r->print(&Apache::loncommon::start_data_table_row()
+                 .'<td>'
+                 .$output
+                 .'</td>'
+                 .&Apache::loncommon::end_data_table_row()
+        );
         $r->rflush();
     }
+    $r->print(&Apache::loncommon::end_data_table());
     if (@Results < 1) {
-        $r->print(&mt("There were no results matching your query"));
+        $r->print('<p class="LC_info">'
+                 .&mt('There were no results matching your query.')
+                 .'</p>');
     } else {
-        $r->print
-            ('<center>'.
-             &prev_next_buttons($min,$env{'form.show'},$total_results,
+        $r->print(
+            &prev_next_buttons($min,$env{'form.show'},$total_results,
                                 "table=".$env{'form.table'}.
-                                "&phase=results".
-                                "&persistent_db_id=".
+                                "&amp;phase=results".
+                                "&amp;persistent_db_id=".
                                 $env{'form.persistent_db_id'})
-             ."</center>\n"
-             );
+        );
     }
     $r->print("</form>".&Apache::loncommon::end_page());
     $r->rflush();
@@ -3005,7 +3065,7 @@ sub catalogmode_output {
         if ($env{'form.catalogmode'} eq 'interactive') {
             $output.=<<END 
 <font size='-1'><input type="button" name="returnvalues" value="select"
-onClick="javascript:select_data('$title','$url')" />
+onclick="javascript:select_data('$title','$url')" />
 </font>
 END
         }
@@ -3015,7 +3075,7 @@ END
         $output.=<<END;
 <font size='-1'>
 <input type="checkbox" name="returnvalues" value="select"
-onClick="javascript:queue($checkbox_num,$fnum)" />
+onclick="javascript:queue($checkbox_num,$fnum)" />
 </font>
 END
     }
@@ -3184,6 +3244,7 @@ sub search_results_header {
 	if (! exists($env{'form.mode'}) || $env{'form.mode'} ne 'edit') {
             $js.=<<SCRIPT;
 <script type="text/javascript">
+// <![CDATA[
     function select_data(title,url) {
 	changeTitle(title);
 	changeURL(url);
@@ -3199,6 +3260,7 @@ sub search_results_header {
 	    parent.opener.inf.document.forms.resinfo.elements.u.value=val;
 	}
     }
+// ]]>
 </script>
 SCRIPT
         } elsif ($env{'form.mode'} eq 'edit') {
@@ -3223,6 +3285,7 @@ END
 
             $js.=<<SCRIPT;
 <script type="text/javascript">
+// <![CDATA[
 function select_data(title,url) {
     changeURL(url);
     changeTitle(title);
@@ -3237,6 +3300,7 @@ function changeURL(val) {
         alert("Unable to transfer data to "+url);
     }
 }
+// ]]>
 </script>
 SCRIPT
         }
@@ -3244,6 +3308,7 @@ SCRIPT
     my $inhibit_menu = "&".&Apache::loncommon::inhibit_menu_check();
     $js.=<<SCRIPT if $env{'form.catalogmode'} eq 'import';
 <script type="text/javascript">
+// <![CDATA[
     function queue(checkbox_num,val) {
         if (document.forms.results.returnvalues.length != "undefined" &&
             typeof(document.forms.results.returnvalues.length) == "number") {
@@ -3262,9 +3327,10 @@ SCRIPT
     }
     function select_group() {
 	parent.window.location=
-    "/adm/groupsort?mode=$env{'form.mode'}&catalogmode=import$inhibit_menu&acts="+
+    "/adm/groupsort?mode=$env{'form.mode'}&amp;catalogmode=import$inhibit_menu&amp;acts="+
 	    parent.statusframe.document.forms.statusform.elements.acts.value;
     }
+// ]]>
 </script>
 SCRIPT
 
@@ -3279,10 +3345,10 @@ END
 }
 
 sub results_link {
-    my $basic_link   = "/adm/searchcat?"."&table=".$env{'form.table'}.
-        "&persistent_db_id=".$env{'form.persistent_db_id'};
-    my $results_link = $basic_link."&phase=results".
-        "&pause=1"."&start=1";
+    my $basic_link   = "/adm/searchcat?"."&amp;table=".$env{'form.table'}.
+        "&amp;persistent_db_id=".$env{'form.persistent_db_id'};
+    my $results_link = $basic_link."&amp;phase=results".
+        "&amp;pause=1"."&amp;start=1";
     return $results_link;
 }
 
@@ -3290,14 +3356,16 @@ sub results_link {
 ######################################################################
 sub print_frames_interface {
     my $r = shift;
-    my $basic_link = "/adm/searchcat?"."&table=".$env{'form.table'}.
-        "&persistent_db_id=".$env{'form.persistent_db_id'};
-    my $run_search_link = $basic_link."&phase=run_search";
+    my $basic_link = "/adm/searchcat?"."&amp;table=".$env{'form.table'}.
+        "&amp;persistent_db_id=".$env{'form.persistent_db_id'};
+    my $run_search_link = $basic_link."&amp;phase=run_search";
     my $results_link = &results_link();
     my $js = <<JS;
 <script type="text/javascript">
+// <![CDATA[
 var targetwin = opener;
 var queue = '';
+// ]]>
 </script>
 JS
 
@@ -3384,7 +3452,7 @@ sub detailed_citation_view {
     my $jumpurl=$values{'url'};
     $jumpurl=~s|^/ext/|http://|;
     $result .= '<b>'.$prefix.
-        '<img src="'.&Apache::loncommon::icon($values{'url'}).'" />'.'&nbsp;'.
+        '<img src="'.&Apache::loncommon::icon($values{'url'}).'" alt="" />'.'&nbsp;'.
         '<a href="'.$jumpurl.'?inhibitmenu=yes" '.
         'target="preview">'.$values{'title'}."</a></b>\n";
     $result .= "<p>\n";
@@ -3476,17 +3544,14 @@ sub detailed_citation_view {
     if (exists($values{'shortabstract'}) && $values{'shortabstract'} ne '') {
         $result .= '<p>'.$values{'shortabstract'}.'</p>';
     }
-    $result .= '<hr align="left" width="200" noshade />'."\n";
     return $result;
 }
 
 sub detailed_citation_preview {
     my ($prefix,%values)=@_;
-    return '<table><tr><td>'.
-           &detailed_citation_view($prefix,%values).
+    return &detailed_citation_view($prefix,%values).
            '</td><td>'.
-           &Apache::lonindexer::showpreview($values{'url'}).
-           '</td></tr></table><hr />';
+           &Apache::lonindexer::showpreview($values{'url'});
 }
 
 
@@ -3503,7 +3568,7 @@ sub detailed_citation_preview {
 sub summary_view {
     my ($prefix,%values) = @_;
     my $icon=&Apache::loncommon::icon($values{'url'});
-    my $result=qq{$prefix<img src="$icon" />};
+    my $result=qq{$prefix<img src="$icon" alt="" />};
     if (exists($env{'form.sortfield'}) && 
         $env{'form.sortfield'} !~ /^(default|
                                      author|
@@ -3522,24 +3587,20 @@ sub summary_view {
 
     $result.=<<END;
 <a href="$jumpurl?inhibitmenu=yes" 
-   target='preview'>$values{'title'}</a> <br />
-$link <br />
+   target="preview">$values{'title'}</a><br />
+$link<br />
 $values{'author'}, $values{'owner'} -- $values{'lastrevisiondate'}<br />
 $values{'copyrighttag'}<br />
 $values{'extrashow'}
-</p>
-<hr align='left' width='200' noshade />
 END
     return $result;
 }
 
 sub summary_preview {
     my ($prefix,%values)=@_;
-    return '<table><tr><td>'.
-           &summary_view($prefix,%values).
+    return &summary_view($prefix,%values).
            '</td><td>'.
-           &Apache::lonindexer::showpreview($values{'url'}).
-           '</td></tr></table><hr />';
+           &Apache::lonindexer::showpreview($values{'url'});
 }
 
 ######################################################################
@@ -3561,7 +3622,7 @@ sub compact_view {
     my $link = &display_url($jumpurl,[1,1,1]);
     
     my $result = 
-        $prefix.'<img src="'.&Apache::loncommon::icon($values{'url'}).'">';
+        $prefix.'<img src="'.&Apache::loncommon::icon($values{'url'}).'" alt="" />';
     if (exists($env{'form.sortfield'}) && 
         $env{'form.sortfield'} !~ /^(default|author|url|title)$/) {
         my $tmp = $values{$env{'form.sortfield'}};
@@ -3572,7 +3633,7 @@ sub compact_view {
     $result.=' <span class="LC_nobreak">'.
 	'<a href="'.$jumpurl.'?inhibitmenu=yes" target="preview">'.
         &HTML::Entities::encode($values{'title'},'<>&"').'</a></span> '.
-	$link.' <b>'.$values{'author'}.'</b> ('.$values{'domain'}.')<br />';
+	$link.' <b>'.$values{'author'}.'</b> ('.$values{'domain'}.')';
     return $result;
 }
 
@@ -3612,7 +3673,7 @@ sub fielded_format_view {
     $jumpurl=~s|^/ext/|http://|;
 
     my $result=<<END;
-$prefix <img src="$icon" />
+$prefix <img src="$icon" alt="" />
 <dl>
 <dt>URL:</dt>
     <dd><a href="$jumpurl?inhibitmenu=yes" 
@@ -3638,7 +3699,6 @@ END
     }
     $result .= "</dl>\n";
     $result .= $values{'extrashow'};
-    $result .= '<hr align="left" width="200" noshade />'."\n";
     return $result;
 }
 
@@ -3712,7 +3772,6 @@ $prefix
 $xml
 </pre>
 $values{'extrashow'}
-<hr align='left' width='200' noshade />
 END
     return $result;
 }
@@ -3752,9 +3811,12 @@ sub output_unparsed_phrase_error {
     my ($r,$closebutton,$parms,$hidden_fields,$field)=@_;
     my $errorstring;
     if ($field eq 'basicexp') {
-        $errorstring = &mt('Unable to understand the search phrase <i>[_1]</i>.  Please modify your search.',$env{'form.basicexp'});
+        $errorstring = &mt('Unable to understand the search phrase [_1]. Please modify your search.'
+                           ,'<i>'.$env{'form.basicexp'}.'</i>');
     } else {
-        $errorstring = &mt('Unable to understand the search phrase <b>[_1]</b>:<i>[_2]</i>.',$field,$env{'form.'.$field});
+        $errorstring = &mt('Unable to understand the search phrase [_1]: [_2]'
+                           ,'<i>'.$field.'</i>'
+                           ,$env{'form.'.$field});
     }
     my $heading = &mt('Unparsed Field');
     my $revise  = &mt('Revise search request');
@@ -3768,11 +3830,11 @@ $hidden_fields
 $closebutton
 <hr />
 <h2>$heading</h2>
-<p>
+<p class="LC_warning">
 $errorstring
 </p>
 <p>
-<a href="/adm/searchcat?$parms&persistent_db_id=$env{'form.persistent_db_id'}">$revise</a>
+<a href="/adm/searchcat?$parms&amp;persistent_db_id=$env{'form.persistent_db_id'}">$revise</a>
 </p>
 $end_page
 ENDPAGE
@@ -3800,7 +3862,7 @@ $parms is extra information to include i
 ######################################################################
 sub output_blank_field_error {
     my ($r,$closebutton,$parms,$hidden_fields)=@_;
-    my $errormsg = &mt('You did not fill in enough information for the search to be started.  You need to fill in relevant fields on the search page in order for a query to be processed.');
+    my $errormsg = &mt('You did not fill in enough information for the search to be started. You need to fill in relevant fields on the search page in order for a query to be processed.');
     my $revise = &mt('Revise Search Request');
     my $heading = &mt('Unactionable Search Queary');
     my $start_page = &Apache::loncommon::start_page('Search');
@@ -3812,11 +3874,11 @@ $hidden_fields
 $closebutton
 <hr />
 <h2>$heading</h2>
-<p>
+<p class="LC_warning">
 $errormsg
 </p>
 <p>
-<a href="/adm/searchcat?$parms&persistent_db_id=$env{'form.persistent_db_id'}">$revise</a>&nbsp;
+<a href="/adm/searchcat?$parms&amp;persistent_db_id=$env{'form.persistent_db_id'}">$revise</a>&nbsp;
 </p>
 $end_page
 ENDPAGE
@@ -3847,16 +3909,18 @@ sub output_date_error {
     # make query information persistent to allow for subsequent revision
     my $start_page = &Apache::loncommon::start_page('Search');
     my $end_page   = &Apache::loncommon::end_page();
+    my $heading = &mt('Error');
     $r->print(<<RESULTS);
 $start_page
 <form method="post" action="/adm/searchcat">
 $hidden_fields
 <input type='button' value='Revise search request'
-onClick='this.form.submit();' />
+onclick='this.form.submit();' />
 $closebutton
+</form>
 <hr />
-<h3>Error</h3>
-<p>
+<h3>$heading</h3>
+<p class="LC_error">
 $message
 </p>
 $end_page