--- loncom/interface/courseprefs.pm 2020/10/29 17:14:23 1.90
+++ loncom/interface/courseprefs.pm 2020/10/29 23:24:13 1.91
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set configuration settings for a course
#
-# $Id: courseprefs.pm,v 1.90 2020/10/29 17:14:23 raeburn Exp $
+# $Id: courseprefs.pm,v 1.91 2020/10/29 23:24:13 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -367,7 +367,7 @@ sub handler {
my %values=&Apache::lonnet::dump('environment',$cdom,$cnum);
my @prefs_order = ('courseinfo','localization','feedback','discussion',
'classlists','appearance','grading','printouts',
- 'spreadsheet','bridgetasks','lti','other');
+ 'menuitems','spreadsheet','bridgetasks','lti','other');
my %prefs = (
'courseinfo' =>
@@ -542,6 +542,21 @@ sub handler {
'lti.lcmenu' => 'Menu items',
},
},
+ 'menuitems' =>
+ {
+ text => 'Menu display',
+ help => 'Course_Prefs_Menus',
+ header => [{col1 => 'Default Menu',
+ col2 => 'Value',},
+ {col1 => 'Menu collections',
+ col2 => 'Settings',
+ }],
+ ordered => ['menudefault','menucollections'],
+ itemtext => {
+ menudefault => 'Choose default collection of menu items for course',
+ menucollections => 'Menu collections',
+ },
+ },
'other' =>
{ text => 'Other settings',
help => 'Course_Prefs_Other',
@@ -557,7 +572,13 @@ sub handler {
$cnum,undef,\@allitems,
'coursepref',$parm_permission);
} elsif (($phase eq 'display') && ($parm_permission->{'display'})) {
- my $jscript = &get_jscript($cid,$cdom,$phase,$crstype,\%values);
+ my $noedit;
+ if (ref($parm_permission) eq 'HASH') {
+ unless ($parm_permission->{'process'}) {
+ $noedit = 1;
+ }
+ }
+ my $jscript = &get_jscript($cid,$cdom,$phase,$crstype,\%values,$noedit);
my @allitems = &get_allitems(%prefs);
&Apache::lonconfigsettings::display_settings($r,$cdom,$phase,$context,
\@prefs_order,\%prefs,\%values,undef,$jscript,\@allitems,$crstype,
@@ -634,7 +655,7 @@ sub print_config_box {
}
$output .= ''."\n".
'';
- if (($action eq 'feedback') || ($action eq 'classlists')) {
+ if (($action eq 'feedback') || ($action eq 'classlists') || ($action eq 'menuitems')) {
$output .= '
@@ -659,6 +680,8 @@ sub print_config_box {
$output .= &print_feedback('top',$cdom,$settings,$ordered,$itemtext,\$rowtotal,$noedit);
} elsif ($action eq 'classlists') {
$output .= &print_classlists('top',$cdom,$settings,$itemtext,\$rowtotal,$crstype,$noedit);
+ } elsif ($action eq 'menuitems') {
+ $output .= &print_menuitems('top',$cdom,$settings,$itemtext,\$rowtotal,$crstype,$noedit);
}
$output .= '
@@ -739,6 +762,8 @@ sub print_config_box {
$output .= &print_bridgetasks($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
} elsif ($action eq 'lti') {
$output .= &print_lti($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
+ } elsif ($action eq 'menuitems') {
+ $output .= &print_menuitems('bottom',$cdom,$settings,$itemtext,\$rowtotal,$crstype,$noedit);
} elsif ($action eq 'other') {
$output .= &print_other($cdom,$settings,$allitems,\$rowtotal,$crstype,$noedit);
}
@@ -831,6 +856,81 @@ sub process_changes {
$changes->{$ext_entry} = $newvalues{$ext_entry};
}
}
+ } elsif ($action eq 'menuitems') {
+ my (%current,@colls);
+ my $next = 1;
+ if ($values->{'menucollections'}) {
+ foreach my $item (split(/;/,$values->{'menucollections'})) {
+ my ($num,$value) = split(/\%/,$item);
+ if ($num =~ /^\d+$/) {
+ unless (grep(/^$num$/,@colls)) {
+ push(@colls,$num);
+ }
+ my @entries = split(/\&/,$value);
+ foreach my $entry (@entries) {
+ my ($name,$fields) = split(/=/,$entry);
+ $current{$num}{$name} = $fields;
+ }
+ }
+ }
+ }
+ if (@colls) {
+ @colls = sort { $a <=> $b } @colls;
+ $next += $colls[-1];
+ }
+ if ($env{'form.menucollections_add'} eq $next) {
+ push(@colls,$next);
+ }
+ my $currdef = $values->{'menudefault'};
+ my $possdef = $env{'form.menudefault'};
+ if (($possdef =~ /^\d+$/) && (grep(/^$possdef$/,@colls))) {
+ if ($values->{'menudefault'} ne $possdef) {
+ $changes->{'menudefault'} = $possdef;
+ }
+ } elsif ($values->{'menudefault'}) {
+ $changes->{'menudefault'} = '';
+ }
+ my $menucoll;
+ if (@colls) {
+ my ($ordered,$cats) = &menuitems_categories();
+ my %shortcats = &menuitems_abbreviations();
+ foreach my $num (@colls) {
+ my ($entry,%include);
+ map { $include{$_}= 1; } &Apache::loncommon::get_env_multiple('form.menucollections_'.$num);
+ foreach my $item (@{$ordered}) {
+ if ($item eq 'shown') {
+ foreach my $type (@{$cats->{$item}}) {
+ $entry .= $type.'=';
+ if ($include{$type}) {
+ $entry .= 'y';
+ } else {
+ $entry .= 'n';
+ }
+ $entry .= '&';
+ }
+ } else {
+ $entry .= $shortcats{$item}.'=';
+ foreach my $type (@{$cats->{$item}}) {
+ if ($include{$type}) {
+ $entry .= $type.',';
+ }
+ }
+ $entry =~ s/,$//;
+ $entry .= '&';
+ }
+ }
+ $entry =~ s/\&$//;
+ if ($menucoll) {
+ $menucoll .= ';';
+ }
+ $menucoll .= $num.'%'.$entry;
+ }
+ if ($menucoll ne $values->{'menucollections'}) {
+ $changes->{'menucollections'} = $menucoll;
+ }
+ } elsif ($values->{'menucollections'}) {
+ $changes->{'menucollections'} = '';
+ }
} else {
foreach my $entry (@ordered) {
if ($entry eq 'cloners') {
@@ -1530,6 +1630,16 @@ sub store_changes {
}
}
$displayname = &mt($text);
+ } elsif ($item eq 'menuitems') {
+ unless ($changes->{$item}{$key} eq '') {
+ if ($key eq 'menudefault') {
+ $displayname = &mt('Default collection of menu items');
+ $displayval = &mt('Collection: [_1]',
+ $changes->{$item}{$key});
+ } elsif ($key eq 'menucollections') {
+ $displayval = &menucollections_display($changes->{$item}{$key});
+ }
+ }
} else {
$displayname = &mt($text);
}
@@ -1605,10 +1715,19 @@ sub store_changes {
} elsif (!exists($changes->{$item}{'lti.override'})) {
$output .= ''.&mt('LTI settings only saved if Override is set to "Yes"').'';
}
+ } elsif ($item eq 'menuitems') {
+ if ($key eq 'menudefault') {
+ $output .= ''.&mt("Default collection of menu items set to: 'Standard' (all menus shown)").'';
+ } elsif ($key eq 'menucollections') {
+ $output .= ''.&mt('Specific collections of menus no longer available').'';
+ }
} else {
$output .= ''.&Apache::lonhtmlcommon::confirm_success(&mt('Deleted setting for [_1]',
''.$displayname.'')).'';
}
+ } elsif ($key eq 'menucollections') {
+ $output .= ''.&Apache::lonhtmlcommon::confirm_success(&mt('Numbered menu collections:')).' '.
+ $displayval.'';
} else {
$output .= ''.&Apache::lonhtmlcommon::confirm_success(&mt('[_1] set to [_2]',
''.$displayname.'',
@@ -1838,7 +1957,7 @@ sub get_course {
}
sub get_jscript {
- my ($cid,$cdom,$phase,$crstype,$settings) = @_;
+ my ($cid,$cdom,$phase,$crstype,$settings,$noedit) = @_;
my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom,$crstype);
my ($jscript,$categorize_js,$loncaparev_js,$instcode_js);
my $stubrowse_js = &Apache::loncommon::studentbrowser_javascript();
@@ -1964,11 +2083,94 @@ function syllabusinfo() {
}
}
ENDSCRIPT
+ my $menuitems_js;
+ unless ($noedit) {
+ my $collections;
+ my $next = 1;
+ if (ref($settings) eq 'HASH') {
+ if ($settings->{'menucollections'} ne '') {
+ my @current;
+ foreach my $item (split(/;/,$settings->{'menucollections'})) {
+ my ($num) = split(/\%/,$item);
+ if ($num =~ /^\d+$/) {
+ push(@current,$num);
+ }
+ }
+ $collections = join("','",sort { $a <=> $b } @current);
+ if ($collections) {
+ $collections = "'$collections'";
+ }
+ $next += $current[-1];
+ }
+ }
+ my $deftext = &mt('Standard (all menus shown)');
+ $menuitems_js = <'."\n".
'// '."\n".
+ $syllabus_js."\n".$menuitems_js."\n".'//]]>'."\n".
''."\n".$stubrowse_js."\n";
return $jscript;
}
@@ -4595,6 +4797,247 @@ sub ltimenu_titles {
);
}
+sub print_menuitems {
+ my ($position,$cdom,$settings,$itemtext,$rowtotal,$crstype,$noedit) = @_;
+ unless ((ref($settings) eq 'HASH') && (ref($itemtext) eq 'HASH')) {
+ return;
+ }
+ if ($position eq 'top') {
+ my (%defaultmenu_options,@defaultmenu_order,$addcollection);
+ if ($settings->{'menucollections'} ne '') {
+ foreach my $item (split(/;/,$settings->{'menucollections'})) {
+ my ($num,$value) = split(/\%/,$item);
+ if ($num =~ /^\d+$/) {
+ $defaultmenu_options{$num} = $num;
+ }
+ }
+ @defaultmenu_order = sort { $a <=> $b } keys(%defaultmenu_options);
+ $addcollection = $defaultmenu_order[-1] + 1;
+ } else {
+ $addcollection = 1;
+ }
+ $defaultmenu_options{$addcollection} = $addcollection;
+ my %items = (
+ 'menudefault' => {
+ text => ''.&mt($itemtext->{'menudefault'}).' '.
+ &mt("(can be overriden in deep-link context)"),
+ input => 'selectbox',
+ options => \%defaultmenu_options,
+ order => \@defaultmenu_order,
+ nullval => &mt('Standard (all menus shown)'),
+ },
+ );
+ return &make_item_rows($cdom,\%items,['menudefault'],$settings,$rowtotal,$crstype,'menuitems',$noedit);
+ } else {
+ my %menu;
+ my $count = 0;
+ my $next = 1;
+ my ($datatable,$disabled);
+ if ($noedit) {
+ $disabled = ' disabled="disabled"';
+ }
+
+ my ($ordered,$cats) = &menuitems_categories();
+ my @order = @{$ordered};
+ my %categories = %{$cats};
+ my %menutitles = &menuitems_titles();
+ my %menufields = &menuitems_fields();
+
+ if ($settings->{'menucollections'} ne '') {
+ foreach my $item (split(/;/,$settings->{'menucollections'})) {
+ my ($num,$value) = split(/\%/,$item);
+ if ($num =~ /^\d+$/) {
+ my @entries = split(/\&/,$value);
+ foreach my $entry (@entries) {
+ my ($name,$fields) = split(/=/,$entry);
+ $menu{$num}{$name} = $fields;
+ }
+ }
+ }
+ if (keys(%menu)) {
+ my @current = sort { $a <=> $b } keys(%menu);
+ $next += $current[-1];
+ foreach my $num (@current) {
+ my %checked;
+ my $on = ' checked="checked"';
+ foreach my $key (keys(%{$menu{$num}})) {
+ if (($key eq 'top') || ($key eq 'inline') || ($key eq 'main')) {
+ if ($menu{$num}{$key} eq 'y') {
+ $checked{$key} = $on;
+ }
+ } else {
+ foreach my $field (split(/,/,$menu{$num}{$key})) {
+ if (exists($menufields{$field})) {
+ $checked{$field} = $on;
+ }
+ }
+ }
+ }
+ if (ref($menu{$num}) eq 'HASH') {
+ $datatable .= &item_table_row_start(''.$num.'',$count,'','','','LC_left_item');
+ foreach my $category (@order) {
+ if ((ref($categories{$category}) eq 'ARRAY') && (@{$categories{$category}} > 0)) {
+ $datatable .= '';
+ }
+ }
+ $datatable .= &item_table_row_end();
+ $count ++;
+ }
+ }
+ }
+ } elsif ($noedit) {
+ my $text = &mt('No menu collections defined for this course.');
+ $datatable .= &item_table_row_start($text,$count);
+ }
+ unless ($noedit) {
+ my $add = '';
+ $datatable .= &item_table_row_start($add,$count,'','','','LC_left_item');
+ foreach my $category (@order) {
+ if ((ref($categories{$category}) eq 'ARRAY') && (@{$categories{$category}} > 0)) {
+ $datatable .= '';
+ }
+ }
+ $datatable .= &item_table_row_end();
+ $count ++;
+ }
+ return $datatable;
+ }
+}
+
+sub menuitems_abbreviations {
+ my %briefcats = (
+ text => 'pt',
+ links => 'p',
+ list => 'ps',
+ inline => 's',
+ );
+ return %briefcats;
+}
+
+sub menuitems_categories {
+ my @order = ('shown','text','links','list','inline');
+ my %categories = (
+ shown => ['top','inline','main'],
+ text => ['name','role','crs'],
+ links => ['personal','menu','comm','roles','help','logout'],
+ list => ['about','prefs','port','wish','anno','rss'],
+ inline => ['cont','grades','chat','people','groups','resv','syll','feeds'],
+ );
+ return (\@order,\%categories);
+}
+
+sub menuitems_titles {
+ return &Apache::lonlocal::texthash (
+ shown => 'Hierarchy',
+ text => 'Header text',
+ links => 'Header links',
+ list => 'Drop-down list',
+ inline => 'Inline links',
+ );
+}
+
+sub menuitems_fields {
+ return &Apache::lonlocal::texthash (
+ top => 'Display header',
+ inline => 'Display inline menu',
+ main => 'Access to main menu',
+ personal => 'Personal',
+ menu => 'Home',
+ comm => 'Messages',
+ roles => 'Roles/Courses',
+ help => 'Help',
+ logout => 'Logout',
+ name => 'Fullname',
+ crs => 'Course Title',
+ role => 'Current Role',
+ about => 'Information',
+ prefs => 'Preferences',
+ port => 'Portfolio',
+ wish => 'Stored Links',
+ anno => 'Calendar',
+ rss => 'RSS Feeds',
+ cont => 'Contents',
+ grades => 'Grades',
+ chat => 'Chat',
+ people => 'People',
+ groups => 'Groups',
+ resv => 'Reservations',
+ syll => 'Syllabus',
+ feeds => 'Feeds',
+ );
+}
+
+sub menucollections_display {
+ my ($collections) = @_;
+ my %menu;
+ my ($ordered,$cats) = &menuitems_categories();
+ my @order = @{$ordered};
+ my %categories = %{$cats};
+ my %menutitles = &menuitems_titles();
+ my %menufields = &menuitems_fields();
+ foreach my $item (split(/;/,$collections)) {
+ my ($num,$value) = split(/\%/,$item);
+ if ($num =~ /^\d+$/) {
+ my @entries = split(/\&/,$value);
+ foreach my $entry (@entries) {
+ my ($name,$fields) = split(/=/,$entry);
+ $menu{$num}{$name} = $fields;
+ }
+ }
+ }
+ my $output = '';
+ if (keys(%menu)) {
+ my @current = sort { $a <=> $b } keys(%menu);
+ foreach my $num (@current) {
+ my %checked;
+ foreach my $key (keys(%{$menu{$num}})) {
+ if (($key eq 'top') || ($key eq 'inline') || ($key eq 'main')) {
+ if ($menu{$num}{$key} eq 'y') {
+ $checked{$key} = 1;
+ }
+ } else {
+ foreach my $field (split(/,/,$menu{$num}{$key})) {
+ if (exists($menufields{$field})) {
+ $checked{$field} = 1;
+ }
+ }
+ }
+ }
+ if (ref($menu{$num}) eq 'HASH') {
+ $output .= '';
+ }
+ }
+ }
+ return $output;
+}
+
sub print_other {
my ($cdom,$settings,$allitems,$rowtotal,$crstype,$noedit) = @_;
unless ((ref($settings) eq 'HASH') && (ref($allitems) eq 'ARRAY')) {
@@ -4646,17 +5089,23 @@ sub get_other_items {
}
sub item_table_row_start {
- my ($text,$count,$add_class,$colspan) = @_;
+ my ($text,$count,$add_class,$colspan,$leftclass,$rightclass) = @_;
my $output;
my $css_class = ($count % 2) ? 'LC_odd_row' : 'LC_even_row';
$css_class = (join(' ',$css_class,$add_class)) unless ($add_class eq '');
+ if ($leftclass eq '') {
+ $leftclass = 'LC_left_item';
+ }
+ if ($rightclass eq '') {
+ $rightclass = 'LC_right_item';
+ }
$output .= ''."\n".
- ''.$text.
+ ' | '.$text.
' | ';
- if ($colspan) {
- $output .= '';
+ if ($colspan > 1) {
+ $output .= ' | ';
} else {
- $output .= ' | ';
+ $output .= ' | ';
}
return $output;
}
@@ -4697,7 +5146,7 @@ sub yesno_radio {
}
sub select_from_options {
- my ($item,$order,$options,$curr,$nullval,$multiple,$maxsize,$onchange,$noedit) = @_;
+ my ($item,$order,$options,$curr,$nullval,$multiple,$maxsize,$onchange,$noedit,$id) = @_;
my $output;
my $disabled;
if ($noedit) {
@@ -4713,6 +5162,9 @@ sub select_from_options {
$output .= ' size="'.$maxsize.'"';
}
}
+ if ($id ne '') {
+ $output .= ' id="'.$id.'"';
+ }
$output .= $disabled.'>'."\n";
if ($nullval ne '') {
$output .= ' | |