--- loncom/interface/lonsearchcat.pm	2009/07/31 10:58:57	1.312
+++ loncom/interface/lonsearchcat.pm	2010/02/13 01:12:16	1.320
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.312 2009/07/31 10:58:57 bisitz Exp $
+# $Id: lonsearchcat.pm,v 1.320 2010/02/13 01:12:16 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -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";
+        $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 .= ">";
+        $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 = '';
@@ -324,7 +324,7 @@ END
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/searchcat?'.&Apache::loncommon::inhibit_menu_check().
                   '&amp;phase=disp_adv'.
-                  'catalogmode='.$env{'form.catalogmode'}.
+                  '&amp;catalogmode='.$env{'form.catalogmode'}.
                   '&amp;launch='.$env{'form.launch'}.
                   '&amp;mode='.$env{'form.mode'},
                   text=>"Course Search",
@@ -492,7 +492,7 @@ sub course_search {
     &Apache::lonhtmlcommon::add_breadcrumb
         ({href=>'/adm/searchcat?'.&Apache::loncommon::inhibit_menu_check().
               '&amp;phase=disp_adv'.
-              'catalogmode='.$env{'form.catalogmode'}.
+              '&amp;catalogmode='.$env{'form.catalogmode'}.
               '&amp;launch='.$env{'form.launch'}.
               '&amp;mode='.$env{'form.mode'},
               text=>"Course Search",
@@ -770,14 +770,26 @@ sub setup_basic_search {
                               portfolio => 'Portfolio Search',
     );
     my ($userelatedwords,$onlysearchdomain,$inclext,$adv_search_link,$scrout);
-    $userelatedwords = '<label>'.&mt('[_1] use related words',
-      &Apache::lonhtmlcommon::checkbox('related',$env{'form.related'},'related')).
-                       '</label>';
-    $onlysearchdomain = '<label>'.&mt('[_1] only search domain [_2]',
-      &Apache::lonhtmlcommon::checkbox('domains',$env{'form.domains'},
-                                       $r->dir_config('lonDefDomain')),
-				      $r->dir_config('lonDefDomain')).
-                        '</label>';
+
+    $userelatedwords = '<label>'
+                      .&Apache::lonhtmlcommon::checkbox(
+                           'related',
+                           $env{'form.related'},
+                           'related')
+                      .' '
+                     .&mt('use related words')
+                     .'</label>';
+
+    $onlysearchdomain = '<label>'
+                       .&Apache::lonhtmlcommon::checkbox(
+                           'domains',
+                           $env{'form.domains'},
+                           $r->dir_config('lonDefDomain'))
+                       .' '
+                       .&mt('only search domain [_1]'
+                               ,'<b>'.$r->dir_config('lonDefDomain').'</b>')
+                       .'</label>';
+
     $adv_search_link = '<a href="/adm/searchcat?'.
 	               &Apache::loncommon::inhibit_menu_check().
 		       '&amp;phase=disp_adv'.
@@ -798,7 +810,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 {
@@ -810,23 +822,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;
 } 
 
@@ -852,15 +868,18 @@ sub print_advanced_search_form{
 				       'reset' => 'Reset',
 				       'help' => 'Help');
     my $advanced_buttons=<<"END";
+<p>
 <input type="submit" name="advancedsubmit" value='$lt{"srch"}' />
 <input type="reset" name="reset" value='$lt{"reset"}' />
 $closebutton
+</p>
 END
     my $srchtype = 'Catalog';
     my $jscript;
     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";
@@ -868,24 +887,33 @@ function additional_metadata() {
         document.advsearch.submit();
     }
 }
+// ]]>
 </script>';
     }
     my $scrout= &Apache::loncommon::start_page("Advanced $srchtype Search",
                                                $jscript);
-    $scrout .= <<"ENDHEADER";
-$bread_crumb
-<form method="post" action="/adm/searchcat" name="advsearch">
-<p>
-$advanced_buttons
-ENDHEADER
-    $scrout.=('&nbsp;'x2).&viewoptions().'</p>'.$hidden_fields. 
-        '<input type="hidden" name="phase" value="adv_search" />';
+    $scrout .= $bread_crumb;
+
+    $scrout .= '<form method="post" action="/adm/searchcat" name="advsearch">'
+              .$hidden_fields 
+              .'<input type="hidden" name="phase" value="adv_search" />';
+
+    $scrout .= '<fieldset>'."\n"
+              .'<legend>'.&mt('Display Options').'</legend>'."\n"
+              .&viewoptions()
+              .'</fieldset>';
+
+    $scrout .= $advanced_buttons;
+
+    $scrout .= &Apache::lonhtmlcommon::start_pick_box();
+
     my %fields=&Apache::lonmeta::fieldnames();
-    #
-    $scrout .= '<h3>'.&mt("Standard $srchtype Metadata").'</h3>';
-    $scrout .= "<table>\n";
-    $scrout .= '<tr><td>&nbsp;</td><td colspan="2"><font size="-1">'.
-        ('&nbsp;'x2).&searchhelp()."</font></td></tr>\n";
+
+    # Standard Metadata
+    $scrout .= &Apache::lonhtmlcommon::row_headline()
+              .'<h3>'.&mt("Standard $srchtype Metadata").'</h3>'
+              .&searchhelp()
+              .&Apache::lonhtmlcommon::row_closure();
     my %related_word_search = 
         ('title'    => 1,
          'author'   => 0,
@@ -897,110 +925,111 @@ ENDHEADER
          'abstract' => 1,
          'standards'=> 1,
          'mime'     => 1,
-	 'subject'  => 1,
+         'subject'  => 1,
          );
     #
     foreach my $field ('title','author','subject','owner','authorspace',
-		       'modifyinguser','keywords','notes','abstract',
-		       'standards','mime') {
-	$scrout.='<tr><td align="right">'.&titlefield($fields{$field}).'</td><td>'.
-	    &Apache::lonmeta::prettyinput($field,
+                       'modifyinguser','keywords','notes','abstract',
+                       'standards','mime') {
+        $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield($fields{$field}))
+                  .&Apache::lonmeta::prettyinput($field,
                                           $env{'form.'.$field},
                                           $field,
                                           'advsearch',
-					  $related_word_search{$field},
-                                          '</td><td align="left">',
+                                          $related_word_search{$field},
+                                          '',
                                           $env{'form.'.$field.'_related'},
                                           50);
         if ($related_word_search{$field}) {
             $scrout .= &mt('related words');
         } else {
-            $scrout .= '</td><td>&nbsp;';
+            $scrout .= '';
         }
-        $scrout .= '</td></tr>'.$/;
+        $scrout .= &Apache::lonhtmlcommon::row_closure();
     }
     foreach my $field ('lowestgradelevel','highestgradelevel') {
-	$scrout.='<tr>'.
-            '<td align="right">'.&titlefield($fields{$field}).'</td>'.
-            '<td colspan="2">'.
-	    &Apache::lonmeta::prettyinput($field,
+        $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield($fields{$field}))
+                  .&Apache::lonmeta::prettyinput($field,
                                           $env{'form.'.$field},
                                           $field,
                                           'advsearch',
-					  0).
-                                          '</td></tr>'.$/;
+                                          0)
+                  .&Apache::lonhtmlcommon::row_closure();
     }
-    $scrout.='<tr><td align="right">'.
-	&titlefield(&mt('MIME Type Category')).'</td><td colspan="2">'. 
-	    &Apache::loncommon::filecategoryselect('category',
-						   $env{'form.category'}).
-	    '</td></tr>'.$/;
-    $scrout.='<tr><td align="right" valign="top">'.
-	&titlefield(&mt('Domains')).'</td><td colspan="2">'. 
-	    &Apache::loncommon::domain_select('domains',
-						   $env{'form.domains'},1).
-						   '<br />';
-     $scrout .= '</td></tr>'.$/;
-    #
+
+    $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('MIME Type Category')))
+              .&Apache::loncommon::filecategoryselect('category',
+                   $env{'form.category'})
+              .&Apache::lonhtmlcommon::row_closure();
+
+    $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('Domains')))
+              .&Apache::loncommon::domain_select('domains',
+                   $env{'form.domains'},1)
+              .&Apache::lonhtmlcommon::row_closure();
+
     # Misc metadata
     if ($env{'form.area'} ne 'portfolio') {
-        $scrout.='<tr><td align="right" valign="top">'.
-	         &titlefield(&mt('Copyright/Distribution')).
-                 '</td><td colspan="2">'.
-                 &Apache::lonmeta::selectbox('copyright',
+        $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('Copyright/Distribution')))
+                  .&Apache::lonmeta::selectbox('copyright',
                                              $env{'form.copyright'},
                                 \&Apache::loncommon::copyrightdescription,
                                        ( undef,
                                         &Apache::loncommon::copyrightids)
-                                ).'</td></tr>'.$/;
+                                )
+                  .&Apache::lonhtmlcommon::row_closure();
     }
-    $scrout.='<tr><td align="right" valign="top">'.
-	&titlefield(&mt('Language')).'</td><td colspan="2">'.
-        &Apache::lonmeta::selectbox('language',
+
+    $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('Language')))
+              .&Apache::lonmeta::selectbox('language',
                                     $env{'form.language'},
                                     \&Apache::loncommon::languagedescription,
                                     ('any',&Apache::loncommon::languageids)
-                                    ).'</td></tr>';
-    $scrout .= "</table>\n";
-
+                                    )
+              .&Apache::lonhtmlcommon::row_closure();
     
+    # Portfolio Metadata
     if ($env{'form.area'} eq 'portfolio') {
         # Added fields
         my $curnumadd = $env{'form.numaddedfields'};
         if ($curnumadd eq '') {
             $curnumadd = 1;
         }
-        $scrout .= '<h3>'.&mt('Custom Metadata fields').'</h3>';
-        $scrout .= "<table>\n";
-        $scrout .= '<tr><td>&nbsp;</td><td align="center">'.
-                   &mt('Field Name').'</td>'.'<td align="center">'.
-                   &mt('Field Value(s)').'</td></tr>';
+        $scrout .= &Apache::lonhtmlcommon::row_headline()
+                  .'<h3>'.&mt('Custom Metadata fields').'</h3>'
+                  .&Apache::lonhtmlcommon::row_closure()
+                  .&Apache::lonhtmlcommon::row_title('')
+                  .&mt('Field Name').' | '.&mt('Field Value(s)')
+                  .&Apache::lonhtmlcommon::row_closure();
 
         for (my $j=0; $j<$curnumadd; $j++) {
             my $num = $j+1;
-            $scrout .= '<tr><td>'.&mt('Custom metadata [_1]: ',$num).
-                       '</td><td align="center">'.
-                       '<input type="text" name="addedfield_'.$j.
-                       '" size="10" value="'.$env{'form.addedfield_'.$j}.
-                       '" /></td>'.
-                       '<td align="center"><input type="text" '.
-                       'name="addedvalues_'.$j.'" size="15" value="'.
-                       $env{'form.addedvalues_'.$j}.'" /></td></tr>';
-        }
-        $scrout .= '<tr><td align="left" colspan="3"><label>'.
-                   '<input type="checkbox" name="newfield" '.
-                   'value="1" onclick="javascript:additional_metadata()" />'.
-                   &mt('Another custom field/value pair?').'</label>'.
-                   '<input type="hidden" name="numaddedfields" value="'.
-                   $curnumadd.'" /></td></tr></table>';
-    } else {
+            $scrout .= &Apache::lonhtmlcommon::row_title(&mt('Custom metadata [_1]',$num))
+                      .'<input type="text"'
+                      .' name="addedfield_'.$j.'" size="10"'
+                      .' value="'.$env{'form.addedfield_'.$j}.'" />'
+                      .' '
+                      .'<input type="text" '
+                      .'name="addedvalues_'.$j.'" size="15"'
+                      .' value="'.$env{'form.addedvalues_'.$j}.'" />'
+                      .&Apache::lonhtmlcommon::row_closure();
+        }
+        $scrout .= &Apache::lonhtmlcommon::row_title('')
+                  .'<label>'
+                  .'<input type="checkbox" name="newfield"'
+                  .' value="1" onclick="javascript:additional_metadata()" />'
+                  .&mt('Another custom field/value pair?').'</label>'
+                  .'<input type="hidden" name="numaddedfields"'
+                  .' value="'.$curnumadd.'" />'
+                  .&Apache::lonhtmlcommon::row_closure();
+} else {
         #
         # Dynamic metadata
-        $scrout .= '<h3>'.&mt('Problem Statistics').'</h3>';
-        $scrout .= "<table>\n";
-        $scrout .= '<tr><td>&nbsp;</td><td align="center">'.
-                   &mt('Minimum').'</td>'.'<td align="center">'.
-                   &mt('Maximum').'</td></tr>'."\n";
+        $scrout .= &Apache::lonhtmlcommon::row_headline()
+                  .'<h3>'.&mt('Problem Statistics').'</h3>'
+                  .&Apache::lonhtmlcommon::row_closure();
+        $scrout .= &Apache::lonhtmlcommon::row_title('')
+                  .&mt('Minimum').' | '.&mt('Maximum')
+                  .&Apache::lonhtmlcommon::row_closure();
         foreach my $statistic 
             ({ name=>'count',
                description=>'Network-wide number of accesses (hits)',},
@@ -1013,20 +1042,21 @@ ENDHEADER
                description=>'Degree of difficulty',},
              { name => 'disc',
                description=>'Degree of discrimination'}) {
-              $scrout .= '<tr><td align="right">'.
-                         &titlefield(&mt($statistic->{'description'})).
-                         '</td><td align="center">'.
-                         '<input type="text" name="'.$statistic->{'name'}.
-                         '_min" value="" size="6" /></td><td align="center">'.
-                         '<input type="text" name="'.$statistic->{'name'}.
-                         '_max" value="" size="6" /></td></tr>'.$/;
-        }
-        $scrout .= "</table>\n";
-        $scrout .= '<h3>'.&mt('Evaluation Data').'</h3>';
-        $scrout .= "<table>\n";
-        $scrout .= '<tr><td>&nbsp;</td><td align="center">'.
-                   &mt('Minimum').'</td>'.'<td align="center">'.
-                   &mt('Maximum').'</td></tr>'."\n";
+              $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt($statistic->{'description'})))
+                        .'<input type="text" name="'.$statistic->{'name'}
+                        .'_min" value="" size="6" />'
+                        .' '
+                        .'<input type="text" name="'.$statistic->{'name'}
+                        .'_max" value="" size="6" />'
+                        .&Apache::lonhtmlcommon::row_closure();
+        }
+
+        $scrout .= &Apache::lonhtmlcommon::row_headline()
+                  .'<h3>'.&mt('Evaluation Data').'</h3>'
+                  .&Apache::lonhtmlcommon::row_closure();
+        $scrout .= &Apache::lonhtmlcommon::row_title('')
+                  .&mt('Minimum').' | '.&mt('Maximum')
+                  .&Apache::lonhtmlcommon::row_closure();
         foreach my $evaluation
             ( { name => 'clear',
                 description => 'Material presented in clear way'},
@@ -1038,22 +1068,24 @@ ENDHEADER
                 description => 'Material appears to be correct'},
               { name => 'technical',
                 description => 'Resource is technically correct'}){
-            $scrout .= '<tr><td align="right">'.
-                       &titlefield(&mt($evaluation->{'description'})).
-                       '</td><td align="center">'.
-                       '<input type="text" name="'.
-                       $evaluation->{'name'}.'_min" value="" size="6" />'.
-                       '</td><td align="center"><input type="text" name="'.
-                       $evaluation->{'name'}.'_max" value="" size="6" />'.
-                       '</td></tr>'.$/;
+            $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt($evaluation->{'description'})))
+                      .'<input type="text" name="'
+                      .$evaluation->{'name'}.'_min" value="" size="6" />'
+                      .' '
+                      .'<input type="text" name="'
+                      .$evaluation->{'name'}.'_max" value="" size="6" />'
+                      .&Apache::lonhtmlcommon::row_closure();
         }
-        $scrout .= "</table>\n";
     }
     #
     # Creation/Modification date limits
-    $scrout .= '<h3>'.&mt('Creation and Modification dates').'</h3>';
-    $scrout .= "\n<table>\n";
-    $scrout .= "<tr><td>&nbsp;</td><td>".&mt('Month[_1]Day[_2]Year','&nbsp;'x14,'&nbsp;'x6)."</td></tr>\n";
+    $scrout .= &Apache::lonhtmlcommon::row_headline()
+              .'<h3>'.&mt('Creation and Modification dates').'</h3>'
+              .&Apache::lonhtmlcommon::row_closure();
+    $scrout .= &Apache::lonhtmlcommon::row_title('')
+              .&mt('Month[_1]Day[_2]Year','&nbsp;'x14,'&nbsp;'x6)
+              .&Apache::lonhtmlcommon::row_closure();
+
     my $cafter = 
         &Apache::lonhtmlcommon::date_setter('advsearch',         # formname
                                             'creationdate1', # fieldname
@@ -1072,10 +1104,13 @@ ENDHEADER
                                             '',          # state
                                             1,           # no_hh_mm_ss
                                             );
-    $scrout .= '<tr><td align="right">'.&mt('Created between').'</td>'
-              .'<td>'.$cafter.'</td></tr>'
-              .'<tr><td align="right">'.&mt('and').'</td>'
-              .'<td>'.$cbefore.'</td></tr>';
+    $scrout .= &Apache::lonhtmlcommon::row_title(&mt('Created between'))
+              .$cafter
+              .&Apache::lonhtmlcommon::row_closure(1)
+              .&Apache::lonhtmlcommon::row_title(&mt('and'))
+              .$cbefore
+              .&Apache::lonhtmlcommon::row_closure();
+
     my $lafter = 
         &Apache::lonhtmlcommon::date_setter('advsearch',
                                             'revisiondate1', 
@@ -1094,15 +1129,18 @@ ENDHEADER
                                             '',          # state
                                             1,           # no_hh_mm_ss
                                             );
-    $scrout .= '<tr><td align="right">'.&mt('Last modified between').'</td>'
-              .'<td>'.$lafter.'</td></tr>'
-              .'<tr><td align="right">'.&mt('and').'</td>'
-              .'<td>'.$lbefore.'</td></tr>';
-    $scrout.="</table>\n";
-    $scrout.=<<ENDDOCUMENT;
-$advanced_buttons
-</form>
-ENDDOCUMENT
+    $scrout .= &Apache::lonhtmlcommon::row_title(&mt('Last modified between'))
+              .$lafter
+              .&Apache::lonhtmlcommon::row_closure(1)
+              .&Apache::lonhtmlcommon::row_title(&mt('and'))
+              .$lbefore
+              .&Apache::lonhtmlcommon::row_closure(1); # Last row of total pick_box
+
+    $scrout .= &Apache::lonhtmlcommon::end_pick_box();
+
+    $scrout .= $advanced_buttons
+              .'</form>';
+
     $scrout .= &Apache::loncommon::end_page();
     $r->print($scrout);
     return;
@@ -1172,21 +1210,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;
 }
@@ -2167,9 +2207,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;
     }
     ##
@@ -2251,6 +2295,7 @@ sub print_sort_form {
     }
     my $js =<<END;
 <script type="text/javascript">
+// <![CDATA[
     function change_sort() {
         var newloc = "/adm/searchcat?phase=results";
         newloc += "&amp;persistent_db_id=$env{'form.persistent_db_id'}";
@@ -2258,6 +2303,7 @@ sub print_sort_form {
         newloc += document.forms.statusform.elements.sortby.value;
         parent.resultsframe.location= newloc;
     }
+// ]]>
 </script>
 END
 
@@ -2400,16 +2446,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();
 }
 
@@ -2436,9 +2494,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;
@@ -2470,7 +2533,7 @@ sub revise_button {
             '&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;
 }
 
@@ -2691,7 +2754,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
@@ -2701,11 +2764,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;
 }
@@ -2728,15 +2791,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>';
 }
 
 ######################################################################
@@ -2905,29 +2968,32 @@ 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" />'.
-                  '<p class="LC_info">'.&mt('There are currently no results').'.</p>'.
+                  '<p class="LC_info">'.&mt('There are currently no results.').'</p>'.
                   "</form>".
 		  &Apache::loncommon::end_page());
         return;
@@ -2995,15 +3061,13 @@ sub display_results {
                  .&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'}.
                                 "&amp;phase=results".
                                 "&amp;persistent_db_id=".
                                 $env{'form.persistent_db_id'})
-             ."</center>\n"
-             );
+        );
     }
     $r->print("</form>".&Apache::loncommon::end_page());
     $r->rflush();
@@ -3033,7 +3097,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
         }
@@ -3043,7 +3107,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
     }
@@ -3212,6 +3276,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);
@@ -3227,6 +3292,7 @@ sub search_results_header {
 	    parent.opener.inf.document.forms.resinfo.elements.u.value=val;
 	}
     }
+// ]]>
 </script>
 SCRIPT
         } elsif ($env{'form.mode'} eq 'edit') {
@@ -3251,6 +3317,7 @@ END
 
             $js.=<<SCRIPT;
 <script type="text/javascript">
+// <![CDATA[
 function select_data(title,url) {
     changeURL(url);
     changeTitle(title);
@@ -3265,6 +3332,7 @@ function changeURL(val) {
         alert("Unable to transfer data to "+url);
     }
 }
+// ]]>
 </script>
 SCRIPT
         }
@@ -3272,6 +3340,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") {
@@ -3293,6 +3362,7 @@ SCRIPT
     "/adm/groupsort?mode=$env{'form.mode'}&amp;catalogmode=import$inhibit_menu&amp;acts="+
 	    parent.statusframe.document.forms.statusform.elements.acts.value;
     }
+// ]]>
 </script>
 SCRIPT
 
@@ -3324,8 +3394,10 @@ sub print_frames_interface {
     my $results_link = &results_link();
     my $js = <<JS;
 <script type="text/javascript">
+// <![CDATA[
 var targetwin = opener;
 var queue = '';
+// ]]>
 </script>
 JS
 
@@ -3481,7 +3553,7 @@ sub detailed_citation_view {
             $result .= '<b>'.&mt($field->{'translate'}).'</b>';
             foreach my $item (split(',',$values{$field->{'name'}})){
                 $item = &Apache::lonnet::clutter($item);
-                $result .= &display_url($item,[2,0,1]);
+                $result .= '<br />'.&display_url($item,1).'<br />';
             }
         } elsif (exists($field->{'format'}) && $field->{'format'} ne ''){
             $result.= &mt($field->{'translate'},
@@ -3489,7 +3561,7 @@ sub detailed_citation_view {
                                   $values{$field->{'name'}}))."<br />\n";
         } else {
             if ($field->{'special'} eq 'url link') {
-                $result .= &display_url($jumpurl,[3,0,1]);
+                $result .= '<br />'.&display_url($jumpurl,1).'<br />';
             } else {
                 $result.= &mt($field->{'translate'},
                               $values{$field->{'name'}});
@@ -3543,7 +3615,7 @@ sub summary_view {
     }
     my $jumpurl=$values{'url'};
     $jumpurl=~s|^/ext/|http://|;
-    my $link = &display_url($jumpurl,[2,0,1]);
+    my $link = '<br />'.&display_url($jumpurl,1).'<br />';
 
     $result.=<<END;
 <a href="$jumpurl?inhibitmenu=yes" 
@@ -3579,7 +3651,7 @@ sub compact_view {
     my $jumpurl=$values{'url'};
     $jumpurl=~s|^/ext/|http://|;
 
-    my $link = &display_url($jumpurl,[1,1,1]);
+    my $link = &display_url($jumpurl,1);
     
     my $result = 
         $prefix.'<img src="'.&Apache::loncommon::icon($values{'url'}).'" alt="" />';
@@ -3598,7 +3670,7 @@ sub compact_view {
 }
 
 sub display_url {
-    my ($url,$crumb_args) = @_;
+    my ($url,$skiplast) = @_;
     my $link;
     if ($url=~m|^/ext/|) {
 	$url=~s|^/ext/|http://|;
@@ -3606,10 +3678,12 @@ sub display_url {
     } elsif ($url=~m{^(http://|/uploaded/)}) {
 	$link='<span class="LC_filename">'.$url.'</span>';
     } else {
-        $link=&Apache::lonhtmlcommon::crumbs($url,
-		  'preview',
-		  '',
-		  (($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),@{$crumb_args}).' ';
+        $link=&Apache::lonhtmlcommon::crumbs(
+                  $url,
+                  'preview',
+                  '',
+                  (($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),
+                  $skiplast).' ';
     }
     return $link;
 }
@@ -3824,21 +3898,30 @@ 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 $revise = &mt('Revise Search Request');
-    my $heading = &mt('Unactionable Search Queary');
+    my $heading = &mt('Unactionable Search Query');
     my $start_page = &Apache::loncommon::start_page('Search');
     my $end_page   = &Apache::loncommon::end_page();
+    if ($closebutton) {
+        $closebutton = '<p>'.$closebutton.'</p><hr />';
+    } else {
+        &Apache::lonhtmlcommon::add_breadcrumb
+            ({href=>'',
+              text=>$heading,});
+        $start_page .= &Apache::lonhtmlcommon::breadcrumbs();
+    }
+
     $r->print(<<ENDPAGE);
 $start_page
 <form method="post" action="/adm/searchcat">
 $hidden_fields
 $closebutton
-<hr />
+</form>
 <h2>$heading</h2>
 <p class="LC_warning">
 $errormsg
 </p>
 <p>
-<a href="/adm/searchcat?$parms&amp;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>
 </p>
 $end_page
 ENDPAGE
@@ -3875,7 +3958,7 @@ $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 />