--- loncom/interface/lonhtmlcommon.pm 2009/02/18 19:28:45 1.201 +++ loncom/interface/lonhtmlcommon.pm 2009/05/22 17:57:19 1.218 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.201 2009/02/18 19:28:45 droeschl Exp $ +# $Id: lonhtmlcommon.pm,v 1.218 2009/05/22 17:57:19 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'); } } @@ -285,7 +312,7 @@ sub checkbox { $Str .= 'value="'.$value.'"'; } if ($checked) { - $Str .= ' checked="1"'; + $Str .= ' checked="checked"'; } $Str .= ' />'; return $Str; @@ -307,7 +334,7 @@ sub radio { $Str .= 'value="'.$value.'"'; } if ($checked eq $value) { - $Str .= ' checked="1"'; + $Str .= ' checked="checked"'; } $Str .= ' />'; return $Str; @@ -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,23 +1354,28 @@ returns: nothing my @Crumbs; sub breadcrumbs { - my ($component,$component_help,$menulink,$helplink,$css_class,$no_mt) = @_; + my ($component,$component_help,$menulink,$helplink,$css_class,$no_mt, $CourseBreadcrumbs) = @_; # - $css_class ||= 'LC_breadcrumbs'; - my $Str1 = '
    '; + $css_class ||= 'LC_breadcrumbs'; + my $Str1 = '
      '; + + if($CourseBreadcrumbs){ + $Str1 = '
        '; + } + my $Str = ''; # # 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; @@ -1331,15 +1385,20 @@ 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 .= '
      • '. + my $links .= '
      • '. join('
      • '.$crumbsymbol, map { $faq = $_->{'faq'} if (exists($_->{'faq'})); @@ -1349,6 +1408,7 @@ returns: nothing if (defined($_->{'target'}) && $_->{'target'} ne '') { $result .= 'target="'.$_->{'target'}.'" '; } + # set the possible translation for title if ($_->{'no_mt'}) { $result .='title="'.$_->{'title'}.'">'. $_->{'text'}.''; @@ -1359,13 +1419,19 @@ returns: nothing $result; } @Crumbs ).'
      • '; - $links .= '
      • '.$crumbsymbol if ($links ne ''); +#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'})); @@ -1383,7 +1449,13 @@ returns: nothing $faq,$bug); } # - $Str1 .= $links.'
    '; + + + if($CourseBreadcrumbs){ + $Str1 .= $links.''; + } else { + $Str1 .= $links.'
'; + } # if (defined($component)) { $Str .= "\n".'' @@ -1402,7 +1474,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"; } @@ -1505,9 +1577,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.'"'; @@ -1598,6 +1670,7 @@ sub course_selection { my ($formname,$totcodes,$codetitles,$idlist,$idlist_titles) = @_; my $output = qq| |; my $courseform=''.&Apache::loncommon::selectcourse_link @@ -1724,7 +1798,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|
@@ -1766,7 +1839,7 @@ sub topic_bar { return '
'.&mt('Step [_1]',$imgnum).
-              '  + ' "src="/res/adm/pages/bl_step'.$imgnum.'.gif" />  '.$title.'
'; @@ -2091,15 +2164,15 @@ sub generate_menu { $img->("", { class => "LC_noBorder LC_middle", src => "/res/adm/pages/$$link{icon}", - alt => defined($$link{alttext}) ? - $$link{alttext} : $$link{linktext} + alt => mt(defined($$link{alttext}) ? + $$link{alttext} : $$link{linktext}) }), { href => $$link{url}, - title => $$link{linktitle} + title => mt($$link{linktitle}) }). - $a->($$link{linktext}, { + $a->(mt($$link{linktext}), { href => $$link{url}, - title => $$link{linktitle}, + title => mt($$link{linktitle}), class => "LC_menubuttons_link" }). (defined($$link{help}) ? @@ -2115,9 +2188,9 @@ sub generate_menu { #

title

  • ...
  • ...
# the category won't be added if there aren't any links push @categories, - $div->($h3->($$category{categorytitle}, {class=>"LC_hcell"}). + $div->($h3->(mt($$category{categorytitle}), {class=>"LC_hcell"}). $ul->(join('' ,@links), {class =>"LC_ListStyleNormal" }), - {class=>"LC_ContentBoxSpecial"}) if scalar(@links); + {class=>"LC_ContentBoxSpecial LC_400Box"}) if scalar(@links); } # wrap the joined @categories in another
(column layout)