--- loncom/interface/lonsearchcat.pm	2009/06/30 14:02:33	1.308
+++ loncom/interface/lonsearchcat.pm	2009/07/31 10:58:57	1.312
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.308 2009/06/30 14:02:33 bisitz Exp $
+# $Id: lonsearchcat.pm,v 1.312 2009/07/31 10:58:57 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',});
@@ -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'},
+                  '&phase=disp_adv'.
+                  '&catalogmode='.$env{'form.catalogmode'}.
+                  '&launch='.$env{'form.launch'}.
+                  '&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'.
+                  '&phase=disp_adv'.
                   'catalogmode='.$env{'form.catalogmode'}.
-                  '&launch='.$env{'form.launch'}.
-                  '&mode='.$env{'form.mode'},
+                  '&launch='.$env{'form.launch'}.
+                  '&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().
+              '&phase=disp_adv'.
+              'catalogmode='.$env{'form.catalogmode'}.
+              '&launch='.$env{'form.launch'}.
+              '&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
@@ -571,7 +584,7 @@ sub course_search {
                         $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>');
@@ -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" '.
@@ -926,7 +939,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
@@ -2240,8 +2253,8 @@ sub print_sort_form {
 <script type="text/javascript">
     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;
     }
@@ -2454,8 +2467,8 @@ 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';" /> };
     return $result;
@@ -2748,7 +2761,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;
     }
@@ -2765,7 +2780,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;
@@ -2779,7 +2797,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);
@@ -2906,15 +2927,15 @@ sub display_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
@@ -2944,13 +2965,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';
         }
@@ -2959,18 +2981,26 @@ 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,
                                 "table=".$env{'form.table'}.
-                                "&phase=results".
-                                "&persistent_db_id=".
+                                "&amp;phase=results".
+                                "&amp;persistent_db_id=".
                                 $env{'form.persistent_db_id'})
              ."</center>\n"
              );
@@ -3260,7 +3290,7 @@ 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>
@@ -3277,10 +3307,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;
 }
 
@@ -3288,9 +3318,9 @@ 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">
@@ -3382,7 +3412,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";
@@ -3474,17 +3504,14 @@ sub detailed_citation_view {
     if (exists($values{'shortabstract'}) && $values{'shortabstract'} ne '') {
         $result .= '<p>'.$values{'shortabstract'}.'</p>';
     }
-    $result .= '<hr />'."\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'});
 }
 
 
@@ -3501,7 +3528,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|
@@ -3520,24 +3547,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 />
 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'});
 }
 
 ######################################################################
@@ -3570,7 +3593,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;
 }
 
@@ -3610,7 +3633,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" 
@@ -3636,7 +3659,6 @@ END
     }
     $result .= "</dl>\n";
     $result .= $values{'extrashow'};
-    $result .= '<hr />'."\n";
     return $result;
 }
 
@@ -3710,7 +3732,6 @@ $prefix
 $xml
 </pre>
 $values{'extrashow'}
-<hr />
 END
     return $result;
 }
@@ -3750,9 +3771,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');
@@ -3766,11 +3790,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
@@ -3798,7 +3822,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');
@@ -3810,11 +3834,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
@@ -3845,6 +3869,7 @@ 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">
@@ -3852,9 +3877,10 @@ $hidden_fields
 <input type='button' value='Revise search request'
 onClick='this.form.submit();' />
 $closebutton
+</form>
 <hr />
-<h3>Error</h3>
-<p>
+<h3>$heading</h3>
+<p class="LC_error">
 $message
 </p>
 $end_page