--- loncom/interface/lonsearchcat.pm	2009/07/31 16:01:48	1.313
+++ loncom/interface/lonsearchcat.pm	2009/10/06 10:31:41	1.315
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.313 2009/07/31 16:01:48 bisitz Exp $
+# $Id: lonsearchcat.pm,v 1.315 2009/10/06 10:31:41 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -268,23 +268,23 @@ sub handler {
     if ($env{'form.catalogmode'} eq 'interactive') {
         $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 .=">\n";
+        $closebutton .=" />\n";
     } elsif ($env{'form.catalogmode'} eq 'import') {
         $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 .= ">";
+        $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 = '';
@@ -856,9 +856,11 @@ 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;
@@ -878,20 +880,28 @@ function additional_metadata() {
     }
     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,
@@ -903,110 +913,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)',},
@@ -1019,20 +1030,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'},
@@ -1044,22 +1056,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
@@ -1078,10 +1092,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', 
@@ -1100,15 +1117,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;
@@ -3864,21 +3884,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