--- loncom/interface/domainprefs.pm 2018/03/23 01:01:20 1.325
+++ loncom/interface/domainprefs.pm 2018/07/06 04:23:58 1.329
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set domain-wide configuration settings
#
-# $Id: domainprefs.pm,v 1.325 2018/03/23 01:01:20 raeburn Exp $
+# $Id: domainprefs.pm,v 1.329 2018/07/06 04:23:58 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1596,7 +1596,7 @@ sub display_color_options {
my $datatable = '
'.
''.$choices->{'font'}.' | ';
if (!$is_custom->{'font'}) {
- $datatable .= ''.&mt('Default in use:').' '.$defaults->{'font'}.' | ';
+ $datatable .= ''.&mt('Default in use:').' '.$defaults->{'font'}.' | ';
} else {
$datatable .= ' | ';
}
@@ -1605,12 +1605,12 @@ sub display_color_options {
$datatable .= ''.
' '.
- ' |
';
+ ' ';
unless ($role eq 'login') {
$datatable .= ''.
''.$choices->{'fontmenu'}.' | ';
if (!$is_custom->{'fontmenu'}) {
- $datatable .= ''.&mt('Default in use:').' '.$defaults->{'fontmenu'}.' | ';
+ $datatable .= ''.&mt('Default in use:').' '.$defaults->{'fontmenu'}.' | ';
} else {
$datatable .= ' | ';
}
@@ -1620,7 +1620,7 @@ sub display_color_options {
' '.
- '
';
+ ' ';
}
my $switchserver = &check_switchserver($dom,$confname);
foreach my $img (@{$images}) {
@@ -1738,7 +1738,7 @@ sub display_color_options {
my $bgs_def;
foreach my $item (@{$bgs}) {
if (!$is_custom->{$item}) {
- $bgs_def .= ''.$choices->{$item}.' '.$defaults->{'bgs'}{$item}.' | ';
+ $bgs_def .= ''.$choices->{$item}.' '.$defaults->{'bgs'}{$item}.' | ';
}
}
if ($bgs_def) {
@@ -1766,7 +1766,7 @@ sub display_color_options {
my $links_def;
foreach my $item (@{$links}) {
if (!$is_custom->{$item}) {
- $links_def .= ''.$choices->{$item}.' '.$defaults->{'links'}{$item}.' | ';
+ $links_def .= ''.$choices->{$item}.' '.$defaults->{'links'}{$item}.' | ';
}
}
if ($links_def) {
@@ -2909,6 +2909,35 @@ function toggleLTI(form,setting,item) {
}
}
}
+ } else if (setting == 'lcmenu') {
+ var menus = new Array('lti_topmenu_'+item,'lti_inlinemenu_'+item);
+ var divid = 'lti_menufield_'+item;
+ var setvis = '';
+ for (var i=0; i 'Other',
'passback' => 'Can return grades to Consumer:',
'roster' => 'Can retrieve roster from Consumer:',
+ 'topmenu' => 'Display LON-CAPA page header',
+ 'inlinemenu'=> 'Display LON-CAPA inline menu',
);
return %lt;
}
@@ -4709,6 +4740,7 @@ sub lti_options {
$checked{'crssec'} = {};
$checked{'crssecsrc'} = {};
$checked{'lcauth'} = {};
+ $checked{'menuitem'} = {};
if ($num eq 'add') {
$checked{'lcauth'}{'lti'} = ' checked="checked"';
}
@@ -4719,7 +4751,9 @@ sub lti_options {
my $lcauthparm;
my $lcauthparmstyle = 'display:none';
my $lcauthparmtext;
+ my $menusty;
my $numinrow = 4;
+ my %menutitles = <imenu_titles();
if (ref($current) eq 'HASH') {
if (($current->{'mapuser'} ne '') && ($current->{'mapuser'} ne 'lis_person_sourcedid')) {
@@ -4749,7 +4783,7 @@ sub lti_options {
}
if ($current->{'makecrs'}) {
$checked{'makecrs'}{'Y'} = ' checked="checked"';
- }
+ }
if (ref($current->{'makeuser'}) eq 'ARRAY') {
foreach my $role (@{$current->{'makeuser'}}) {
$checked{'makeuser'}{$role} = ' checked="checked"';
@@ -4788,10 +4822,35 @@ sub lti_options {
} else {
$checked{'crssec'}{'N'} = ' checked="checked"';
}
+ if ($current->{'topmenu'}) {
+ $checked{'topmenu'}{'Y'} = ' checked="checked"';
+ } else {
+ $checked{'topmenu'}{'N'} = ' checked="checked"';
+ }
+ if ($current->{'inlinemenu'}) {
+ $checked{'inlinemenu'}{'Y'} = ' checked="checked"';
+ } else {
+ $checked{'inlinemenu'}{'N'} = ' checked="checked"';
+ }
+ if (($current->{'topmenu'}) || ($current->{'inlinemenu'})) {
+ $menusty = 'inline-block';
+ if (ref($current->{'lcmenu'}) eq 'ARRAY') {
+ foreach my $item (@{$current->{'lcmenu'}}) {
+ if (exists($menutitles{$item})) {
+ $checked{'menuitem'}{$item} = ' checked="checked"';
+ }
+ }
+ }
+ } else {
+ $menusty = 'none';
+ }
} else {
$checked{'makecrs'}{'N'} = ' checked="checked"';
$checked{'crssec'}{'N'} = ' checked="checked"';
-#FIXME
+ $checked{'topmenu'}{'N'} = ' checked="checked"';
+ $checked{'inlinemenu'}{'Y'} = ' checked="checked"';
+ $checked{'menuitem'}{'grades'} = ' checked="checked"';
+ $menusty = 'inline-block';
}
my @coursetypes = ('official','unofficial','community','textbook','placement','lti');
my %coursetypetitles = &Apache::lonlocal::texthash (
@@ -4818,6 +4877,7 @@ sub lti_options {
my $onclicksec = ' onclick="toggleLTI(this.form,'."'sec','$num'".');"';
my $onclicksecsrc = ' onclick="toggleLTI(this.form,'."'secsrc','$num'".')"';
my $onclicklcauth = ' onclick="toggleLTI(this.form,'."'lcauth','$num'".')"';
+ my $onclickmenu = ' onclick="toggleLTI(this.form,'."'lcmenu','$num'".');"';
my $output = '