Diff for /loncom/interface/lonhtmlcommon.pm between versions 1.112 and 1.113

version 1.112, 2005/10/04 19:59:15 version 1.113, 2005/10/13 18:31:06
Line 1246  returns: nothing Line 1246  returns: nothing
 #  #
 # In general a &submit_row() call should proceed the call to &end_pick_box(),  # In general a &submit_row() call should proceed the call to &end_pick_box(),
 # as this routine adds a button for form submission.  # as this routine adds a button for form submission.
 # &submit_row(0 does not require a &row_closure after it.  # &submit_row() does not require a &row_closure after it.
 #    #  
 # &start_pick_box() creates a bounding table with 1-pixel wide black border.  # &start_pick_box() creates a bounding table with 1-pixel wide black border.
 # rows should be placed between calls to &start_pick_box() and &end_pick_box.  # rows should be placed between calls to &start_pick_box() and &end_pick_box.
Line 1317  ENDONE Line 1317  ENDONE
 }  }
   
 sub row_closure {  sub row_closure {
     my $output .= <<"ENDTWO";      my $output = <<"ENDTWO";
               </tr>                </tr>
              </table>               </table>
             </td>              </td>
Line 1336  sub role_select_row { Line 1336  sub role_select_row {
     my $output = &row_title($col_width,$tablecolor,$title);      my $output = &row_title($col_width,$tablecolor,$title);
     $output .= qq|               <td>      $output .= qq|               <td>
                                   <select name="roles" multiple >\n|;                                    <select name="roles" multiple >\n|;
     foreach (@$roles) {      foreach my $role (@$roles) {
         my $plrole=&Apache::lonnet::plaintext($_);          my $plrole=&Apache::lonnet::plaintext($role);
         $output .= '  <option value="'.$_.'">'.$plrole.'</option>';          $output .= '  <option value="'.$role.'">'.$plrole.'</option>';
     }      }
     $output .= qq|                </select>      $output .= qq|                </select>
                                  </td>\n|;                                   </td>\n|;
Line 1381  sub course_select_row { Line 1381  sub course_select_row {
             my @items = ();              my @items = ();
             my @longitems = ();              my @longitems = ();
             if ($$idlist{$$codetitles[0]} =~ /","/) {              if ($$idlist{$$codetitles[0]} =~ /","/) {
                 @items = split/","/,$$idlist{$$codetitles[0]};                  @items = split(/","/,$$idlist{$$codetitles[0]});
             } else {              } else {
                 $items[0] = $$idlist{$$codetitles[0]};                  $items[0] = $$idlist{$$codetitles[0]};
             }              }
             if (defined($$idlist_titles{$$codetitles[0]})) {              if (defined($$idlist_titles{$$codetitles[0]})) {
                 if ($$idlist_titles{$$codetitles[0]} =~ /","/) {                  if ($$idlist_titles{$$codetitles[0]} =~ /","/) {
                     @longitems = split/","/,$$idlist_titles{$$codetitles[0]};                      @longitems = split(/","/,$$idlist_titles{$$codetitles[0]});
                 } else {                  } else {
                     $longitems[0] = $$idlist_titles{$$codetitles[0]};                      $longitems[0] = $$idlist_titles{$$codetitles[0]};
                 }                  }
Line 1424  sub status_select_row { Line 1424  sub status_select_row {
     my $output = &row_title($col_width,$tablecolor,$title);      my $output = &row_title($col_width,$tablecolor,$title);
     $output .= qq|              <td>      $output .= qq|              <td>
                                     <select name="types" multiple>\n|;                                      <select name="types" multiple>\n|;
     foreach my $status_type (sort keys (%{$types})) {      foreach my $status_type (sort(keys(%{$types}))) {
         $output .= '  <option value="'.$status_type.'">'.$$types{$status_type}.'</option>';          $output .= '  <option value="'.$status_type.'">'.$$types{$status_type}.'</option>';
     }      }
     $output .= qq|                   </select>      $output .= qq|                   </select>
Line 1437  sub email_default_row { Line 1437  sub email_default_row {
     my ($authtypes,$col_width,$tablecolor,$title,$descrip) = @_;      my ($authtypes,$col_width,$tablecolor,$title,$descrip) = @_;
     my $output = &row_title($col_width,$tablecolor,$title);      my $output = &row_title($col_width,$tablecolor,$title);
     my @rowcols = ('#eeeeee','#dddddd');      my @rowcols = ('#eeeeee','#dddddd');
     $output .= '              <td>'.$descrip.'      $output .= '              <td>'.$descrip;
                                <table>      $output .= &start_pick_box('50%'); 
                                 <tr>      $output .= '                <tr bgcolor="'.$tablecolor.'">
                                  <td><b>'.&mt('Authentication Method').'</b></td><td>&nbsp;&nbsp;&nbsp;</td><td>&nbsp;&nbsp;&nbsp;</td><td><b>'.&mt('Username -> e-mail conversion').'</b></td>                                   <td><b>'.&mt('Authentication Method').'</b></td><td align="right"><b>'.&mt('Username -> e-mail conversion').'</b></td>
                                 </tr>'."\n";                                  </tr>'."\n";
     my $rownum = 0;      my $rownum = 0;
     foreach my $auth (sort keys (%{$authtypes})) {      foreach my $auth (sort(keys(%{$authtypes}))) {
         my ($userentry,$size);          my ($userentry,$size);
         my $rowiter = $rownum%2;          my $rowiter = $rownum%2;
         if ($auth =~ /^krb/) {          if ($auth =~ /^krb/) {
Line 1453  sub email_default_row { Line 1453  sub email_default_row {
             $userentry = 'username@';              $userentry = 'username@';
             $size = 15;              $size = 15;
         }          }
         $output .= '<tr rowcolor="'.$rowcols[$rowiter].'"><td>  '.$$authtypes{$auth}.'</td><td>&nbsp;&nbsp;&nbsp;</td><td align="right">'.$userentry.'</td><td><input type="text" name="'.$auth.'" size="'.$size.'" /></td></tr>';          $output .= '<tr bgcolor="'.$rowcols[$rowiter].'"><td>  '.$$authtypes{$auth}.'</td><td align="right">'.$userentry.'<input type="text" name="'.$auth.'" size="'.$size.'" /></td></tr>';
         $rownum ++;          $rownum ++;
     }      }
     $output .= "                   </table>      $output .= &end_pick_box();
                                   </td>\n";      $output .= "                   <br /></td>\n"; 
     $output .= &row_closure();      $output .= &row_closure();
     return $output;      return $output;
 }  }
Line 1465  sub email_default_row { Line 1465  sub email_default_row {
   
 sub submit_row {  sub submit_row {
     my ($col_width,$tablecolor,$title,$cmd,$submit_text) = @_;      my ($col_width,$tablecolor,$title,$cmd,$submit_text) = @_;
     my $output .= &row_title($col_width,$tablecolor,$title);      my $output = &row_title($col_width,$tablecolor,$title);
     $output .= qq|      $output .= qq|
             <td width="100%" valign="top" align="right">              <td width="100%" valign="top" align="right">
              <br />               <br />

Removed from v.1.112  
changed lines
  Added in v.1.113


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