--- loncom/interface/lonhtmlcommon.pm 2009/04/04 20:06:37 1.206 +++ loncom/interface/lonhtmlcommon.pm 2009/06/04 16:33:08 1.220 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.206 2009/04/04 20:06:37 bisitz Exp $ +# $Id: lonhtmlcommon.pm,v 1.220 2009/06/04 16:33:08 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -62,6 +62,31 @@ use Apache::lonlocal; use Apache::lonnet; use LONCAPA; +############################################## +############################################## + +=pod + +=item confirm_success + +Successful completion of an operation message + +=cut + +sub confirm_success { + my ($message,$failure)=@_; + if ($failure) { + return ''."\n" + .''.&mt('Error').' '."\n" + .$message."\n" + .''."\n"; + } else { + return ''."\n" + .''.&mt('Ok').' '."\n" + .$message."\n" + .''."\n"; + } +} ############################################## ############################################## @@ -105,11 +130,13 @@ sub dragmath_js { my ($popup) = @_; return < + // ENDDRAGMATHJS @@ -136,7 +163,7 @@ sub authorbombs { foreach (keys %bombs) { if ($_=~/^$udom\/$uname\//) { return ''. + '">'.&mt('Bomb').''. &Apache::loncommon::help_open_topic('About_Bombs'); } } @@ -405,6 +432,7 @@ sub date_setter { my $result = "\n\n"; $result .= < +// ENDJS $result .= ' '; @@ -950,17 +979,20 @@ sub Create_PrgWin { #the whole function called through timeout is due to issues #in mozilla Read BUG #2665 if you want to know the whole story &r_print($r,'"); + "\nwindow.setTimeout(openpopwin,0)". + '// ]]>'. + ''); $prog_state{'formname'}='popremain'; $prog_state{'inputname'}="remaining"; } elsif ($type eq 'inline') { @@ -993,10 +1025,14 @@ sub Create_PrgWin { # update progress sub Update_PrgWin { my ($r,$prog_state,$displayString)=@_; - &r_print($r,''); + $displayString.'";'. + '// ]]>'. + ''); $$prog_state{'laststart'}=&Time::HiRes::time(); } @@ -1049,11 +1085,15 @@ sub Increment_PrgWin { if ($user_browser eq 'explorer' && $user_os =~ 'mac') { $lasttime = ''; } - &r_print($r,''); + ': '.$time_est.' '.&mt('remaining').' '.$lasttime.'";'. + '// ]]>'. + ''); $$prog_state{'laststart'}=&Time::HiRes::time(); } @@ -1061,7 +1101,11 @@ sub Increment_PrgWin { sub Close_PrgWin { my ($r,$prog_state)=@_; if ($$prog_state{'type'} eq 'popup') { - &r_print($r,''."\n"); + &r_print($r,''."\n"); } elsif ($$prog_state{'type'} eq 'inline') { &Update_PrgWin($r,$prog_state,&mt('Done')); } @@ -1143,6 +1187,7 @@ sub spellheader { my $nothing=&javascript_nothing(); return (< +// +// ]]> ENDCHECK } @@ -1226,7 +1272,8 @@ sub htmlareaselectactive { my @fields=@_; unless (&htmlareabrowser()) { return ''; } if (&htmlareablocked()) { return '
'.&enablelink(@fields); } - my $output='
". + $output.="\nwindow.status='Activated Editfields';\n" + .'// ]]>' + .'
'. &disablelink(@fields); return $output; } @@ -1305,13 +1354,13 @@ returns: nothing my @Crumbs; sub breadcrumbs { - my ($component,$component_help,$menulink,$helplink,$css_class,$no_mt, $no_realBreadcrumb) = @_; + my ($component,$component_help,$menulink,$helplink,$css_class,$no_mt, $CourseBreadcrumbs) = @_; # - $css_class ||= 'LC_breadcrumbs'; - my $Str1 = '
    '; + $css_class ||= 'LC_breadcrumbs'; + my $Str1 = '
      '; - if($no_realBreadcrumb){ - $Str1 = '
        '; + if($CourseBreadcrumbs){ + $Str1 = '
          '; } my $Str = ''; @@ -1319,14 +1368,14 @@ returns: nothing # Make the faq and bug data cascade my $faq = ''; my $bug = ''; - my $help=''; - # Crumb Symbol - my $crumbsymbol = '» '; + my $help=''; + # Crumb Symbol + my $crumbsymbol = '» '; # The last breadcrumb does not have a link, so handle it separately. my $last = pop(@Crumbs); # # The first one should be the course or a menu link - if (!defined($menulink)) { $menulink=1; } + if (!defined($menulink)) { $menulink=1; } if ($menulink) { my $description = 'Menu'; my $no_mt_descr = 0; @@ -1336,41 +1385,47 @@ returns: nothing $env{'course.'.$env{'request.course.id'}.'.description'}; $no_mt_descr = 1; } - unshift(@Crumbs,{ - href =>'/adm/menu', - title =>'Go to main menu', - target =>'_top', - text =>$description, - no_mt =>$no_mt_descr, - }); + $menulink = { href =>'/adm/menu', + title =>'Go to main menu', + target =>'_top', + text =>$description, + no_mt =>$no_mt_descr, }; + if($last) { + #$last set, so we have some crumbs + unshift(@Crumbs,$menulink); + } else { + #only menulink crumb present + $last = $menulink; + } } - my $links .= '
        • '. - join('
        • '.$crumbsymbol, + my $links = join "", map { - $faq = $_->{'faq'} if (exists($_->{'faq'})); - $bug = $_->{'bug'} if (exists($_->{'bug'})); + $faq = $_->{'faq'} if (exists($_->{'faq'})); + $bug = $_->{'bug'} if (exists($_->{'bug'})); $help = $_->{'help'} if (exists($_->{'help'})); - my $result = '{'target'}) && $_->{'target'} ne '') { - $result .= 'target="'.$_->{'target'}.'" '; - } - if ($_->{'no_mt'}) { - $result .='title="'.$_->{'title'}.'">'. - $_->{'text'}.''; - } else { - $result .='title="'.&mt($_->{'title'}).'">'. - &mt($_->{'text'}).''; - } - $result; - } @Crumbs - ).'
          • '; - $links .= '
        • '.$crumbsymbol if ($links ne ''); + + my $result = htmltag( 'a', + $_->{no_mt} ? $_->{text} : mt($_->{text}), + { + href => $_->{href}, + title => $_->{no_mt} ? $_->{title} : mt($_->{title}), + target => $_->{target}, + }); + $result = htmltag( 'li', $crumbsymbol.$result); + } @Crumbs; +#Workaround for edit course. + if(@Crumbs == 0 ){ + $links .= '
        • ' if ($links ne ''); + } else { + $links .= '
        • '.$crumbsymbol if ($links ne ''); + } +#should the last Element be translated? if ($last->{'no_mt'}) { - $links .= ''.$last->{'text'}.'
          • '; + $links .= ''.$last->{'text'}.''; } else { - $links .= ''.&mt($last->{'text'}).''; + $links .= ''.&mt($last->{'text'}).''; } - # + $links .= ''; my $icons = ''; $faq = $last->{'faq'} if (exists($last->{'faq'})); $bug = $last->{'bug'} if (exists($last->{'bug'})); @@ -1390,10 +1445,10 @@ returns: nothing # - if($no_realBreadcrumb){ + if($CourseBreadcrumbs){ $Str1 .= $links.'
        '; } else { - $Str1 .= $links.'
    '; + $Str1 .= $links.'
'; } # if (defined($component)) { @@ -1413,7 +1468,7 @@ returns: nothing # Return the @Crumbs stack to what we started with push(@Crumbs,$last); shift(@Crumbs); - # + # Return a table and after that the breadcrumb's line return "$Str\n$Str1"; } @@ -1516,9 +1571,9 @@ END } sub row_title { + my ($title,$css_title_class,$css_value_class) = @_; $row_count[0]++; my $css_class = ($row_count[0] % 2)?'LC_odd_row':'LC_even_row'; - my ($title,$css_title_class,$css_value_class) = @_; $css_title_class ||= 'LC_pick_box_title'; $css_title_class = 'class="'.$css_title_class.'"'; @@ -1609,6 +1664,7 @@ sub course_selection { my ($formname,$totcodes,$codetitles,$idlist,$idlist_titles) = @_; my $output = qq| |; my $courseform=''.&Apache::loncommon::selectcourse_link @@ -1735,7 +1792,6 @@ sub email_default_row { sub submit_row { my ($title,$cmd,$submit_text,$css_class) = @_; - $submit_text = &mt($submit_text); my $output = &row_title($title,$css_class,'LC_pick_box_submit'); $output .= qq|
@@ -1774,13 +1830,11 @@ sub course_custom_roles { # sub topic_bar { my ($imgnum,$title) = @_; - return ' -
- '.&mt('Step [_1]',$imgnum). - '  - '.$title.' -
-'; + return '
' + .''.&mt('Step [_1]',$imgnum).'' + .$title + .'
'; } ############################################## @@ -2032,6 +2086,53 @@ END return $scripttag; } + +# USAGE: htmltag(element, content, {attribute => value,...}); +# +# EXAMPLES: +# - htmltag('a', 'this is an anchor', {href => 'www.example.com', +# title => 'this is a title'}) +# +# - You might want to set up needed tags like: +# +# my $h3 = sub { return htmltag( "h3", @_ ) }; +# +# ... and use them: $h3->("This is a headline") +# +# - To set up a couple of tags, see sub inittags +# +# NOTES: +# - Empty elements, such as
are correctly terminated, +# i.e. htmltag('br') returns
+# - Empty attributes (title="") are filtered out. +# - The function will not check for deprecated attributes. +# +# OUTPUT: content enclosed in xhtml conform tags +sub htmltag{ + return + qq|<$_[0]| + . join( '', map { qq| $_="${$_[2]}{$_}"| if ${$_[2]}{$_} } keys %{ $_[2] } ) + . ($_[1] ? qq|>$_[1]| : qq|/>|). "\n"; +}; + + +# USAGE: inittags(@tags); +# +# EXAMPLES: +# - my ($h1, $h2, $h3) = initTags( qw( h1 h2 h3 ) ) +# $h1->("This is a headline") #Returns:

This is a headline

+# +# NOTES: See sub htmltag for further information. +# +# OUTPUT: List of subroutines. +sub inittags { + my @tags = @_; + return map { my $tag = $_; + sub { return htmltag( $tag, @_ ) } + } @tags; +} + + ############################################## ############################################## @@ -2069,23 +2170,8 @@ END # -------------------------- sub generate_menu { my @menu = @_; - - # usage: $wrap->(element, content, {attribute => value,...}); - # output: content enclosed in html conform tags - my $wrap = sub { - return - qq|<$_[0]| - . join( '', map { qq| $_="${$_[2]}{$_}"| } keys %{ $_[2] } ) - . ($_[1] ? qq|>$_[1]| : qq|/>|). "\n"; - }; - # subs for specific html elements - my $h3 = sub { return $wrap->( "h3", @_ ) }; - my $div = sub { return $wrap->( "div", @_ ) }; - my $ul = sub { return $wrap->( "ul", @_ ) }; - my $li = sub { return $wrap->( "li", @_ ) }; - my $a = sub { return $wrap->( "a", @_ ) }; - my $img = sub { return $wrap->( "img", @_ ) }; + my ($h3, $div, $ul, $li, $a, $img) = inittags( qw(h3 div ul li a img) ); my @categories; # each element represents the entire markup for a category