--- loncom/interface/lonsyllabus.pm 2022/10/27 20:33:31 1.152
+++ loncom/interface/lonsyllabus.pm 2025/03/16 21:04:09 1.157
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.152 2022/10/27 20:33:31 raeburn Exp $
+# $Id: lonsyllabus.pm,v 1.157 2025/03/16 21:04:09 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -40,6 +40,7 @@ use Apache::lonannounce;
use Apache::lonlocal;
use Apache::lonhtmlcommon;
use Apache::lonspeller();
+use Apache::lonwrapper();
use HTML::Entities();
sub handler {
@@ -152,8 +153,20 @@ sub handler {
&Apache::structuretags::reset_problem_globals();
my $oldfile = $env{'request.filename'};
$env{'request.filename'} = $item;
+ my $oldinhibit;
+ if ($env{'form.only_body'}) {
+ $oldinhibit = $env{'form.inhibitmenu'};
+ $env{'form.inhibitmenu'} = 'yes';
+ }
my $result = &Apache::lonxml::xmlparse($r,$target,$filecontents,
'',%mystyle);
+ if ($env{'form.only_body'}) {
+ if ($oldinhibit ne '') {
+ $env{'form.inhibitmenu'} = $oldinhibit;
+ } else {
+ delete($env{'form.inhibitmenu'});
+ }
+ }
&Apache::structuretags::reset_problem_globals();
&Apache::lonhomework::finished_parsing();
$env{'request.filename'} = $oldfile;
@@ -211,6 +224,7 @@ sub handler {
if ($title eq '') {
$title = &mt('Syllabus');
}
+ $title = &HTML::Entities::encode($title,'\'"<>&');
$brcrum =
&Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
}
@@ -434,7 +448,7 @@ sub handler {
'box_111_showrssfeeds',$display);
my ($numfeeds,$hiddenfeeds,$rsslinktext);
my $feeds=&Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit,\$numfeeds,
- \$hiddenfeeds);
+ \$hiddenfeeds,1);
if ($numfeeds) {
$r->print($feeds);
$rsslinktext = &mt('New RSS Feed or Blog');
@@ -462,7 +476,7 @@ sub handler {
&Apache::lontemplate::print_end_template($r);
} else {
unless ($hidefeeds) {
- my $feeds = &Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit);
+ my $feeds = &Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit,'','',1);
if ($feeds ne '') {
&Apache::lontemplate::print_start_template($r,&mt('RSS Feeds and Blogs'),'LC_Box');
$r->print($feeds);
@@ -507,7 +521,7 @@ sub handler {
$r->print($urls);
$r->print("<br /><div>");
&Apache::lontemplate::print_textarea_template($r, $data{$field},
- $field, Apache::lontemplate->RICH_TEXT_ALWAYS_OFF);
+ $field, $fields{$field}, Apache::lontemplate->RICH_TEXT_ALWAYS_OFF);
&Apache::lontemplate::print_saveall_template($r);
$r->print("</div>");
&Apache::lontemplate::print_end_template($r);
@@ -774,6 +788,7 @@ sub get_breadcrumbs{
&Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
if (ref($brcrum) eq 'ARRAY') {
$args->{'bread_crumbs'} = $brcrum;
+ $args->{'bread_crumbs_nomenu'} = 1;
}
} else {
if ((&Apache::lonnet::is_on_map("public/$cdom/$cnum/syllabus"))
@@ -845,11 +860,12 @@ sub chooser {
$output .= '<label><input type="radio" name="choice" value="'.$item.'" '.$checked{$item}.' onclick="toggleEditor('."'$item'".')" />'.
$lt{$item}.'</label><br />';
}
+ my $urllabeltext = &HTML::Entities::encode(&mt('Enter URL'),'"&<>');
$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','$protocol'".');">'.$lt{'pr'}.'</a></span> '."\n".
- '<input type="text" id="syllabusurl" name="externalsyllabus" value="'.$external.'" size="55" />'."\n".
+ '<input type="text" id="syllabusurl" name="externalsyllabus" value="'.$external.'" size="55" aria-label="'.$urllabeltext.'" />'."\n".
' <input type="submit" name="storeurl" value="'.$lt{'save'}.'" />'."\n".
'</fieldset></div>'."\n".
'<div id="minimal" class="LC_left_float" style="display: '.$display{'minimal'}.'">'."\n".
@@ -860,8 +876,8 @@ sub chooser {
'<input type="hidden" name="minimalfile" value="'.&HTML::Entities::encode($absurl).'?inhibitmenu=yes" id="currminimal" />'.
$depbutton;
} else {
- $output .= &mt('Title of Syllabus Page:').' '.
- '<input type="text" id="minimaltitle" name="syllabustitle" value="'.&mt('Syllabus').'" size="30" />'."\n".
+ $output .= '<label>'.&mt('Title of Syllabus Page:').' '.
+ '<input type="text" id="minimaltitle" name="syllabustitle" value="'.&mt('Syllabus').'" size="30" /></label>'."\n".
' <input type="submit" name="storeminimal" value="'.$lt{'sved'}.'" />'."\n";
}
$output .= '</fieldset></div>'."\n".
@@ -876,9 +892,10 @@ sub chooser {
} else {
$output .= $lt{'upl'};
}
+ my $labeltext = &HTML::Entities::encode(&mt('Choose syllabus file'),'"&<>');
$output .= '<br />'."\n".
'<span class="LC_nobreak">'.
- '<input type="file" name="syllabusfile" size="55" />'."\n".
+ '<input type="file" name="syllabusfile" size="55" aria-label="'.$labeltext.'" />'."\n".
' <input type="submit" name="storefile" value="'.$lt{'save'}.'" />'.
'</span><br />'.
'<label>'.
@@ -1042,7 +1059,7 @@ sub get_personnel {
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('Role (hidden if checked)').'</th>'.
'<th>'.&mt('Personnel (hidden if checked)').'</th>'.
&Apache::loncommon::end_data_table_header_row());
} else {
@@ -1074,10 +1091,9 @@ sub get_personnel {
$checked = ' checked="checked"';
}
$r->print(&Apache::loncommon::start_data_table_row().
- '<td>'.
+ '<td><span class="LC_nobreak"><label>'.
'<input type="checkbox" name="hiderole" value="'.$element.'" '.
- $checked.' />'.
- '</td><td>'.$roletext.'</td><td>');
+ $checked.' />'.$roletext.'</label></span></td><td>');
} else {
$r->print(&Apache::lonhtmlcommon::row_title($roletext));
}