| '.
' | ';
- my ($usersty,$onclickrequser,%checkedrequser,$onclickreturnurl,%checkedreturnurl);
+ my ($usersty,$onclickrequser,%checkedrequser,$onclickreturnurl,%checkedreturnurl,
+ $onclickpassback,%checkedpassback,$passbacksty,%checkedpassbackfmt);
+ $passbacksty = 'none';
+ $onclickpassback = ' onclick="toggleLinkProtExtra(this.form,'."'passback','passbackparam','1','inline-block','$i'".');"';
+ %checkedpassback = (
+ 'no' => ' checked="checked"',
+ 'yes' => '',
+ );
+ %checkedpassbackfmt = (
+ '1p1' => ' checked="checked"',
+ '1p0' => '',
+ );
+ if ($values{'passback'} ne '') {
+ $passbacksty = 'inline-block';
+ $checkedpassback{'yes'} = ' checked="checked"';
+ $checkedpassback{'no'} = '';
+ if ($values{'passbackformat'} eq '1.0') {
+ $checkedpassbackfmt{'1p0'} = ' checked="checked"';
+ $checkedpassbackfmt{'1p1'} = '';
+ }
+ }
if ($ltiauth) {
$usersty = 'display:none';
$onclickrequser = ' onclick="toggleLinkProtExtra(this.form,'."'requser','optional','1','block','$i'".');"';
@@ -5742,7 +7420,7 @@ sub print_linkprotection {
$checkedrequser{'no'} = '';
}
$datatable .= ' | '."\n".
'';
- my ($usersty,$onclickrequser,%checkedrequser,$onclickreturnurl,%checkedreturnurl);
+ my ($usersty,$onclickrequser,%checkedrequser,$onclickreturnurl,%checkedreturnurl,
+ $onclickpassback,%checkedpassback,%checkedpassbackfmt);
if ($ltiauth) {
$usersty = 'display:none';
$onclickrequser = ' onclick="toggleLinkProtExtra(this.form,'."'requser','optional','1','block','add'".');"';
@@ -5858,6 +7550,15 @@ sub print_linkprotection {
);
$datatable .= ''.
+ $onclickrequser.$checkedrequser{'yes'}.$disabled.' />'.&mt('Yes').''.
+ ''.
'';
@@ -5914,6 +7626,7 @@ sub linkprot_names {
'lifetime' => 'Nonce lifetime (s)',
'name' => 'Launcher Application',
'secret' => 'Secret',
+ 'passback' => 'Can return grades to Launcher',
'returnurl' => 'Launcher return URL',
'requser' => 'Use identity',
'email' => 'Email address',
@@ -5994,6 +7707,45 @@ sub linkprot_options {
return $output;
}
+sub print_extresource_row {
+ my ($item,$config,$curr,$noedit) = @_;
+ my $onchange;
+ unless ($noedit) {
+ $onchange = ' onchange="javascript:toggleExtRes();"';
+ }
+ my $id = 'LC_'.$item;
+ my ($selected,$reuse,$width,$height) = split(/:/,$curr);
+ my $output = &select_from_options($item,$config->{'order'},
+ $config->{'options'},$selected,
+ $config->{'nullval'},
+ undef,undef,$onchange,$noedit,$id);
+ my ($checked,$reusesty,$sizesty);
+ if ($reuse) {
+ $checked = ' checked="checked"';
+ }
+ $reusesty = 'none';
+ $sizesty = 'none';
+ if (($selected eq 'window') || ($selected eq 'tab')) {
+ $reusesty = 'inline-block';
+ if ($selected eq 'window') {
+ $sizesty = 'inline-block';
+ }
+ }
+ $output .= ' '.
+ ''.
+ ''.
+ ' '.
+ '';
+ return $output;
+}
+
sub print_other {
my ($cdom,$settings,$allitems,$rowtotal,$crstype,$noedit) = @_;
unless ((ref($settings) eq 'HASH') && (ref($allitems) eq 'ARRAY')) {
@@ -6071,7 +7823,7 @@ sub item_table_row_end {
}
sub yesno_radio {
- my ($item,$settings,$unsetdefault,$valueyes,$valueno,$noedit) = @_;
+ my ($item,$settings,$unsetdefault,$valueyes,$valueno,$noedit,$onclick,$reverse) = @_;
my $itemon = ' ';
my $itemoff = ' checked="checked" ';
if (($valueyes eq '') && ($valueno eq '')) {
@@ -6093,12 +7845,22 @@ sub yesno_radio {
my $disabled;
if ($noedit) {
$disabled = ' disabled="disabled"';
+ } elsif ($onclick) {
+ $onclick = ' onclick="'.$onclick.'"';
+ }
+ if ($reverse) {
+ return ' '.
+ '';
+ } else {
+ return ' '.
+ '';
}
- return ' '.
- '';
}
sub select_from_options {
@@ -6154,7 +7916,7 @@ sub select_from_options {
}
sub make_item_rows {
- my ($cdom,$items,$ordered,$settings,$rowtotal,$crstype,$caller,$noedit) = @_;
+ my ($cdom,$items,$ordered,$settings,$rowtotal,$crstype,$caller,$noedit,$cnum) = @_;
my $datatable;
if ((ref($items) eq 'HASH') && (ref($ordered) eq 'ARRAY')) {
my $count = 0;
@@ -6165,10 +7927,16 @@ sub make_item_rows {
(($caller eq 'printouts') && ($item ne 'print_header_format'))) {
$colspan = 2;
}
+ my $rowdesc;
+ if ($caller eq 'appearance') {
+ $rowdesc = ''.$items->{$item}{text}.'';
+ } else {
+ $rowdesc = $items->{$item}{text};
+ }
if (exists $items->{$item}{advanced} && $items->{$item}{advanced} == 1) {
- $datatable .= &item_table_row_start($items->{$item}{text},$count,"advanced",$colspan);
+ $datatable .= &item_table_row_start($rowdesc,$count,"advanced",$colspan);
} else {
- $datatable .= &item_table_row_start($items->{$item}{text},$count,undef,$colspan);
+ $datatable .= &item_table_row_start($rowdesc,$count,undef,$colspan);
}
if ($item eq 'defaultcredits') {
my $defaultcredits = $env{'course.'.$env{'request.course.id'}.'.internal.defaultcredits'};
@@ -6187,6 +7955,8 @@ sub make_item_rows {
$datatable .= &print_hdrfmt_row($item,$settings,$noedit);
} elsif ($item eq 'lti.lcmenu') {
$datatable .= &lcmenu_checkboxes($cdom,$item,$settings,$crstype,$noedit);
+ } elsif ($item eq 'extresource') {
+ $datatable .= &print_extresource_row($item,$items->{$item},$settings->{$item},$noedit);
} elsif ($items->{$item}{input} eq 'dates') {
my $disabled;
if ($noedit) {
@@ -6209,16 +7979,65 @@ sub make_item_rows {
}
$datatable .= &yesno_radio($item,$settings,$unsetdefault,$valueyes,$valueno,$noedit);
} elsif ($items->{$item}{input} eq 'selectbox') {
- my $id;
+ my ($id,$onchange);
if ($caller eq 'menuitems') {
$id = $item;
+ } elsif ($caller eq 'grading') {
+ if ($item eq 'grading') {
+ $onchange = ' onchange="javascript:toggleGrading(this.form);"';
+ $id = $item;
+ }
}
my $curr = $settings->{$item};
$datatable .=
&select_from_options($item,$items->{$item}{'order'},
$items->{$item}{'options'},$curr,
$items->{$item}{'nullval'},
- undef,undef,undef,$noedit,$id);
+ undef,undef,$onchange,$noedit,$id);
+ if ($item eq 'grading') {
+ my ($unsetdefault,$valueyes,$valueno,$sectionbox);
+ my $gradingsty = 'none';
+ my $gradingsecsty = 'none';
+ $unsetdefault = 0;
+ my (@selsec,@sections,%current);
+ if ($curr eq 'standard') {
+ $gradingsty = 'inline-block';
+ if (ref($settings) eq 'HASH') {
+ $current{'hidetotals'} = $settings->{'hidetotals'};
+ if ($settings->{'hidetotals'} =~ /^([\w,]+)$/) {
+ my $secstr = $1;
+ unless ($secstr eq 'all') {
+ @selsec = split(/,/,$secstr);
+ }
+ $current{'hidetotals'} = 1;
+ }
+ }
+ }
+ $valueyes = "1";
+ $valueno = "0";
+ my %sections = &Apache::loncommon::get_sections($cdom,$cnum);
+ if (keys(%sections)) {
+ @sections = sort( { $a <=> $b } keys(%sections));
+ }
+ my $onclick = 'javascript:toggleHiddenTotalsSec(this.form);';
+ my $sectionbox = '';
+ my $reverse = 1;
+ if (@sections) {
+ $sectionbox .= ' ... '.&mt('hidden in sections').': '.
+ ' '.
+ &select_sections('hidetotals','',\@sections,\@selsec,$noedit,'all').
+ ' ';
+ }
+ $sectionbox .= ' | '.
@@ -6355,13 +8174,13 @@ sub checkforpriv_row {
&mt('Delete').' | '.
&Apache::loncommon::end_data_table_row();
$num ++;
- unless (grep(/^\Q$currdom\E$/,@excdoms)) {
+ unless (grep(/^\Q$currdom\E$/,@excdoms)) {
push(@excdoms,$currdom);
}
}
}
if ((scalar(keys(%domains)) - scalar(@excdoms)) > 0) {
- $datatable .=
+ $datatable .=
&Apache::loncommon::start_data_table_row().
''.
&mt('Additional domain:'). '
'.
@@ -6475,7 +8294,7 @@ ENDJS
}
}
my $pos = $currnum+1;
- unless ($noedit) {
+ unless ($noedit) {
$output .=
' |