--- loncom/interface/courseprefs.pm	2010/12/22 16:57:41	1.28.2.5
+++ loncom/interface/courseprefs.pm	2011/10/19 21:15:53	1.47
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set configuration settings for a course
 #
-# $Id: courseprefs.pm,v 1.28.2.5 2010/12/22 16:57:41 raeburn Exp $
+# $Id: courseprefs.pm,v 1.47 2011/10/19 21:15:53 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -215,6 +215,7 @@ use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::lonconfigsettings;
+use Apache::lonparmset;
 use Apache::lonlocal;
 use LONCAPA qw(:DEFAULT :match);
 
@@ -267,8 +268,8 @@ sub handler {
     my %lt;
     if ($crstype eq 'Community') {
         %lt = (
-                conf => 'Community Configuration',
-                edit => 'Edit Community Configuration',
+                conf => 'Community Settings',
+                edit => 'Edit Community Settings',
                 gens => 'General community settings',
                 idnu => 'Community ID or number',
                 desc => 'Community Description',
@@ -286,7 +287,7 @@ sub handler {
                 defd => 'Default dates for member access',
                 stuv => 'Member-viewable membership list options',
                 stul => 'Member agreement needed to be listed',
-                clas => 'Membership and Facilitator Listing',
+                clas => 'Membership and facilitator listing',
                 priv => 'Privileged users (Domain Coordinators) in facilitator listing',
                 defc => 'Default Community Spreadsheet',
                 defs => 'Default User Spreadsheet',
@@ -294,8 +295,8 @@ sub handler {
               );
     } else {
         %lt = (
-                conf => 'Course Configuration',
-                edit => 'Edit Course Configuration',
+                conf => 'Course Settings',
+                edit => 'Edit Course Settings',
                 gens => 'General course settings',
                 idnu => 'Course ID or number',
                 desc => 'Course Description',
@@ -313,7 +314,7 @@ sub handler {
                 defd => 'Default dates for student access',
                 stuv => 'Student-viewable classlist options',
                 stul => 'Student agreement needed to be listed',
-                clas => 'Classlists and Staff Listing',
+                clas => 'Classlists and staff listing',
                 priv => 'Privileged users (Domain Coordinators) in staff listing',
                 defc => 'Default Course Spreadsheet',
                 defs => 'Default Student Spreadsheet',
@@ -336,6 +337,14 @@ sub handler {
         return OK;
     }
 
+    if ($phase eq 'releaseinfo') {
+        my $loncaparev = $env{'course.'.$cid.'.internal.releaserequired'};
+        if ($loncaparev) { 
+            &display_loncaparev_constraints($r,$navmap,$loncaparev,$crstype);
+            return OK;
+        }
+    }
+
     my %values=&Apache::lonnet::dump('environment',$cdom,$cnum);
     my @prefs_order = ('courseinfo','localization','feedback','discussion',
                        'classlists','appearance','grading','printouts',
@@ -344,9 +353,7 @@ sub handler {
     my %prefs = (
         'courseinfo' =>
                    { text => $lt{'gens'},
-                     help => 'Course_Environment',
-                     header => [{col1 => 'Setting',
-                                 col2 => 'Value'}],
+                     help => 'Course_Prefs_General',
                      ordered => ['owner','co-owners','loncaparev','description',
                                  'courseid','categories','hidefromcat',
                                  'externalsyllabus','cloners','url','rolenames'],
@@ -365,10 +372,8 @@ sub handler {
                                  },
                     },
         'localization' =>
-                    { text => 'Language and Time Localization',
-                      help => 'Course_Environment',
-                      header => [{col1 => 'Setting',
-                                  col2 => 'Value',}],
+                    { text => 'Language and time localization',
+                      help => 'Course_Prefs_Language',
                       ordered => ['languages','timezone','datelocale'],
                       itemtext => {
                                     languages  => 'Languages used',
@@ -378,11 +383,9 @@ sub handler {
                     },
         'feedback' =>
                     { text => 'Feedback messages',
-                      help => 'Course_Environment',
+                      help => 'Course_Prefs_Feedback',
                       header => [{col1 => 'Questions about:',
-                                  col2 => 'Recipients'},
-                                 {col1 => 'Questions about:',
-                                  col2 => 'Custom Text'}],
+                                  col2 => 'Recipients'}],
                       ordered => ['question.email','comment.email','policy.email'],
                       itemtext => {
                                      'question.email' => 'Resource Content',
@@ -392,7 +395,7 @@ sub handler {
                     },
         'discussion' =>
                     { text => 'Discussion and Chat',
-                      help => 'Course_Environment',
+                      help => 'Course_Prefs_Discussions',
                       ordered => ['pch.roles.denied','pch.users.denied',
                                   'plc.roles.denied','plc.users.denied',
                                   'allow_limited_html_in_feedback',
@@ -408,7 +411,7 @@ sub handler {
                     },
         'classlists' =>
                    { text => $lt{'clas'},
-                     help => 'Course_Environment',
+                     help => 'Course_Prefs_Classlists',
                      header => [{col1 => 'Type',
                                  col2 => $lt{'defd'}},
                                 {col1 => 'Setting',
@@ -430,9 +433,7 @@ sub handler {
                    },
         'appearance' =>
                    { text => 'Display of resources ',
-                     help => 'Course_Environment',
-                     header => [{col1 => 'Setting',
-                                 col2 => 'Value',}],
+                     help => 'Course_Prefs_Display',
                      ordered => ['default_xml_style','pageseparators',
                                  'disable_receipt_display','texengine',
                                  'tthoptions'],
@@ -446,9 +447,7 @@ sub handler {
                   },
         'grading' =>
                   { text => 'Grading',
-                    help => 'Course_Environment',
-                    header => [{col1 => 'Setting',
-                                col2 => 'Value',}],
+                    help => 'Course_Prefs_Grading',
                     ordered => ['grading','rndseed',
                                 'receiptalg','disablesigfigs'],
                     itemtext => {
@@ -461,9 +460,7 @@ sub handler {
                   },
         'printouts' =>
                   { text => 'Printout generation',
-                    help => 'Course_Environment',
-                    header => [{col1 => 'Setting',
-                                col2 => 'Value',}],
+                    help => 'Course_Prefs_Printouts',
                     ordered => ['problem_stream_switch','suppress_tries',
                                 'default_paper_size','print_header_format',
                                 'disableexampointprint','canuse_pdfforms'],
@@ -478,9 +475,7 @@ sub handler {
                   },
         'spreadsheet' =>
                   { text => 'Spreadsheets',
-                    help => 'Course_Environment',
-                    header => [{col1 => 'Setting',
-                                col2 => 'Value'}],
+                    help => 'Course_Prefs_Spreadsheet',
                     ordered => ['spreadsheet_default_classcalc',
                                 'spreadsheet_default_studentcalc',
                                 'spreadsheet_default_assesscalc','hideemptyrows'],
@@ -493,9 +488,7 @@ sub handler {
                   },
         'bridgetasks' =>
                   { text => 'Bridge tasks',
-                    help => 'Course_Environment',
-                    header => [{col1 => 'Setting',
-                                col2 => 'Value'}],
+                    help => 'Course_Prefs_Bridgetasks',
                     ordered => ['task_messages','task_grading',
                                 'suppress_embed_prompt'],
                     itemtext => {
@@ -506,7 +499,7 @@ sub handler {
                   },
         'other' =>
                   { text => 'Other settings',
-                    help => 'Course_Environment',
+                    help => 'Course_Prefs_Other',
                     header => [ {col1 => 'Item',
                                  col2 => 'Value',
                               }],
@@ -516,15 +509,15 @@ sub handler {
         my @allitems = &get_allitems(%prefs);
         &Apache::lonconfigsettings::make_changes($r,$cdom,$phase,$context,
                                                  \@prefs_order,\%prefs,\%values,
-                                                  $cnum,undef,\@allitems);
+                                                  $cnum,undef,\@allitems,'coursepref');
     } elsif ($phase eq 'display') {
-        my $jscript = &get_jscript($cdom,$phase,$crstype);
+        my $jscript = &get_jscript($cid,$cdom,$phase,$crstype);
         my @allitems = &get_allitems(%prefs);
         &Apache::lonconfigsettings::display_settings($r,$cdom,$phase,$context,
-            \@prefs_order,\%prefs,\%values,undef,$jscript,\@allitems,$crstype);
+            \@prefs_order,\%prefs,\%values,undef,$jscript,\@allitems,$crstype,'coursepref');
     } else {
         &Apache::lonconfigsettings::display_choices($r,$phase,$context,
-                                                    \@prefs_order,\%prefs);
+                                                    \@prefs_order,\%prefs,'coursepref');
     }
     return OK;
 }
@@ -561,7 +554,7 @@ sub print_config_box {
         $output .= '
           <tr>
            <td>
-            <table class="LC_nested">';
+            <table class="LC_nested">';   
         if (exists $item->{'header'}->[0]->{'col1'} || 
             exists $item->{'header'}->[0]->{'col2'}) {
 			$output .= '          
@@ -581,7 +574,7 @@ sub print_config_box {
           </td>
          </tr>
          <tr>
-           <td>
+          <td>
             <table class="LC_nested">
              <tr class="LC_info_row">
               <td class="LC_left_item">'.&mt($item->{'header'}->[1]->{'col1'}).'</td>';
@@ -597,14 +590,14 @@ sub print_config_box {
           <tr>
            <td>
             <table class="LC_nested">';
-            if (exists $item->{'header'}->[0]->{'col1'} || 
-            	exists $item->{'header'}->[0]->{'col2'}) {
+            if (exists $item->{'header'}->[2]->{'col1'} || 
+            	exists $item->{'header'}->[2]->{'col2'}) {
 				$output .= '          
 				<tr class="LC_info_row">
-				  <td class="LC_left_item">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>
-				  <td class="LC_right_item">'.&mt($item->{'header'}->[0]->{'col2'}).'</td>
+				  <td class="LC_left_item">'.&mt($item->{'header'}->[2]->{'col1'}).'</td>
+				  <td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td>
 				</tr>';
-            }
+        	}
         }
     } else {
         $output .= '
@@ -1370,9 +1363,9 @@ sub store_changes {
                     $output .= '</ul>';
                 } else {
                     if ($crstype eq 'Community') {
-                        $output = &mt('No changes made to community settings.');
+                        $output .= &mt('No changes made to community settings.');
                     } else {
-                        $output = &mt('No changes made to course settings.');
+                        $output .= &mt('No changes made to course settings.');
                     }
                 }
             }
@@ -1547,9 +1540,9 @@ sub get_course {
 }
 
 sub get_jscript {
-    my ($cdom,$phase,$crstype) = @_;
+    my ($cid,$cdom,$phase,$crstype) = @_;
     my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom,$crstype);
-    my ($jscript,$categorize_js);
+    my ($jscript,$categorize_js,$loncaparev_js);
     my $stubrowse_js = &Apache::loncommon::studentbrowser_javascript();
     my $browse_js = &Apache::loncommon::browser_and_searcher_javascript('parmset');
     my $cloners_js = &cloners_javascript($phase);
@@ -1566,9 +1559,23 @@ function catsbrowser() {
 }
 ENDSCRIPT
     }
+    my $loncaparev = $env{'course.'.$cid.'.internal.releaserequired'};
+    if ($loncaparev) {
+        $loncaparev_js = <<ENDSCRIPT;
+function loncaparevinfo() {
+    var lcrevwin = null;
+    var url = '/adm/courseprefs?phase=releaseinfo';
+    if (!lcrevwin || lcrevwin.closed) {
+        lcrevwin=window.open(url,'releasewin','height=480,width=600,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
+    } else {
+        lcrevwin.focus();
+    }
+}
+ENDSCRIPT
+    }
     $jscript = '<script type="text/javascript" language="Javascript">'."\n".
-               $browse_js."\n".$categorize_js."\n".$cloners_js."\n".'</script>'.
-               "\n".$stubrowse_js."\n";
+               $browse_js."\n".$categorize_js."\n".$loncaparev_js."\n".
+               $cloners_js."\n".'</script>'."\n".$stubrowse_js."\n";
     return $jscript;
 }
 
@@ -1695,6 +1702,7 @@ sub print_courseinfo {
                            '</span>',
                    input => 'textbox',
                    size  => '40',
+                   advanced => 1
                  },
         'description'  => { 
                    text => '<b>'.&mt($itemtext->{'description'}).'</b>',
@@ -1717,13 +1725,14 @@ sub print_courseinfo {
                    text => '<b>'.&mt($itemtext->{'cloners'}).'</b><br />'.
                            &mt('Owner and Coordinators included automatically'),
                    input => 'textbox',
-                   size  => '40',
+                   size  => '40'
                          },
         'rolenames'  => { 
                    text  => '<b>'.&mt($itemtext->{'rolenames'}).'</b><br />'.
                             '('.$replace.')',
                    input => 'textbox',
                    size  => '20',
+                   advanced => 1
                         },
         'externalsyllabus' => {
                    text => '<b>'.&mt($itemtext->{'externalsyllabus'}).'</b><br />('.
@@ -1755,7 +1764,11 @@ sub print_courseinfo {
             next if (!$can_categorize);
         }
         $count ++;
-        $datatable .= &item_table_row_start($items{$item}{text},$count);
+        if (exists $items{$item}{advanced} && $items{$item}{advanced} == 1) {
+        	$datatable .= &item_table_row_start($items{$item}{text},$count,"advanced");
+        } else {
+        	$datatable .= &item_table_row_start($items{$item}{text},$count);
+        }
         if ($items{$item}{input} eq 'radio') {
             $datatable .= &yesno_radio($item,$settings);
         } elsif ($item eq 'cloners') {
@@ -1903,7 +1916,8 @@ sub print_courseinfo {
             my $loncaparev = $env{'course.'.$env{'request.course.id'}.'.internal.releaserequired'};
             my $showreqd;
             if ($loncaparev) {
-                $showreqd = &mt('[_1] or newer',$loncaparev);
+                $showreqd = &mt('[_1] or newer',$loncaparev).' <a href="javascript:loncaparevinfo()">'.
+                            &mt('Details').'</a>';
             } else {
                 $showreqd = &mt('No specific version required');
             }
@@ -2065,6 +2079,455 @@ ENDSCRIPT
     return;
 }
 
+sub display_loncaparev_constraints {
+    my ($r,$navmap,$loncaparev,$crstype) = @_;
+    my $cid = $env{'request.course.id'};
+    my $cdom = $env{'course.'.$cid.'.domain'};
+    my $cnum = $env{'course.'.$cid.'.num'};
+    my $output;
+    my %lt = &Apache::lonlocal::texthash (
+                                           'all'           => 'all',
+                                           'section/group' =>  'section/group',
+                                           'user'          => 'user',
+                                         );
+    my (%checkparms,%checkresponsetypes,%checkcrstypes,%anonsurvey,%randomizetry);
+    &Apache::loncommon::build_release_hashes(\%checkparms,\%checkresponsetypes,
+                                              \%checkcrstypes,\%anonsurvey,\%randomizetry);
+    if (defined($checkcrstypes{$crstype})) {
+        $output .= '<h4>'.&mt('Course type: [_1] requires [_2] or newer',$crstype,
+                              $checkcrstypes{$crstype}).'</h4>';
+    }
+    my (%fromparam,%rowspan,%bymap,%byresource,@scopeorder,%toshow,%allmaps,
+        %byresponsetype,%bysubmission);
+    @scopeorder = ('all','section/group','user');
+    my $resourcedata = &Apache::lonparmset::readdata($cnum,$cdom);
+    if (ref($resourcedata) eq 'HASH') {
+        foreach my $key (keys(%{$resourcedata})) {
+            foreach my $item (keys(%checkparms)) {
+                if ($key =~ /(\Q$item\E)$/) {
+                     if (ref($checkparms{$item}) eq 'ARRAY') {
+                         my $value = $resourcedata->{$key};
+                         my ($middle,$scope,$which,$level,$map,$resource);
+                         if (grep(/^\Q$value\E$/,@{$checkparms{$item}})) {
+                             my $stdtype = &Apache::lonparmset::standard_parameter_types($item);
+                             my $stdname = &Apache::lonparmset::standard_parameter_names($item);
+                             my $valname = &get_param_description($stdtype,$value);
+                             my $rev = $Apache::lonnet::needsrelease{'parameter:'.$item.':'.$value};
+                             my $start = $cid.'.';
+                             if ($key =~ /^\Q$start\E(\[useropt\:($match_username\:$match_domain)\]\.)/) {
+                                 $middle = $1;
+                                 $which = $2;
+                                 $scope = 'user'; 
+                             } elsif ($key =~ /^\Q$start\E(\[(\w+)\]\.)/) {
+                                 $middle = $1;
+                                 $which = $2;
+                                 $scope = 'section/group';
+                             } else {
+                                 $scope = 'all';
+                             }
+                             my $what="$stdname=$valname";
+                             if ($key =~ /^\Q$start$middle\E\w+\.\Q$item\E$/) {
+                                 $level = 'general';
+                                 if ($scope eq 'all') {
+                                     if (ref($fromparam{$rev}{$scope}) eq 'ARRAY') {
+                                         unless(grep(/^\Q$what\E$/,@{$fromparam{$rev}{$scope}})) {
+                                             push(@{$fromparam{$rev}{$scope}},$what);
+                                         }
+                                     } else {
+                                         push(@{$fromparam{$rev}{$scope}},$what);
+                                     }
+                                 } else {
+                                     if (ref($fromparam{$rev}{$scope}{$which}) eq 'ARRAY') {
+                                         unless (grep(/^\Q$what\E$/,@{$fromparam{$rev}{$scope}{$which}})) {
+                                             push(@{$fromparam{$rev}{$scope}{$which}},$what);
+                                         }
+                                     } else {
+                                         push(@{$fromparam{$rev}{$scope}{$which}},$what);
+                                     }
+                                 }
+                                 $rowspan{$rev} ++;
+                             } elsif ($key =~ /^\Q$start$middle\E(.+)___\(all\).\w+\.\Q$item\E$/) {
+                                 $level = 'folder';
+                                 $map = $1;
+                                 if ($scope eq 'all') {
+                                     if (ref($bymap{$map}{$rev}{$scope}) eq 'ARRAY') {
+                                         unless(grep(/^\Q$what\E$/,@{$bymap{$map}{$rev}{$scope}})) {
+                                             push(@{$bymap{$map}{$rev}{$scope}},$what);
+                                         }
+                                     } else {
+                                         push(@{$bymap{$map}{$rev}{$scope}},$what);
+                                     }
+                                 } else {
+                                     if (ref($bymap{$map}{$rev}{$scope}{$which}) eq 'ARRAY') {
+                                         unless(grep(/^\Q$what\E$/,@{$bymap{$map}{$rev}{$scope}{$which}})) {
+                                             push(@{$bymap{$map}{$rev}{$scope}{$which}},$what);
+                                         }
+                                     } else {
+                                         push(@{$bymap{$map}{$rev}{$scope}{$which}},$what);
+                                     }
+                                 }
+                             } elsif ($key =~ /^\Q$start$middle\E(.+)\.\w+\.\Q$item\E$/) {
+                                 $level = 'resource';
+                                 $resource = $1;
+                                 if ($scope eq 'all') {
+                                     if (ref($byresource{$resource}{$rev}{$scope}) eq 'ARRAY') {
+                                         unless(grep(/^\Q$what\E$/,@{$byresource{$resource}{$rev}{$scope}})) {
+                                             push(@{$byresource{$resource}{$rev}{$scope}},$what);
+                                         }
+                                     } else {
+                                         push(@{$byresource{$resource}{$rev}{$scope}},$what);
+                                     }
+                                 } else {
+                                     if (ref($byresource{$resource}{$rev}{$scope}{$which}) eq 'ARRAY') {
+                                         unless (grep(/^\Q$what\E$/,@{$byresource{$resource}{$rev}{$scope}{$which}})) {
+                                             push(@{$byresource{$resource}{$rev}{$scope}{$which}},$what);
+                                         }
+                                     } else {
+                                         push(@{$byresource{$resource}{$rev}{$scope}{$which}},$what);
+                                     }
+                                 }
+                             }
+                        }
+                    }
+                }
+            }
+        }
+        if (keys(%fromparam)) {
+            $output .= '<h4>'.&mt('Requirements from general settings').'</h4>'.
+                       &Apache::loncommon::start_data_table().
+                       &Apache::loncommon::start_data_table_header_row().
+                       '<th>'.&mt('Release').'</th><th>'.&mt('Scope').'</th>'.
+                       '<th>'.&mt('Extent').'</th><th>'.&mt('Setting').'</th>'.
+                       &Apache::loncommon::end_data_table_header_row();
+            foreach my $rev (keys(%fromparam)) {
+                $output .=  &Apache::loncommon::start_data_table_row().
+                            '<td rowspan="'.$rowspan{$rev}.'">'.$rev.'</td>';
+                my $newrow;
+                foreach my $scope (@scopeorder) {
+                    if (ref($fromparam{$rev}{$scope}) eq 'HASH') {
+                         if ($newrow) {
+                             $output .= &Apache::loncommon::continue_data_table_row();
+                         }
+                         $output .= '<td>'.$lt{$scope}.'</td>';
+                         foreach my $which (sort(keys(%{$fromparam{$rev}{$scope}}))) {
+                             $output .= '<td>'.$which.'</td><td>'.
+                                        join('<br />',@{$fromparam{$rev}{$scope}{$which}}).'</td>';
+                         }
+                         $output .= &Apache::loncommon::end_data_table_row();
+                         $newrow = 1;
+                    } elsif (ref($fromparam{$rev}{$scope}) eq 'ARRAY') {
+                         if ($newrow) {
+                             $output .= &Apache::loncommon::continue_data_table_row();
+                         }
+                         $output .= '<td>'.$lt{$scope}.'</td><td>&nbsp;</td><td>'.
+                                    join('<br />',@{$fromparam{$rev}{$scope}}).'</td>'.
+                                    &Apache::loncommon::end_data_table_row();
+                         $newrow = 1;
+                    }
+                }
+            }
+            $output .= &Apache::loncommon::end_data_table().'<br />';
+        }
+    }
+
+    if (defined($navmap)) {
+        my %anonsubms=&Apache::lonnet::dump('nohist_anonsurveys',$cdom,$cnum);
+        my $rev_anonsurv=$Apache::lonnet::needsrelease{'parameter:type:anonsurvey'};
+        my %randtrysubms=&Apache::lonnet::dump('nohist_randomizetry',$cdom,$cnum);
+        my $rev_randtry=$Apache::lonnet::needsrelease{'parameter:type:randomizetry'};
+        my $stdtype=&Apache::lonparmset::standard_parameter_types('type');
+        my $stdname=&Apache::lonparmset::standard_parameter_names('type');
+        my $valanon=&get_param_description($stdtype,'anonsurvey');
+        my $valrandtry=&get_param_description($stdtype,'randomizetry');
+
+        foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_problem() },1,0)) {
+            my @parts = @{$res->parts()};
+            my $symb = $res->symb();
+            my $enclosing_map = &Apache::lonnet::declutter($res->enclosing_map_src());
+            foreach my $part (@parts) {
+                if (exists($anonsubms{$symb."\0".$part})) {
+                    my $rev = $rev_anonsurv;
+                    my $what="$stdname=$valanon";
+                    if (ref($bysubmission{$symb}{$rev}) eq 'ARRAY') {
+                        unless (grep(/^\Q$what\E/,@{$bysubmission{$symb}{$rev}})) {
+                            push(@{$bysubmission{$symb}{$rev}},$what);
+                        }
+                    } else {
+                        push(@{$bysubmission{$symb}{$rev}},$what);
+                    }
+                    $allmaps{$enclosing_map} = 1;
+                }
+                if (exists($randtrysubms{$symb."\0".$part})) {
+                    my $rev = $rev_randtry;
+                    my $what="$stdname=$valrandtry";
+                    if (ref($bysubmission{$symb}{$rev}) eq 'ARRAY') {
+                        unless (grep(/^\Q$what\E/,@{$bysubmission{$symb}{$rev}})) {
+                            push(@{$bysubmission{$symb}{$rev}},$what);
+                        }
+                    } else {
+                        push(@{$bysubmission{$symb}{$rev}},$what);
+                    }
+                    $allmaps{$enclosing_map} = 1;
+                }
+            }
+            my %responses = $res->responseTypes();
+            foreach my $key (keys(%responses)) {
+                if (exists($checkresponsetypes{$key})) {
+                    push(@{$byresponsetype{$symb}{$checkresponsetypes{$key}}},$key);
+                    $allmaps{$enclosing_map} = 1;
+                }
+            }
+        }
+        if (keys(%byresource) > 0) {
+            foreach my $symb (keys(%byresource)) {
+                my ($map,$resid,$resurl)=&Apache::lonnet::decode_symb($symb);
+                $allmaps{$map} = 1;
+            }
+        }
+        if (keys(%bymap) > 0) {
+            foreach my $map (keys(%bymap)) {
+                $allmaps{$map} = 1;
+            }
+        }
+        foreach my $map (keys(%allmaps)) {
+            my $mapres = $navmap->getResourceByUrl($map);
+            my $mapsymb = $mapres->symb();
+            $toshow{$mapsymb} = 1;
+            if (ref($mapres)) {
+                my $pcslist = $mapres->map_hierarchy();
+                if ($pcslist ne '') {
+                    foreach my $pc (split(/,/,$pcslist)) {
+                        my $res = $navmap->getByMapPc($pc);
+                        if (ref($res)) {
+                            my $symb = $res->symb();
+                            unless ($symb eq '______') {
+                                $toshow{$symb} = 1;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    my $mapres_header = '<h4>'.
+                        &mt('Requirements for specific folders or resources').
+                        '</h4>';
+    if ((keys(%toshow) > 0) || (keys(%byresource) > 0) || 
+        (keys(%bysubmission) > 0) || (keys(%byresponsetype))) {
+        $output .= $mapres_header;
+    }
+    my $top_header = '<h3>'.&mt('LON-CAPA version dependencies').'</h3>';
+    my $title = 'Version Constraints';
+    my $start_page =
+        &Apache::loncommon::start_page($title,undef,{'only_body' => 1,});
+    $r->print($start_page.$top_header);
+    if ($output) {
+        $r->print($output);
+        if (defined($navmap)) {
+            &show_contents_view($r,$navmap,$cid,\%toshow,\%bymap,\%byresource,\%bysubmission,
+                                \%byresponsetype,\@scopeorder,\%lt);
+        }
+        $r->print('<br /><br />'); 
+    } else {
+        $r->print('<p class="LC_info">'.
+                  &mt('No version requirements from resource content or settings.').
+                  '</p>'); 
+    }
+    $r->print(&Apache::loncommon::end_page());
+    return;
+}
+
+sub show_contents_view {
+    my ($r,$navmap,$cid,$toshow,$bymap,$byresource,$bysubmission,$byresponsetype,
+        $scopeorder,$lt) = @_;
+    if ((keys(%{$toshow}) > 0) || (keys(%{$byresource}) > 0) || 
+        (keys(%{$bysubmission}) > 0) || (keys(%{$byresponsetype}) > 0)) {
+        my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons");
+        my $whitespace = '<img src="'.$location.'/whitespace_21.gif" alt="" />';
+        my $icon =  '<img src="'.$location.'/navmap.folder.open.gif" alt="" />';
+        my $topmap = $env{'course.'.$cid.'.url'};
+        $r->print(&Apache::loncommon::start_data_table().
+                  &Apache::loncommon::start_data_table_header_row().
+                  '<th>'.&mt('Location').'</th><th>'.&mt('Release').'</th>'.
+                  '<th>'.&mt('Attribute/Setting').'</th>'.
+                  &Apache::loncommon::end_data_table_header_row().
+                  &Apache::loncommon::start_data_table_row().
+                  '<td>&nbsp;'.$icon.'&nbsp;'.&mt('Main Course Documents').'</td>');
+                  &releases_by_map($r,$bymap,$topmap,$scopeorder,$lt);
+                  $r->print(&Apache::loncommon::end_data_table_row());
+        my $it=$navmap->getIterator(undef,undef,undef,1,1,undef);
+        my $curRes;
+        my $depth = 0;
+        my %parent = ();
+        my $startcount = 5;
+        my $lastcontainer = $startcount;
+        while ($curRes = $it->next()) {
+            if ($curRes == $it->BEGIN_MAP()) {
+                $depth++;
+                $parent{$depth}= $lastcontainer;
+            }
+            if ($curRes == $it->END_MAP()) {
+                $depth--;
+                $lastcontainer = $parent{$depth};
+            }
+            my $indent;
+            for (my $i=0; $i<$depth; $i++) {
+                $indent.= $whitespace;
+            }
+            if (ref($curRes)) {
+                my $symb = $curRes->symb();
+                my $ressymb = $symb;
+                my $srcf = $curRes->src();
+                my $title = &Apache::lonnet::gettitle($srcf);
+                if (($curRes->is_sequence()) || ($curRes->is_page())) {
+                    next unless($toshow->{$symb});
+                    my ($parent,$ind,$url) = &Apache::lonnet::decode_symb($symb);
+                    $icon =  '<img src="'.$location.'/navmap.folder.open.gif" alt="" />';
+                    if ($curRes->is_page()) {
+                        $icon = '<img src="'.$location.'/navmap.page.open.gif" alt="" />';
+                    }
+                    my $rowspan = 1;
+                    if (ref($bymap->{$url}) eq 'HASH') {
+                        $rowspan = scalar(keys(%{$bymap->{$url}}));
+                    }
+                    $r->print(&Apache::loncommon::start_data_table_row().
+                              '<td rowspan="'.$rowspan.'">'.$indent.$icon.'&nbsp;'.$title.'</td>');
+                    &releases_by_map($r,$bymap,$url,$scopeorder);
+                    $r->print(&Apache::loncommon::end_data_table_row());
+                } else {
+                    my $rowspan;
+                    if (ref($byresource->{$symb}) eq 'HASH') {
+                        $rowspan += scalar(keys(%{$byresource->{$symb}}));
+                    }
+                    if (ref($bysubmission->{$symb}) eq 'HASH') {
+                        $rowspan += scalar(keys(%{$bysubmission->{$symb}}));
+                    }
+                    if (ref($byresponsetype->{$symb}) eq 'HASH') {
+                        $rowspan += scalar(keys(%{$byresponsetype->{$symb}}));
+                    }
+                    next if (!$rowspan);
+                    $icon = '<img class="LC_contentImage" src="'.$location.'/problem.gif" alt="'.
+                            &mt('Problem').'" />';
+                    $r->print(&Apache::loncommon::start_data_table_row().
+                              '<td rowspan="'.$rowspan.'">'.$indent.$icon.'&nbsp;'.$title.'</td>');
+                    my $newrow;
+                    if (ref($byresource->{$symb}) eq 'HASH') {
+                        foreach my $rev (sort(keys(%{$byresource->{$symb}}))) {
+                            if ($newrow) {
+                                $r->print(&Apache::loncommon::continue_data_table_row());
+                            }
+                            $r->print('<td valign="middle">'.$rev.'</td><td>');
+                            if (ref($byresource->{$symb}{$rev}) eq 'HASH') {
+                                $r->print('<table border="0">');
+                                foreach my $scope (@{$scopeorder}) {
+                                    if (ref($byresource->{$symb}{$rev}{$scope}) eq 'HASH') {
+                                        $r->print('<tr><td>'.&mt('Setting - scope: [_1]',$lt->{$scope}).'</td>');
+                                        foreach my $which (sort(keys(%{$byresource->{$symb}{$rev}{$scope}}))) {
+                                            $r->print('<td>'.$which.'</td><td>'.
+                                                join('<br />',@{$byresource->{$symb}{$rev}{$scope}{$which}}).
+                                                      '</td>');
+                                        }
+                                        $r->print('</tr>');
+                                    } elsif (ref($byresource->{$symb}{$rev}{$scope}) eq 'ARRAY') {
+                                        $r->print('<tr><td>'.&mt('Setting - scope: [_1]',$lt->{$scope}).'</td>'.
+                                                  '<td>&nbsp;</td><td>'.
+                                                  join('<br />',@{$byresource->{$symb}{$rev}{$scope}}).'</td></tr>');
+                                    }
+                                }
+                                $r->print('</table>');
+                            }
+                            $r->print('</td>');
+                            $r->print(&Apache::loncommon::end_data_table_row());
+                            $newrow = 1;
+                        }
+                    }
+                    if (ref($bysubmission->{$symb}) eq 'HASH') {
+                        foreach my $rev (sort(keys(%{$bysubmission->{$symb}}))) {
+                            if ($newrow) {
+                                $r->print(&Apache::loncommon::continue_data_table_row());
+                            }
+                            $r->print('<td>'.$rev.'</td><td>');
+                            if (ref($bysubmission->{$symb}{$rev}) eq 'ARRAY') {
+                                $r->print(&mt('Submissions to: ').' '.
+                                         join(', ',@{$bysubmission->{$symb}{$rev}}));
+                            }
+                            $r->print('</td>');
+                            $r->print(&Apache::loncommon::end_data_table_row());
+                            $newrow = 1;
+                        }
+                    }
+                    if (ref($byresponsetype->{$symb}) eq 'HASH') {
+                        foreach my $rev (sort(keys(%{$byresponsetype->{$symb}}))) {
+                            if ($newrow) {
+                                $r->print(&Apache::loncommon::continue_data_table_row());
+                            }
+                            $r->print('<td>'.$rev.'</td><td>');
+                            if (ref($byresponsetype->{$symb}{$rev}) eq 'ARRAY') {
+                                $r->print(&mt('Response Type(s): ').' '.
+                                         join('<br />',@{$byresponsetype->{$symb}{$rev}}));
+                            }
+                            $r->print('</td>');
+                        }
+                        $r->print(&Apache::loncommon::end_data_table_row());
+                    }
+                }
+            }
+        }
+        $r->print(&Apache::loncommon::end_data_table());
+    }
+}
+
+sub releases_by_map {
+    my ($r,$bymap,$url,$scopeorder,$lt) = @_;
+    return unless ((ref($bymap) eq 'HASH') && (ref($scopeorder) eq 'ARRAY'));
+    if (ref($bymap->{$url}) eq 'HASH') {
+        foreach my $rev (sort(keys(%{$bymap->{$url}}))) {
+            $r->print('<td valign="middle">'.$rev.'</td><td>');
+            if (ref($bymap->{$url}{$rev}) eq 'HASH') {
+                $r->print('<table border="0">');
+                foreach my $scope (@{$scopeorder}) {
+                    if (ref($bymap->{$url}{$rev}{$scope}) eq 'HASH') {
+                        $r->print('<tr><td>'.&mt('Setting - scope: [_1]',$lt->{$scope}).'</td>');
+                        foreach my $which (sort(keys(%{$bymap->{$url}{$rev}{$scope}}))) {
+                            $r->print('<td>'.$which.'</td><td>'.
+                                      join('<br />',@{$bymap->{$url}{$rev}{$scope}{$which}}).
+                                      '</td>');
+                        }
+                        $r->print('</tr>');
+                    } elsif (ref($bymap->{$url}{$rev}{$scope}) eq 'ARRAY') {
+                        $r->print('<tr><td>'.&mt('Setting - scope: [_1]',$lt->{$scope}).
+                                  '</td><td>&nbsp;</td><td>'.
+                                  join('<br />',@{$bymap->{$url}{$rev}{$scope}}).'</td></tr>');
+                    }
+                }
+                $r->print('</table>');
+            }
+            $r->print('</td>');
+        }
+    } else {
+        $r->print('<td colspan="2">&nbsp;</td>');
+    }
+    return;
+}
+
+sub get_param_description {
+    my ($stdtype,$value) = @_;
+    my $name = $value;
+    my $paramstrings = &Apache::lonparmset::standard_string_options($stdtype);
+    unless (ref($paramstrings) eq 'ARRAY') {
+        return $name;
+    }
+    foreach my $possibilities (@{$paramstrings}) {
+        next unless (ref($possibilities) eq 'ARRAY');
+        my ($thing, $description) = @{ $possibilities };
+        if ($thing eq $value) {
+            $name = $description;
+            last;
+        }
+    }
+    return $name;
+}
+
 sub show_autocoowners {
     my (@currcoown) = @_;
     my $output = '<i>'.&mt('Co-ownership is set automatically when a Course Coordinator role is assigned to official course personnel (from institutional data).').'</i>';
@@ -2321,14 +2784,18 @@ sub print_feedback {
 
     foreach my $item (@{$ordered}) {
         $count ++;
-       	$datatable .= &item_table_row_start($items{$item}{text},$count);
+        if ($position eq 'top') {
+        	$datatable .= &item_table_row_start($items{$item}{text},$count);
+        } else {
+        	$datatable .= &item_table_row_start($items{$item}{text}."<br/>(Custom text)",$count, "advanced");
+        }
         if ($position eq 'top') {
             my $includeempty = 0;
             $datatable .= &user_table($cdom,$item,\@sections,
                                       $settings->{$item},\%lt);
         } else {
             $datatable .= &Apache::lonhtmlcommon::textbox($item.'.text',
-                              $settings->{$item.'.text'},$items{$item}{size});
+                              $settings->{$item.'.text'},$items{$item}{size});  
         }
         $datatable .= &item_table_row_end();
     }
@@ -2778,11 +3245,12 @@ sub print_grading {
                    input => 'selectbox',
                    options => {
                                 standard => &mt('Standard: shows points'),
+                                categories => &mt('Categories: shows points according to categories'),
                                 external => &mt('External: shows number of completed parts and totals'),
                                 externalnototals => &mt('External: shows only number of completed parts'),
                                 spreadsheet => &mt('Spreadsheet: (with link to detailed scores)'), 
                               },
-                   order => ['standard','external','externalnototals','spreadsheet'],
+                   order => ['standard','categories','external','externalnototals','spreadsheet'],
                  },
         'rndseed' => {
                    text => '<b>'.&mt($itemtext->{'rndseed'}).'</b>'.
@@ -2799,6 +3267,7 @@ sub print_grading {
                                 '64bit5' => '64bit5',
                               },
                    order => ['32bit','64bit','64bit2','64bit3','64bit4','64bit5'],
+                   advanced => 1
                  },
         'receiptalg'  => {
                    text => '<b>'.&mt($itemtext->{'receiptalg'}).'</b><br />'.
@@ -2810,6 +3279,7 @@ sub print_grading {
                                 receipt3 => 'receipt3',
                               },
                    order => ['receipt','receipt2','receipt3'],
+                   advanced => 1
                  },
         'disablesigfigs' => {
                    text => '<b>'.&mt($itemtext->{'disablesigfigs'}).'</b>',
@@ -3081,7 +3551,11 @@ sub make_item_rows {
         my $count = 0;
         foreach my $item (@{$ordered}) {
             $count ++;
-            $datatable .= &item_table_row_start($items->{$item}{text},$count);
+            if (exists $items->{$item}{advanced} && $items->{$item}{advanced} == 1) {
+                $datatable .= &item_table_row_start($items->{$item}{text},$count,"advanced");
+            } else {
+                $datatable .= &item_table_row_start($items->{$item}{text},$count);
+            }
             if ($item eq 'nothideprivileged') {
                 $datatable .= &nothidepriv_row($cdom,$item,$settings,$crstype);
             } elsif ($item eq 'print_header_format') {