--- loncom/interface/statistics/lonstathelpers.pm	2008/09/14 15:16:29	1.55
+++ loncom/interface/statistics/lonstathelpers.pm	2010/09/11 19:08:23	1.59.12.1
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstathelpers.pm,v 1.55 2008/09/14 15:16:29 raeburn Exp $
+# $Id: lonstathelpers.pm,v 1.59.12.1 2010/09/11 19:08:23 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -158,14 +158,14 @@ sub problem_selector {
                                                      resptype=>$resptype});
                         my $checked = '';
                         if ($env{'form.problemchoice'} eq $value) {
-                            $checked = 'checked ';
+                            $checked = ' checked="checked"';
                         }
                         my $title = $res->compTitle;
                         if (! defined($title) || $title eq '') {
                             ($title) = ($res->src =~ m:/([^/]*)$:);
                         }
                         $seq_str .= '<tr>'.
-                            qq{<td><input type="radio" id="$rb_count" name="problemchoice" value="$value" $checked /></td>}.
+                            qq{<td><input type="radio" id="$rb_count" name="problemchoice" value="$value"$checked /></td>}.
                             '<td><label for="'.$rb_count.'">'.$resptype.'</label></td>'.
                             '<td><label for="'.$rb_count.'">'.$title.'</label>';
                         if (scalar(@response_ids) > 1) {
@@ -173,7 +173,7 @@ sub problem_selector {
                         }
                         my $link = $res->link.'?symb='.&escape($res->shown_symb);
                         $seq_str .= ('&nbsp;'x2).
-                            qq{<a target="preview" href="$link">view</a>};
+                            '<a target="preview" href="'.$link.'">'.&mt('view').'</a>';
                         $seq_str .= "</td></tr>\n";
                         $rb_count++;
                     }
@@ -181,12 +181,12 @@ sub problem_selector {
             }
         }
         if ($seq_str ne '') {
-            $Str .= '<tr><td>&nbsp</td>'.
+            $Str .= '<tr><td>&nbsp;</td>'.
                 '<td colspan="2"><b>'.$seq->compTitle.'</b></td>'.
                 "</tr>\n".$seq_str;
             if (defined($sequence_addendum)) {
                 $Str .= '<tr>'.
-                    ('<td>&nbsp</td>'x2).
+                    ('<td>&nbsp;</td>'x2).
                     '<td align="right">'.$sequence_addendum.'</td>'.
                     "</tr>\n";
             }
@@ -229,15 +229,16 @@ sub MultipleProblemSelector {
     if (! defined($navmap)) {
         $navmap = Apache::lonnavmaps::navmap->new();
         if (! defined($navmap)) {
-            $Str .= 
-                '<h1>'.&mt('Error: cannot process course structure').'</h1>';
+            $Str .= '<div class="LC_error">'
+                   .&mt('Error: cannot process course structure')
+                   .'</div>';
             return $Str;
         }
     }
     my $selected = {map { ($_,1) } (&get_selected_symbs($inputname))};
     # Header
     $Str .= <<"END";
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript" language="JavaScript">
     function checkall(value,seqid) {
         for (i=0; i<document.forms.$formname.elements.length; i++) {
             ele = document.forms.$formname.elements[i];
@@ -261,14 +262,29 @@ END
         ('&nbsp;'x4).
         '<a href="javascript:checkall(false)">'.&mt('Unselect All').'</a>';
     $Str .= $/.'<table>'.$/;
-    my $iterator = $navmap->getIterator(undef, undef, undef, 1);
-    my $sequence_string;
+    my ($iterator,$sequence_string,@Accumulator);
     my $seq_id = 0;
-    my @Accumulator = (&new_accumulator($env{'course.'.$cid.'.description'},
-                                        '',
-                                        '',
-                                        $seq_id++,
-                                        $inputname));
+    if (&Apache::loncommon::needs_gci_custom()) {
+        my $cdom = $env{'course.'.$cid.'.domain'};
+        my $cnum = $env{'course.'.$cid.'.num'};
+        my $mapurl = "/uploaded/$cdom/$cnum/default_1261144274.sequence";
+        my $map = $navmap->getResourceByUrl($mapurl);
+        my $firstResource = $map->map_start();
+        my $lastResource = $map->map_finish();
+        $iterator = $navmap->getIterator($firstResource,$lastResource,undef,1);
+        @Accumulator = (&new_accumulator($map->compTitle,
+                                         $map->src,
+                                         $map->symb,
+                                         $seq_id++,
+                                         $inputname));
+    } else {
+        $iterator = $navmap->getIterator(undef, undef, undef, 1);
+        @Accumulator = (&new_accumulator($env{'course.'.$cid.'.description'},
+                                         '',
+                                         '',
+                                         $seq_id++,
+                                         $inputname));
+    }
     my @Sequence_Data;
     while (my $curRes = $iterator->next()) {
         if ($curRes == $iterator->END_MAP) {
@@ -321,7 +337,7 @@ sub new_accumulator {
                 $target.='<tr><td><label>'.
                     '<input type="checkbox" name="'.$inputname.'" ';
                 if ($checked) {
-                    $target .= 'checked ';
+                    $target .= 'checked="checked" ';
                 }
                 $target .= 'id="'.$seq_id.':'.$item_id++.'" ';
                 $target.= 
@@ -329,7 +345,7 @@ sub new_accumulator {
                     '&nbsp;'.$res->compTitle.'</label>'.
                     ('&nbsp;'x2).'<a target="preview" '.
                     'href="'.$res->link.'?symb='.
-                    &escape($res->shown_symb).'">view</a>'.
+                    &escape($res->shown_symb).'">'.&mt('view').'</a>'.
                     '</td></tr>'.$/;
             } else { 
                 if (defined($target)) {
@@ -1254,7 +1270,7 @@ sub limit_by_time_form {
     my $enddateform = &Apache::lonhtmlcommon::date_setter
         ('Statistics','limitby_enddate',$endtime,undef,undef,$state);
     my $Str;
-    $Str .= '<script language="Javascript" >';
+    $Str .= '<script type="text/javascript" language="JavaScript">';
     $Str .= 'function toggle_limitby_activity(state) {';
     $Str .= '    if (state) {';
     $Str .= '        limitby_startdate_enable();';
@@ -1419,7 +1435,7 @@ sub submission_report_form {
              ' enough input.');
     }
     my $html = $/.
-        '<script type="Text/JavaScript">'.
+        '<script type="text/javascript" language="JavaScript">'.
         "document.Statistics.reportSelected.value='$original_report';".
         '</script>'.
         '<input type="hidden" name="correctans" value="true" />'.