--- loncom/interface/lonhtmlcommon.pm	2008/03/06 22:30:17	1.173
+++ loncom/interface/lonhtmlcommon.pm	2009/01/12 01:53:38	1.182.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.173 2008/03/06 22:30:17 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.182.2.1 2009/01/12 01:53:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -62,6 +62,60 @@ use Apache::lonlocal;
 use Apache::lonnet;
 use LONCAPA;
 
+
+##############################################
+##############################################
+
+=pod
+
+=item dragmath_button
+
+Creates a button that launches a dragmath popup-window, in which an 
+expression can be edited and pasted as LaTeX into a specified textarea. 
+
+  textarea - Name of the textarea to edit.
+  helpicon - If true, show a help icon to the right of the button.
+
+=cut
+
+sub dragmath_button {
+    my ($textarea,$helpicon) = @_;
+    my $help_text; 
+    if ($helpicon) {
+        $help_text = &Apache::loncommon::help_open_topic('Authoring_Math_Editor');
+    }
+    my $buttontext=&mt('Edit Math');
+    return <<ENDDRAGMATH;
+                <input type="button" value="$buttontext", onclick="javascript:mathedit('$textarea',document)" />$help_text
+ENDDRAGMATH
+}
+
+##############################################
+
+=pod
+
+=item dragmath_js
+
+Javascript used to open pop-up window containing dragmath applet which 
+can be used to paste LaTeX into a textarea.
+ 
+=cut
+
+sub dragmath_js {
+    my ($popup) = @_;
+    return <<ENDDRAGMATHJS;
+                <script type="text/javascript">
+                  function mathedit(textarea, doc) {
+                     targetEntry = textarea;
+                     targetDoc   = doc;
+                     newwin  = window.open("/adm/dragmath/applet/$popup.html","","width=565,height=500,resizable");
+                  }
+                </script>
+
+ENDDRAGMATHJS
+}
+
+
 ##############################################
 ##############################################
 
@@ -311,6 +365,7 @@ The method used to restrict user input w
 sub date_setter {
     my ($formname,$dname,$currentvalue,$special,$includeempty,$state,
         $no_hh_mm_ss,$defhour,$defmin,$defsec,$nolink) = @_;
+    my $now = time;
     my $wasdefined=1;
     if (! defined($state) || $state ne 'disabled') {
         $state = '';
@@ -319,28 +374,25 @@ sub date_setter {
         $no_hh_mm_ss = 0;
     }
     if ($currentvalue eq 'now') {
-	$currentvalue=time;
+	$currentvalue = $now;
     }
     if ((!defined($currentvalue)) || ($currentvalue eq '')) {
 	$wasdefined=0;
 	if ($includeempty) {
 	    $currentvalue = 0;
 	} else {
-	    $currentvalue = time;
+	    $currentvalue = $now;
 	}
     }
     # other potentially useful values:     wkday,yrday,is_daylight_savings
+    my $tzname;
     my ($sec,$min,$hour,$mday,$month,$year)=('','',undef,'','','');
     if ($currentvalue) {
-	($sec,$min,$hour,$mday,$month,$year,undef,undef,undef) = 
-	    localtime($currentvalue);
-	$year += 1900;
+        ($tzname,$sec,$min,$hour,$mday,$month,$year) = &get_timedates($currentvalue); 
     }
     unless ($wasdefined) {
+        ($tzname,$sec,$min,$hour,$mday,$month,$year) = &get_timedates($now);
 	if (($defhour) || ($defmin) || ($defsec)) {
-	    ($sec,$min,$hour,$mday,$month,$year,undef,undef,undef) = 
-		localtime(time);
-	    $year += 1900;
 	    $sec=($defsec?$defsec:0);
 	    $min=($defmin?$defmin:0);
 	    $hour=($defhour?$defhour:0);
@@ -463,16 +515,19 @@ ENDJS
         $cal_link = qq{<a href="javascript:$dname\_opencalendar()">};
     }
     #
+    my $tzone = ' '.$tzname.' ';
     if ($no_hh_mm_ss) {
         $result .= &mt('[_1] [_2] [_3] ',
-                       $monthselector,$dayselector,$yearselector);
+                       $monthselector,$dayselector,$yearselector).
+                   $tzone;
         if (!$nolink) {
             $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);
+                      $hourselector,$minuteselector,$secondselector).
+                   $tzone;
         if (!$nolink) {
             $result .= &mt('[_1]Select Date[_2]',$cal_link,'</a>');
         }
@@ -481,6 +536,22 @@ ENDJS
     return $result;
 }
 
+sub get_timedates {
+    my ($epoch) = @_;
+    my $dt = DateTime->from_epoch(epoch => $epoch)
+                     ->set_time_zone(&Apache::lonlocal::gettimezone());
+    my $tzname = $dt->time_zone_short_name();
+    my $sec = $dt->second;
+    my $min = $dt->minute;
+    my $hour = $dt->hour;
+    my $mday = $dt->day;
+    my $month = $dt->month;
+    if ($month) {
+        $month --;
+    }
+    my $year = $dt->year;
+    return ($tzname,$sec,$min,$hour,$mday,$month,$year);
+}
 
 sub build_url {
     my ($base, $fields)=@_;
@@ -562,20 +633,33 @@ sub get_date_from_form {
     if (defined($env{'form.'.$dname.'_month'})) {
         my $tmpmonth = $env{'form.'.$dname.'_month'};
         if (($tmpmonth =~ /^\d+$/) && ($tmpmonth > 0) && ($tmpmonth < 13)) {
-            $month = $tmpmonth - 1;
+            $month = $tmpmonth;
         }
     }
     if (defined($env{'form.'.$dname.'_year'})) {
         my $tmpyear = $env{'form.'.$dname.'_year'};
-        if (($tmpyear =~ /^\d+$/) && ($tmpyear > 1900)) {
-            $year = $tmpyear - 1900;
+        if (($tmpyear =~ /^\d+$/) && ($tmpyear >= 1970)) {
+            $year = $tmpyear;
         }
     }
-    if (($year<70) || ($year>137)) { return undef; }
+    if (($year<1970) || ($year>2037)) { return undef; }
     if (defined($sec) && defined($min)   && defined($hour) &&
-        defined($day) && defined($month) && defined($year) &&
-        eval('&timelocal($sec,$min,$hour,$day,$month,$year)')) {
-        return &timelocal($sec,$min,$hour,$day,$month,$year);
+        defined($day) && defined($month) && defined($year)) {
+        my $timezone = &Apache::lonlocal::gettimezone();
+        my $dt = DateTime->new( year   => $year,
+                                month  => $month,
+                                day    => $day,
+                                hour   => $hour,
+                                minute => $min,
+                                second => $sec,
+                                time_zone => $timezone,
+                              );
+        my $epoch_time  = $dt->epoch;
+        if ($epoch_time ne '') {
+            return $epoch_time;
+        } else {
+            return undef;
+        }
     } else {
         return undef;
     }
@@ -1194,6 +1278,9 @@ Inputs: $component (the large text on th
         $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)
+        $no_mt (optional flag, 1 if &mt() is _not_ to be applied to $component
+           when including the text on the right.
+
 Returns a string containing breadcrumbs for the current page.
 
 =item clear_breadcrumbs
@@ -1219,7 +1306,7 @@ returns: nothing
     my @Crumbs;
     
     sub breadcrumbs {
-        my ($component,$component_help,$menulink,$helplink,$css_class) = @_;
+        my ($component,$component_help,$menulink,$helplink,$css_class,$no_mt) = @_;
         #
 	$css_class ||= 'LC_breadcrumbs';
         my $Str = "\n".'<table class="'.$css_class.'"><tr><td>';
@@ -1228,6 +1315,8 @@ returns: nothing
         my $faq = '';
         my $bug = '';
 	my $help='';
+	# Crumb Symbol
+	my $crumbsymbol = ' &#x25b6; ';
         # The last breadcrumb does not have a link, so handle it separately.
         my $last = pop(@Crumbs);
         #
@@ -1251,7 +1340,7 @@ returns: nothing
                 });
         }
         my $links .= 
-            join('-&gt;',
+            join($crumbsymbol,
                  map {
                      $faq = $_->{'faq'} if (exists($_->{'faq'}));
                      $bug = $_->{'bug'} if (exists($_->{'bug'}));
@@ -1270,7 +1359,7 @@ returns: nothing
                      $result;
                      } @Crumbs
                  );
-        $links .= '-&gt;' if ($links ne '');
+        $links .= $crumbsymbol if ($links ne '');
 	if ($last->{'no_mt'}) {
 	    $links .= '<b>'.$last->{'text'}.'</b>';
 	} else {
@@ -1297,8 +1386,12 @@ returns: nothing
         $Str .= $links.'</td>';
         #
         if (defined($component)) {
-            $Str .= '<td class="'.$css_class.'_component">'.
-                &mt($component);
+            $Str .= '<td class="'.$css_class.'_component">';
+            if ($no_mt) {
+                $Str .= $component;
+            } else {
+                $Str .= &mt($component);
+            }
 	    if ($icons ne '') {
 		$Str .= '&nbsp;'.$icons;
 	    }
@@ -1399,6 +1492,13 @@ END
     return $output;
 }
 
+sub row_headline {
+    my $output = <<"END";
+           <tr><td colspan="2">
+END
+    return $output;
+}
+
 sub row_title {
     my ($title,$css_title_class,$css_value_class) = @_;
     $css_title_class ||= 'LC_pick_box_title';
@@ -1645,6 +1745,25 @@ sub course_custom_roles {
 
 ##############################################
 ##############################################
+
+# topic_bar
+#
+# Generates a div containing a numbered (static image) followed by a title
+# with a background color defined in the corresponding CSS: LC_topic_bar
+#
+sub topic_bar {
+    my ($imgnum,$title) = @_;
+    return '
+<div class="LC_topic_bar">
+    <img alt="'.&mt('Step [_1]',$imgnum).
+              '"src="/res/adm/pages/bl_step'.$imgnum.'.gif" />&nbsp;
+    <span>'.$title.'</span>
+</div>
+';
+}
+
+##############################################
+##############################################
                                                                              
 # echo_form_input
 #
@@ -1892,6 +2011,8 @@ END
     return $scripttag;
 }
 
+
+
 1;
 
 __END__