--- loncom/interface/domainprefs.pm 2013/12/24 19:15:10 1.216
+++ loncom/interface/domainprefs.pm 2014/01/08 17:18:11 1.223
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set domain-wide configuration settings
#
-# $Id: domainprefs.pm,v 1.216 2013/12/24 19:15:10 raeburn Exp $
+# $Id: domainprefs.pm,v 1.223 2014/01/08 17:18:11 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -95,7 +95,7 @@ institutional affiliation in the domain
but is now also used to manage availability of user tools:
i.e., blogs, aboutme page, and portfolios, and the course request tool,
used by course owners to request creation of a course, and to display/store
-default quota sizes for authoring spaces.
+default quota sizes for Authoring Spaces.
Outputs: 1
@@ -334,7 +334,7 @@ sub handler {
col2 => ''}],
},
'requestauthor' =>
- {text => 'Request authoring space',
+ {text => 'Request Authoring Space',
help => 'Domain_Configuration_Request_Author',
header => [{col1 => 'User affiliation',
col2 => 'Availability/Processing of requests',},
@@ -420,7 +420,7 @@ sub handler {
if ($phase eq 'process') {
my $result = &Apache::lonconfigsettings::make_changes($r,$dom,$phase,$context,\@prefs_order,
\%prefs,\%domconfig,$confname,\@roles);
- if (ref($result) eq 'HASH') {
+ if ((ref($result) eq 'HASH') && (keys(%{$result}))) {
$r->rflush();
&devalidate_remote_domconfs($dom,$result);
}
@@ -2002,7 +2002,7 @@ sub print_requestmail {
if ($action eq 'requestcourses') {
$text = &mt('Receive notification of course requests requiring approval');
} else {
- $text = &mt('Receive notification of authoring space requests requiring approval')
+ $text = &mt('Receive notification of Authoring Space requests requiring approval')
}
$datatable = '
'.
' '.$text.' | '.
@@ -2022,14 +2022,28 @@ sub print_requestmail {
sub print_studentcode {
my ($settings,$rowtotal) = @_;
my $rownum = 0;
- my %choices;
- $choices{'uniquecode'} = &mt('Generate unique six character code as course identifier?');
- my @toggles = ('uniquecode');
- my %defaultchecked = ('uniquecode' => 'off');
- (my $reports,$rownum) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
- \%choices,$rownum);
- $$rowtotal += $rownum;
- return $reports;
+ my ($output,%current);
+ my @crstypes = ('official','unofficial','community','textbook');
+ if (ref($settings->{'uniquecode'}) eq 'HASH') {
+ foreach my $type (@crstypes) {
+ $current{$type} = $settings->{'uniquecode'}{$type};
+ }
+ }
+ $output .= '
'.
+ ''.&mt('Generate unique six character code as course identifier?').' | '.
+ '';
+ foreach my $type (@crstypes) {
+ my $check = ' ';
+ if ($current{$type}) {
+ $check = ' checked="checked" ';
+ }
+ $output .= ''.(' 'x2).' ';
+ }
+ $output .= ' |
';
+ $$rowtotal ++;
+ return $output;
}
sub print_textbookcourses {
@@ -2054,7 +2068,7 @@ sub print_textbookcourses {
my $confname = $dom.'-domainconfig';
my $switchserver = &check_switchserver($dom,$confname);
my $maxnum = scalar(keys(%ordered));
- my $datatable;
+ my $datatable = &textbookcourses_javascript(\%ordered);
if (keys(%ordered)) {
my @items = sort { $a <=> $b } keys(%ordered);
for (my $i=0; $i<@items; $i++) {
@@ -2074,7 +2088,7 @@ sub print_textbookcourses {
$imgsrc = '';
}
}
- my $chgstr = ' onchange="javascript:reorderBooks(this.form,'."'','$key','$i'".');"';
+ my $chgstr = ' onchange="javascript:reorderBooks(this.form,'."'$key'".');"';
$datatable .= ''
.' |