--- loncom/interface/lonhtmlcommon.pm 2004/06/08 01:32:02 1.76
+++ loncom/interface/lonhtmlcommon.pm 2004/08/05 16:59:29 1.86
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.76 2004/06/08 01:32:02 www Exp $
+# $Id: lonhtmlcommon.pm,v 1.86 2004/08/05 16:59:29 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -772,20 +772,22 @@ sub Increment_PrgWin {
$$prog_state{'done'} *
($$prog_state{'max'}-$$prog_state{'done'});
$time_est = int($time_est);
- if (int ($time_est/60) > 0) {
- my $min = int($time_est/60);
- my $sec = $time_est % 60;
- $time_est = $min.' '.&mt('minutes');
- if ($min < 10) {
- if ($sec > 1) {
- $time_est.= ', '.$sec.' '.&mt('seconds');
- } elsif ($sec > 0) {
- $time_est.= ', '.$sec.' '.&mt('second');
- }
- }
- } else {
- $time_est .= ' '.&mt('seconds');
+ #
+ my $min = int($time_est/60);
+ my $sec = $time_est % 60;
+ #
+ my $str;
+ if ($min == 1 && $sec > 1) {
+ $str = '[_2] seconds';
+ } elsif ($min == 1 && $sec < 2) {
+ $str = '1 minute';
+ } elsif ($min < 10 && $sec > 1) {
+ $str = '[_1] minutes, [_2] seconds';
+ } elsif ($min >= 10 || $sec < 2) {
+ $str = '[_1] minutes';
}
+ $time_est = &mt($str,$min,$sec);
+ #
my $lasttime = &Time::HiRes::time()-$$prog_state{'laststart'};
if ($lasttime > 9) {
$lasttime = int($lasttime);
@@ -841,11 +843,13 @@ sub r_print {
# ------------------------------------------------------- Puts directory header
sub crumbs {
- my ($uri,$target,$prefix,$form,$size)=@_;
+ my ($uri,$target,$prefix,$form,$size,$noformat)=@_;
if (! defined($size)) {
$size = '+2';
}
- my $output='<br /><tt><b><font size="'.$size.'">'.$prefix.'/';
+ my $output='';
+ unless ($noformat) { $output.='<br /><tt><b>'; }
+ $output.='<font size="'.$size.'">'.$prefix.'/';
if ($ENV{'user.adv'}) {
my $path=$prefix.'/';
foreach (split('/',$uri)) {
@@ -862,7 +866,36 @@ sub crumbs {
$output.=$uri;
}
unless ($uri=~/\/$/) { $output=~s/\/$//; }
- return $output.'</font></b></tt><br />';
+ return $output.'</font>'.($noformat?'':'</b></tt><br />');
+}
+
+# --------------------- A function that generates a window for the spellchecker
+
+sub spellheader {
+ my $nothing = &javascript_nothing();
+ return (<<ENDCHECK);
+<script type="text/javascript">
+// BEGIN LON-CAPA Internal
+var checkwin;
+
+function spellcheckerwindow() {
+ checkwin=window.open($nothing,'spellcheckwin','height=320,width=280,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
+ checkwin.document.writeln('<html><body bgcolor="#DDDDDD"><form name="spellcheckform" action="/adm/spellcheck" method="post"><input type="hidden" name="text" value="" /></form></body></html>');
+ checkwin.document.close();
+}
+// END LON-CAPA Internal
+</script>
+ENDCHECK
+}
+
+# ---------------------------------- Generate link to spell checker for a field
+
+sub spelllink {
+ my ($form,$field)=@_;
+ my $linktext=&mt('Check Spelling');
+ return (<<ENDLINK);
+<a href="javascript:if (typeof(document.$form.onsubmit)!='undefined') { document.$form.onsubmit();};spellcheckerwindow();checkwin.document.forms.spellcheckform.text.value=this.document.forms.$form.$field.value;checkwin.document.forms.spellcheckform.submit();">$linktext</a>
+ENDLINK
}
# ------------------------------------------------- Output headers for HTMLArea
@@ -910,42 +943,34 @@ ENDADDBUTTON
# ----------------------------------------------------------------- Preferences
sub disablelink {
+ my @fields=@_;
+ if (defined($#fields)) {
+ unless ($#fields>=0) { return ''; }
+ }
return '<a href="/adm/preferences?action=set_wysiwyg&wysiwyg=off&returnurl='.&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'">'.&mt('Disable WYSIWYG Editor').'</a>';
}
sub enablelink {
+ my @fields=@_;
+ if (defined($#fields)) {
+ unless ($#fields>=0) { return ''; }
+ }
return '<a href="/adm/preferences?action=set_wysiwyg&wysiwyg=on&returnurl='.&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'">'.&mt('Enable WYSIWYG Editor').'</a>';
}
-# ---------------------------------------------------------- Script to activate
-
-sub htmlareaactive {
- unless (&htmlareabrowser()) { return ''; }
- if (&htmlareablocked()) { return '<br />'.&enablelink(); }
- my $addbuttons=&htmlareaaddbuttons();
- my $disable=&disablelink();
- return (<<ENDSCRIPT);
-<script type="text/javascript" defer="1">
- $addbuttons
- HTMLArea.replaceAll(config);
-</script><br />
-$disable
-ENDSCRIPT
-}
-
# ----------------------------------------- Script to activate only some fields
sub htmlareaselectactive {
my @fields=@_;
unless (&htmlareabrowser()) { return ''; }
- if (&htmlareablocked()) { return '<br />'.&enablelink(); }
+ if (&htmlareablocked()) { return '<br />'.&enablelink(@fields); }
my $output='<script type="text/javascript" defer="1">'.
&htmlareaaddbuttons();
foreach(@fields) {
$output.="\nHTMLArea.replace('$_',config);";
}
$output.="\nwindow.status='Activated Editfields';\n</script><br />".
- &disablelink();
+ &disablelink(@fields);
return $output;
}
@@ -1061,17 +1086,18 @@ returns: nothing
} @Crumbs
);
$links .= '->' if ($links ne '');
- $links .= '<b>'.$last->{'text'}.'</b>';
+ $links .= '<b>'.&mt($last->{'text'}).'</b>';
#
my $icons = '';
$faq = $last->{'faq'} if (exists($last->{'faq'}));
$bug = $last->{'bug'} if (exists($last->{'bug'}));
- if ($faq ne '') {
- $icons .= &Apache::loncommon::help_open_faq($faq);
- }
- if ($bug ne '') {
- $icons .= &Apache::loncommon::help_open_bug($bug);
- }
+# if ($faq ne '') {
+# $icons .= &Apache::loncommon::help_open_faq($faq);
+# }
+# if ($bug ne '') {
+# $icons .= &Apache::loncommon::help_open_bug($bug);
+# }
+ $icons .= &Apache::loncommon::help_open_menu($color,$component,$component_help,$function,$faq,$bug);
if ($icons ne '') {
$Str .= $icons.' ';
}
@@ -1080,12 +1106,7 @@ returns: nothing
#
if (defined($component)) {
$Str .= '<td align="right" bgcolor="'.$color.'">'.
- '<font size="+1">'.&mt($component).'</font>';
- if (defined($component_help)) {
- $Str .=
- &Apache::loncommon::help_open_topic($component_help);
- }
- $Str.= '</td>';
+ '<font size="+1">'.&mt($component).'</font></td>';
}
$Str .= '</tr></table>'."\n";
#