[LON-CAPA-cvs] cvs: loncom /interface courseclassifier.pm courseprefs.pm loncommon.pm lonconfigsettings.pm lonmenu.pm mydesk.tab
raeburn
raeburn at source.lon-capa.org
Tue Oct 11 18:58:56 EDT 2016
raeburn Tue Oct 11 22:58:56 2016 EDT
Modified files:
/loncom/interface mydesk.tab lonmenu.pm loncommon.pm
lonconfigsettings.pm courseclassifier.pm
courseprefs.pm
Log:
- vpa priv allows Course Settings to be viewed, but not modified.
- users with vpa priv in a course receive "View parameter settings
(due dates, etc) for resources and the course" item in the Main Menu,
and a Settings item in the inline menu.
-------------- next part --------------
Index: loncom/interface/mydesk.tab
diff -u loncom/interface/mydesk.tab:1.169 loncom/interface/mydesk.tab:1.170
--- loncom/interface/mydesk.tab:1.169 Mon Oct 10 03:02:47 2016
+++ loncom/interface/mydesk.tab Tue Oct 11 22:58:55 2016
@@ -71,7 +71,7 @@
# - whn: access what's new
# - cst: Grant/revoke role of Student:Grant/revoke role of Member
# - ncst: Not grant/revoke roles
-# - opa: Set assessment parameters
+# - params: Set and/or view assessment parameters
# - nvgr: cannot view other people's grades
# - mgr: Manage grades
# - author: authors (au, ca, aa)
@@ -86,7 +86,7 @@
scnd:/adm/slotrequest?command=manageresv:::Reservations:showresv
scnd:/adm/slotrequest?command=showslots:::Slots:mgr
scnd:/adm/grades:::Grades:vgr
-scnd:/adm/parmset:::Settings:opa
+scnd:/adm/parmset:::Settings:params
scnd:/public/[cdom]/[cnum]/syllabus:::Syllabus:showsyllabus
scnd:/adm/[cdom]/[cnum]/_rss.html:::Feeds:showfeeds
scnd:/adm/roles:::Roles:
@@ -207,6 +207,7 @@
5:3:clear
5:3:pccc:$requested_domain:ccrs.png:course[_8]:creation[_1]:go('/adm/createcourse');:Course and community creation:ccm
5:3:pdcc:$requested_domain:ccrs.png:course[_8]:creation[_1]:go('/adm/createcourse');:Course and community creation:ccm
+5:3:pvpa:$crs:parm.png:course[_9]:parms[_1]:go('/adm/parmset');:View parameter settings (due dates, etc) for resources and the course:cmn
5:3:popa:$crs:parm.png:course[_9]:parms[_1]:go('/adm/parmset');:Modify parameter settings (due dates, etc) for resources and the course:cmn
5:3:popa:$cmty:parm.png:communi-[_6]:ty parms[_1]:go('/adm/parmset');:Modify parameter settings (due dates, etc) for resources and the community:cmm
6:1:clear
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.453 loncom/interface/lonmenu.pm:1.454
--- loncom/interface/lonmenu.pm:1.453 Thu Oct 6 20:03:34 2016
+++ loncom/interface/lonmenu.pm Tue Oct 11 22:58:55 2016
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.453 2016/10/06 20:03:34 raeburn Exp $
+# $Id: lonmenu.pm,v 1.454 2016/10/11 22:58:55 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -389,6 +389,7 @@
my $canmodifyuser = &Apache::lonnet::allowed('cst', $crs_sec);
my $canviewusers = &Apache::lonnet::allowed('vcl', $crs_sec);
my $canviewwnew = &Apache::lonnet::allowed('whn', $crs_sec);
+ my $canviewpara = &Apache::lonnet::allowed('vpa', $crs_sec);
my $canmodpara = &Apache::lonnet::allowed('opa', $crs_sec);
my $canvgr = &Apache::lonnet::allowed('vgr', $crs_sec);
my $canmgr = &Apache::lonnet::allowed('mgr', $crs_sec);
@@ -467,8 +468,8 @@
&& !$showresv;
next if $$menuitem[4] eq 'whn'
&& !$canviewwnew;
- next if $$menuitem[4] eq 'opa'
- && !$canmodpara;
+ next if $$menuitem[4] eq 'params'
+ && (!$canmodpara && !$canviewpara);
next if $$menuitem[4] =~ /showgroups$/
&& !$canviewgrps
&& !$grouptools;
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1255 loncom/interface/loncommon.pm:1.1256
--- loncom/interface/loncommon.pm:1.1255 Mon Oct 10 03:02:47 2016
+++ loncom/interface/loncommon.pm Tue Oct 11 22:58:55 2016
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.1255 2016/10/10 03:02:47 raeburn Exp $
+# $Id: loncommon.pm,v 1.1256 2016/10/11 22:58:55 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -943,8 +943,8 @@
}
sub select_timezone {
- my ($name,$selected,$onchange,$includeempty)=@_;
- my $output='<select name="'.$name.'" '.$onchange.'>'."\n";
+ my ($name,$selected,$onchange,$includeempty,$disabled)=@_;
+ my $output='<select name="'.$name.'" '.$onchange.$disabled.'>'."\n";
if ($includeempty) {
$output .= '<option value=""';
if (($selected eq '') || ($selected eq 'local')) {
@@ -965,8 +965,8 @@
}
sub select_datelocale {
- my ($name,$selected,$onchange,$includeempty)=@_;
- my $output='<select name="'.$name.'" '.$onchange.'>'."\n";
+ my ($name,$selected,$onchange,$includeempty,$disabled)=@_;
+ my $output='<select name="'.$name.'" '.$onchange.$disabled.'>'."\n";
if ($includeempty) {
$output .= '<option value=""';
if ($selected eq '') {
@@ -1018,7 +1018,7 @@
}
sub select_language {
- my ($name,$selected,$includeempty) = @_;
+ my ($name,$selected,$includeempty,$noedit) = @_;
my %langchoices;
if ($includeempty) {
%langchoices = ('' => 'No language preference');
@@ -1030,7 +1030,7 @@
}
}
%langchoices = &Apache::lonlocal::texthash(%langchoices);
- return &select_form($selected,$name,\%langchoices);
+ return &select_form($selected,$name,\%langchoices,undef,$noedit);
}
=pod
@@ -2742,7 +2742,7 @@
=pod
-=item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms,$excdoms)
+=item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms,$excdoms,$disabled)
Returns a string containing a <select name='$name' size='1'> form to
allow a user to select the domain to preform an operation in.
@@ -2759,14 +2759,19 @@
The optional $excdoms is a reference to an array of domains which will be excluded from the available options.
+The optional $disabled argument, if true, adds the disabled attribute to the select tag.
+
=cut
#-------------------------------------------
sub select_dom_form {
- my ($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms,$excdoms) = @_;
+ my ($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms,$excdoms,$disabled) = @_;
if ($onchange) {
$onchange = ' onchange="'.$onchange.'"';
}
+ if ($disabled) {
+ $disabled = ' disabled="disabled"';
+ }
my (@domains,%exclude);
if (ref($incdoms) eq 'ARRAY') {
@domains = sort {lc($a) cmp lc($b)} (@{$incdoms});
@@ -2777,7 +2782,7 @@
if (ref($excdoms) eq 'ARRAY') {
map { $exclude{$_} = 1; } @{$excdoms};
}
- my $selectdomain = "<select name=\"$name\" size=\"1\"$onchange>\n";
+ my $selectdomain = "<select name=\"$name\" size=\"1\"$onchange$disabled>\n";
foreach my $dom (@domains) {
next if ($exclude{$dom});
$selectdomain.="<option value=\"$dom\" ".
Index: loncom/interface/lonconfigsettings.pm
diff -u loncom/interface/lonconfigsettings.pm:1.32 loncom/interface/lonconfigsettings.pm:1.33
--- loncom/interface/lonconfigsettings.pm:1.32 Mon Jul 25 19:50:30 2016
+++ loncom/interface/lonconfigsettings.pm Tue Oct 11 22:58:55 2016
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set domain-wide configuration settings
#
-# $Id: lonconfigsettings.pm,v 1.32 2016/07/25 19:50:30 raeburn Exp $
+# $Id: lonconfigsettings.pm,v 1.33 2016/10/11 22:58:55 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -213,7 +213,7 @@
}
sub print_footer {
- my ($r,$phase,$newphase,$button_text,$actions,$container) = @_;
+ my ($r,$phase,$newphase,$button_text,$actions,$container,$parm_permission) = @_;
$button_text = &mt($button_text);
$r->print('<input type="hidden" name="phase" value="" />');
if (defined($env{'form.origin'})) {
@@ -238,8 +238,16 @@
} else {
$onclick = '"javascript:changePage(document.'.$phase.','."'$newphase'".')"';
}
- $r->print('<p><input type="button" name="store" value="'.
- $button_text.'" onclick='.$onclick.' /></p>');
+ my $showbutton = 1;
+ if (ref($parm_permission) eq 'HASH') {
+ unless (($parm_permission->{'process'}) || ($newphase eq 'display')) {
+ $showbutton = 0;
+ }
+ }
+ if ($showbutton) {
+ $r->print('<p><input type="button" name="store" value="'.
+ $button_text.'" onclick='.$onclick.' /></p>');
+ }
}
if ($phase eq 'process') {
$r->print('</form>');
@@ -252,7 +260,8 @@
}
sub make_changes {
- my ($r,$dom,$phase,$context,$prefs_order,$prefs,$values,$confname,$roles,$allitems,$container) = @_;
+ my ($r,$dom,$phase,$context,$prefs_order,$prefs,$values,$confname,$roles,
+ $allitems,$container,$parm_permission) = @_;
my %brcrumtext = &get_crumb_text();
my @actions = &Apache::loncommon::get_env_multiple('form.actions');
my ($numchanged,%changes,%disallowed);
@@ -316,14 +325,14 @@
if ($context eq 'course') {
$footer_text = 'Back to display/edit settings';
}
- &print_footer($r,$phase,'display',$footer_text,\@actions,$container);
+ &print_footer($r,$phase,'display',$footer_text,\@actions,$container,$parm_permission);
$r->print('</p>');
return \%lastact;
}
sub display_settings {
my ($r,$dom,$phase,$context,$prefs_order,$prefs,$values,$confname,$jscript,
- $allitems,$crstype,$container) = @_;
+ $allitems,$crstype,$container,$parm_permission) = @_;
my %brcrumtext = &get_crumb_text();
my @actions = &Apache::loncommon::get_env_multiple('form.actions');
&Apache::lonhtmlcommon::add_breadcrumb
@@ -387,7 +396,7 @@
} else {
($output{$item},$rowtotal{$item}) =
&Apache::courseprefs::print_config_box($r,$dom,$phase,
- $item,$prefs->{$item},$values,$allitems,$crstype);
+ $item,$prefs->{$item},$values,$allitems,$crstype,$parm_permission);
}
$rowsum += $rowtotal{$item};
}
@@ -397,7 +406,7 @@
$r->print($output{$items[$i]});
}
$r->print('</div>');
- $r->print(&print_footer($r,$phase,'process','Save Changes',\@actions,$container));
+ $r->print(&print_footer($r,$phase,'process','Save Changes',\@actions,$container,$parm_permission));
} else {
$r->print('<input type="hidden" name="phase" value="" />'.
'<span class="LC_error">'.&mt('No settings chosen').
@@ -413,7 +422,7 @@
}
sub display_choices {
- my ($r,$phase,$context,$prefs_order,$prefs,$container) = @_;
+ my ($r,$phase,$context,$prefs_order,$prefs,$container,$parm_permission) = @_;
if ($phase eq '') {
$phase = 'pickactions';
}
@@ -424,7 +433,13 @@
&Apache::loncommon::check_uncheck_jscript()."\n".
'// ]]>'."\n".
'</script>'."\n");
- $r->print('<h3>'.&mt('Settings to display/modify').'</h3>'.
+ my $heading = &mt('Settings to display/modify');
+ if (ref($parm_permission) eq 'HASH') {
+ unless ($parm_permission->{'process'}) {
+ $heading = &mt('Settings to display');
+ }
+ }
+ $r->print('<h3>'.$heading.'</h3>'.
'<div><input type="button" value="'.&mt('check all').'" '.
'onclick="javascript:checkAll(document.pickactions.actions)"'.
' />'.(' 'x2).
@@ -462,7 +477,7 @@
}
$r->print('</div><br clear="all" />');
}
- $r->print(&print_footer($r,$phase,'display','Display',undef,$container));
+ $r->print(&print_footer($r,$phase,'display','Display',undef,$container,$parm_permission));
$r->print('</form>');
if ($container) {
&Apache::lonparmset::endSettingsScreen($r);
Index: loncom/interface/courseclassifier.pm
diff -u loncom/interface/courseclassifier.pm:1.23 loncom/interface/courseclassifier.pm:1.24
--- loncom/interface/courseclassifier.pm:1.23 Fri May 22 16:00:55 2015
+++ loncom/interface/courseclassifier.pm Tue Oct 11 22:58:55 2016
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Utilities for classifying courses based on institutional code
#
-# $Id: courseclassifier.pm,v 1.23 2015/05/22 16:00:55 raeburn Exp $
+# $Id: courseclassifier.pm,v 1.24 2016/10/11 22:58:55 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -575,7 +575,7 @@
}
sub build_instcode_selectors {
- my ($numtitles,$lasttitle,$cat_items,$codetitles,$cat_titles,$cat_order,$official,$class,$id) = @_;
+ my ($numtitles,$lasttitle,$cat_items,$codetitles,$cat_titles,$cat_order,$official,$class,$id,$noedit) = @_;
my $output;
my @standardnames = &Apache::loncommon::get_standard_codeitems();
if ($numtitles > 0) {
@@ -586,6 +586,10 @@
if ($id eq '') {
$id = 'instcodes';
}
+ my $disabled;
+ if ($noedit) {
+ $disabled = ' disabled="disabled"';
+ }
$output .= '<div id="'.$id.'"'.$style.'><table><tr>';
for (my $k=0; $k<$lasttitle-1; $k++) {
my (@items, at unsorted);
@@ -606,7 +610,7 @@
if ($class) {
$output .= ' class="'.$class.'"';
}
- $output .= '>'."\n".'<option value="0">'.&mt('All').'</option>'."\n";
+ $output .= $disabled.'>'."\n".'<option value="0">'.&mt('All').'</option>'."\n";
for (my $i=0; $i<@items; $i++) {
if ($longitems[$i] eq '') {
$longitems[$i] = $items[$i];
@@ -620,14 +624,14 @@
if ($class) {
$output .= ' class="'.$class.'"';
}
- $output .= '>'."\n".
+ $output .= $disabled.'>'."\n".
'<option value="0">'.&mt('All')."\n".
'</option>'."\n".'</select>'."\n".
'</td></tr></table>'."\n";
if ($numtitles > 4) {
$output .= '<br /><br />'.$codetitles->[$numtitles-1].'<br />'."\n".
'<input type="text" name="'.$standardnames[$numtitles-1].
- '" /><br />'."\n";
+ '"'.$disabled.' /><br />'."\n";
}
$output .= '</div>';
}
Index: loncom/interface/courseprefs.pm
diff -u loncom/interface/courseprefs.pm:1.79 loncom/interface/courseprefs.pm:1.80
--- loncom/interface/courseprefs.pm:1.79 Fri May 13 22:57:45 2016
+++ loncom/interface/courseprefs.pm Tue Oct 11 22:58:55 2016
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set configuration settings for a course
#
-# $Id: courseprefs.pm,v 1.79 2016/05/13 22:57:45 raeburn Exp $
+# $Id: courseprefs.pm,v 1.80 2016/10/11 22:58:55 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -137,7 +137,7 @@
advanced course user .db file for a course are to be hidden (e.g.,
in syllabus, or from course user lists).
-Inputs: $cdom,$item,$settings,$crstype
+Inputs: $cdom,$item,$settings,$crstype,$noedit
where $cdom is course domain, item is nothideprivileged, $settings is
HASH ref of the current values for nothideprivileged, $crstype is
course type (Course or Community).
@@ -235,9 +235,9 @@
my $cid = $env{'request.course.id'};
my ($cnum,$cdom,$chome) = &get_course($cid);
my $crstype = &Apache::loncommon::course_type();
- my $parm_permission = &Apache::lonnet::allowed('opa',$cid);
+ my ($parm_permission,$allowed) = &get_permission($cid);
my $navmap = Apache::lonnavmaps::navmap->new();
- if ($parm_permission && $navmap) {
+ if ($allowed && $navmap) {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
} else {
@@ -344,12 +344,12 @@
$phase = $env{'form.phase'};
}
- if ($phase eq 'categorizecourse') {
+ if (($phase eq 'categorizecourse') && ($parm_permission->{'categorizecourse'})) {
&assign_course_categories($r,$crstype);
return OK;
}
- if ($phase eq 'releaseinfo') {
+ if (($phase eq 'releaseinfo') && ($parm_permission->{'releaseinfo'})) {
my $loncaparev = $env{'course.'.$cid.'.internal.releaserequired'};
if ($loncaparev) {
if (&display_loncaparev_constraints($r,$navmap,$loncaparev,$crstype)) {
@@ -538,23 +538,52 @@
}],
},
);
- if ($phase eq 'process') {
+ if (($phase eq 'process') && ($parm_permission->{'process'})) {
my @allitems = &get_allitems(%prefs);
&Apache::lonconfigsettings::make_changes($r,$cdom,$phase,$context,
\@prefs_order,\%prefs,\%values,
- $cnum,undef,\@allitems,'coursepref');
- } elsif ($phase eq 'display') {
+ $cnum,undef,\@allitems,
+ 'coursepref',$parm_permission);
+ } elsif (($phase eq 'display') && ($parm_permission->{'display'})) {
my $jscript = &get_jscript($cid,$cdom,$phase,$crstype,\%values);
my @allitems = &get_allitems(%prefs);
&Apache::lonconfigsettings::display_settings($r,$cdom,$phase,$context,
- \@prefs_order,\%prefs,\%values,undef,$jscript,\@allitems,$crstype,'coursepref');
+ \@prefs_order,\%prefs,\%values,undef,$jscript,\@allitems,$crstype,
+ 'coursepref',$parm_permission);
} else {
&Apache::lonconfigsettings::display_choices($r,$phase,$context,
- \@prefs_order,\%prefs,'coursepref');
+ \@prefs_order,\%prefs,
+ 'coursepref',$parm_permission);
}
return OK;
}
+sub get_permission {
+ my ($cid) = @_;
+ my %permission;
+ my $allowed = 0;
+ return (\%permission,$allowed) unless ($cid);
+ if (&Apache::lonnet::allowed('opa',$cid)) {
+ %permission= (
+ 'pickactions' => 1,
+ 'categorizecourse' => 1,
+ 'releaseinfo' => 1,
+ 'process' => 1,
+ 'display' => 1,
+ );
+ } elsif (&Apache::lonnet::allowed('vpa',$env{'request.course.id'})) {
+ %permission = (
+ 'pickactions' => 1,
+ 'releaseinfo' => 1,
+ 'display' => 1,
+ );
+ }
+ foreach my $perm (values(%permission)) {
+ if ($perm) { $allowed=1; last; }
+ }
+ return (\%permission,$allowed);
+}
+
sub get_allitems {
my (%prefs) = @_;
my @allitems;
@@ -572,9 +601,15 @@
}
sub print_config_box {
- my ($r,$cdom,$phase,$action,$item,$settings,$allitems,$crstype) = @_;
+ my ($r,$cdom,$phase,$action,$item,$settings,$allitems,$crstype,$parm_permission) = @_;
my $ordered = $item->{'ordered'};
my $itemtext = $item->{'itemtext'};
+ my $noedit;
+ if (ref($parm_permission) eq 'HASH') {
+ unless ($parm_permission->{'process'}) {
+ $noedit = 1;
+ }
+ }
my $rowtotal = 0;
my $output =
'<table class="LC_nested_outer">
@@ -609,9 +644,9 @@
}
$rowtotal ++;
if ($action eq 'feedback') {
- $output .= &print_feedback('top',$cdom,$settings,$ordered,$itemtext,\$rowtotal);
+ $output .= &print_feedback('top',$cdom,$settings,$ordered,$itemtext,\$rowtotal,$noedit);
} elsif ($action eq 'classlists') {
- $output .= &print_classlists('top',$cdom,$settings,$itemtext,\$rowtotal,$crstype);
+ $output .= &print_classlists('top',$cdom,$settings,$itemtext,\$rowtotal,$crstype,$noedit);
}
$output .= '
</table>
@@ -632,7 +667,7 @@
$output .= &mt($item->{'header'}->[1]->{'col2'}).'</td>
</tr>';
if ($action eq 'classlists') {
- $output .= &print_classlists('middle',$cdom,$settings,$itemtext,\$rowtotal,$crstype).
+ $output .= &print_classlists('middle',$cdom,$settings,$itemtext,\$rowtotal,$crstype,$noedit).
'
</table>
</td>
@@ -671,27 +706,27 @@
}
$rowtotal ++;
if ($action eq 'courseinfo') {
- $output .= &print_courseinfo($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype);
+ $output .= &print_courseinfo($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
} elsif ($action eq 'localization') {
- $output .= &print_localization($cdom,$settings,$ordered,$itemtext,\$rowtotal);
+ $output .= &print_localization($cdom,$settings,$ordered,$itemtext,\$rowtotal,$noedit);
} elsif ($action eq 'feedback') {
- $output .= &print_feedback('bottom',$cdom,$settings,$ordered,$itemtext,\$rowtotal);
+ $output .= &print_feedback('bottom',$cdom,$settings,$ordered,$itemtext,\$rowtotal,$noedit);
} elsif ($action eq 'discussion') {
- $output .= &print_discussion($cdom,$settings,$ordered,$itemtext,\$rowtotal);
+ $output .= &print_discussion($cdom,$settings,$ordered,$itemtext,\$rowtotal,$noedit);
} elsif (($action eq 'classlists') || ($action eq 'viewableroster')) {
- $output .= &print_classlists('bottom',$cdom,$settings,$itemtext,\$rowtotal,$crstype);
+ $output .= &print_classlists('bottom',$cdom,$settings,$itemtext,\$rowtotal,$crstype,$noedit);
} elsif ($action eq 'appearance') {
- $output .= &print_appearance($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype);
+ $output .= &print_appearance($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
} elsif ($action eq 'grading') {
- $output .= &print_grading($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype);
+ $output .= &print_grading($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
} elsif ($action eq 'printouts') {
- $output .= &print_printouts($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype);
+ $output .= &print_printouts($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
} elsif ($action eq 'spreadsheet') {
- $output .= &print_spreadsheet($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype);
+ $output .= &print_spreadsheet($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
} elsif ($action eq 'bridgetasks') {
- $output .= &print_bridgetasks($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype);
+ $output .= &print_bridgetasks($cdom,$settings,$ordered,$itemtext,\$rowtotal,$crstype,$noedit);
} elsif ($action eq 'other') {
- $output .= &print_other($cdom,$settings,$allitems,\$rowtotal,$crstype);
+ $output .= &print_other($cdom,$settings,$allitems,\$rowtotal,$crstype,$noedit);
}
$output .= '
</table>
@@ -1939,7 +1974,7 @@
sub print_courseinfo {
- my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype) = @_;
+ my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype,$noedit) = @_;
unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
return;
}
@@ -2094,6 +2129,10 @@
);
my $datatable;
my $count = 0;
+ my $disabled;
+ if ($noedit) {
+ $disabled = ' disabled="disabled"';
+ }
foreach my $item (@{$ordered}) {
my $colspan;
if ($item eq 'hidefromcat') {
@@ -2113,7 +2152,7 @@
$datatable .= &item_table_row_start($items{$item}{text},$count,undef,$colspan);
}
if ($items{$item}{input} eq 'radio') {
- $datatable .= &yesno_radio($item,$settings);
+ $datatable .= &yesno_radio($item,$settings,undef,undef,undef,$noedit);
} elsif ($item eq 'cloners') {
my $includeempty = 1;
my $num = 0;
@@ -2127,14 +2166,14 @@
$datatable .= ' checked="checked" ';
}
$datatable .= 'onchange="javascript:update_cloners('.
- "'cloners_all'".');" />'.&mt('Yes').'</label>'.
+ "'cloners_all'".');"'.$disabled.' />'.&mt('Yes').'</label>'.
(' 'x2).'<label>'.
'<input type="radio" name="cloners_all" value="0" ';
if ($settings->{$item} ne '*') {
$datatable .= ' checked="checked" ';
}
$datatable .= ' onchange="javascript:update_cloners('.
- "'cloners_all'".');" />'.&mt('No').'</label></td>'.
+ "'cloners_all'".');"'.$disabled.' />'.&mt('No').'</label></td>'.
&Apache::loncommon::end_data_table_row().
&Apache::loncommon::end_data_table().
'<table><tr><td align="left"><b>'.&mt('Or').
@@ -2142,11 +2181,13 @@
&Apache::loncommon::start_data_table();
my @cloners;
if ($settings->{$item} eq '') {
- my $default;
- if ($currcanclone eq 'domain') {
- $default = '0';
+ unless ($noedit) {
+ my $default;
+ if ($currcanclone eq 'domain') {
+ $default = '0';
+ }
+ $datatable .= &new_cloners_dom_row($cdom,'0',$default);
}
- $datatable .= &new_cloners_dom_row($cdom,'0',$default);
} elsif ($settings->{$item} ne '*') {
my @entries = split(/,/,$settings->{$item});
if (@entries > 0) {
@@ -2167,7 +2208,7 @@
'</b><input type="hidden" name="cloners_dom_'.$num.
'" value="'.$udom.'" /></span><br />'.
'<span class="LC_nobreak"><label><input type="checkbox" '.
- 'name="cloners_delete" value="'.$num.'" onchange="javascript:update_cloners('."'cloners_delete','$num'".');" />'.
+ 'name="cloners_delete" value="'.$num.'" onchange="javascript:update_cloners('."'cloners_delete','$num'".');"'.$disabled.' />'.
&mt('Delete').'</label></span></td>'.
&Apache::loncommon::end_data_table_row();
$num ++;
@@ -2190,7 +2231,8 @@
'<td align="left"><span class="LC_nobreak">'.
$add_domtitle.'</span><br />'.
&Apache::loncommon::select_dom_form('','cloners_newdom',
- $includeempty).
+ $includeempty,undef,undef,
+ undef,undef,$noedit).
'<input type="hidden" name="cloners_total" value="'.$num.'" />'.
'</td>'.&Apache::loncommon::end_data_table_row().
&Apache::loncommon::end_data_table().
@@ -2202,7 +2244,7 @@
&mt('Specific users').' (<tt>'.
&mt('user:domain,user:domain').'</tt>)<br />'.
&Apache::lonhtmlcommon::textbox($item,$cloners_str,
- $items{$item}{'size'}).
+ $items{$item}{'size'},$disabled).
'</td>'.&Apache::loncommon::end_data_table_row().
&Apache::loncommon::end_data_table();
if (@code_order > 0) {
@@ -2226,13 +2268,13 @@
'<td align="left"><span class="LC_nobreak">'.
&mt('Cloning by official course(s) based on course category').(' 'x2).
'<label>'.
- '<input type="radio" name="cloners_instcode" value="1" onclick="toggleCloners(this);"'.$checkedon.' />'.&mt('Yes').'</label>'.
+ '<input type="radio" name="cloners_instcode" value="1" onclick="toggleCloners(this);"'.$checkedon.$disabled.' />'.&mt('Yes').'</label>'.
(' ').
'<label>'.
- '<input type="radio" name="cloners_instcode" value="0" onclick="toggleCloners(this);"'.$checkedoff.' />'.&mt('No').'</label>'.
+ '<input type="radio" name="cloners_instcode" value="0" onclick="toggleCloners(this);"'.$checkedoff.$disabled.' />'.&mt('No').'</label>'.
&Apache::courseclassifier::build_instcode_selectors($numtitles,
$lasttitle,\%cat_items,\@codetitles,\%cat_titles,\%cat_order,
- $showncodes,'LC_cloners_instcodes','LC_cloners_instcode').
+ $showncodes,'LC_cloners_instcodes','LC_cloners_instcode',$noedit).
'</td>'.&Apache::loncommon::end_data_table_row().
&Apache::loncommon::end_data_table();
}
@@ -2253,12 +2295,17 @@
'</span></td><td align="left">'.
&Apache::lonhtmlcommon::textbox('rolenames_'.$role,
$settings->{$role.'.plaintext'},
- $items{$item}{size}).'</td>'.
+ $items{$item}{size},$disabled).'</td>'.
&Apache::loncommon::end_data_table_row();
}
$datatable .= &Apache::loncommon::end_data_table().'</td>';
} elsif ($item eq 'categories') {
- my $launcher = 'onfocus="this.blur();javascript:catsbrowser();"';
+ my $launcher;
+ if ($noedit) {
+ $launcher = $disabled;
+ } else {
+ $launcher = 'onfocus="this.blur();javascript:catsbrowser();"';
+ }
$datatable .= '<input type="hidden" name="categories" value="'.$settings->{$item}.'" />'.
&Apache::lonhtmlcommon::textbox($item.'_display',$settings->{$item},
$items{$item}{size},$launcher);
@@ -2298,13 +2345,13 @@
if (($crstype eq 'Course') && ($env{'course.'.$env{'request.course.id'}.'.internal.coursecode'}) && ($autocoowner)) {
$datatable .= &show_autocoowners(@currcoown);
} else {
- $datatable .= &coowner_invitations($cnum,$cdom, at currcoown);
+ $datatable .= &coowner_invitations($cnum,$cdom,\@currcoown,$noedit);
}
} else {
if (($crstype eq 'Course') && ($env{'course.'.$env{'request.course.id'}.'.internal.coursecode'}) && ($autocoowner)) {
$datatable .= &show_autocoowners(@currcoown);
} else {
- $datatable .= &manage_coownership($cnum,$cdom, at currcoown);
+ $datatable .= &manage_coownership($cnum,$cdom,\@currcoown,$noedit);
}
}
} elsif ($item eq 'externalsyllabus') {
@@ -2348,7 +2395,7 @@
}
$datatable .= $showreqd;
} else {
- $datatable .= &Apache::lonhtmlcommon::textbox($item,$settings->{$item},$items{$item}{size});
+ $datatable .= &Apache::lonhtmlcommon::textbox($item,$settings->{$item},$items{$item}{size},$disabled);
}
$datatable .= &item_table_row_end();
}
@@ -3209,13 +3256,20 @@
}
sub coowner_invitations {
- my ($cnum,$cdom, at currcoown) = @_;
- my ($output, at pendingcoown, at othercoords);
+ my ($cnum,$cdom,$currcoownref,$noedit) = @_;
+ my ($output, at pendingcoown, at othercoords, at currcoown);
my $pendingcoowners =
$env{'course.'.$env{'request.course.id'}.'.internal.pendingco-owners'};
if ($pendingcoowners) {
@pendingcoown = split(',',$pendingcoowners);
}
+ if (ref($currcoownref) eq 'ARRAY') {
+ @currcoown == @{$currcoownref};
+ }
+ my $disabled;
+ if ($noedit) {
+ $disabled = ' disabled="disabled"';
+ }
my $ccrole = 'cc';
my %ccroles = &Apache::lonnet::get_my_roles($cnum,$cdom,undef,undef,[$ccrole]);
foreach my $key (sort(keys(%ccroles))) {
@@ -3233,7 +3287,7 @@
'<td><i>'.&mt('Current co-owners').'</i></td><td>';
foreach my $person (@currcoown) {
my ($co_uname,$co_dom) = split(':',$person);
- $output .= '<span class="LC_nobreak"><label><input type="checkbox" name="coowners" checked="checked" value="'.$person.'" />'.&Apache::loncommon::plainname($co_uname,$co_dom).'</label></span>'.(' 'x2).' ';
+ $output .= '<span class="LC_nobreak"><label><input type="checkbox" name="coowners" checked="checked" value="'.$person.'"'.$disabled.' />'.&Apache::loncommon::plainname($co_uname,$co_dom).'</label></span>'.(' 'x2).' ';
}
$output .= '</td>'.
&Apache::loncommon::end_data_table_row();
@@ -3243,7 +3297,7 @@
'<td><i>'.&mt('Invited as co-owners [_1](agreement pending)','<br />').'</i></td><td>';
foreach my $person (@pendingcoown) {
my ($co_uname,$co_dom) = split(':',$person);
- $output .= '<span class="LC_nobreak"><label><input type="checkbox" name="pendingcoowners" checked="checked" value="'.$person.'" />'.&Apache::loncommon::plainname($co_uname,$co_dom).'</label></span>'.(' 'x2).' ';
+ $output .= '<span class="LC_nobreak"><label><input type="checkbox" name="pendingcoowners" checked="checked" value="'.$person.'"'.$disabled.' />'.&Apache::loncommon::plainname($co_uname,$co_dom).'</label></span>'.(' 'x2).' ';
}
$output .= '</td>'.
&Apache::loncommon::end_data_table_row();
@@ -3253,7 +3307,7 @@
'<td><i>'.&mt('Invite other Coordinators [_1]to become co-owners','<br />').'</i></td><td>';
foreach my $person (@othercoords) {
my ($co_uname,$co_dom) = split(':',$person);
- $output .= '<span class="LC_nobreak"><label><input type="checkbox" name="invitecoowners" value="'.$person.'" />'.&Apache::loncommon::plainname($co_uname,$co_dom).'</label></span>'.(' 'x2).' ';
+ $output .= '<span class="LC_nobreak"><label><input type="checkbox" name="invitecoowners" value="'.$person.'"'.$disabled.' />'.&Apache::loncommon::plainname($co_uname,$co_dom).'</label></span>'.(' 'x2).' ';
}
$output .= '</td>'.
&Apache::loncommon::end_data_table_row();
@@ -3266,13 +3320,20 @@
}
sub manage_coownership {
- my ($cnum,$cdom, at currcoown) = @_;
- my (@pendingcoown);
+ my ($cnum,$cdom,$currcoownref,$noedit) = @_;
+ my (@pendingcoown, at currcoown);
my $pendingcoowners =
$env{'course.'.$env{'request.course.id'}.'.internal.pendingco-owners'};
if ($pendingcoowners) {
@pendingcoown = split(',',$pendingcoowners);
}
+ if (ref($currcoownref) eq 'ARRAY') {
+ @currcoown == @{$currcoownref};
+ }
+ my $disabled;
+ if ($noedit) {
+ $disabled = ' disabled="disabled"';
+ }
my ($is_coowner,$is_pending,$output);
my $uname = $env{'user.name'};
my $udom = $env{'user.domain'};
@@ -3304,8 +3365,8 @@
if ($is_coowner) {
$output .= &mt('You are currently a co-owner:').' <label><input type="checkbox" name="remove_coowoner" value="'.$uname.':'.$udom.'" />'.&mt('Discontinue?').'</label>';
} else {
- $output .= &mt('The course owner has invited you to become a co-owner:').' <label><input type="radio" name="pending_coowoner" value="accept" />'.&mt('Accept?').'</label>'.(' 'x2).
- '<label><input type="radio" name=pending_coowoner" value="decline" />'.&mt('Decline?').'</label>';
+ $output .= &mt('The course owner has invited you to become a co-owner:').' <label><input type="radio" name="pending_coowoner" value="accept"'.$disabled.' />'.&mt('Accept?').'</label>'.(' 'x2).
+ '<label><input type="radio" name=pending_coowoner" value="decline"'.$disabled.' />'.&mt('Decline?').'</label>';
}
$output .= '</span>';
if (@currcoown) {
@@ -3319,7 +3380,7 @@
}
sub print_localization {
- my ($cdom,$settings,$ordered,$itemtext,$rowtotal) = @_;
+ my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$noedit) = @_;
unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
return;
}
@@ -3338,13 +3399,16 @@
input => 'selectbox',
},
);
- my $datatable;
+ my ($datatable,$disabled);
my $count = 0;
+ if ($noedit) {
+ $disabled = ' disabled="disabled"';
+ }
foreach my $item (@{$ordered}) {
$count ++;
my $colspan;
unless ($item eq 'languages') {
- $colspan = 2;
+ $colspan = 2;
}
$datatable .= &item_table_row_start($items{$item}{text},$count,undef,$colspan);
if ($item eq 'timezone') {
@@ -3352,7 +3416,7 @@
my $timezone = &Apache::lonlocal::gettimezone();
$datatable .=
&Apache::loncommon::select_timezone($item,$timezone,undef,
- $includeempty);
+ $includeempty,$disabled);
} elsif ($item eq 'datelocale') {
my $includeempty = 1;
my $locale_obj = &Apache::lonlocal::getdatelocale();
@@ -3362,11 +3426,13 @@
}
$datatable .=
&Apache::loncommon::select_datelocale($item,$currdatelocale,
- undef,$includeempty);
+ undef,$includeempty,$disabled);
} else {
if ($settings->{$item} eq '') {
- $datatable .= '</td><td align="right">'.
- &Apache::loncommon::select_language('languages_0','',1);
+ unless ($noedit) {
+ $datatable .= '</td><td align="right">'.
+ &Apache::loncommon::select_language('languages_0','',1);
+ }
} else {
my $num = 0;
my @languages = split(/\s*[,;:]\s*/,$settings->{$item});
@@ -3386,19 +3452,22 @@
'</b><input type="hidden" name="languages_'.$num.
'" value="'.$lang.'" /></span><br />'.
'<span class="LC_nobreak"><label><input type="checkbox" '.
- 'name="languages_delete" value="'.$num.'" />'.
+ 'name="languages_delete" value="'.$num.'"'.$disabled.' />'.
&mt('Delete').'</label></span></td>'.
&Apache::loncommon::end_data_table_row();
$num ++;
}
}
- $datatable .= &Apache::loncommon::start_data_table_row().
+ unless ($noedit) {
+ $datatable .=
+ &Apache::loncommon::start_data_table_row().
'<td align="left"><span class="LC_nobreak">'.
&mt('Additional language:'). '</span><br />'.
&Apache::loncommon::select_language('languages_'.$num,'',1).
'<input type="hidden" name="languages_total" value="'.$num.'" />'.
- '</td>'.&Apache::loncommon::end_data_table_row().
- &Apache::loncommon::end_data_table().'<br />';
+ '</td>'.&Apache::loncommon::end_data_table_row();
+ }
+ $datatable .= &Apache::loncommon::end_data_table().'<br />';
}
}
$datatable .= &item_table_row_end();
@@ -3419,7 +3488,7 @@
}
sub print_feedback {
- my ($position,$cdom,$settings,$ordered,$itemtext,$rowtotal) = @_;
+ my ($position,$cdom,$settings,$ordered,$itemtext,$rowtotal,$noedit) = @_;
unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
return;
}
@@ -3454,7 +3523,10 @@
del => 'Delete?',
sec => 'Sections:',
);
-
+ my $disabled;
+ if ($noedit) {
+ $disabled = ' disabled="disabled"';
+ }
foreach my $item (@{$ordered}) {
$count ++;
if ($position eq 'top') {
@@ -3466,10 +3538,10 @@
my $includeempty = 0;
$datatable .= '</td><td align="right">'.
&user_table($cdom,$item,\@sections,
- $settings->{$item},\%lt);
+ $settings->{$item},\%lt,$noedit);
} else {
$datatable .= &Apache::lonhtmlcommon::textbox($item.'.text',
- $settings->{$item.'.text'},$items{$item}{size});
+ $settings->{$item.'.text'},$items{$item}{size},$disabled);
}
$datatable .= &item_table_row_end();
}
@@ -3478,15 +3550,21 @@
}
sub user_table {
- my ($cdom,$item,$sections,$currvalue,$lt) = @_;
+ my ($cdom,$item,$sections,$currvalue,$lt,$noedit) = @_;
my $output;
if ($currvalue eq '') {
- $output .= &select_recipient($item,'0',$cdom,$sections);
+ unless ($noedit) {
+ $output .= &select_recipient($item,'0',$cdom,$sections);
+ }
} else {
my $num = 0;
my @curr = split(/,/,$currvalue);
$output .= '<table class="LC_data_table">';
my ($currusers);
+ my $disabled;
+ if ($noedit) {
+ $disabled = ' disabled="disabled"';
+ }
foreach my $val (@curr) {
next if ($val eq '');
my ($uname,$udom,$seclist) = ($val =~ /^($match_username):($match_domain)(\(?[^\)]*\)?)$/);
@@ -3498,7 +3576,7 @@
$currusers .= '<tr>'.
'<td valign="top"><span class="LC_nobreak">'.
'<label><input type="checkbox" '.
- 'name="'.$item.'_delete" value="'.$num.'" />'.
+ 'name="'.$item.'_delete" value="'.$num.'"'.$disabled.' />'.
$lt->{'del'}.'</label>'.
'<input type="hidden" name="'.$item.'_user_'.
$num.'" value="'.$uname.':'.$udom.'" />'.(' 'x2).
@@ -3509,7 +3587,7 @@
if (@{$sections}) {
$currusers.= (' 'x3).$lt->{'sec'}.' '.
&select_sections($item,$num,$sections,
- \@selsec);
+ \@selsec,$noedit);
}
}
$currusers .= '</span></td></tr>';
@@ -3527,12 +3605,16 @@
'<table>'.$currusers.'</table></td>'.
'</tr>';
}
- $output .= '<tr>'.
+ unless ($noedit) {
+ $output .=
+ '<tr>'.
'<td align="left"><span class="LC_nobreak"><i>'.
$lt->{'add'}.'</i></span><br />'.
&select_recipient($item,$num,$cdom,$sections).
'<input type="hidden" name="'.$item.'_total" value="'.$num.'" />'.
- '</td></tr></table>';
+ '</td></tr>';
+ }
+ $output .= '</table>';
}
return $output;
}
@@ -3559,14 +3641,17 @@
}
sub select_sections {
- my ($item,$num,$sections,$selected) = @_;
- my ($output, at currsecs,$allsec);
+ my ($item,$num,$sections,$selected,$noedit) = @_;
+ my ($output, at currsecs,$allsec,$disabled);
if (ref($selected) eq 'ARRAY') {
@currsecs = @{$selected};
}
if (!@currsecs) {
$allsec = ' selected="selected"';
}
+ if ($noedit) {
+ $disabled = ' disabled="disabled"';
+ }
if (ref($sections) eq 'ARRAY') {
if (@{$sections}) {
my $mult;
@@ -3576,7 +3661,7 @@
$mult .= ' size="4"';
}
}
- $output = '<select name="'.$item.'_sections_'.$num.'"'.$mult.'>'.
+ $output = '<select name="'.$item.'_sections_'.$num.'"'.$mult.$disabled.'>'.
' <option value=""'.$allsec.'>'.&mt('All').'</option>';
foreach my $sec (@{$sections}) {
my $is_sel;
@@ -3592,7 +3677,7 @@
}
sub print_discussion {
- my ($cdom,$settings,$ordered,$itemtext,$rowtotal) = @_;
+ my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$noedit) = @_;
unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
return;
}
@@ -3672,30 +3757,30 @@
$datatable .= &item_table_row_start($items{$item}{text},$count,undef,$colspan);
if ($item eq 'plc.roles.denied') {
$datatable .= '</td><td align="right">'.
- '<table>'.&role_checkboxes($cdom,$cnum,$item,$settings).
+ '<table>'.&role_checkboxes($cdom,$cnum,$item,$settings,undef,undef,$noedit).
'</table>';
} elsif ($item eq 'plc.users.denied') {
$datatable .= '</td><td align="right">'.
&user_table($cdom,$item,undef,
- $settings->{$item},\%lt);
+ $settings->{$item},\%lt,$noedit);
} elsif ($item eq 'pch.roles.denied') {
$datatable .= '</td><td align="right">'.
- '<table>'.&role_checkboxes($cdom,$cnum,$item,$settings).
+ '<table>'.&role_checkboxes($cdom,$cnum,$item,$settings,undef,undef,$noedit).
'</table>';
} elsif ($item eq 'pch.users.denied') {
$datatable .= '</td><td align="right">'.
&user_table($cdom,$item,undef,
- $settings->{$item},\%lt);
+ $settings->{$item},\%lt,$noedit);
} elsif ($item eq 'pac.roles.denied') {
$datatable .= '</td><td align="right">'.
- '<table>'.&role_checkboxes($cdom,$cnum,$item,$settings).
+ '<table>'.&role_checkboxes($cdom,$cnum,$item,$settings,undef,undef,$noedit).
'</table>';
} elsif ($item eq 'pac.users.denied') {
$datatable .= '</td><td align="right">'.
&user_table($cdom,$item,undef,
- $settings->{$item},\%lt);
+ $settings->{$item},\%lt,$noedit);
} elsif ($item eq 'allow_limited_html_in_feedback') {
- $datatable .= &yesno_radio($item,$settings);
+ $datatable .= &yesno_radio($item,$settings,undef,undef,undef,$noedit);
} elsif ($item eq 'allow_discussion_post_editing') {
$datatable .= '</td><td align="right"><br />'.
&Apache::loncommon::start_data_table().
@@ -3703,7 +3788,7 @@
'<th align="left">'.&mt('Role').'</th><th>'.
&mt('Sections').'</th>'.
&Apache::loncommon::end_data_table_row().
- &role_checkboxes($cdom,$cnum,$item,$settings,1).
+ &role_checkboxes($cdom,$cnum,$item,$settings,1,undef,$noedit).
&Apache::loncommon::end_data_table().'<br />';
} elsif ($item eq 'discussion_post_fonts') {
$datatable .= '</td><td align="right"><br />'.
@@ -3715,7 +3800,7 @@
'<th align="center">'.&mt('font-style').'</th>'.
'<th align="center">'.&mt('Other css').'</th>'.
&Apache::loncommon::end_data_table_row().
- &set_discussion_fonts($cdom,$cnum,$item,$settings).
+ &set_discussion_fonts($cdom,$cnum,$item,$settings,$noedit).
&Apache::loncommon::end_data_table().'<br />';
}
$datatable .= &item_table_row_end();
@@ -3725,7 +3810,7 @@
}
sub role_checkboxes {
- my ($cdom,$cnum,$item,$settings,$showsections,$crstype) = @_;
+ my ($cdom,$cnum,$item,$settings,$showsections,$crstype,$noedit) = @_;
my @roles = ('st','ad','ta','ep','in');
if ($crstype eq 'Community') {
push(@roles,'co');
@@ -3763,6 +3848,10 @@
}
my $numinrow = 3;
my $count = 0;
+ my $disabled;
+ if ($noedit) {
+ $disabled = ' disabled="disabled"';
+ }
foreach my $role (@roles) {
my $checked = '';
if (grep(/^\Q$role\E$/, at current)) {
@@ -3781,11 +3870,11 @@
}
}
$output .= '<td align="left"><span class="LC_nobreak"><label><input type="checkbox" name="'.
- $item.'" value="'.$role.'"'.$checked.'/> '.
+ $item.'" value="'.$role.'"'.$checked.$disabled.'/> '.
$plrole.'</label></span></td>';
if ($showsections) {
$output .= '<td align="left">'.
- &select_sections($item,$role,\@sections,$currsec{$role}).
+ &select_sections($item,$role,\@sections,$currsec{$role},$noedit).
'</td></tr>';
}
$count ++;
@@ -3813,11 +3902,11 @@
}
}
$output .= '<td><span class="LC_nobreak"><label><input type="checkbox" name="'.
- $item.'" value="'.$value.'"'.$checked.' /> '.$rolename.
+ $item.'" value="'.$value.'"'.$checked.$disabled.' /> '.$rolename.
'</label></span></td>';
if ($showsections) {
$output .= '<td>'.
- &select_sections($item,$role,\@sections,$currsec{$role}).
+ &select_sections($item,$role,\@sections,$currsec{$role},$noedit).
'</td>'.&Apache::loncommon::end_data_table_row();
}
$total ++;
@@ -3839,11 +3928,15 @@
}
sub set_discussion_fonts {
- my ($cdom,$cnum,$item,$settings) = @_;
+ my ($cdom,$cnum,$item,$settings,$noedit) = @_;
my ($classorder,$classtitles) = &discussion_vote_classes();
my ($styleorder,$styleitems) = &discussion_vote_styles();
my $output;
if (ref($classorder) eq 'ARRAY') {
+ my $disabled;
+ if ($noedit) {
+ $disabled = ' disabled="disabled"';
+ }
foreach my $cat (@{$classorder}) {
my %curr = ();
($curr{'size'},$curr{'weight'},$curr{'style'},$curr{'other'}) =
@@ -3860,12 +3953,12 @@
($currsize,$currunit) = ($1,$2);
$curr{'size'} = $currunit;
}
- $output .= '<input type="textbox" name="discussion_post_fonts_'.$cat.'_'.$item.'" value="'.$currsize.'" size="5">'.
+ $output .= '<input type="textbox" name="discussion_post_fonts_'.$cat.'_'.$item.'" value="'.$currsize.'" size="5"'.$disabled.'>'.
' ';
$selitem = 'unit';
}
if ((ref($styleitems) eq 'HASH') && (ref($styleitems->{$item}) eq 'ARRAY')) {
- $output .= '<select name="discussion_post_fonts_'.$cat.'_'.$selitem.'">';
+ $output .= '<select name="discussion_post_fonts_'.$cat.'_'.$selitem.'"'.$disabled.'>';
foreach my $val (@{$styleitems->{$item}}) {
my $sel;
if ($val eq $curr{$item}) {
@@ -3876,7 +3969,7 @@
}
}
}
- $output .= '</span></td><td><input type="textbox" size="10" name="discussion_post_fonts_'.$cat.'_other" value="'.$curr{'other'}.'" /></td>';
+ $output .= '</span></td><td><input type="textbox" size="10" name="discussion_post_fonts_'.$cat.'_other" value="'.$curr{'other'}.'"'.$disabled.' /></td>';
}
$output .= &Apache::loncommon::end_data_table_row();
}
@@ -3908,7 +4001,7 @@
}
sub print_classlists {
- my ($position,$cdom,$settings,$itemtext,$rowtotal,$crstype) = @_;
+ my ($position,$cdom,$settings,$itemtext,$rowtotal,$crstype,$noedit) = @_;
my @ordered;
if ($position eq 'top') {
@ordered = ('default_enrollment_start_date',
@@ -3982,11 +4075,11 @@
($settings->{'student_classlist_view'} eq 'section')) {
$settings->{'student_classlist_view'} = 'disabled';
}
- return &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype,'classlists');
+ return &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype,'classlists',$noedit);
}
sub print_appearance {
- my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype) = @_;
+ my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype,$noedit) = @_;
unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
return;
}
@@ -4039,11 +4132,11 @@
input => 'radio',
},
);
- return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'appearance');
+ return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'appearance',$noedit);
}
sub print_grading {
- my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype) = @_;
+ my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype,$noedit) = @_;
unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
return;
}
@@ -4095,11 +4188,11 @@
input => 'radio',
},
);
- return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'grading');
+ return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'grading',$noedit);
}
sub print_printouts {
- my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype) = @_;
+ my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype,$noedit) = @_;
unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
return;
}
@@ -4148,11 +4241,11 @@
nullval => &mt('None specified - use domain default'),
}
);
- return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'printouts');
+ return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'printouts',$noedit);
}
sub print_spreadsheet {
- my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype) = @_;
+ my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype,$noedit) = @_;
unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
return;
}
@@ -4184,11 +4277,11 @@
input => 'radio',
},
);
- return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'spreadsheet');
+ return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'spreadsheet',$noedit);
}
sub print_bridgetasks {
- my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype) = @_;
+ my ($cdom,$settings,$ordered,$itemtext,$rowtotal,$crstype,$noedit) = @_;
unless ((ref($settings) eq 'HASH') && (ref($ordered) eq 'ARRAY') && (ref($itemtext) eq 'HASH')) {
return;
}
@@ -4226,11 +4319,11 @@
input => 'radio',
},
);
- return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'bridgetasks');
+ return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'bridgetasks',$noedit);
}
sub print_other {
- my ($cdom,$settings,$allitems,$rowtotal,$crstype) = @_;
+ my ($cdom,$settings,$allitems,$rowtotal,$crstype,$noedit) = @_;
unless ((ref($settings) eq 'HASH') && (ref($allitems) eq 'ARRAY')) {
return;
}
@@ -4251,7 +4344,7 @@
input => 'textbox',
size => '30',
};
- my $output = &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype,'other');
+ my $output = &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype,'other',$noedit);
}
sub get_other_items {
@@ -4300,7 +4393,7 @@
}
sub yesno_radio {
- my ($item,$settings,$unsetdefault,$valueyes,$valueno) = @_;
+ my ($item,$settings,$unsetdefault,$valueyes,$valueno,$noedit) = @_;
my $itemon = ' ';
my $itemoff = ' checked="checked" ';
if (($valueyes eq '') && ($valueno eq '')) {
@@ -4319,16 +4412,24 @@
}
}
}
+ my $disabled;
+ if ($noedit) {
+ $disabled = ' disabled="disabled"';
+ }
return '<span class="LC_nobreak"><label>'.
'<input type="radio" name="'.$item.'"'.
- $itemon.' value="'.$valueyes.'" />'.&mt('Yes').'</label> '.
+ $itemon.' value="'.$valueyes.'"'.$disabled.' />'.&mt('Yes').'</label> '.
'<label><input type="radio" name="'.$item.'"'.
- $itemoff.' value="'.$valueno.'" />'.&mt('No').'</label></span>';
+ $itemoff.' value="'.$valueno.'"'.$disabled.' />'.&mt('No').'</label></span>';
}
sub select_from_options {
- my ($item,$order,$options,$curr,$nullval,$multiple,$maxsize,$onchange) = @_;
+ my ($item,$order,$options,$curr,$nullval,$multiple,$maxsize,$onchange,$noedit) = @_;
my $output;
+ my $disabled;
+ if ($noedit) {
+ $disabled = ' disabled=disabled"';
+ }
if ((ref($order) eq 'ARRAY') && (ref($options) eq 'HASH')) {
$output='<select name="'.$item.'" '.$onchange;
if ($multiple) {
@@ -4339,7 +4440,7 @@
$output .= ' size="'.$maxsize.'"';
}
}
- $output .= '>'."\n";
+ $output .= $disabled.'>'."\n";
if ($nullval ne '') {
$output .= '<option value=""';
if (ref($curr) eq 'ARRAY') {
@@ -4372,7 +4473,7 @@
}
sub make_item_rows {
- my ($cdom,$items,$ordered,$settings,$rowtotal,$crstype,$caller) = @_;
+ my ($cdom,$items,$ordered,$settings,$rowtotal,$crstype,$caller,$noedit) = @_;
my $datatable;
if ((ref($items) eq 'HASH') && (ref($ordered) eq 'ARRAY')) {
my $count = 0;
@@ -4398,15 +4499,19 @@
}
$datatable .= $showcredits;
} elsif ($item eq 'nothideprivileged') {
- $datatable .= ¬hidepriv_row($cdom,$item,$settings,$crstype);
+ $datatable .= ¬hidepriv_row($cdom,$item,$settings,$crstype,$noedit);
} elsif ($item eq 'checkforpriv') {
- $datatable .= &checkforpriv_row($cdom,$item,$settings,$crstype);
+ $datatable .= &checkforpriv_row($cdom,$item,$settings,$crstype,$noedit);
} elsif ($item eq 'print_header_format') {
- $datatable .= &print_hdrfmt_row($item,$settings);
+ $datatable .= &print_hdrfmt_row($item,$settings,$noedit);
} elsif ($items->{$item}{input} eq 'dates') {
+ my $disabled;
+ if ($noedit) {
+ $disabled = ' disabled="disabled"';
+ }
$datatable .=
&Apache::lonhtmlcommon::date_setter('display',$item,
- $settings->{$item});
+ $settings->{$item},$disabled);
} elsif ($items->{$item}{input} eq 'radio') {
my ($unsetdefault,$valueyes,$valueno);
if (($item eq 'usejsme') || ($item eq 'uselcmath')) {
@@ -4417,17 +4522,23 @@
$valueyes = "1";
$valueno = "0";
}
- $datatable .= &yesno_radio($item,$settings,$unsetdefault,$valueyes,$valueno);
+ $datatable .= &yesno_radio($item,$settings,$unsetdefault,$valueyes,$valueno,$noedit);
} elsif ($items->{$item}{input} eq 'selectbox') {
my $curr = $settings->{$item};
$datatable .=
&select_from_options($item,$items->{$item}{'order'},
$items->{$item}{'options'},$curr,
- $items->{$item}{'nullval'});
+ $items->{$item}{'nullval'},
+ undef,undef,undef,$noedit);
} elsif ($items->{$item}{input} eq 'textbox') {
+ my $disabled;
+ if ($noedit) {
+ $disabled = ' disabled=disabled"';
+ }
$datatable .=
&Apache::lonhtmlcommon::textbox($item,$settings->{$item},
- $items->{$item}{size});
+ $items->{$item}{size},
+ $disabled);
}
$datatable .= &item_table_row_end();
}
@@ -4439,7 +4550,7 @@
}
sub nothidepriv_row {
- my ($cdom,$item,$settings,$crstype) = @_;
+ my ($cdom,$item,$settings,$crstype,$noedit) = @_;
my ($cnum) = &get_course();
my ($datatable,%nothide, at checkdoms);
if (ref($settings) eq 'HASH') {
@@ -4476,6 +4587,10 @@
}
}
if (@privusers > 0) {
+ my $disabled;
+ if ($noedit) {
+ $disabled = ' disabled="disabled"';
+ }
$datatable .= '<table align="right">';
foreach my $user (sort(@privusers)) {
my $hideon = ' checked="checked" ';
@@ -4492,9 +4607,9 @@
'</td><td align="left">'.
'<span class="LC_nobreak"><label>'.
'<input type="radio" name="'.$item.'_'.$user.'"'.
- $hideon.' value="" />'.&mt('Hidden').'</label> '.
+ $hideon.' value=""'.$disabled.' />'.&mt('Hidden').'</label> '.
'<label><input type="radio" name="'.$item.'_'.$user.'"'.
- $hideoff.' value="yes" />'.&mt('Shown').'</label></span></td>'.
+ $hideoff.' value="yes"'.$disabled.' />'.&mt('Shown').'</label></span></td>'.
'</tr>';
}
$datatable .= '</table>';
@@ -4509,7 +4624,7 @@
}
sub checkforpriv_row {
- my ($cdom,$item,$settings,$crstype) = @_;
+ my ($cdom,$item,$settings,$crstype,$noedit) = @_;
my $datatable;
my %domains=map { $_ => 1; } &Apache::lonnet::all_domains();
if (keys(%domains) == 1) {
@@ -4522,12 +4637,17 @@
if ($settings->{$item} eq '') {
$datatable = '</td><td align="right">'.
&Apache::loncommon::select_dom_form('','checkforpriv_'.$num,
- 1,1,undef,undef,\@excdoms);
+ 1,1,undef,undef,\@excdoms,
+ $noedit);
} else {
my @privdoms = split(/,/,$settings->{$item});
my %domains=map { $_ => 1; } &Apache::lonnet::all_domains();
$datatable = '</td><td align="right"><br />'.
&Apache::loncommon::start_data_table();
+ my $disabled;
+ if ($noedit) {
+ $disabled = ' disabled="disabled"';
+ }
if (@privdoms > 0) {
foreach my $currdom (@privdoms) {
next unless ($domains{$currdom});
@@ -4543,7 +4663,7 @@
'" value="'.$currdom.'" /></span><br />'.
'<span class="LC_nobreak"><label><input type="checkbox" '.
'name="checkforpriv_delete" value="'.$num.'" />'.
- &mt('Delete').'</label></span></td>'.
+ &mt('Delete').$disabled.'</label></span></td>'.
&Apache::loncommon::end_data_table_row();
$num ++;
unless (grep(/^\Q$currdom\E$/, at excdoms)) {
@@ -4557,7 +4677,7 @@
'<td align="left"><span class="LC_nobreak">'.
&mt('Additional domain:'). '</span><br />'.
&Apache::loncommon::select_dom_form('','checkforpriv_'.$num,1,
- 1,undef,undef,\@excdoms).
+ 1,undef,undef,\@excdoms,$noedit).
'</td>'.&Apache::loncommon::end_data_table_row();
}
$datatable .= &Apache::loncommon::end_data_table().
@@ -4568,7 +4688,7 @@
}
sub print_hdrfmt_row {
- my ($item,$settings) = @_;
+ my ($item,$settings,$noedit) = @_;
my @curr;
my $currnum = 0;
my $maxnum = 2;
@@ -4641,36 +4761,43 @@
ENDJS
$output .= '</td><td align="right"><br />'.
$currstr.'<table class="LC_data_table">';
+ my $disabled;
+ if ($noedit) {
+ $disabled = ' disabled="disabled"';
+ }
if (@curr > 0) {
for (my $i=0; $i<@curr; $i++) {
my $pos = $i+1;
$output .= '<tr>'.
'<td align="left"><span class="LC_nobreak">'.
- &position_selector($pos,$i,$maxnum).&mt('Delete:').
+ &position_selector($pos,$i,$maxnum,$disabled).&mt('Delete:').
'<input type="checkbox" name="printfmthdr_del_'.$i.
- '" /></span></td>';
+ '"'.$disabled.' /></span></td>';
if ($curr[$i] =~ /^%\d*[nca]$/) {
my ($limit,$subst) = ($curr[$i] =~ /^%(\d*)([nca])$/);
$output .= '<td align="left">'.
- &substitution_selector($i,$subst,$limit).'</td>';
+ &substitution_selector($i,$subst,$limit,$disabled).'</td>';
} else {
$output .= '<td colspan="2" align="left">'.&mt('Text').'<br />'.
'<input type="textbox" name="printfmthdr_text_'.$i.'"'.
- ' value="'.$curr[$i].'" size="25" /></td>';
+ ' value="'.$curr[$i].'" size="25"'.$disabled.' /></td>';
}
$output .= '</tr>';
}
}
- my $pos = $currnum+1;
- $output .= '<tr>'.
+ my $pos = $currnum+1;
+ unless ($noedit) {
+ $output .=
+ '<tr>'.
'<td align="left"><span class="LC_nobreak">'.
&position_selector($pos,$currnum,$maxnum).
'<b>'.&mt('New').'</b></span></td><td align="left">'.
&substitution_selector($currnum).'</td>'.
'</tr>';
- $pos ++;
- $currnum ++;
- $output .= '<tr>'.
+ $pos ++;
+ $currnum ++;
+ $output .=
+ '<tr>'.
'<td align="left"><span class="LC_nobreak">'.
&position_selector($pos,$currnum,$maxnum).
'<b>'.&mt('New').'</b></span></td>'.
@@ -4679,14 +4806,15 @@
'" value="" size ="25" />'.
'<input type="hidden" name="printfmthdr_maxnum" value="'.
$maxnum.'" /></td>'.
- '</tr>'.
- '</table><br />';
+ '</tr>';
+ }
+ $output .= '</table><br />';
return $output;
}
sub position_selector {
- my ($pos,$num,$maxnum) = @_;
- my $output = '<select name="printfmthdr_pos_'.$num.'" onchange="reOrder('."'$num'".');">';
+ my ($pos,$num,$maxnum,$disabled) = @_;
+ my $output = '<select name="printfmthdr_pos_'.$num.'" onchange="reOrder('."'$num'".');"'.$disabled.'>';
for (my $j=1; $j<=$maxnum; $j++) {
my $sel = '';
if ($pos == $j) {
@@ -4700,7 +4828,7 @@
}
sub substitution_selector {
- my ($num,$subst,$limit,$crstype) = @_;
+ my ($num,$subst,$limit,$crstype,$disabled) = @_;
my ($stunametxt,$crsidtxt);
if ($crstype eq 'Community') {
$stunametxt = 'member name';
@@ -4715,7 +4843,7 @@
a => 'assignment note',
);
my $output .= &mt('Substitution').'<br />'.
- '<select name="printfmthdr_sub_'.$num.'">';
+ '<select name="printfmthdr_sub_'.$num.'"'.$disabled.'>';
if ($subst eq '') {
$output .= '<option value="" selected="selected"> </option>';
}
More information about the LON-CAPA-cvs
mailing list