--- loncom/interface/lonsyllabus.pm	2007/07/27 00:17:17	1.60
+++ loncom/interface/lonsyllabus.pm	2008/08/25 14:50:01	1.67
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Syllabus
 #
-# $Id: lonsyllabus.pm,v 1.60 2007/07/27 00:17:17 albertel Exp $
+# $Id: lonsyllabus.pm,v 1.67 2008/08/25 14:50:01 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -110,15 +110,58 @@ sub handler {
 # ----------------------------------------------------------------- Make header 
     if ($target ne 'tex') {
 	my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom);
-    
+        my $js;
+        if ($env{'form.backto'} eq 'coursecatalog') {
+            $js .= <<"ENDSCRIPT";
+
+<script type="text/javascript">
+function ToCatalog(caller) {
+    numidx = getIndexByName('coursenum');
+    if (numidx > -1) {
+        if (caller != 'details') {
+            document.backtocat.elements[numidx].value = '';
+        }
+    }
+    document.backtocat.submit();
+}
+
+function getIndexByName(item) {
+    for (var i=0;i<document.backtocat.elements.length;i++) {
+        if (document.backtocat.elements[i].name == item) {
+            return i;
+        }
+    }
+    return -1;
+}
+
+</script>
+
+ENDSCRIPT
+        }
 	my $start_page = 
-	    &Apache::loncommon::start_page("Syllabus", $rss_link,
+	    &Apache::loncommon::start_page("Syllabus", $rss_link.$js,
 					   {'function'       => $forcestudent,
 					    'domain'         => $cdom,
 					    'force_register' =>
 						$env{'form.register'},});
 
-	$r->print($start_page.'<h1>'.$courseenv{'description'}.'</h1><h3>'.
+	$r->print($start_page);
+        if ($env{'form.backto'} eq 'coursecatalog') {
+            &Apache::lonhtmlcommon::clear_breadcrumbs();
+            &Apache::lonhtmlcommon::add_breadcrumb
+             ({href=>"javascript:ToCatalog()",
+               text=>"Course Catalog"});
+            if ($env{'form.coursenum'} ne '') {
+                &Apache::lonhtmlcommon::add_breadcrumb
+                  ({href=>"javascript:ToCatalog('details')",
+                   text=>"Course details"});
+            }
+            &Apache::lonhtmlcommon::add_breadcrumb
+              ({href=>$r->uri,
+               text=>"Course syllabus"});
+            $r->print(&Apache::lonhtmlcommon::breadcrumbs());
+        }
+        $r->print('<h1>'.$courseenv{'description'}.'</h1><h3>'.
 		  &Apache::lonnet::domain($cdom,'description').'</h3>');
     } else {
 	$r->print('\noindent{\large\textbf{'.$courseenv{'description'}.'}}\\\\\\\\\textbf{'.
@@ -136,35 +179,41 @@ sub handler {
 # -------------------------------------------------------- Get course personnel
     my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum);
     if ($target ne 'tex') {
-	$r->print('<table border="2">');
+	$r->print(&Apache::loncommon::start_data_table());
     } else {
 	$r->print('\begin{tabular}{|p{0.45\textwidth}|p{0.45\textwidth}|}\hline');
     }
     foreach my $element (sort keys %coursepersonnel) {
 	if ($target ne 'tex') {
-	    $r->print('<tr><td>'.$element.'</td><td>');
+	    $r->print(&Apache::loncommon::start_data_table_row().
+		      '<td>'.$element.'</td><td>');
 	} else {
 	    $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$element).' & '); 
 	}
         foreach (split(/\,/,$coursepersonnel{$element})) {
 	    my ($puname,$pudom)=split(/\:/,$_);
 	    if ($target ne 'tex') {
-		$r->print(' '.&Apache::loncommon::aboutmewrapper(
-                              &Apache::loncommon::plainname($puname,
-                              $pudom),$puname,$pudom));
+                my $courseperson = &Apache::loncommon::plainname($puname,$pudom);
+                if (($env{'user.name'} eq '') || ($env{'user.name'} eq 'public') ||
+                    ($env{'user.domain'} eq '') || ($env{'user.domain'} eq 'public')) {
+		    $r->print(' '.$courseperson);
+                } else {
+                    $r->print(' '.&Apache::loncommon::aboutmewrapper($courseperson,
+                              $puname,$pudom));
+                }
 	    } else {
 		$r->print(' '.&Apache::loncommon::plainname($puname,
                               $pudom).' ');
 	    }
 	}
 	if ($target ne 'tex') {
-	    $r->print('</td></tr>');
+	    $r->print('</td>'.&Apache::loncommon::end_data_table_row());
 	} else {
 	    $r->print('\\\\ \hline');
 	}
     }
     if ($target ne 'tex') {
-	$r->print('</table>');
+	$r->print(&Apache::loncommon::end_data_table());
     } else {
 	$r->print('\end{tabular}\\\\');
     }
@@ -189,7 +238,7 @@ sub handler {
        }
        if ($allowed) {
           $r->print('<p>'.
-&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'</p><p>'.&mt('This syllabus can be publicly viewed at')
+&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).'</p><p>'.&mt('This syllabus can be publicly viewed at')
 		    .' <tt>http://'.
 		    &Apache::lonnet::hostname($homeserver).$r->uri.'</tt>'.
                &Apache::loncommon::help_open_topic('Syllabus_ExtLink').'</p>'.
@@ -260,12 +309,16 @@ sub handler {
                      $syllabus{'uploaded.domain'});
        if ($target ne 'tex') {
 	   $r->print('<table><tr><td>'.&mt('Last updated').':</td><td>'.
-		     $lastmod.'</td><td>'.&mt('by').' '.$who.
+		     $lastmod.'</td><td>'.
+		     ($who ? &mt('by').' '.$who
+                           : '' ).
 		     '</td></tr></table><p>');
        } else {
-	   $r->print('\\\\ '.&mt('Last updated').': '.$lastmod.' '.&mt('by').'\\\\ '.
-		     &Apache::loncommon::plainname($syllabus{'uploaded.name'},
-                     $syllabus{'uploaded.domain'}).'\\\\');
+	   $r->print('\\\\ '.&mt('Last updated').': '.$lastmod.' '.
+		     ($who? &mt('by').'\\\\ '.
+		            &Apache::loncommon::plainname($syllabus{'uploaded.name'},$syllabus{'uploaded.domain'})
+		          :'')
+		     .'\\\\');
        }
        if ($allowed) {
 	   $r->print('<form method="post">'.
@@ -323,7 +376,7 @@ sub handler {
 	       if ($allowed) {
 		   $r->print('<br /><textarea cols="80" rows="12" name="'.$field.'" id="'.$field.'">'.
 			     &HTML::Entities::encode($syllabus{$field},'"&<>').
-			     '</textarea> <input type="submit" name="storesyl" value="Save" />');
+			     '</textarea> <input type="submit" name="storesyl" value="'.&mt('Save').'" />');
 	       }
 	   }
        }
@@ -334,10 +387,15 @@ sub handler {
        if ($target ne 'tex') {$r->print('</p>');} else {$r->print('\\\\');}
     } else {
 	if ($target ne 'tex') {$r->print('<p>');} else {$r->print('\par ');} 
-	$r->print('No syllabus information provided.');
+	$r->print(&mt('No syllabus information provided.'));
 	if ($target ne 'tex') {$r->print('</p>');}
     }
     if ($target ne 'tex') {
+        if ($env{'form.backto'} eq 'coursecatalog') {
+            $r->print('<form name="backtocat" method="post" action="/adm/coursecatalog">'.
+                      &Apache::lonhtmlcommon::echo_form_input(['backto','courseid']).
+                      '</form>');
+        }
 	$r->print(&Apache::loncommon::end_page());
     } else {
 	$r->print('\end{document}');