--- loncom/interface/lonhtmlcommon.pm	2004/04/06 15:07:41	1.62
+++ loncom/interface/lonhtmlcommon.pm	2004/07/26 21:57:27	1.84
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.62 2004/04/06 15:07:41 matthew Exp $
+# $Id: lonhtmlcommon.pm,v 1.84 2004/07/26 21:57:27 albertel 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;
 }
 
@@ -219,10 +225,14 @@ The method used to restrict user input w
 ##############################################
 ##############################################
 sub date_setter {
-    my ($formname,$dname,$currentvalue,$special,$includeempty,$state) = @_;
+    my ($formname,$dname,$currentvalue,$special,$includeempty,$state,
+        $no_hh_mm_ss) = @_;
     if (! defined($state) || $state ne 'disabled') {
         $state = '';
     }
+    if (! defined($no_hh_mm_ss)) {
+        $no_hh_mm_ss = 0;
+    }
     if (! defined($currentvalue) || $currentvalue eq 'now') {
 	unless ($includeempty) {
 	    $currentvalue = time;
@@ -231,7 +241,7 @@ sub date_setter {
 	}
     }
     # other potentially useful values:     wkday,yrday,is_daylight_savings
-    my ($sec,$min,$hour,$mday,$month,$year)=('','','','','','');
+    my ($sec,$min,$hour,$mday,$month,$year)=('','',undef,'','','');
     if ($currentvalue) {
 	($sec,$min,$hour,$mday,$month,$year,undef,undef,undef) = 
 	    localtime($currentvalue);
@@ -305,6 +315,7 @@ ENDJS
     $result .= "  <nobr><select name=\"$dname\_month\" ".$special.' '.
         $state.' '.
         "onChange=\"javascript:$dname\_checkday()\" >\n";
+    # Month
     my @Months = qw/January February  March     April   May      June 
                     July    August    September October November December/;
     # Pad @Months with a bogus value to make indexing easier
@@ -316,39 +327,47 @@ ENDJS
         $result .= "> ".&mt($Months[$m])." </option>\n";
     }
     $result .= "  </select>\n";
+    # Day
     $result .= "  <input type=\"text\" name=\"$dname\_day\" ".$state.' '.
             "value=\"$mday\" size=\"3\" ".$special.' '.
             "onChange=\"javascript:$dname\_checkday()\" />\n";
+    # Year
     $result .= "  <input type=\"year\" name=\"$dname\_year\" ".$state.' '.
             "value=\"$year\" size=\"5\" ".$special.' '.
             "onChange=\"javascript:$dname\_checkday()\" />\n";
     $result .= "&nbsp;&nbsp;";
-    $result .= "  <select name=\"$dname\_hour\" ".$special." ".$state.' '.">\n";
-    if ($includeempty) { $result.="<option value=''></option>"; }
-    for (my $h = 0;$h<24;$h++) {
-        $result .= "      <option value=\"$h\" ";
-        $result .= "selected " if ($hour == $h);
-        $result .= "> ";
-	my $timest='';
-        if ($h == 0) {
-            $timest .= "12 am";
-        } elsif($h == 12) {
-            $timest .= "12 noon";
-        } elsif($h < 12) {
-            $timest .= "$h am";
-        } else {
-            $timest .= $h-12 ." pm";
-        }
-	$timest=&mt($timest);
-        $result .= $timest." </option>\n";
-    } 
-    $result .= "  </select>\n";
-    $result .= "  <input type=\"text\" name=\"$dname\_minute\" ".$special.' '.
-        $state.' '.
-        "value=\"$min\" size=\"3\" /> m\n";
-    $result .= "  <input type=\"text\" name=\"$dname\_second\" ".$special.' '.
-        $state.' '.
-        "value=\"$sec\" size=\"3\" /> s\n";
+    if (! $no_hh_mm_ss) {
+        # Hours
+        $result .= "  <select name=\"$dname\_hour\" ".$special." ".$state.' '.
+            ">\n";
+        if ($includeempty) { $result.="<option value=''></option>"; }
+        for (my $h = 0;$h<24;$h++) {
+            $result .= "      <option value=\"$h\" ";
+            $result .= "selected " if (defined($hour) && $hour == $h);
+            $result .= "> ";
+            my $timest='';
+            if ($h == 0) {
+                $timest .= "12 am";
+            } elsif($h == 12) {
+                $timest .= "12 noon";
+            } elsif($h < 12) {
+                $timest .= "$h am";
+            } else {
+                $timest .= $h-12 ." pm";
+            }
+            $timest=&mt($timest);
+            $result .= $timest." </option>\n";
+        } 
+        $result .= "  </select>\n";
+        $result .= "  <input type=\"text\" name=\"$dname\_minute\" ".
+            $special.' '.
+            $state.' '.
+            "value=\"$min\" size=\"3\" /> m\n";
+        $result .= "  <input type=\"text\" name=\"$dname\_second\" ".
+            $special.' '.
+            $state.' '.
+            "value=\"$sec\" size=\"3\" /> s\n";
+    }
     $result .= "<a href=\"javascript:$dname\_opencalendar()\">".
     &mt('Select Date')."</a></nobr>\n<!-- end $dname date setting form -->\n";
     return $result;
@@ -392,18 +411,26 @@ sub get_date_from_form {
         if (($tmpsec =~ /^\d+$/) && ($tmpsec >= 0) && ($tmpsec < 60)) {
             $sec = $tmpsec;
         }
+	if (!defined($tmpsec) || $tmpsec eq '') { $sec = 0; }
+    } else {
+        $sec = 0;
     }
     if (defined($ENV{'form.'.$dname.'_minute'})) {
         my $tmpmin = $ENV{'form.'.$dname.'_minute'};
         if (($tmpmin =~ /^\d+$/) && ($tmpmin >= 0) && ($tmpmin < 60)) {
             $min = $tmpmin;
         }
+	if (!defined($tmpmin) || $tmpmin eq '') { $min = 0; }
+    } else {
+        $min = 0;
     }
     if (defined($ENV{'form.'.$dname.'_hour'})) {
         my $tmphour = $ENV{'form.'.$dname.'_hour'};
         if (($tmphour =~ /^\d+$/) && ($tmphour >= 0) && ($tmphour < 24)) {
             $hour = $tmphour;
         }
+    } else {
+        $hour = 0;
     }
     if (defined($ENV{'form.'.$dname.'_day'})) {
         my $tmpday = $ENV{'form.'.$dname.'_day'};
@@ -745,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);
@@ -814,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)) {
@@ -835,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?
@@ -899,6 +977,9 @@ 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),
         $component_help
+        $function (role to get colors from)
+        $domain   (domian of role)
+        $menulink (boolean, controls whether to include a link to /adm/menu)
 
 Returns a string containing breadcrumbs for the current page.
 
@@ -924,7 +1005,8 @@ returns: nothing
     my @Crumbs;
     
     sub breadcrumbs {
-        my ($color,$component,$component_help,$function,$domain) = @_;
+        my ($color,$component,$component_help,$function,$domain,$menulink) =
+	    @_;
         if (! defined($color)) {
             if (! defined($function)) {
                 $function = &Apache::loncommon::get_users_function();
@@ -944,36 +1026,49 @@ 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.
-        if (exists($ENV{'request.course.id'})) {
-            my $cid = $ENV{'request.course.id'};
+        # The first one should be the course or a menu link
+	if (!defined($menulink)) { $menulink=1; }
+        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('-&gt;',
                  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 .= '-&gt;' 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.'&nbsp;';
         }
@@ -982,12 +1077,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";
         #