--- loncom/interface/lonsyllabus.pm	2009/06/08 18:04:46	1.92
+++ loncom/interface/lonsyllabus.pm	2009/09/20 22:04:57	1.97
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Syllabus
 #
-# $Id: lonsyllabus.pm,v 1.92 2009/06/08 18:04:46 bisitz Exp $
+# $Id: lonsyllabus.pm,v 1.97 2009/09/20 22:04:57 amueller Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -141,7 +141,7 @@ ENDSCRIPT
         }
         my $start_page =
          &Apache::loncommon::start_page("Syllabus", $rss_link.$js,
-                       {'function'       => $forcestudent,
+                       {'function'       => undef,
                         'domain'         => $cdom,
                         'force_register' =>
                         $env{'form.register'},});
@@ -162,7 +162,6 @@ ENDSCRIPT
                 text=>"Course syllabus"});
             $r->print(&Apache::lonhtmlcommon::breadcrumbs());
         }
-
     }
 # ---------------------------------------------------------- Load syllabus info
     my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum);
@@ -230,7 +229,41 @@ ENDSCRIPT
         }
     }
 
-#---------------------Print External URL Syllabus Info
+#--------Functions
+    if( ($allowed || $privileged) && $target ne 'tex') {
+        my $functions=&Apache::lonhtmlcommon::start_funclist();
+        if ($allowed) {
+			#if you have the register flag, keep it
+			if($env{'form.register'} == 1) {
+            	$functions.=&Apache::lonhtmlcommon::add_item_funclist(
+                          '<a href="'.$r->uri.'?forcestudent=1&register=1">'
+                           .&mt('Show Public View').'</a>'
+                           .&Apache::loncommon::help_open_topic(
+                                'Uploaded_Templates_PublicView'));
+			} else {
+            	$functions.=&Apache::lonhtmlcommon::add_item_funclist(
+                          '<a href="'.$r->uri.'?forcestudent=1">'
+                           .&mt('Show Public View').'</a>'
+                           .&Apache::loncommon::help_open_topic(
+                                'Uploaded_Templates_PublicView'));
+			}
+        } elsif ($privileged) {
+			if($env{'form.register'} == 1) {
+	            $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+                           '<a href="'.$r->uri.'?forceedit=1&register=1">'
+                            .&mt('Edit').'</a>');
+			} else {
+	            $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+                           '<a href="'.$r->uri.'?forceedit=1">'
+                            .&mt('Edit').'</a>');
+			}
+        }
+
+        $functions.=&Apache::lonhtmlcommon::end_funclist();
+        $r->print(&Apache::loncommon::head_subbox($functions));
+    }
+
+#---------------------Print External URL Syllabus Info and Help Text
     if( ($allowed) && ($target ne 'tex') ) {
         my $protocol = $Apache::lonnet::protocol{$homeserver};
           $protocol = 'http' if ($protocol ne 'https');
@@ -240,18 +273,16 @@ ENDSCRIPT
                  .'&nbsp;'.&Apache::loncommon::help_open_topic('Syllabus_ExtLink')
                  .'</p>'
                  .'<p class="LC_info">'
-                 .&mt('Instead of using this template you can specify an external URL as Syllabus in the [_1]Course Parameters[_2].'
-                     ,'<a href="/adm/parmset?action=crsenv">','</a>')
+                 .&mt('Instead of using this template you can specify an external URL as Syllabus in the [_1]Course Configuration[_2].'
+                     ,'<a href="/adm/courseprefs?actions=courseinfo&phase=display">','</a>')
                  .'</p>'
         );
+        #-Print Help Text
+        $r->print(&Apache::loncommon::help_open_topic( 
+                        'Uploaded_Templates_TextBoxes',
+                        &mt('Help with filling in text boxes')));
     }
 
-#-Print Help Text
-    if ($target ne 'tex') {
-        if ($allowed) {
-            $r->print(&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')));
-        }
-    }
 #----------Print last update
     my $lastmod=$syllabus{'uploaded.lastmodified'};
     $lastmod=($lastmod?&Apache::lonlocal::locallocaltime($lastmod):&mt('never'));
@@ -273,21 +304,6 @@ ENDSCRIPT
                   :'')
              .'\\\\');
     }
-#--------Functions
-    if ($target ne 'tex') {
-        if( $allowed || $privileged) {
-            $r->print(&Apache::lontemplate::start_functionslist());
-        if ($allowed) {
-            $r->print(&Apache::lontemplate::item_functionslist(
-                        '<a href="'.$r->uri.'?forcestudent=1">'.&mt('Show Public View').'</a>'
-                       .&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView')));
-        } elsif ($privileged) {
-            $r->print(&Apache::lontemplate::item_functionslist(
-                        '<a href="'.$r->uri.'?forceedit=1">'.&mt('Edit').'</a>'));
-        }
-            $r->print(&Apache::lontemplate::end_functionslist());
-        }
-    }
 #----------------------------Print Headtitle
     if ($target ne 'tex') {
         $r->print('<h1>'.$courseenv{'description'}.'</h1>');
@@ -361,7 +377,7 @@ ENDSCRIPT
 # ---------------------------------------------------------------- Get syllabus
     if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
         if ($allowed) {
-            $r->print('<form method="post">'.
+            $r->print('<form method="post" action="">'.
             '<input type="hidden" name="forceedit" value="edit" />');
         }
         my @htmlids=();
@@ -404,9 +420,6 @@ ENDSCRIPT
                     }
                     $message=&Apache::lontexconvert::msgtexconverted($message);
                     if ($target ne 'tex') {
-                        if ($allowed) {
-                            $r->print('<p>');
-                        }
                         &Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message,$allowed,'LC_Box');
                     } else {
                         $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.
@@ -416,7 +429,6 @@ ENDSCRIPT
                 }
                 if ($allowed) {
                     if ($target ne 'tex') {
-                        $r->print('</p>');
                         &Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field);
                     }
                 }