--- loncom/interface/lonsyllabus.pm	2008/12/16 20:00:11	1.73
+++ loncom/interface/lonsyllabus.pm	2009/02/13 17:26:55	1.76
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Syllabus
 #
-# $Id: lonsyllabus.pm,v 1.73 2008/12/16 20:00:11 ehlerst Exp $
+# $Id: lonsyllabus.pm,v 1.76 2009/02/13 17:26:55 neumanie Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -240,12 +240,14 @@ ENDSCRIPT
           if ($forcestudent or $target eq 'tex') { $allowed=0; }
        }
        if ($allowed) {
+          my $protocol = $Apache::lonnet::protocol{$homeserver};
+          $protocol = 'http' if ($protocol ne 'https');
           $r->print('<p><a href="'.$r->uri.'?forcestudent=1"><font size="+1">'.
 &mt('Show Public View').'</font></a>'.
           &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').
           '</p><p>'.
 &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://'.
+		    .' <tt>'.$protocol.'://'.
 		    &Apache::lonnet::hostname($homeserver).$r->uri.'</tt>'.
                &Apache::loncommon::help_open_topic('Syllabus_ExtLink').'</p>'.
           '<p>'.&mt('You can specify an external URL as Syllabus in the [_1].','<a href="/adm/parmset?action=crsenv">'.&mt('Course Parameters').'</a>').'</p>');
@@ -271,7 +273,7 @@ ENDSCRIPT
 # get rid of leading and trailing spaces
                       $url=~s/^\s+//;
                       $url=~s/\s+$//;
-                      if ($url=~m|^http://([^/]+)/(.+)$|) {
+                      if ($url=~m|^https?\://([^/]+)/(.+)$|) {
 			  my $host = $1;
                           my $remainder=$2;
 # remove the hostname from internal URLs
@@ -284,7 +286,7 @@ ENDSCRIPT
 		          }
 		      }
 # norm internal URLs
-                      unless ($url=~/^http\:/) {
+                      unless ($url=~/^https?\:/) {
 		          $url=&Apache::lonnet::clutter($url);
                       }
 # re-assemble field
@@ -327,8 +329,8 @@ ENDSCRIPT
 		     '<input type="hidden" name="forceedit" value="edit" />');
        }
        my @htmlids=();
-	&Apache::lontemplate::start_columnSection($r);
-	&Apache::lontemplate::start_ContentBox($r, $allowed);
+	#&Apache::lontemplate::start_columnSection($r);
+	#&Apache::lontemplate::start_ContentBox($r, $allowed);
 	foreach my $field (sort(keys(%syllabusfields))) {
 	   if (($syllabus{$field}=~/\w/) || ($allowed)) {
 	       my $message=$syllabus{$field};
@@ -361,14 +363,16 @@ ENDSCRIPT
 		   } 
 	       } else {
 		   &Apache::lonfeedback::newline_to_br(\$message);
-		   $message =~s|(https*://[^\s]+)|<a href="$1"><tt>$1</tt></a>|g;
+		   $message =~s|(https?\://[^\s]+)|<a href="$1"><tt>$1</tt></a>|g;
 		   if ($allowed) {
 		       $message=&Apache::lonspeller::markeduptext($message);
 		   }
 		   $message=&Apache::lontexconvert::msgtexconverted($message);
 		   if ($target ne 'tex') {
-			&Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message);
-
+			if($allowed){
+				$r->print('<p>');
+			}			
+			&Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message,$allowed,'LC_ContentBoxSpecial');
 		   } else {
 		       $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.
 				 &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
@@ -376,7 +380,10 @@ ENDSCRIPT
 		   push(@htmlids,$field);
 	       }
 	       if ($allowed) {
-		&Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field);
+			if($target ne 'tex'){
+				$r->print('</p>');
+			}
+			&Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field);
 	       }
 	   }
        }
@@ -384,8 +391,8 @@ ENDSCRIPT
                 $r->print('<p><a href="'.$r->uri.'?forcestudent=1"><font size="+1">'.&mt('Show Public View').'</font></a>'.
                                  &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');
         }
-	&Apache::lontemplate::end_ContentBox($r);
-	&Apache::lontemplate::end_columnSection($r);
+	#&Apache::lontemplate::end_ContentBox($r);
+	#&Apache::lontemplate::end_columnSection($r);
        if ($allowed) {
 	   $r->print('</form>'.
 		     &Apache::lonhtmlcommon::htmlareaselectactive(@htmlids));