--- loncom/interface/lonhtmlcommon.pm 2008/08/24 12:56:28 1.179 +++ loncom/interface/lonhtmlcommon.pm 2010/01/23 22:26:27 1.182.2.3 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.179 2008/08/24 12:56:28 raeburn Exp $ +# $Id: lonhtmlcommon.pm,v 1.182.2.3 2010/01/23 22:26:27 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -102,18 +102,20 @@ can be used to paste LaTeX into a textar =cut sub dragmath_js { + my ($popup) = @_; return < function mathedit(textarea, doc) { targetEntry = textarea; targetDoc = doc; - newwin = window.open("/adm/dragmath/applet/EditMathPopup.html","","width=565,height=500,resizable"); + newwin = window.open("/adm/dragmath/applet/$popup.html","","width=565,height=500,resizable"); } ENDDRAGMATHJS } + ############################################## ############################################## @@ -389,8 +391,8 @@ sub date_setter { ($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)) { + ($tzname,$sec,$min,$hour,$mday,$month,$year) = &get_timedates($now); $sec=($defsec?$defsec:0); $min=($defmin?$defmin:0); $hour=($defhour?$defhour:0); @@ -1090,7 +1092,7 @@ sub crumbs { my $output=''; unless ($noformat) { $output.='
'; } $output.=''.$prefix.'/'; - if ($env{'user.adv'}) { + if (($env{'user.adv'}) || ($env{'user.author'})) { my $path=$prefix.'/'; foreach my $dir (split('/',$uri)) { if (! $dir) { next; } @@ -1276,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 @@ -1301,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".''; # if (defined($component)) { - $Str .= '
'; @@ -1310,6 +1315,8 @@ returns: nothing my $faq = ''; my $bug = ''; my $help=''; + # Crumb Symbol + my $crumbsymbol = ' ▶ '; # The last breadcrumb does not have a link, so handle it separately. my $last = pop(@Crumbs); # @@ -1333,7 +1340,7 @@ returns: nothing }); } my $links .= - join('->', + join($crumbsymbol, map { $faq = $_->{'faq'} if (exists($_->{'faq'})); $bug = $_->{'bug'} if (exists($_->{'bug'})); @@ -1352,7 +1359,7 @@ returns: nothing $result; } @Crumbs ); - $links .= '->' if ($links ne ''); + $links .= $crumbsymbol if ($links ne ''); if ($last->{'no_mt'}) { $links .= ''.$last->{'text'}.''; } else { @@ -1379,8 +1386,12 @@ returns: nothing $Str .= $links.''. - &mt($component); + $Str .= ''; + if ($no_mt) { + $Str .= $component; + } else { + $Str .= &mt($component); + } if ($icons ne '') { $Str .= ' '.$icons; } @@ -1480,6 +1491,13 @@ sub end_pick_box { END return $output; } + +sub row_headline { + my $output = <<"END"; +
+END + return $output; +} sub row_title { my ($title,$css_title_class,$css_value_class) = @_;