--- loncom/interface/lonsyllabus.pm	2013/05/09 05:43:30	1.121
+++ loncom/interface/lonsyllabus.pm	2017/06/22 02:11:27	1.138.2.3.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Syllabus
 #
-# $Id: lonsyllabus.pm,v 1.121 2013/05/09 05:43:30 raeburn Exp $
+# $Id: lonsyllabus.pm,v 1.138.2.3.2.1 2017/06/22 02:11:27 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -35,6 +35,7 @@ use Apache::loncommon;
 use Apache::lonnet;
 use Apache::lontexconvert;
 use Apache::lonfeedback;
+use Apache::lonhtmlgateway;
 use Apache::lonannounce;
 use Apache::lonlocal;
 use Apache::lonhtmlcommon;
@@ -53,7 +54,7 @@ sub handler {
 # ------------------------------------------------------------ Get query string
     &Apache::loncommon::get_unprocessed_cgi
                         ($ENV{'QUERY_STRING'},['register','forceedit','todocs',
-                                               'folderpath','title']);
+                                               'folderpath','title','only_body']);
 # ----------------------------------------------------- Is this even a course?
     my $homeserver=&Apache::lonnet::homeserver($cnum,$cdom);
     if ($homeserver eq 'no_host') {
@@ -71,12 +72,7 @@ sub handler {
     }
 # ------------------------------------- There is such a course, get environment
     my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);
-
-# ------------------------------------------------------------ Print the screen
-
-    if ($target eq 'tex') {
-        $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));
-    }
+    my $crstype = &Apache::loncommon::course_type();
 
 # --------------------------------------------------------------- Force Student
     my ($forceedit,$forcestudent);
@@ -100,31 +96,64 @@ sub handler {
 # -------------------------------------------------- Let's see who handles this
     my $external=$courseenv{'externalsyllabus'};
     my $uploaded=$courseenv{'uploadedsyllabus'};
+    my $minimal=$courseenv{'minimalsyllabus'};
 
-    if ($uploaded =~/\w/) {
-        if ($external =~ m{\Q$uploaded\E$}) {
-            undef($external);
+    if (($minimal =~/\w/) || ($uploaded =~/\w/)) {
+        my ($item,$is_pdf);
+        if ($minimal =~/\w/) {
+            if ($external =~ m{\Q$minimal\E$}) {
+                undef($external);
+            }
+            $item = $minimal;
+        } elsif ($uploaded =~/\w/) {
+            if ($external =~ m{\Q$uploaded\E$}) {
+                undef($external);
+            }
+            $item = $uploaded;
+            if ($item =~ /\.pdf$/i) {
+                $is_pdf = 1;
+            }
         }
         unless ($allowed && $forceedit) {
-            my $file=&Apache::lonnet::filelocation("",$uploaded);
-            if ($file =~ /\.(sty|css|js|txt|tex|html?)$/) {  
-                my $filetype;
-                if ($file =~ /\.(sty|css|js|txt|tex)$/) {
-                    $filetype=$1;
-                } else {
-                    $filetype='html';
-                }
-                my $result = '';
+            my $file=&Apache::lonnet::filelocation("",$item);
+            if ($file =~ /\.(tex|x?html?)$/) {
+                my $filetype = $1;
                 my $filecontents=&Apache::lonnet::getfile($file);
                 if ($filecontents eq -1) {
                     $r->print(&mt('Syllabus file unavailable'));
-                } elsif ($filetype eq 'html') {
+                } elsif ($filetype eq 'tex') {
+                    if ($target eq 'tex') {
+                        $r->print($filecontents);
+                    } else {
+                        my $texengine = $env{'form.texengine'};
+                        if ($texengine eq '') {
+                            $texengine = 'tth';
+                        } elsif (lc($texengine) eq 'jsmath') {
+                            $texengine = 'MathJax';
+                        }
+                        my $result = &Apache::lontexconvert::converted(\$filecontents,$texengine);
+                        my %args;
+                        &get_breadcrumbs($cdom,$cnum,$crstype,\%args);
+                        if ($env{'form.only_body'}) {
+                            $args{'only_body'} = 1;
+                        }
+                        if ($env{'request.use_absolute'}) {
+                            $args{'use_absolute'} = $env{'request.use_absolute'};
+                        }
+                        $r->print(&Apache::loncommon::start_page("Syllabus",undef,\%args).
+                                  $result.
+                                  &Apache::loncommon::end_page());
+                    }
+                } else {
                     my %mystyle;
+                    unless ($target eq 'tex') {
+                        $target = 'web';
+                    }
                     &Apache::structuretags::reset_problem_globals();
                     my $oldfile = $env{'request.filename'};
-                    $env{'request.filename'} = $uploaded;
-                    $result = &Apache::lonxml::xmlparse($r,'web',$filecontents,
-                                                        '',%mystyle);
+                    $env{'request.filename'} = $item;
+                    my $result = &Apache::lonxml::xmlparse($r,$target,$filecontents,
+                                                           '',%mystyle);
                     &Apache::structuretags::reset_problem_globals();
                     &Apache::lonhomework::finished_parsing();
                     $env{'request.filename'} = $oldfile;
@@ -132,18 +161,61 @@ sub handler {
                     $r->print($result);
                 }
             } else {
-                $r->print(&Apache::lonwrapper::wrapper($uploaded));
+                if ($target eq 'tex') {
+                    $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}).
+                              ' \strut \\\\ \textbf{'.&mt('Syllabus').'} \strut \\\\ '.
+                              &mt('Unsupported file type.').' \strut \\\\ '.
+                              &mt('Print the syllabus directly from your web browser').
+                              '\end{document}');
+                } else {
+                    my $brcrum;
+                    if ($env{'form.folderpath'} =~ /^supplemental/) {
+                        my $title = $env{'form.title'};
+                        if ($title eq '') {
+                            $title = &mt('Syllabus');
+                        }
+                        $brcrum =
+                            &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
+                    }
+                    $r->print(&Apache::lonwrapper::wrapper($item,$brcrum,$env{'request.use_absolute'},
+                                                           undef,$is_pdf,'','','',&mt('Syllabus')));
+                }
             }
             return OK;
         }
     } elsif ($external=~/\w/) {
         unless ($allowed && $forceedit) {
-            $r->print(&Apache::lonwrapper::wrapper($external));
+            if ($target eq 'tex') {
+                $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}).
+                         ' \strut \\\\ \textbf{'.&mt('Syllabus').'} \strut \\\\ '.$external.' '.
+                         ' \strut \\\\ '.&mt('Print the syllabus directly from your web browser').
+                         '\end{document}');
+            } else {
+                my $is_ext = 1;
+                my ($is_pdf,$brcrum);
+                if ($external =~ /\.pdf$/i) {
+                    $is_pdf = 1;
+                }
+                if ($env{'form.folderpath'} =~ /^supplemental/) {
+                    my $title = $env{'form.title'};
+                    if ($title eq '') {
+                        $title = &mt('Syllabus');
+                    }
+                    $brcrum =
+                        &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
+                }
+                $r->print(&Apache::lonwrapper::wrapper($external,$brcrum,$env{'request.use_absolute'},
+                                                       $is_ext,$is_pdf,'','','',&mt('Syllabus')));
+            }
             return OK;
         }
     }
 
-    my $crstype = &Apache::loncommon::course_type();
+# ------------------------------------------------------------ Print the screen
+
+    if ($target eq 'tex') {
+        $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));
+    }
 
 # ------------------------------ The buck stops here: internal syllabus display
 # --------------------------------------------------------- The syllabus fields
@@ -170,17 +242,25 @@ sub handler {
 # This handler might be called anonymously ...
 # ----------------------------------------------------- Only if not public call
     if ($allowed) {
-        if (($env{'form.choice'} =~ /^(template|url|file)$/) ||
+        if (($env{'form.choice'} =~ /^(template|minimal|url|file)$/) ||
             ($env{'form.phase'} =~ /^(upload|check)_embedded$/)) {
             my $earlyout;
-            ($earlyout,$uploaded,$external,$output) =
-                &save_changes($cnum,$cdom,$uploaded,$external,\%syllabus,
-                              \%syllabusfields,\%courseenv);
+            ($earlyout,$uploaded,$external,$minimal,$output) =
+                &save_changes($cnum,$cdom,$uploaded,$external,$minimal,
+                              \%syllabus,\%syllabusfields,\%courseenv);
+            if (($env{'form.choice'} eq 'minimal') && 
+                ($minimal eq "/uploaded/$cdom/$cnum/portfolio/syllabus/loncapa.html")) { 
+                delete($env{'form.symb'});
+                delete($env{'request.symb'});
+                $r->internal_redirect("$minimal?editmode=1&forceedit=1");
+                return OK;
+            }
             if ($earlyout) {
                 if ($target ne 'tex') {
                     &print_header($r,$cnum,$cdom,$crstype,$allowed,$forceedit,
                                   \%syllabus,\%syllabusfields);
-                    $r->print($output);
+                    $r->print($output.
+                              &Apache::loncommon::end_page());
                 }
                 return OK;
             }
@@ -237,8 +317,8 @@ sub handler {
                      .'</span>'
                      .'</div><div style="padding:0;clear:both;margin:0;border:0"></div>'."\n");
             my $lonhost = $r->dir_config('lonHostID');
-            $r->print(&chooser($external,$uploaded,$cdom,$cnum,$lonhost,\%syllabusfields,
-                               \%syllabus));
+            $r->print(&chooser($external,$uploaded,$minimal,$cdom,$cnum,$lonhost,
+                               \%syllabusfields,\%syllabus));
         }
     } else {
 #--------------------------------------------- Print last update unless editing
@@ -277,7 +357,7 @@ sub handler {
 #-------------------------------------------------------------- Print Headtitle
     if ($target ne 'tex') {
         my $display = 'block';
-        if ($external || $uploaded) {
+        if ($external || $uploaded || $minimal) {
             $display = 'none';
         }
         $r->print('<div class="LC_Box" id="template" style="display: '.$display.'">'.
@@ -312,18 +392,18 @@ sub handler {
             }
             &Apache::lontemplate::print_start_template($r,&mt('Personnel'),'LC_Box',
                                                        'box_000_showpeople',$display);
-            $r->print(&get_personnel($r,$target,$cdom,$cnum,$allowed));
+            $r->print(&get_personnel($r,$target,$cdom,$cnum,$allowed,$crstype,\%syllabus));
             &Apache::lontemplate::print_end_template($r);
         } else {
             unless ($hidepersonnel) {
                 &Apache::lontemplate::print_start_template($r,&mt('Personnel'),'LC_Box');
-                $r->print(&get_personnel($r,$target,$cdom,$cnum,$allowed));  
+                $r->print(&get_personnel($r,$target,$cdom,$cnum,$allowed,$crstype,\%syllabus));  
                 &Apache::lontemplate::print_end_template($r);
             }
         }
     } else {
         unless ($hidepersonnel) {
-            $r->print(&get_personnel($r,$target,$cdom,$cnum,$allowed));
+            $r->print(&get_personnel($r,$target,$cdom,$cnum,$allowed,$crstype,%syllabus));
         }
     }
 # -------------------------------------------------------------- Announcements?
@@ -365,7 +445,7 @@ sub handler {
                 }
                 $rsslinktext = &mt('Manage Course RSS Feeds/Blogs');
                 if ($crstype eq 'Community') {
-                    $rsslinktext = &mt('Manage Communiity RSS Feeds/Blogs');
+                    $rsslinktext = &mt('Manage Community RSS Feeds/Blogs');
                 }
             }
             my $editurl= &Apache::lonnet::absolute_url().'/adm/'.$cdom.'/'.$cnum.'/_rss.html';
@@ -386,10 +466,6 @@ sub handler {
     }
 # ---------------------------------------------------------------- Get syllabus
     if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
-        if ($allowed) {
-            $r->print('<form method="post" action="">');
-        }
-
 		my $url_include_handler = sub {
 			my ($r, $field, $message, $group, $data_ref, $fields_ref, $target, $allowed, $display) = @_;
 			my %data = %{$data_ref};
@@ -436,7 +512,7 @@ sub handler {
 			$target, $allowed, Apache::lontemplate->RICH_TEXT_DETECT_HTML, \%custom_hash,
                         undef,\%displayfields,\%noshow);
         if ($allowed) {
-            $r->print('</form>'.
+            $r->print('</div></form>'.
             &Apache::lonhtmlcommon::htmlareaselectactive());
         }
     } else {
@@ -526,6 +602,7 @@ ENDSCRIPT
         my $checkedstr = "var include = new Array('".join("','",@checked)."');";
         my $uncheckedstr = "var exclude = new Array('".join("','",@unchecked)."');";
         my $invurl = &mt('Invalid URL');
+        &js_escape(\$invurl);
         my $urlregexp = <<'ENDREGEXP';
 /^([a-z]([a-z]|\d|\+|-|\.)*):(\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?((\[(|(v[\da-f]{1,}\.(([a-z]|\d|-|\.|_|~)|[!\$&'\(\)\*\+,;=]|:)+))\])|((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=])*)(:\d*)?)(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*|(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)|((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)|((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)){0})(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i
 ENDREGEXP
@@ -536,7 +613,7 @@ ENDREGEXP
 // <![CDATA[
 
 function toggleEditor(pick) {
-    var choices = new Array('template','url','file','templatebox');
+    var choices = new Array('template','minimal','url','file','templatebox');
     for (var i=0; i<choices.length; i++) {
         if (((choices[i] == 'templatebox') && (pick == 'template')) ||
             (choices[i] == pick)) {
@@ -550,11 +627,16 @@ function toggleEditor(pick) {
 
 var regexp = $urlregexp;
 
-function extUrlPreview(caller) {
+function extUrlPreview(caller,protocol) {
     if (document.getElementById(caller)) {
         var url = document.getElementById(caller).value;
         if (regexp.test(url)) {
-            openMyModal(url,500,400,'yes');
+            var http_regex = /^http\:\/\//gi;
+            if ((protocol == 'https') && (http_regex.test(url))) {
+                window.open(url,"syllabuspreview","height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1");
+            } else {
+                openMyModal(url,500,400,'yes');
+            }
         } else {
             alert("$invurl");
         }
@@ -646,7 +728,33 @@ ENDSCRIPT
               {href=>$r->uri,
                text=>"Course syllabus"});
         $args->{'bread_crumbs'} = $brcrum;
-    } elsif ($env{'form.folderpath'} =~ /^supplemental/) {
+    } else {
+        &get_breadcrumbs($cdom,$cnum,$crstype,$args);
+    }
+    if ($allowed) {
+        my %loaditem = (
+                         onload => 'setTemplateBoxes();',
+                       );
+        $args->{'add_entries'} = \%loaditem;
+    } else {
+        if ($env{'request.use_absolute'}) {
+            $args->{'use_absolute'} = $env{'request.use_absolute'};
+        }
+    }
+    if ($env{'form.only_body'}) {
+        $args->{'only_body'} = 1;
+    }
+    my $start_page =
+        &Apache::loncommon::start_page("Syllabus", $rss_link.$js,$args);
+    if ($start_page) {
+        $r->print($start_page);
+    }
+}
+
+sub get_breadcrumbs{
+    my ($cdom,$cnum,$crstype,$args) = @_;
+    return unless (ref($args) eq 'HASH');
+    if ($env{'form.folderpath'} =~ /^supplemental/) {
         my $title = $env{'form.title'};
         if ($title eq '') {
             $title = &mt('Syllabus');
@@ -667,41 +775,37 @@ ENDSCRIPT
                                       ];
         }
     }
-    if ($allowed) {
-        my %loaditem = (
-                         onload => 'setTemplateBoxes();',
-                       );
-        $args->{'add_entries'} = \%loaditem;
-    }
-    my $start_page =
-        &Apache::loncommon::start_page("Syllabus", $rss_link.$js,$args);
-    $r->print($start_page);
+    return;
 }
 
 sub chooser {
-    my ($external,$uploaded,$cdom,$cnum,$lonhost,$fields,$values) = @_;
+    my ($external,$uploaded,$minimal,$cdom,$cnum,$lonhost,$fields,$values) = @_;
     my %lt = &Apache::lonlocal::texthash(
                  'type'          => 'Syllabus Type',
                  'url'           => 'External URL',
-                 'file'          => 'Uploaded File',
-                 'template'      => 'Syllabus Template',
+                 'file'          => 'Uploaded file',
+                 'minimal'       => 'Minimal template',
+                 'template'      => 'Standard template',
                  'templateboxes' => 'Choose template items ... ',
                  'curr'          => 'Current:',
                  'rep'           => 'Replace:',
                  'upl'           => 'Upload:',
                  'pr'            => 'Preview',
                  'save'          => 'Save',
-                 'chourl'        => 'Choose external URL',
+                 'sved'          => 'Save and Edit',
+                 'chourl'        => 'External URL',
                  'chofile'       => 'Uploaded syllabus file',
                  'parse'         => 'Upload embedded images/multimedia files if HTML file',
     );
     my %checked = (
                     file     => '',
+                    minimal  => '',
                     url      => '',
                     template => '',
                   );
     my %display = (
                     file        => 'none',
+                    minimal     => 'none',
                     url         => 'none',
                     templatebox => 'none',
                   );
@@ -712,59 +816,48 @@ sub chooser {
     } elsif ($external) {
         $checked{'url'}  = $check;
         $display{'url'} = 'block';
+    } elsif ($minimal) {
+        $checked{'minimal'} = $check;
+        $display{'minimal'} = 'block';
     } else {
         $checked{'template'} = $check;
         $checked{'templatebox'} = $check;
         $display{'templatebox'} = 'block';
     }
+    my $protocol = ($ENV{'SERVER_PORT'} == 443?'https':'http');
 
     my $output = 
         '<form name="syllabus" method="post" enctype="multipart/form-data" action="">'."\n".
         '<input type="hidden" name="forceedit" value="1" />'."\n".
         '<div class="LC_left_float"><fieldset><legend>'.$lt{'type'}.'</legend>';
-    foreach my $item ('template','url','file') {
+    foreach my $item ('minimal','template','url','file') {
         $output .= '<label><input type="radio" name="choice" value="'.$item.'" '.$checked{$item}.' onclick="toggleEditor('."'$item'".')" />'.
                    $lt{$item}.'</label><br />';
     }
     $output .= '</fieldset></div>'."\n".
                '<div id="url" class="LC_left_float" style="display: '.$display{'url'}.'">'."\n".
                '<fieldset><legend>'.$lt{'chourl'}.'</legend><span class="LC_nobreak">'."\n".
-               '<a href="javascript:extUrlPreview('."'syllabusurl'".');">'.$lt{'pr'}.'</a></span>&nbsp;'."\n".
+               '<a href="javascript:extUrlPreview('."'syllabusurl','$protocol'".');">'.$lt{'pr'}.'</a></span>&nbsp;'."\n".
                '<input type="text" id="syllabusurl" name="externalsyllabus" value="'.$external.'" size="55" />'."\n".
                '&nbsp;<input type="submit" name="storeurl" value="'.$lt{'save'}.'" />'."\n".
                '</fieldset></div>'."\n".
-               '<div id="file" class="LC_left_float" style="display: '.$display{'file'}.'"><fieldset><legend>'.$lt{'file'}.'</legend>';
+               '<div id="minimal" class="LC_left_float" style="display: '.$display{'minimal'}.'">'."\n".
+               '<fieldset><legend>'.$lt{'minimal'}.'</legend>';
+    if ($minimal) {
+        my ($absurl,$filename,$depbutton) = &syllabus_file_info($minimal,$cnum,$cdom,$lonhost,'minimal');
+        $output .= '<a href="javascript:extUrlPreview('."'currminimal'".');">'.$lt{'pr'}.'</a>'.
+                   '<input type="hidden" name="minimalfile" value="'.&HTML::Entities::encode($absurl).'?inhibitmenu=yes" id="currminimal" />'.
+                   $depbutton;
+    } else {
+        $output .= &mt('Title of Syllabus Page:').'&nbsp;'.
+                   '<input type="text" id="minimaltitle" name="syllabustitle" value="'.&mt('Syllabus').'" size="30" />'."\n".
+                   '&nbsp;<input type="submit" name="storeminimal" value="'.$lt{'sved'}.'" />'."\n";
+    }
+    $output .= '</fieldset></div>'."\n".
+               '<div id="file" class="LC_left_float" style="display: '.$display{'file'}.'">'."\n".
+               '<fieldset><legend>'.$lt{'file'}.'</legend>';
     if ($uploaded) {
-        my $protocol = $Apache::lonnet::protocol{$lonhost};
-        $protocol = 'http' if ($protocol ne 'https');
-        my $absurl = $protocol.'://'.&Apache::lonnet::hostname($lonhost).$uploaded;
-        my ($filename) = ($uploaded =~ m{([^/]+)$});
-        my $file=&Apache::lonnet::filelocation("",$uploaded);
-        my $depbutton;
-        if ($file =~ /\.html?$/) {
-            my $filecontents=&Apache::lonnet::getfile($file);
-            unless ($filecontents eq -1) {
-                my $mm = new File::MMagic;
-                my $mimetype = $mm->checktype_contents($filecontents);
-                if ($mimetype eq 'text/html') {
-                    my (%codebase,%allfiles);
-                    my $parse_result = &Apache::lonnet::extract_embedded_items($uploaded,\%allfiles,
-                                                                               \%codebase,\$filecontents);
-                    my $actionurl = "/public/$cdom/$cnum/syllabus";
-                    my ($ignore,$num,$numpathchanges,$existing,$mapping) =
-                        &Apache::loncommon::ask_for_embedded_content($actionurl,undef,\%allfiles,
-                                                                     \%codebase,
-                                                                     {'context' => 'rewrites',
-                                                                      'ignore_remote_references' => 1,});
-                    if (keys(%allfiles)) {
-                        $depbutton = ('&nbsp;' x 3).
-                                     &editfile_button().
-                                     &editbutton_js($uploaded);
-                    }
-                }
-            }
-        }
-
+        my ($absurl,$filename,$depbutton) = &syllabus_file_info($uploaded,$cnum,$cdom,$lonhost,'file');
         $output .= '<span class="LC_nobreak">'.$lt{'curr'}.'&nbsp;'.
                    '<input type="hidden" name="uploadedfile" value="'.&HTML::Entities::encode($absurl).'?inhibitmenu=yes" id="currfile" />'.
                    '<a href="javascript:extUrlPreview('."'currfile'".');">'.$filename.'</a></span>'.$depbutton.
@@ -772,7 +865,6 @@ sub chooser {
     } else {
         $output .= $lt{'upl'};
     }
-
     $output .= '<br />'."\n".
                '<span class="LC_nobreak">'.
                '<input type="file" name="syllabusfile" size="55" />'."\n".
@@ -799,6 +891,47 @@ sub chooser {
     return $output;
 }
 
+sub syllabus_file_info {
+    my ($item,$cnum,$cdom,$lonhost,$context) = @_;
+    my $protocol = $Apache::lonnet::protocol{$lonhost};
+    $protocol = 'http' if ($protocol ne 'https');
+    my $absurl = $protocol.'://'.&Apache::lonnet::hostname($lonhost).$item;
+    my ($filename) = ($item =~ m{([^/]+)$});
+    my $file=&Apache::lonnet::filelocation("",$item);
+    my ($depbutton,$filetype,$editable);
+    if ($file =~ /\.(xhtml|xml|tex|html|htm)$/) {
+        $filetype=$1;
+    }
+    if ($filetype) {
+        unless ($filetype eq 'tex') {
+            $filetype='html';
+        }
+    }
+    if ($filetype eq 'html') {
+        my $filecontents=&Apache::lonnet::getfile($file);
+        unless ($filecontents eq -1) {
+            my $mm = new File::MMagic;
+            my $mimetype = $mm->checktype_contents($filecontents);
+            if ($mimetype eq 'text/html') {
+                my (%codebase,%allfiles);
+                my $parse_result = &Apache::lonnet::extract_embedded_items($item,\%allfiles,
+                                                                           \%codebase,\$filecontents);
+                my $actionurl = "/public/$cdom/$cnum/syllabus";
+                my ($ignore,$num,$numpathchanges,$existing,$mapping) =
+                    &Apache::loncommon::ask_for_embedded_content($actionurl,undef,\%allfiles,
+                                                                 \%codebase,
+                                                                 {'context' => 'rewrites',
+                                                                  'ignore_remote_references' => 1,});
+                $editable = 1;
+            }
+        }
+    }
+    $depbutton = ('&nbsp;' x 3).
+                 &editfile_button($item,$context,$editable).
+                 &editbutton_js();
+    return ($absurl,$filename,$depbutton);
+}
+
 sub fields_check_uncheck {
     my ($fields,$values) = @_;
     return unless ((ref($fields) eq 'HASH') && (ref($values) eq 'HASH'));
@@ -877,49 +1010,121 @@ sub fields_check_uncheck {
 }
 
 sub get_personnel {
-    my ($r,$target,$cdom,$cnum,$allowed) = @_;
+    my ($r,$target,$cdom,$cnum,$allowed,$crstype,$syllabus) = @_;
+    my (%hiddenroles,%hiddenusers);
+    if (ref($syllabus) eq 'HASH') {
+        if (ref($syllabus->{'personnel'}) eq 'HASH') {
+            if ($syllabus->{'personnel'}{'hiderole'}) {
+                map { $hiddenroles{$_} = 1; } split(/,/,$syllabus->{'personnel'}{'hiderole'});
+            }
+            if ($syllabus->{'personnel'}{'hideuser'}) {
+                map { $hiddenusers{$_} = 1; } split(/,/,$syllabus->{'personnel'}{'hideuser'});
+            }
+        }
+    }
     my $output;
-    my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum);
+    my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum,1);
     if ($target ne 'tex') {
-        $r->print(&Apache::lonhtmlcommon::start_pick_box());
+        if ($allowed) {
+            $r->print(&Apache::loncommon::start_data_table().
+                      &Apache::loncommon::start_data_table_header_row().
+                      '<th>'.&mt('Role hidden?').'</th><th>'.&mt('Role').'</th>'.
+                      '<th>'.&mt('Personnel (hidden if checked)').'</th>'.
+                      &Apache::loncommon::end_data_table_header_row());
+        } else {
+            $r->print(&Apache::lonhtmlcommon::start_pick_box());
+        }
     } else {
         $r->print('\begin{tabular}{|p{0.45\textwidth}|p{0.45\textwidth}|}\hline');
     }
     my @personnel=sort(keys(%coursepersonnel));
     my $lastpers=$personnel[$#personnel];
     foreach my $element (@personnel) {
+        unless ($allowed) {
+            next if ($hiddenroles{$element}) 
+        }
+        my ($role,$sec);
+        if ($element =~ /:/) {
+            ($role,$sec) = split(/:/,$element);
+        } else {
+            $role = $element;
+        }
+        my $roletext = &Apache::lonnet::plaintext($role,$crstype);
+        if ($sec) {
+            $roletext .=' ('.&Apache::lonlocal::mt('Section [_1]',$sec).')';
+        }
         if ($target ne 'tex') {
-            $r->print(&Apache::lonhtmlcommon::row_title($element));
+            if ($allowed) {
+                my $checked;
+                if ($hiddenroles{$element}) {
+                    $checked = ' checked="checked"';
+                }
+                $r->print(&Apache::loncommon::start_data_table_row().
+                          '<td>'.
+                          '<input type="checkbox" name="hiderole" value="'.$element.'" '.
+                          $checked.' />'.
+                          '</td><td>'.$roletext.'</td><td>');
+            } else {
+                $r->print(&Apache::lonhtmlcommon::row_title($roletext));
+            }
         } else {
-            $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$element).' & ');
+            $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$roletext).' & ');
         }
         my @coursepersonlist;
         foreach my $user (split(/\,/,$coursepersonnel{$element})) {
             my ($puname,$pudom)=split(/\:/,$user);
             if ($target ne 'tex') {
                 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')) {
-                    push(@coursepersonlist,$courseperson);
+                my $checked;
+                if ($hiddenusers{$element.'&'.$puname.':'.$pudom}) {
+                    $checked = ' checked="checked"';
+                }
+                if ($allowed) {
+                    my $item = '<span class="LC_nobreak"><label>'.
+                               '<input type="checkbox" name="hideuser" value="'.$element.'&amp;'.$puname.':'.$pudom.'"'.$checked.' />'.
+                               &Apache::loncommon::aboutmewrapper($courseperson
+,
+                                               $puname,$pudom).
+                               '</label>'.('&nbsp;'x2).'</span> ';
+                    push(@coursepersonlist,$item);
+
                 } else {
-                    push(@coursepersonlist,&Apache::loncommon::aboutmewrapper($courseperson,
-                              $puname,$pudom));
+                    next if ($hiddenusers{$element.'&'.$puname.':'.$pudom});
+                    if (($env{'user.name'} eq '') || ($env{'user.name'} eq 'public') ||
+                        ($env{'user.domain'} eq '') || ($env{'user.domain'} eq 'public')) {
+                        push(@coursepersonlist,$courseperson);
+                    } else {
+                        push(@coursepersonlist,&Apache::loncommon::aboutmewrapper($courseperson,
+                                               $puname,$pudom));
+                    }
                 }
             } else {
                 push(@coursepersonlist,&Apache::loncommon::plainname($puname,
                               $pudom).' ');
             }
         }
-        $r->print(join(", ",@coursepersonlist));
+        if ($allowed) {
+            $r->print(join('',@coursepersonlist));
+        } else {
+            $r->print(join(', ',@coursepersonlist));
+        }
         if ($target ne 'tex') {
-            my $lastclose=$element eq $lastpers?1:0;
-            $r->print(&Apache::lonhtmlcommon::row_closure($lastclose));
+            if ($allowed) {
+                $r->print('</td>'.&Apache::loncommon::end_data_table_row());
+            } else {
+                my $lastclose=$element eq $lastpers?1:0;
+                $r->print(&Apache::lonhtmlcommon::row_closure($lastclose));
+            }
         } else {
             $r->print('\\\\ \hline');
         }
     }
     if ($target ne 'tex') {
-        $r->print(&Apache::lonhtmlcommon::end_pick_box());
+        if ($allowed) {
+            $r->print(&Apache::loncommon::end_data_table());
+        } else {
+            $r->print(&Apache::lonhtmlcommon::end_pick_box());
+        }
     } else {
         $r->print('\end{tabular}\\\\');
     }
@@ -927,13 +1132,50 @@ sub get_personnel {
 }
 
 sub save_changes {
-    my ($cnum,$cdom,$uploaded,$external,$syllabus,$syllabusfields,$courseenv) = @_;
+    my ($cnum,$cdom,$uploaded,$external,$minimal,$syllabus,$syllabusfields,$courseenv) = @_;
     my ($earlyout,$output);
-    unless ((ref($syllabus) eq 'HASH') && (ref($syllabusfields) eq 'HASH')) {
-        return ($earlyout,$uploaded,$external,$output);
-    }
+    unless ((ref($syllabus) eq 'HASH') && (ref($syllabusfields) eq 'HASH') ||
+            (ref($courseenv) eq 'HASH')) {
+        return ($earlyout,$uploaded,$external,$minimal,$output);
+    }
+    if (($env{'form.deleteuploaded_file'}) || ($env{'form.deleteuploaded_minimal'})) {
+        my %storehash;
+        if (($env{'form.choice'} eq 'file') && 
+            ($env{'form.deleteuploaded_file'}) && ($uploaded =~ /\w/)) {
+            if ($courseenv->{'uploadedsyllabus'} =~ m{^\Q/uploaded/$cdom/$cnum/portfolio\E(/syllabus/.+)$}) {
+                my $filename = $1;
+                &update_access_permissions($cdom,$cnum,$filename);
+            }
+            &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.uploadedsyllabus');
+            &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.externalsyllabus');
+            $storehash{'uploadedsyllabus'} = '';
+            $storehash{'externalsyllabus'} = '';
+            my $putres = &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum);
+            undef($uploaded);
+            undef($external);
+        } elsif (($env{'form.choice'} eq 'minimal') &&
+                 ($env{'form.deleteuploaded_minimal'}) && ($minimal =~ /\w/)) {
+            my $minimalurl = "/uploaded/$cdom/$cnum/portfolio/syllabus/loncapa.html";
+            if ($courseenv->{'minimalsyllabus'} eq "$minimalurl") {
+                my $filecontents=&Apache::lonnet::getfile(&Apache::lonnet::filelocation("",$minimalurl));
+                unless ($filecontents eq -1) {
+                    $env{'form.output'} = $filecontents; 
+                    &Apache::lonnet::finishuserfileupload($cnum,$cdom,'output',
+                                                          'portfolio/syllabus/loncapa.html.bak');
+                    $minimalurl = &default_minimal_syllabus($cnum,$cdom);
+                }
+            }
+            &update_access_permissions($cdom,$cnum,'/syllabus/loncapa.html');
+            &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.externalsyllabus');
+            &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.minimalsyllabus');
+            $storehash{'externalsyllabus'} = '';
+            $storehash{'minimalsyllabus'} = '';
+            my $putres = &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum);
+            undef($external);
+            undef($minimal);
+        }
+    } elsif ($env{'form.choice'} eq 'template') {
 #store what the user typed in to the template
-    if ($env{'form.choice'} eq 'template') {
         my @shown = &Apache::loncommon::get_env_multiple('form.showfield');
         $syllabus->{'uploaded.fields'} = '';
         if (@shown == 0) {
@@ -946,16 +1188,41 @@ sub save_changes {
                     my ($prefix) = split(/_/,$field);
                     $syllabus->{'uploaded.fields'} .= $prefix.',';
                 }
+                if ($field eq '000_showpeople') {
+                    my @hideusers = &Apache::loncommon::get_env_multiple('form.hideuser');
+                    my @hideroles = &Apache::loncommon::get_env_multiple('form.hiderole');
+                    my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'/'.$cnum,1);
+                    my %personnel;
+                    foreach my $key (keys(%coursepersonnel)) {
+                        map { $personnel{$key}{$_} = 1; } split(/,/,$coursepersonnel{$key});
+                    }
+                    %{$syllabus->{'personnel'}} = ();
+                    $syllabus->{'personnel'}{'hideuser'} = '';
+                    $syllabus->{'personnel'}{'hiderole'} = '';
+                    foreach my $role (@hideroles) {
+                        if (exists($personnel{$role})) {
+                            $syllabus->{'personnel'}{'hiderole'} .= $role.',';
+                        }
+                    }
+                    foreach my $item (@hideusers) {
+                        my ($role,$user) = split(/\&/,$item);
+                        if (ref($personnel{$role}) eq 'HASH') {
+                            if ($personnel{$role}{$user}) {
+                                $syllabus->{'personnel'}{'hideuser'} .= $item.',';
+                            }
+                        }
+                    }
+                    $syllabus->{'personnel'}{'hideuser'} =~ s/,$//;
+                    $syllabus->{'personnel'}{'hiderole'} =~ s/,$//;
+                }
             }
             $syllabus->{'uploaded.fields'} =~ s/,$//;
         }
         foreach my $syl_field (keys(%{$syllabusfields})) {
             my $field=$env{'form.'.$syl_field};
             chomp($field);
-            $field=~s/\s+$//s;
-            $field=~s/^\s+//s;
-            $field=~s/\<br\s*\/*\>$//s;
-            $field=&Apache::lonfeedback::clear_out_html($field,1);
+            my $gateway = Apache::lonhtmlgateway->new();
+            $field = $gateway->process_incoming_html($field,1);
                             #here it will be stored
             $syllabus->{$syl_field}=$field;
             if ($syl_field eq 'lll_includeurl') { # clean up included URLs
@@ -995,22 +1262,9 @@ sub save_changes {
         $syllabus->{'uploaded.lastmodified'} = $now;
         my $putres = &Apache::lonnet::put('syllabus',$syllabus,$cdom,$cnum);
         if ($putres eq 'ok') {
-            my %storehash;
-            if ($courseenv->{'uploadedsyllabus'}) {
-                &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.uploadedsyllabus');
-                $storehash{'uploadedsyllabus'} = '';
-            }
-            if ($courseenv->{'externalsyllabus'}) {
-                &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.externalsyllabus');
-                $storehash{'externalsyllabus'} = '';
-            }
-            $storehash{'updatedsyllabus'} = $now;
-            &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum);
-            &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.updatedsyllabus' => $now});
-            if ($courseenv->{'externalsyllabus'} || $courseenv->{'uploadedsyllabus'}) {
-                undef($uploaded);
-                undef($external);
-            }
+            ($uploaded,$minimal,$external) = 
+                &update_syllabus_env($cdom,$cnum,$courseenv,$env{'form.choice'},$uploaded,
+                                     $minimal,$external);
             $output = '<div>'.
                       &Apache::lonhtmlcommon::confirm_success(&mt('Template saved.')).
                       '</div>';
@@ -1025,22 +1279,9 @@ sub save_changes {
                 $output = '<div class="LC_info">'.
                           &mt('External URL unchanged.').
                           '</div>';
-                if ($uploaded) {
-                    my $prefix;
-                    my $home=&Apache::lonnet::homeserver($cnum,$cdom);
-                    if ($home ne 'no_host') {
-                        my $protocol = $Apache::lonnet::protocol{$home};
-                        $protocol = 'http' if ($protocol ne 'https');
-                        $prefix = $protocol.'://'.&Apache::lonnet::hostname($home);
-                    }
-                    unless ($external =~ m{^\Q$prefix/uploaded/$cdom/$cnum/portfolio/syllabus\E}) {
-                        &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.uploadedsyllabus');
-                        &Apache::lonnet::put('environment',{uploadedsyllabus => ''},
-                                             $cdom,$cnum);
-                        undef($uploaded);
-                        $earlyout = 1;
-                    }
-                }
+                ($uploaded,$minimal,$external) =
+                    &update_syllabus_env($cdom,$cnum,$courseenv,$env{'form.choice'},$uploaded,
+                                         $minimal,$external);
             } else {
                 $external=$env{'form.externalsyllabus'};
                 $external =~ s/(`)//g;
@@ -1052,21 +1293,9 @@ sub save_changes {
                     $output = '<div>'.
                               &Apache::lonhtmlcommon::confirm_success(&mt('External URL saved.')).
                              '</div>';
-                    if ($uploaded) {
-                        my $prefix;
-                        my $home=&Apache::lonnet::homeserver($cnum,$cdom);
-                        if ($home ne 'no_host') {
-                            my $protocol = $Apache::lonnet::protocol{$home};
-                            $protocol = 'http' if ($protocol ne 'https');
-                            $prefix = $protocol.'://'.&Apache::lonnet::hostname($home);
-                        }
-                        unless ($external =~ m{^\Q$prefix/uploaded/$cdom/$cnum/portfolio/syllabus\E}) {
-                            &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.uploadedsyllabus');
-                            &Apache::lonnet::put('environment',{uploadedsyllabus => ''},
-                                                 $cdom,$cnum);
-                            undef($uploaded);
-                        }
-                    }
+                    ($uploaded,$minimal,$external) =
+                        &update_syllabus_env($cdom,$cnum,$courseenv,$env{'form.choice'},$uploaded,
+                                             $minimal,$external);
                 } else {
                     $output = '<div class="LC_error">'.
                               &mt('An error occurred storing the external URL: [_1]',$putres).
@@ -1078,48 +1307,80 @@ sub save_changes {
                       &mt('External URL not saved -- invalid URL.').
                       '</div>';
         }
-    } elsif ($env{'form.choice'} eq 'file') {
+    } elsif (($env{'form.choice'} eq 'file') || ($env{'form.choice'} eq 'minimal')) {
         # Process file upload - phase one - upload and parse primary file.
-        my %allfiles = ();
-        my %codebase = ();
-        my ($upload_result,$uploadphase);
-        if ($env{'form.syllabusfile.filename'}) {
-            my ($url,$needlink) = &process_upload(\$output,$cnum,$cdom,
-                                                  \%allfiles,\%codebase);
-            if ($url =~ m{^/uploaded/\Q$cdom\E/\Q$cnum\E.*/[^/]+$}) {
-                my $exturl;
-                my $home=&Apache::lonnet::homeserver($cnum,$cdom);
-                if ($home ne 'no_host') {
-                    my $protocol = $Apache::lonnet::protocol{$home};
-                    $protocol = 'http' if ($protocol ne 'https');
-                    $exturl = $protocol.'://'.&Apache::lonnet::hostname($home).$url;
-                }
-                my %storehash = (
-                                   uploadedsyllabus => $url,
-                                );
-                if ($exturl) {
-                    $storehash{'externalsyllabus'} = $exturl;
-                    if ($exturl =~ /\.(html?|txt|js|css)$/) {
-                        $exturl .= '?inhibitmenu=yes';
-                    }
-                } else {
-                    $storehash{'externalsyllabus'} = '',
+        my ($upload_result,$uploadphase,$url,$needlink,$error,$errormsg);
+        if ($env{'form.choice'} eq 'file') {
+            if ($env{'form.syllabusfile.filename'}) {
+                my %allfiles = ();
+                my %codebase = ();
+                ($url,$needlink) = &process_upload(\$output,$cnum,$cdom,
+                                                   \%allfiles,\%codebase);
+            } else {
+                $output = '<div class="LC_info">'.
+                          &mt('No file uploaded').
+                          '</div>';
+            }
+        } elsif ($env{'form.choice'} eq 'minimal') {
+            $url = "/uploaded/$cdom/$cnum/portfolio/syllabus/loncapa.html";
+            my $filecontents=&Apache::lonnet::getfile(&Apache::lonnet::filelocation("",$url));
+            if ($filecontents eq -1) {
+                $url = &default_minimal_syllabus($cnum,$cdom);
+            }
+        }
+        if ($url =~ m{^/uploaded/\Q$cdom\E/\Q$cnum\E.*/[^/]+$}) {
+            my $exturl = &home_http_host($cdom,$cnum);
+            if ($exturl) {
+                $exturl .= $url;
+            }
+            my %storehash;
+            if ($env{'form.choice'} eq 'minimal') {
+                $storehash{'minimalsyllabus'} = $url;
+            } else {
+                $storehash{'uploadedsyllabus'} = $url;
+            }
+            if ($exturl) {
+                $storehash{'externalsyllabus'} = $exturl;
+                if ($exturl =~ /\.(html?|txt|js|css)$/) {
+                    $exturl .= '?inhibitmenu=yes';
                 }
-                my $putres =
-                    &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum);
-                if ($putres eq 'ok') {
-                    &Apache::lonnet::make_public_indefinitely($url);
-                    foreach my $key (keys(%storehash)) {
-                        &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.'.$key => $storehash{$key}});
-                    }
+            } else {
+                $storehash{'externalsyllabus'} = '',
+            }
+            my $putres =
+                &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum);
+            if ($putres eq 'ok') {
+                &Apache::lonnet::make_public_indefinitely($url);
+                foreach my $key (keys(%storehash)) {
+                    &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.'.$key => $storehash{$key}});
+                }
+                if ($env{'form.choice'} eq 'minimal') {
+                    $minimal = $url;
+                } else {
                     $uploaded = $url;
-                    if ($needlink) {
-                        $output .= &return_to_editor($cdom,$cnum).
-                                   &Apache::loncommon::end_page();
-                        $earlyout = 1;
-                    }
                 }
+                if ($needlink) {
+                    $output .= &return_to_editor($cdom,$cnum);
+                    $earlyout = 1;
+                }
+                ($uploaded,$minimal,$external) =
+                    &update_syllabus_env($cdom,$cnum,$courseenv,$env{'form.choice'},$uploaded,
+                                         $minimal,$external);
+            } else {
+                $error = 1;
+                $errormsg = $putres;
+            }
+        } else {
+            $error = 1;
+        }
+        if ($error) {
+            $output = '<div class="LC_error">';
+            if ($env{'form.choice'} eq 'minimal') {
+                $output = &mt('An error occurred creating the minimal template file [_1]',$errormsg);
+            } else {
+                $output = &mt('An error occurred storing the uploaded file [_1]',$errormsg);
             }
+            $output .= '</div>';
         }
     } elsif ($env{'form.phase'} eq 'upload_embedded') {
         # Process file upload - phase two - upload embedded objects
@@ -1139,8 +1400,7 @@ sub save_changes {
                                                      '/userfiles',$env{'form.primaryurl'});
             $result .= $modres;
         }
-        $output = $result.&return_to_editor($cdom,$cnum).
-                  &Apache::loncommon::end_page();
+        $output = $result.&return_to_editor($cdom,$cnum);
         $earlyout = 1;
     } elsif ($env{'form.phase'} eq 'check_embedded') {
         # Process file upload - phase three - modify references in HTML file
@@ -1149,11 +1409,149 @@ sub save_changes {
             &Apache::loncommon::modify_html_refs('syllabus','portfolio/syllabus',
                                                  $cnum,$cdom,
                                                  '/userfiles',$env{'form.primaryurl'});
-        $output = $result.&return_to_editor($cdom,$cnum).
-                  &Apache::loncommon::end_page();
+        $output = $result.&return_to_editor($cdom,$cnum);
         $earlyout = 1;
     }
-    return ($earlyout,$uploaded,$external,$output);
+    return ($earlyout,$uploaded,$external,$minimal,$output);
+}
+
+sub default_minimal_syllabus {
+    my ($cnum,$cdom) = @_;
+    my $title;
+    if ($env{'form.syllabustitle'}) {
+        $title = $env{'form.syllabustitle'};
+        $title =~ s{`}{}g;
+        $title=~s/^\s+//;
+        $title=~s/\s+$//;
+    }
+    if ($title eq '') {
+        $title = &mt('Syllabus');
+    }
+    my $initialtext = &mt('Replace with your own content.');
+    my $newhtml = <<END;
+<html>
+<head>
+<title>$title</title>
+</head>
+<body bgcolor="#ffffff">
+<h2>$title</h2>
+$initialtext
+</body>
+</html>
+END
+    $env{'form.output'}=$newhtml;
+    return &Apache::lonnet::finishuserfileupload($cnum,$cdom,'output',
+                                                 'portfolio/syllabus/loncapa.html');
+}
+
+sub update_syllabus_env {
+    my ($cdom,$cnum,$courseenv,$saved,$uploaded,$minimal,$external) = @_;
+    return ($uploaded,$minimal,$external) unless(ref($courseenv) eq 'HASH');
+    my $now = time;
+    my (@envkeys,%storehash);
+    if ($saved eq 'template') {
+        if ($uploaded || $env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'}) {
+            push(@envkeys,'uploaded');
+        }
+        if ($minimal || $env{'course.'.$env{'request.course.id'}.'.minimalsyllabus'}) {
+            push(@envkeys,'minimal');
+        }
+        if ($external || $env{'course.'.$env{'request.course.id'}.'.externalsyllabus'}) {
+            push(@envkeys,'external');
+        }
+        $storehash{'updatedsyllabus'} = $now;
+        &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.updatedsyllabus' => $now
+});
+    } elsif ($saved eq 'url') {
+        my $prefix = &home_http_host($cdom,$cnum);
+        if ($external =~ m{^\Q$prefix/uploaded/$cdom/$cnum/portfolio/syllabus/\E(.+)$}) {
+            my $file = $1;
+            if ($file eq 'loncapa.html') {
+                if ($uploaded || $env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'}) {
+                    push(@envkeys,'uploaded');
+                }
+            } elsif ($minimal || $env{'course.'.$env{'request.course.id'}.'.minimalsyllabus'}) {
+                push(@envkeys,'minimal');
+            }
+        } else {
+            if ($uploaded || $env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'}) {
+                push(@envkeys,'uploaded');
+            }
+            if ($minimal || $env{'course.'.$env{'request.course.id'}.'.minimalsyllabus'}) {
+                push(@envkeys,'minimal');
+            }
+        }
+    } elsif ($saved eq 'file') {
+        if ($minimal || $env{'course.'.$env{'request.course.id'}.'.minimalsyllabus'}) {
+            push(@envkeys,'minimal');
+        }
+    } elsif ($saved eq 'minimal') {
+        if ($uploaded || $env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'}) {
+            push(@envkeys,'uploaded');
+        }
+    }
+    if (@envkeys > 0) {
+        foreach my $item (@envkeys) {
+            my $key = $item.'syllabus';
+            if ($courseenv->{$key} ne '') {
+                &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.'.$key);
+                if ($item eq 'minimal') {
+                    &update_access_permissions($cdom,$cnum,'/syllabus/loncapa.html');
+                } elsif ($item eq 'uploaded') {
+                    if ($courseenv->{$key} =~ m{^\Q/uploaded/$cdom/$cnum/portfolio\E(/syllabus/.+)$}) {
+                        my $filename = $1;
+                        &update_access_permissions($cdom,$cnum,$filename);
+                    }
+                }
+                $storehash{$key} = '';
+            } elsif ($env{'course.'.$env{'request.course.id'}.'.'.$key} ne '') {
+                &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.'.$key);
+            }
+            if ($item eq 'uploaded') {
+                undef($uploaded);
+            }
+            if ($item eq 'external') {
+                undef($external);
+            }
+            if ($item eq 'minimal') {
+                undef($minimal);
+            }
+        }
+    }
+    if (keys(%storehash) > 0) {
+        &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum);
+    }
+    return ($uploaded,$minimal,$external);
+}
+
+sub update_access_permissions {
+    my ($cdom,$cnum,$file_name) = @_;
+    my $current_permissions = &Apache::lonnet::get_portfile_permissions($cdom,$cnum);
+    my %access_controls =
+        &Apache::lonnet::get_access_controls($current_permissions,'',$file_name);
+    if (keys(%access_controls) > 0) {
+        my %changes;
+        foreach my $key (keys(%{$access_controls{$file_name}})) {
+            $changes{'delete'}{$key} = 1;
+        }
+        if (keys(%changes) > 0) {
+            my ($outcome,$deloutcome,$new_values,$translation) =
+                &Apache::lonnet::modify_access_controls($file_name,\%changes,
+                                                        $cdom,$cnum);
+        }
+    }
+    return; 
+}
+
+sub home_http_host {
+    my ($cdom,$cnum) = @_;
+    my $home=&Apache::lonnet::homeserver($cnum,$cdom);
+    if ($home ne 'no_host') {
+        my $protocol = $Apache::lonnet::protocol{$home};
+        $protocol = 'http' if ($protocol ne 'https');
+        return $protocol.'://'.&Apache::lonnet::hostname($home);
+    }
+    return;
 }
 
 sub process_upload {
@@ -1241,19 +1639,50 @@ sub return_to_editor {
 }
 
 sub editfile_button {
-    my $buttontext=&mt('Edit');
-    return <<"END";
-                <input type="button" value="$buttontext" onclick="javascript:gotoeditor();" />
-END
+    my ($url,$context,$editable) = @_;
+    my $edittext=&mt('Edit');
+    my $deltext=&mt('Delete');
+    my $output;
+    if ($editable) {
+        $output = '
+                <input type="button" value="'.$edittext.'" onclick="javascript:gotoeditor('."'$url'".');" name="edit_'.$context.'" />
+                &nbsp;&nbsp;&nbsp;';
+    }
+    $output .= '
+                <input type="button" value="'.$deltext.'" onclick="javascript:dodelete('."'$context'".');" name="del_'.$context.'" />
+                <input type="hidden" value="" name="deleteuploaded_'.$context.'" id="deleteuploaded_'.$context.'" />
+    ';
+    return $output;
 }
 
 sub editbutton_js {
-    my ($url) = @_;
+    my %js_lt = &Apache::lonlocal::texthash(
+               min    => 'Are you sure you want to delete the contents of the syllabus template?',
+               file   => 'Are you sure you want to delete the uploaded syllabus file?',
+               noundo => 'This action cannot be reversed.'
+             );
+    &js_escape(\%js_lt);
     return <<ENDJS;
                 <script type="text/javascript">
                 // <![CDATA[
-                  function gotoeditor() {
-                      document.location.href = '$url?forceedit=1';
+                  function gotoeditor(url) {
+                      document.location.href = url+'?editmode=1&forceedit=1';
+                  }
+                  function dodelete(caller,url) {
+                      if (document.getElementById('deleteuploaded_'+caller)) {
+                          document.getElementById('deleteuploaded_'+caller).value=1;
+                          if (caller == 'minimal') {
+                              if (confirm("$js_lt{'min'}"+"\\n"+"$js_lt{'noundo'}")) {
+                                  document.syllabus.submit();
+                              }
+                          }
+                          if (caller == 'file') {
+                              if (confirm("$js_lt{'file'}"+"\\n"+"$js_lt{'noundo'}")) {
+                                  document.syllabus.submit();
+                              }
+                          }
+                      }
+                      return;   
                   }
                 // ]]>
                 </script>