[BACK]Return to loncommon.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/loncommon.pm between versions 1.661 and 1.672

version 1.661, 2008/06/16 23:34:12 version 1.672, 2008/07/23 10:07:25
Line 878  sub help_open_topic { Line 878  sub help_open_topic {
   
     # Add the graphic      # Add the graphic
     my $title = &mt('Online Help');      my $title = &mt('Online Help');
     my $helpicon=&lonhttpdurl("/res/adm/pages/help.png");      my $helpicon=&lonhttpdurl("/adm/help/help.png");
     $template .= <<"ENDTEMPLATE";      $template .= <<"ENDTEMPLATE";
  <a target="_top" href="$link" title="$title"><img src="$helpicon" border="0" alt="(Help: $topic)" /></a>   <a target="_top" href="$link" title="$title"><img src="$helpicon" border="0" alt="(Help: $topic)" /></a>
 ENDTEMPLATE  ENDTEMPLATE
Line 913  sub general_help { Line 913  sub general_help {
  $helptopic='Authoring_Intro';   $helptopic='Authoring_Intro';
     } elsif ($env{'request.role'}=~/^cc/) {      } elsif ($env{'request.role'}=~/^cc/) {
  $helptopic='Course_Coordination_Intro';   $helptopic='Course_Coordination_Intro';
       } elsif ($env{'request.role'}=~/^dc/) {
           $helptopic='Domain_Coordination_Intro';
     }      }
     return $helptopic;      return $helptopic;
 }  }
Line 4569  td.LC_menubuttons_img { Line 4571  td.LC_menubuttons_img {
   text-align: right;    text-align: right;
 }  }
   
   .LC_roleslog_note {
     font-size: smaller;
   }
   
 table.LC_aboutme_port {  table.LC_aboutme_port {
   border: 0px;    border: 0px;
   border-collapse: collapse;    border-collapse: collapse;
Line 6806  sub instrule_disallow_msg { Line 6812  sub instrule_disallow_msg {
         } elsif ($checkitem eq 'id') {          } elsif ($checkitem eq 'id') {
             $response .= &mt("Either upload a file which includes $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}, or when associating fields with data columns, omit an association for the ID/Student Number field.");              $response .= &mt("Either upload a file which includes $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}, or when associating fields with data columns, omit an association for the ID/Student Number field.");
         }          }
       } elsif ($mode eq 'selfcreate') {
           if ($checkitem eq 'id') {
               $response .= &mt("You must either choose $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}, or leave the ID field blank.");
           }
     } else {      } else {
         if ($checkitem eq 'username') {          if ($checkitem eq 'username') {
             $response .= &mt("You must choose $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}.");              $response .= &mt("You must choose $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}.");
Line 6834  sub sorted_inst_types { Line 6844  sub sorted_inst_types {
     my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($dom);      my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($dom);
     my $othertitle = &mt('All users');      my $othertitle = &mt('All users');
     if ($env{'request.course.id'}) {      if ($env{'request.course.id'}) {
         $othertitle  = 'any';          $othertitle  = &mt('Any users');
     }      }
     my @types;      my @types;
     if (ref($order) eq 'ARRAY') {      if (ref($order) eq 'ARRAY') {
Line 6847  sub sorted_inst_types { Line 6857  sub sorted_inst_types {
     }      }
     if (keys(%{$usertypes}) > 0) {      if (keys(%{$usertypes}) > 0) {
         $othertitle = &mt('Other users');          $othertitle = &mt('Other users');
         if ($env{'request.course.id'}) {  
             $othertitle = 'other';  
         }  
     }      }
     return ($othertitle,$usertypes,\@types);      return ($othertitle,$usertypes,\@types);
 }  }
Line 7238  sub check_for_upload { Line 7245  sub check_for_upload {
             }              }
         }          }
     }      }
     my $getpropath = 1;  
     if (($current_disk_usage + $filesize) > $disk_quota){      if (($current_disk_usage + $filesize) > $disk_quota){
         my $msg = '<span class="LC_error">'.          my $msg = '<span class="LC_error">'.
                 &mt('Unable to upload [_1]. (size = [_2] kilobytes). Disk quota will be exceeded.','<span class="LC_filename">'.$fname.'</span>',$filesize).'</span>'.                  &mt('Unable to upload [_1]. (size = [_2] kilobytes). Disk quota will be exceeded.','<span class="LC_filename">'.$fname.'</span>',$filesize).'</span>'.
Line 7491  Apache Request ref, $records is an array Line 7497  Apache Request ref, $records is an array
 ######################################################  ######################################################
 sub csv_print_samples {  sub csv_print_samples {
     my ($r,$records) = @_;      my ($r,$records) = @_;
     my $samples = &get_samples($records,3);      my $samples = &get_samples($records,5);
   
     $r->print(&mt('Samples').'<br />'.&start_data_table().      $r->print(&mt('Samples').'<br />'.&start_data_table().
               &start_data_table_header_row());                &start_data_table_header_row());
Line 7546  sub csv_print_select_table { Line 7552  sub csv_print_select_table {
  foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) {   foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) {
     $r->print('<option value="'.$sample.'"'.      $r->print('<option value="'.$sample.'"'.
                       ($sample eq $defaultcol ? ' selected="selected" ' : '').                        ($sample eq $defaultcol ? ' selected="selected" ' : '').
                       '>Column '.($sample+1).'</option>');                        '>'.&mt('Column [_1]',($sample+1)).'</option>');
  }   }
  $r->print('</select></td>'.&end_data_table_row()."\n");   $r->print('</select></td>'.&end_data_table_row()."\n");
  $i++;   $i++;
Line 7577  sub csv_samples_select_table { Line 7583  sub csv_samples_select_table {
     my ($r,$records,$d) = @_;      my ($r,$records,$d) = @_;
     my $i=0;      my $i=0;
     #      #
     my $samples = &get_samples($records,3);      my $max_samples = 5;
       my $samples = &get_samples($records,$max_samples);
     $r->print(&start_data_table().      $r->print(&start_data_table().
               &start_data_table_header_row().'<th>'.                &start_data_table_header_row().'<th>'.
               &mt('Field').'</th><th>'.&mt('Samples').'</th>'.                &mt('Field').'</th><th>'.&mt('Samples').'</th>'.
Line 7593  sub csv_samples_select_table { Line 7600  sub csv_samples_select_table {
                       $display.'</option>');                        $display.'</option>');
  }   }
  $r->print('</select></td><td>');   $r->print('</select></td><td>');
  foreach my $line (0..2) {   foreach my $line (0..($max_samples-1)) {
     if (defined($samples->[$line]{$key})) {       if (defined($samples->[$line]{$key})) { 
  $r->print($samples->[$line]{$key}."<br />\n");    $r->print($samples->[$line]{$key}."<br />\n"); 
     }      }
Line 8271  domain - to an array.  Also generates ja Line 8278  domain - to an array.  Also generates ja
 generate Domain Coordinator interface for editing Course Categories.  generate Domain Coordinator interface for editing Course Categories.
   
 Inputs:  Inputs:
   
 categories (reference to hash of category definitions).  categories (reference to hash of category definitions).
   
 cats (reference to array of arrays/hashes which encapsulates hierarchy of  cats (reference to array of arrays/hashes which encapsulates hierarchy of
       categories and subcategories).        categories and subcategories).
   
 idx (reference to hash of counters used in Domain Coordinator interface for   idx (reference to hash of counters used in Domain Coordinator interface for 
       editing Course Categories).        editing Course Categories).
   
 jsarray (reference to array of categories used to create Javascript arrays for  jsarray (reference to array of categories used to create Javascript arrays for
          Domain Coordinator interface for editing Course Categories).           Domain Coordinator interface for editing Course Categories).
   
Line 8318  sub gather_categories { Line 8329  sub gather_categories {
 Used to generate breadcrumb trails for course categories.  Used to generate breadcrumb trails for course categories.
   
 Inputs:  Inputs:
   
 categories (reference to hash of category definitions).  categories (reference to hash of category definitions).
   
 cats (reference to array of arrays/hashes which encapsulates hierarchy of  cats (reference to array of arrays/hashes which encapsulates hierarchy of
       categories and subcategories).        categories and subcategories).
   
 trails (reference to array of breacrumb trails for each category).  trails (reference to array of breacrumb trails for each category).
   
 allitems (reference to hash - key is category key   allitems (reference to hash - key is category key 
          (format: escaped(name):escaped(parent category):depth in hierarchy).           (format: escaped(name):escaped(parent category):depth in hierarchy).
   
 idx (reference to hash of counters used in Domain Coordinator interface for  idx (reference to hash of counters used in Domain Coordinator interface for
       editing Course Categories).        editing Course Categories).
   
 jsarray (reference to array of categories used to create Javascript arrays for  jsarray (reference to array of categories used to create Javascript arrays for
          Domain Coordinator interface for editing Course Categories).           Domain Coordinator interface for editing Course Categories).
   
   subcats (reference to hash of arrays containing all subcategories within each 
            category, -recursive)
   
 Returns: nothing  Returns: nothing
   
 Side effects: populates trails and allitems hash references.  Side effects: populates trails and allitems hash references.
Line 8336  Side effects: populates trails and allit Line 8356  Side effects: populates trails and allit
 =cut  =cut
   
 sub extract_categories {  sub extract_categories {
     my ($categories,$cats,$trails,$allitems,$idx,$jsarray) = @_;      my ($categories,$cats,$trails,$allitems,$idx,$jsarray,$subcats) = @_;
     if (ref($categories) eq 'HASH') {      if (ref($categories) eq 'HASH') {
         &gather_categories($categories,$cats,$idx,$jsarray);          &gather_categories($categories,$cats,$idx,$jsarray);
         if (ref($cats->[0]) eq 'ARRAY') {          if (ref($cats->[0]) eq 'ARRAY') {
Line 8357  sub extract_categories { Line 8377  sub extract_categories {
                 if (ref($cats->[1]{$name}) eq 'ARRAY') {                  if (ref($cats->[1]{$name}) eq 'ARRAY') {
                     for (my $j=0; $j<@{$cats->[1]{$name}}; $j++) {                      for (my $j=0; $j<@{$cats->[1]{$name}}; $j++) {
                         my $category = $cats->[1]{$name}[$j];                          my $category = $cats->[1]{$name}[$j];
                         &recurse_categories($cats,2,$category,$trails,$allitems,\@parents);                          if (ref($subcats) eq 'HASH') {
                               push(@{$subcats->{$item}},&escape($category).':'.&escape($name).':1');
                           }
                           &recurse_categories($cats,2,$category,$trails,$allitems,\@parents,$subcats);
                       }
                   } else {
                       if (ref($subcats) eq 'HASH') {
                           $subcats->{$item} = [];
                     }                      }
                 }                  }
             }              }
Line 8373  sub extract_categories { Line 8400  sub extract_categories {
 Recursively used to generate breadcrumb trails for course categories.  Recursively used to generate breadcrumb trails for course categories.
   
 Inputs:  Inputs:
   
 cats (reference to array of arrays/hashes which encapsulates hierarchy of  cats (reference to array of arrays/hashes which encapsulates hierarchy of
       categories and subcategories).        categories and subcategories).
   
 depth (current depth in hierarchy of categories and sub-categories - 0 indexed).  depth (current depth in hierarchy of categories and sub-categories - 0 indexed).
 category (current course category, for which breadcrumb trail is being generated).     
 trails (reference to array of breacrumb trails for each category).  category (current course category, for which breadcrumb trail is being generated).
   
   trails (reference to array of breadcrumb trails for each category).
   
 allitems (reference to hash - key is category key  allitems (reference to hash - key is category key
          (format: escaped(name):escaped(parent category):depth in hierarchy).           (format: escaped(name):escaped(parent category):depth in hierarchy).
   
 parents (array containing containers directories for current category,   parents (array containing containers directories for current category, 
          back to top level).            back to top level). 
   
Line 8387  Returns: nothing Line 8420  Returns: nothing
   
 Side effects: populates trails and allitems hash references  Side effects: populates trails and allitems hash references
   
 =back  
   
 =cut  =cut
   
 sub recurse_categories {  sub recurse_categories {
     my ($cats,$depth,$category,$trails,$allitems,$parents) = @_;      my ($cats,$depth,$category,$trails,$allitems,$parents,$subcats) = @_;
     my $shallower = $depth - 1;      my $shallower = $depth - 1;
     if (ref($cats->[$depth]{$category}) eq 'ARRAY') {      if (ref($cats->[$depth]{$category}) eq 'ARRAY') {
         for (my $k=0; $k<@{$cats->[$depth]{$category}}; $k++) {          for (my $k=0; $k<@{$cats->[$depth]{$category}}; $k++) {
Line 8405  sub recurse_categories { Line 8436  sub recurse_categories {
             }              }
             my $deeper = $depth+1;              my $deeper = $depth+1;
             push(@{$parents},$category);              push(@{$parents},$category);
             &recurse_categories($cats,$deeper,$name,$trails,$allitems,$parents);              if (ref($subcats) eq 'HASH') {
                   my $subcat = &escape($name).':'.$category.':'.$depth;
                   for (my $j=@{$parents}; $j>=0; $j--) {
                       my $higher;
                       if ($j > 0) {
                           $higher = &escape($parents->[$j]).':'.
                                     &escape($parents->[$j-1]).':'.$j;
                       } else {
                           $higher = &escape($parents->[$j]).'::'.$j;
                       }
                       push(@{$subcats->{$higher}},$subcat);
                   }
               }
               &recurse_categories($cats,$deeper,$name,$trails,$allitems,$parents,
                                   $subcats);
             pop(@{$parents});              pop(@{$parents});
         }          }
     } else {      } else {
Line 8419  sub recurse_categories { Line 8464  sub recurse_categories {
     return;      return;
 }  }
   
   =pod
   
   =item *&assign_categories_table()
   
   Create a datatable for display of hierarchical categories in a domain,
   with checkboxes to allow a course to be categorized. 
   
   Inputs:
   
   cathash - reference to hash of categories defined for the domain (from
             configuration.db)
   
   currcat - scalar with an & separated list of categories assigned to a course. 
   
   Returns: $output (markup to be displayed) 
   
   =cut
   
   sub assign_categories_table {
       my ($cathash,$currcat) = @_;
       my $output;
       if (ref($cathash) eq 'HASH') {
           my (@cats,@trails,%allitems,%idx,@jsarray,@path,$maxdepth);
           &extract_categories($cathash,\@cats,\@trails,\%allitems,\%idx,\@jsarray);
           $maxdepth = scalar(@cats);
           if (@cats > 0) {
               my $itemcount = 0;
               if (ref($cats[0]) eq 'ARRAY') {
                   $output = &Apache::loncommon::start_data_table();
                   my @currcategories;
                   if ($currcat ne '') {
                       @currcategories = split('&',$currcat);
                   }
                   for (my $i=0; $i<@{$cats[0]}; $i++) {
                       my $parent = $cats[0][$i];
                       my $css_class = $itemcount%2?' class="LC_odd_row"':'';
                       next if ($parent eq 'instcode');
                       my $item = &escape($parent).'::0';
                       my $checked = '';
                       if (@currcategories > 0) {
                           if (grep(/^\Q$item\E$/,@currcategories)) {
                               $checked = ' checked="checked" ';
                           }
                       }
                       $output .= '<tr '.$css_class.'><td><span class="LC_nobreak">'
                                  .'<input type="checkbox" name="usecategory" value="'.
                                  $item.'"'.$checked.' />'.$parent.'</span></td>';
                       my $depth = 1;
                       push(@path,$parent);
                       $output .= &assign_category_rows($itemcount,\@cats,$depth,$parent,\@path,\@currcategories);
                       pop(@path);
                       $output .= '</tr><tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr>';
                       $itemcount ++;
                   }
                   $output .= &Apache::loncommon::end_data_table();
               }
           }
       }
       return $output;
   }
   
   =pod
   
   =item *&assign_category_rows()
   
   Create a datatable row for display of nested categories in a domain,
   with checkboxes to allow a course to be categorized,called recursively.
   
   Inputs:
   
   itemcount - track row number for alternating colors
   
   cats - reference to array of arrays/hashes which encapsulates hierarchy of
         categories and subcategories.
   
   depth - current depth in hierarchy of categories and sub-categories - 0 indexed.
   
   parent - parent of current category item
   
   path - Array containing all categories back up through the hierarchy from the
          current category to the top level.
   
   currcategories - reference to array of current categories assigned to the course
   
   Returns: $output (markup to be displayed).
   
   =cut
   
   sub assign_category_rows {
       my ($itemcount,$cats,$depth,$parent,$path,$currcategories) = @_;
       my ($text,$name,$item,$chgstr);
       if (ref($cats) eq 'ARRAY') {
           my $maxdepth = scalar(@{$cats});
           if (ref($cats->[$depth]) eq 'HASH') {
               if (ref($cats->[$depth]{$parent}) eq 'ARRAY') {
                   my $numchildren = @{$cats->[$depth]{$parent}};
                   my $css_class = $itemcount%2?' class="LC_odd_row"':'';
                   $text .= '<td><table class="LC_datatable">';
                   for (my $j=0; $j<$numchildren; $j++) {
                       $name = $cats->[$depth]{$parent}[$j];
                       $item = &escape($name).':'.&escape($parent).':'.$depth;
                       my $deeper = $depth+1;
                       my $checked = '';
                       if (ref($currcategories) eq 'ARRAY') {
                           if (@{$currcategories} > 0) {
                               if (grep(/^\Q$item\E$/,@{$currcategories})) {
                                   $checked = ' checked="checked" ';
                               }
                           }
                       }
                       $text .= '<tr><td><span class="LC_nobreak"><label>'.
                                '<input type="checkbox" name="usecategory" value="'.
                                $item.'"'.$checked.' />'.$name.'</label></span></td><td>';
                       if (ref($path) eq 'ARRAY') {
                           push(@{$path},$name);
                           $text .= &assign_category_rows($itemcount,$cats,$deeper,$name,$path,$currcategories);
                           pop(@{$path});
                       }
                       $text .= '</td></tr>';
                   }
                   $text .= '</table></td>';
               }
           }
       }
       return $text;
   }
   
 ############################################################  ############################################################
 ############################################################  ############################################################
   
   
 sub commit_customrole {  sub commit_customrole {
     my ($udom,$uname,$url,$three,$four,$five,$start,$end) = @_;      my ($udom,$uname,$url,$three,$four,$five,$start,$end,$context) = @_;
     my $output = &mt('Assigning custom role').' "'.$five.'" by '.$four.':'.$three.' in '.$url.      my $output = &mt('Assigning custom role').' "'.$five.'" by '.$four.':'.$three.' in '.$url.
                          ($start?', '.&mt('starting').' '.localtime($start):'').                           ($start?', '.&mt('starting').' '.localtime($start):'').
                          ($end?', ending '.localtime($end):'').': <b>'.                           ($end?', ending '.localtime($end):'').': <b>'.
               &Apache::lonnet::assigncustomrole(                &Apache::lonnet::assigncustomrole(
                  $udom,$uname,$url,$three,$four,$five,$end,$start).                   $udom,$uname,$url,$three,$four,$five,$end,$start,undef,undef,$context).
                  '</b><br />';                   '</b><br />';
     return $output;      return $output;
 }  }
Removed from v.1.661  
changed lines
  Added in v.1.672

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>