--- loncom/interface/lonhtmlcommon.pm 2006/06/22 23:22:41 1.136
+++ loncom/interface/lonhtmlcommon.pm 2006/07/07 19:17:19 1.143
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.136 2006/06/22 23:22:41 albertel Exp $
+# $Id: lonhtmlcommon.pm,v 1.143 2006/07/07 19:17:19 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -467,14 +467,14 @@ ENDJS
$result .= &mt('[_1] [_2] [_3] ',
$monthselector,$dayselector,$yearselector);
if (!$nolink) {
- $result .= &mt('[_4]Select Date[_5]',$cal_link,'</a>');
+ $result .= &mt('[_1]Select Date[_2]',$cal_link,'</a>');
}
} else {
$result .= &mt('[_1] [_2] [_3] [_4] [_5]m [_6]s ',
$monthselector,$dayselector,$yearselector,
$hourselector,$minuteselector,$secondselector);
if (!$nolink) {
- $result .= &mt('[_7]Select Date[_8]',$cal_link,'</a>');
+ $result .= &mt('[_1]Select Date[_2]',$cal_link,'</a>');
}
}
$result .= "</span>\n<!-- end $dname date setting form -->\n";
@@ -1025,9 +1025,14 @@ sub crumbs {
sub spellheader {
my $start_page=
&Apache::loncommon::start_page('Speller Suggestions',undef,
- {'only_body' => 1,
- 'js_ready' => 1,
- 'bgcolor' => '#DDDDDD',});
+ {'only_body' => 1,
+ 'js_ready' => 1,
+ 'bgcolor' => '#DDDDDD',
+ 'add_entries' => {
+ 'onload' =>
+ 'document.forms.spellcheckform.submit()',
+ }
+ });
my $end_page=
&Apache::loncommon::end_page({'js_ready' => 1});
@@ -1037,9 +1042,10 @@ sub spellheader {
//<!-- BEGIN LON-CAPA Internal
var checkwin;
-function spellcheckerwindow() {
+function spellcheckerwindow(string) {
+ var esc_string = string.replace(/\"/g,'"');
checkwin=window.open($nothing,'spellcheckwin','height=320,width=280,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
- checkwin.document.writeln('$start_page<form name="spellcheckform" action="/adm/spellcheck" method="post"><input type="hidden" name="text" value="" /><\\/form>$end_page');
+ checkwin.document.writeln('$start_page<form name="spellcheckform" action="/adm/spellcheck" method="post"><input type="hidden" name="text" value="'+esc_string+'" /><\/form>$end_page');
checkwin.document.close();
}
// END LON-CAPA Internal -->
@@ -1053,7 +1059,7 @@ sub spelllink {
my ($form,$field)=@_;
my $linktext=&mt('Check Spelling');
return (<<ENDLINK);
-<a href="javascript:if (typeof(document.$form.onsubmit)!='undefined') { if (document.$form.onsubmit!=null) { document.$form.onsubmit();}};spellcheckerwindow();checkwin.document.forms.spellcheckform.text.value=this.document.forms.$form.$field.value;checkwin.document.forms.spellcheckform.submit();">$linktext</a>
+<a href="javascript:if (typeof(document.$form.onsubmit)!='undefined') { if (document.$form.onsubmit!=null) { document.$form.onsubmit();}};spellcheckerwindow(this.document.forms.$form.$field.value);">$linktext</a>
ENDLINK
}
@@ -1178,13 +1184,11 @@ A link to help for the component will be
All inputs can be undef without problems.
-Inputs: $color (the background color of the table returned),
- $component (the large text on the right side of the table),
+Inputs: $component (the large text on the right side of the table),
$component_help
- $function (role to get colors from)
- $domain (domian of role)
$menulink (boolean, controls whether to include a link to /adm/menu)
-
+ $helplink (if 'nohelp' don't include the orange help link)
+ $css_class (optional name for the class to apply to the table for CSS)
Returns a string containing breadcrumbs for the current page.
=item clear_breadcrumbs
@@ -1209,9 +1213,10 @@ returns: nothing
my @Crumbs;
sub breadcrumbs {
- my ($component,$component_help,$menulink,$helplink) = @_;
+ my ($component,$component_help,$menulink,$helplink,$css_class) = @_;
#
- my $Str = "\n".'<table id="LC_breadcrumbs"><tr><td>';
+ $css_class ||= 'LC_breadcrumbs';
+ my $Str = "\n".'<table class="'.$css_class.'"><tr><td>';
#
# Make the faq and bug data cascade
my $faq = '';
@@ -1266,9 +1271,9 @@ returns: nothing
# $icons .= &Apache::loncommon::help_open_bug($bug);
# }
if ($helplink ne 'nohelp') {
- $icons .= &Apache::loncommon::help_open_menu(undef,$component,
+ $icons .= &Apache::loncommon::help_open_menu($component,
$component_help,
- undef,$faq,$bug);
+ $faq,$bug);
}
if ($icons ne '') {
$Str .= $icons.' ';
@@ -1277,7 +1282,7 @@ returns: nothing
$Str .= $links.'</td>';
#
if (defined($component)) {
- $Str .= '<td class="LC_breadcrumb_component">'.
+ $Str .= '<td class="'.$css_class.'_component">'.
&mt($component).'</td>';
}
$Str .= '</tr></table>'."\n";
@@ -1356,15 +1361,14 @@ returns: nothing
# needs that are not accommodated by the *_select_row() routines.
sub start_pick_box {
- my ($table_width) = @_;
+ my ($css_class) = @_;
+ if (defined($css_class)) {
+ $css_class = 'class="'.$css_class.'"';
+ } else {
+ $css_class= 'class="LC_pick_box"';
+ }
my $output = <<"END";
- <table width="$table_width" border="0" cellpadding="0" cellspacing="1" bgcolor="#000000">
- <tr>
- <td>
- <table width="100%" border="0" cellpadding="0" cellspacing="0" bgcolor="#ffffff">
- <tr>
- <td>
- <table width="100%" border="0" cellpadding="0" cellspacing="1" bgcolor="#ffffff">
+ <table $css_class>
END
return $output;
}
@@ -1372,57 +1376,52 @@ END
sub end_pick_box {
my $output = <<"END";
</table>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
END
return $output;
}
sub row_title {
- my ($col_width,$tablecolor,$title) = @_;
+ my ($title,$css_title_class,$css_value_class) = @_;
+ $css_title_class ||= 'LC_pick_box_title';
+ $css_title_class = 'class="'.$css_title_class.'"';
+
+ $css_value_class ||= 'LC_pick_box_value';
+ $css_value_class = 'class="'.$css_value_class.'"';
+
my $output = <<"ENDONE";
- <tr>
- <td width="$col_width" bgcolor="$tablecolor">
- <table width="$col_width" border="0" cellpadding="8" cellspacing="0">
- <tr>
- <td align="right"><b>$title:</b>
- </td>
- </tr>
- </table>
+ <tr class="LC_pick_box_row">
+ <td $css_title_class>
+ $title:
</td>
- <td width="100%" valign="top">
- <table width="100%" border="0" cellpadding="8" cellspacing="0">
- <tr>
+ <td $css_value_class>
ENDONE
return $output;
}
sub row_closure {
+ my ($no_separator) =@_;
my $output = <<"ENDTWO";
- </tr>
- </table>
</td>
</tr>
+ENDTWO
+ if (!$no_separator) {
+ $output .= <<"ENDTWO";
<tr>
- <td width="100%" colspan="2" bgcolor="#000000">
- <img src="/adm/lonMisc/blackdot.gif" /><br />
+ <td colspan="2" class="LC_pick_box_separator">
</td>
</tr>
ENDTWO
+ }
return $output;
}
sub role_select_row {
- my ($roles,$col_width,$tablecolor,$title) = @_;
+ my ($roles,$title,$css_class) = @_;
my $output;
if (defined($title)) {
- $output = &row_title($col_width,$tablecolor,$title);
+ $output = &row_title($title,$css_class);
}
- $output .= qq| <td valign="top">
+ $output .= qq|
<select name="roles" multiple >\n|;
foreach my $role (@$roles) {
my $plrole;
@@ -1433,8 +1432,7 @@ sub role_select_row {
}
$output .= ' <option value="'.$role.'">'.$plrole.'</option>';
}
- $output .= qq| </select>
- </td>\n|;
+ $output .= qq| </select>\n|;
if (defined($title)) {
$output .= &row_closure();
}
@@ -1442,11 +1440,11 @@ sub role_select_row {
}
sub course_select_row {
- my ($col_width,$tablecolor,$title,$formname,$totcodes,$codetitles,$idlist,$idlist_titles) = @_;
- my $output = &row_title($col_width,$tablecolor,$title);
- $output .= " <td>\n";
+ my ($title,$formname,$totcodes,$codetitles,$idlist,$idlist_titles,
+ $css_class) = @_;
+ my $output = &row_title($title,$css_class);
$output .= qq|
-<script type="text/javascript" language="Javascript" >
+<script type="text/javascript">
function coursePick (formname) {
for (var i=0; i<formname.coursepick.length; i++) {
if (formname.coursepick[i].value == 'category') {
@@ -1518,24 +1516,23 @@ sub course_select_row {
$output .= '</tr></table><br />';
}
}
- $output .= '<input type="radio" name="coursepick" value="specific" onclick="coursePick(this.form);opencrsbrowser('."'".$formname."'".','."'".'dccourse'."'".','."'".'dcdomain'."'".','."'".'coursedesc'."','','1'".')" />'.&mt('Pick specific course(s):').' '.$courseform.' <input type="text" value="0" size="4" name="coursetotal" /><input type="hidden" name="courselist" value="" />selected.<br /></td>'."\n";
+ $output .= '<input type="radio" name="coursepick" value="specific" onclick="coursePick(this.form);opencrsbrowser('."'".$formname."'".','."'".'dccourse'."'".','."'".'dcdomain'."'".','."'".'coursedesc'."','','1'".')" />'.&mt('Pick specific course(s):').' '.$courseform.' <input type="text" value="0" size="4" name="coursetotal" /><input type="hidden" name="courselist" value="" />selected.<br />'."\n";
$output .= &row_closure();
return $output;
}
sub status_select_row {
- my ($types,$col_width,$tablecolor,$title) = @_;
+ my ($types,$title,$css_class) = @_;
my $output;
if (defined($title)) {
- $output = &row_title($col_width,$tablecolor,$title);
+ $output = &row_title($title,$css_class,'LC_pick_box_select');
}
- $output .= qq| <td valign="top">
+ $output .= qq|
<select name="types" multiple>\n|;
foreach my $status_type (sort(keys(%{$types}))) {
$output .= ' <option value="'.$status_type.'">'.$$types{$status_type}.'</option>';
}
- $output .= qq| </select>
- </td>\n|;
+ $output .= qq| </select>\n|;
if (defined($title)) {
$output .= &row_closure();
}
@@ -1543,18 +1540,18 @@ sub status_select_row {
}
sub email_default_row {
- my ($authtypes,$col_width,$tablecolor,$title,$descrip) = @_;
- my $output = &row_title($col_width,$tablecolor,$title);
+ my ($authtypes,$title,$descrip,$css_class) = @_;
+ my $output = &row_title($title,$css_class);
my @rowcols = ('#eeeeee','#dddddd');
- $output .= ' <td>'.$descrip;
- $output .= &start_pick_box('');
- $output .= ' <tr bgcolor="'.$tablecolor.'">
- <td><b>'.&mt('Authentication Method').'</b></td><td align="right"><b>'.&mt('Username -> e-mail conversion').'</b></td>
- </tr>'."\n";
+ $output .= $descrip.
+ &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row().
+ '<th>'.&mt('Authentication Method').'</th>'.
+ '<th align="right">'.&mt('Username -> e-mail conversion').'</th>'."\n".
+ &Apache::loncommon::end_data_table_header_row();
my $rownum = 0;
foreach my $auth (sort(keys(%{$authtypes}))) {
my ($userentry,$size);
- my $rowiter = $rownum%2;
if ($auth =~ /^krb/) {
$userentry = '';
$size = 25;
@@ -1562,26 +1559,27 @@ sub email_default_row {
$userentry = 'username@';
$size = 15;
}
- $output .= '<tr bgcolor="'.$rowcols[$rowiter].'"><td> '.$$authtypes{$auth}.'</td><td align="right">'.$userentry.'<input type="text" name="'.$auth.'" size="'.$size.'" /></td></tr>';
- $rownum ++;
+ $output .= &Apache::loncommon::start_data_table_row().
+ '<td> '.$$authtypes{$auth}.'</td>'.
+ '<td align="right">'.$userentry.
+ '<input type="text" name="'.$auth.'" size="'.$size.'" /></td>'.
+ &Apache::loncommon::end_data_table_row();
}
- $output .= &end_pick_box();
- $output .= " <br /></td>\n";
+ $output .= &Apache::loncommon::end_data_table();
$output .= &row_closure();
return $output;
}
sub submit_row {
- my ($col_width,$tablecolor,$title,$cmd,$submit_text) = @_;
- my $output = &row_title($col_width,$tablecolor,$title);
+ my ($title,$cmd,$submit_text,$css_class) = @_;
+ my $output = &row_title($title,$css_class,'LC_pick_box_submit');
$output .= qq|
- <td width="100%" valign="top" align="right">
<br />
<input type="hidden" name="command" value="$cmd" />
<input type="submit" value="$submit_text"/>
<br /><br />
- </td>\n|;
+ \n|;
return $output;
}