--- loncom/interface/lonhtmlcommon.pm 2004/04/23 17:49:25 1.67
+++ loncom/interface/lonhtmlcommon.pm 2004/07/16 19:29:26 1.80
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.67 2004/04/23 17:49:25 matthew Exp $
+# $Id: lonhtmlcommon.pm,v 1.80 2004/07/16 19:29:26 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -163,9 +163,15 @@ sub textbox {
##############################################
##############################################
sub checkbox {
- my ($name,$value) = @_;
- my $Str = '<input type="checkbox" name="'.$name.'"'.
- ($value?' checked="1"':'').' />';
+ my ($name,$checked,$value) = @_;
+ my $Str = '<input type="checkbox" name="'.$name.'" ';
+ if (defined($value)) {
+ $Str .= 'value="'.$value.'"';
+ }
+ if ($checked) {
+ $Str .= ' checked="1"';
+ }
+ $Str .= ' />';
return $Str;
}
@@ -766,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);
@@ -835,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)) {
@@ -856,43 +866,90 @@ sub crumbs {
$output.=$uri;
}
unless ($uri=~/\/$/) { $output=~s/\/$//; }
- return $output.'</font></b></tt><br />';
+ return $output.'</font>'.($noformat?'':'</b></tt><br />');
}
# ------------------------------------------------- Output headers for HTMLArea
sub htmlareaheaders {
- unless (&htmlareablocked()) { return ''; }
+ if (&htmlareablocked()) { return ''; }
+ unless (&htmlareabrowser()) { return ''; }
my $lang='en';
+ if (&mt('htmlarea_lang') ne 'htmlarea_lang') {
+ $lang=&mt('htmlarea_lang');
+ }
return (<<ENDHEADERS);
<script type="text/javascript">
- _editor_url="/htmlarea/";
+_editor_url='/htmlarea/';
+_editor_lang='$lang';
</script>
<script type="text/javascript" src="/htmlarea/htmlarea.js"></script>
-<script type="text/javascript" src="/htmlarea/lang/$lang.js"></script>
-<script type="text/javascript" src="/htmlarea/dialog.js"></script>
-<style type="text/css">
-\@import url(/htmlarea/htmlarea.css);
-</style>
ENDHEADERS
}
-# ---------------------------------------------------------- Script to activate
+# ------------------------------------------------- Activate additional buttons
-sub htmlareaactive {
- unless (&htmlareablocked()) { return ''; }
- return (<<ENDSCRIPT);
-<script type="text/javascript" defer="1">
- HTMLArea.replaceAll();
-</script>
-ENDSCRIPT
+sub htmlareaaddbuttons {
+ if (&htmlareablocked()) { return ''; }
+ unless (&htmlareabrowser()) { return ''; }
+ return (<<ENDADDBUTTON);
+ var config=new HTMLArea.Config();
+ config.registerButton('ed_math','LaTeX Inline',
+ '/htmlarea/images/ed_math.gif',false,
+ function(editor,id) {
+ editor.surroundHTML('<m>\$','\$</m>');
+ }
+ );
+ config.registerButton('ed_math_eqn','LaTeX Equation',
+ '/htmlarea/images/ed_math_eqn.gif',false,
+ function(editor,id) {
+ editor.surroundHTML(
+ '<center><m>\\\\[','\\\\]</m></center>');
+ }
+ );
+ config.toolbar.push(['ed_math','ed_math_eqn']);
+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 only some fields
+
+sub htmlareaselectactive {
+ my @fields=@_;
+ unless (&htmlareabrowser()) { return ''; }
+ 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(@fields);
+ return $output;
}
# --------------------------------------------------------------------- Blocked
sub htmlareablocked {
- unless (&htmlareabrowser()) { return ''; }
- return 1;
+ unless ($ENV{'environment.wysiwygeditor'} eq 'on') { return 1; }
+ return 0;
}
# ---------------------------------------- Browser capable of running HTMLArea?
@@ -969,23 +1026,34 @@ returns: nothing
# The last breadcrumb does not have a link, so handle it separately.
my $last = pop(@Crumbs);
#
- # The first one should be the course, I guess.
+ # The first one should be the course or a menu link
if (!defined($menulink)) { $menulink=1; }
- if ($menulink && exists($ENV{'request.course.id'}) && $ENV{'request.course.id'} ne '') {
- my $cid = $ENV{'request.course.id'};
+ if ($menulink) {
+ my $description = 'Menu';
+ if (exists($ENV{'request.course.id'}) &&
+ $ENV{'request.course.id'} ne '') {
+ $description =
+ $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+ }
unshift(@Crumbs,{
- href=>'/adm/menu',
- title=>'Go to main menu',
- text=>$ENV{'course.'.$cid.'.description'},
- });
+ href =>'/adm/menu',
+ title =>'Go to main menu',
+ target =>'_top',
+ text =>$description,
+ });
}
my $links .=
join('->',
map {
$faq = $_->{'faq'} if (exists($_->{'faq'}));
$bug = $_->{'bug'} if (exists($_->{'bug'}));
- '<a href="'.$_->{'href'}.'" title="'.&mt($_->{'title'}).'">'.
- &mt($_->{'text'}).'</a>'
+ my $result = '<a href="'.$_->{'href'}.'" ';
+ if (defined($_->{'target'}) && $_->{'target'} ne '') {
+ $result .= 'target="'.$_->{'target'}.'" ';
+ }
+ $result .='title="'.&mt($_->{'title'}).'">'.
+ &mt($_->{'text'}).'</a>';
+ $result;
} @Crumbs
);
$links .= '->' if ($links ne '');
@@ -994,12 +1062,13 @@ returns: nothing
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.' ';
}