--- loncom/interface/lonhtmlcommon.pm 2010/01/22 13:54:06 1.182.4.9 +++ loncom/interface/lonhtmlcommon.pm 2009/05/06 13:37:56 1.212 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.182.4.9 2010/01/22 13:54:06 raeburn Exp $ +# $Id: lonhtmlcommon.pm,v 1.212 2009/05/06 13:37:56 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -77,12 +77,12 @@ sub confirm_success { my ($message,$failure)=@_; if ($failure) { return ''."\n" - .''.&mt('Error').' '."\n" + .' '."\n" .$message."\n" .''."\n"; } else { return ''."\n" - .''.&mt('OK').' '."\n" + .' '."\n" .$message."\n" .''."\n"; } @@ -130,13 +130,11 @@ sub dragmath_js { my ($popup) = @_; return < - // ENDDRAGMATHJS @@ -432,7 +430,6 @@ sub date_setter { my $result = "\n\n"; $result .= < -// ENDJS - $result .= ' '; + $result .= ' '; my $monthselector = qq{'; # Day my $dayselector = qq{}; # Year - my $yearselector = qq{}; + my $yearselector = qq{}; # my $hourselector = qq{<\\/form>'.$end_page. "\');". "popwin.document.close();}". - "\nwindow.setTimeout(openpopwin,0)\n". - '// ]]>'."\n". - ''); + "\nwindow.setTimeout(openpopwin,0)"); $prog_state{'formname'}='popremain'; $prog_state{'inputname'}="remaining"; } elsif ($type eq 'inline') { @@ -1025,14 +1018,10 @@ sub Create_PrgWin { # update progress sub Update_PrgWin { my ($r,$prog_state,$displayString)=@_; - &r_print($r,''); + $displayString.'";'); $$prog_state{'laststart'}=&Time::HiRes::time(); } @@ -1085,15 +1074,11 @@ 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(); } @@ -1101,11 +1086,7 @@ 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')); } @@ -1136,7 +1117,7 @@ sub crumbs { my $output=''; unless ($noformat) { $output.='
'; } $output.=''.$prefix.'/'; - if (($env{'user.adv'}) | ($env{'user.author'})) { + if ($env{'user.adv'}) { my $path=$prefix.'/'; foreach my $dir (split('/',$uri)) { if (! $dir) { next; } @@ -1186,8 +1167,7 @@ sub spellheader { my $nothing=&javascript_nothing(); return (< -// // -// ]]> ENDCHECK } @@ -1272,8 +1251,7 @@ sub htmlareaselectactive { my @fields=@_; unless (&htmlareabrowser()) { return ''; } if (&htmlareablocked()) { return '
'.&enablelink(@fields); } - my $output='
'. + $output.="\nwindow.status='Activated Editfields';\n
". &disablelink(@fields); return $output; } @@ -1327,6 +1303,8 @@ 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 @@ -1352,10 +1330,16 @@ 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, $no_realBreadcrumb) = @_; # $css_class ||= 'LC_breadcrumbs'; - my $Str = "\n".''; + + + if($no_realBreadcrumb){ + $Str1 .= $links.''; + } else { + $Str1 .= $links.''; + } # if (defined($component)) { - $Str .= '
'; + my $Str1 = '
    '; + + if($no_realBreadcrumb){ + $Str1 = '
      '; + } + + my $Str = ''; # # Make the faq and bug data cascade my $faq = ''; @@ -1385,8 +1369,8 @@ returns: nothing no_mt =>$no_mt_descr, }); } - my $links .= - join($crumbsymbol, + my $links .= '
    • '. + join('
    • '.$crumbsymbol, map { $faq = $_->{'faq'} if (exists($_->{'faq'})); $bug = $_->{'bug'} if (exists($_->{'bug'})); @@ -1395,6 +1379,7 @@ returns: nothing if (defined($_->{'target'}) && $_->{'target'} ne '') { $result .= 'target="'.$_->{'target'}.'" '; } + # set the possible translation for title if ($_->{'no_mt'}) { $result .='title="'.$_->{'title'}.'">'. $_->{'text'}.''; @@ -1404,14 +1389,20 @@ 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'}.''; } else { $links .= ''.&mt($last->{'text'}).''; } - # + $links .= '
      • '; my $icons = ''; $faq = $last->{'faq'} if (exists($last->{'faq'})); $bug = $last->{'bug'} if (exists($last->{'bug'})); @@ -1429,10 +1420,17 @@ returns: nothing $faq,$bug); } # - $Str .= $links.'
'; + $Str .= "\n".'' + .''; + $Str .= '
'; if ($no_mt) { $Str .= $component; } else { @@ -1441,15 +1439,14 @@ returns: nothing if ($icons ne '') { $Str .= ' '.$icons; } - $Str .= '
'."\n"; } - $Str .= '
'."\n"; # # Return the @Crumbs stack to what we started with push(@Crumbs,$last); shift(@Crumbs); - # - return $Str; + # Return a table and after that the breadcrumb's line + return "$Str\n$Str1"; } sub clear_breadcrumbs { @@ -1594,16 +1591,12 @@ ENDTWO sub role_select_row { my ($roles,$title,$css_class,$show_separate_custom,$cdom,$cnum) = @_; - my $crstype = 'Course'; - if ($cdom ne '' && $cnum ne '') { - $crstype = &Apache::loncommon::course_type($cdom.'_'.$cnum); - } my $output; if (defined($title)) { $output = &row_title($title,$css_class); } $output .= qq| - \n|; foreach my $role (@$roles) { my $plrole; if ($role eq 'ow') { @@ -1622,7 +1615,7 @@ sub role_select_row { $plrole = &mt('Custom Role'); } } else { - $plrole=&Apache::lonnet::plaintext($role,$crstype); + $plrole=&Apache::lonnet::plaintext($role); } if (($role ne 'cr') || (!$show_separate_custom)) { $output .= ' '; @@ -1637,18 +1630,17 @@ sub role_select_row { sub course_select_row { my ($title,$formname,$totcodes,$codetitles,$idlist,$idlist_titles, - $css_class,$crstype) = @_; + $css_class) = @_; my $output = &row_title($title,$css_class); - $output .= &course_selection($formname,$totcodes,$codetitles,$idlist,$idlist_titles,$crstype); + $output .= &course_selection($formname,$totcodes,$codetitles,$idlist,$idlist_titles); $output .= &row_closure(); return $output; } sub course_selection { - my ($formname,$totcodes,$codetitles,$idlist,$idlist_titles,$crstype) = @_; + my ($formname,$totcodes,$codetitles,$idlist,$idlist_titles) = @_; my $output = qq| |; - - my ($allcrs,$pickspec); - if ($crstype eq 'Community') { - $allcrs = &mt('All communities'); - $pickspec = &mt('Pick specific communities:'); - } else { - $allcrs = &mt('All courses'); - $pickspec = &mt('Pick specific course(s):'); - } - my $courseform=''.&Apache::loncommon::selectcourse_link - ($formname,'pickcourse','pickdomain','coursedesc','',1,$crstype).''; - $output .= ''.$allcrs.'
'; + ($formname,'pickcourse','pickdomain','coursedesc','',1).''; + $output .= ''.&mt('All courses').'
'; if ($totcodes > 0) { my $numtitles = @$codetitles; if ($numtitles > 0) { @@ -1731,7 +1712,7 @@ sub course_selection { $output .= '
'; } } - $output .= ''.$pickspec.' '.$courseform.'  selected.
'."\n"; + $output .= ''.&mt('Pick specific course(s):').' '.$courseform.'  selected.
'."\n"; return $output; } @@ -1786,6 +1767,7 @@ 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|
@@ -1827,7 +1809,8 @@ sub topic_bar { return '
'.&mt('Step [_1]',$imgnum). - ' '.$title.' + '"src="/res/adm/pages/bl_step'.$imgnum.'.gif" />  + '.$title.'
'; } @@ -1964,7 +1947,7 @@ sub set_form_elements { $values{$name}[$i] =~ s/([\r\n\f]+)/\\n/g; $values{$name}[$i] =~ s/"/\\"/g; } - if (($$elements{$name} eq 'text') || ($$elements{$name} eq 'hidden')) { + if ($$elements{$name} eq 'text') { my $numvalues = @{$values{$name}}; if ($numvalues > 1) { my $valuestring = join('","',@{$values{$name}}); @@ -1999,8 +1982,6 @@ sub set_form_elements { $output .= qq| if (courseForm.elements['$name'].value == "$value") { courseForm.elements['$name'].checked = true; - } else { - courseForm.elements['$name'].checked = false; }|; } } @@ -2042,7 +2023,6 @@ sub set_form_elements { } } $output .= " - return; }\n"; return $output; } @@ -2084,7 +2064,108 @@ END return $scripttag; } +############################################## +############################################## +# generate_menu +# +# Generates html markup for a menu. +# +# Inputs: +# An array of following structure: +# ({ categorytitle => 'Categorytitle', +# items => [ +# { +# linktext => 'Text to be displayed', +# url => 'URL the link is pointing to, i.e. /adm/site?action=dosomething', +# permission => 'Contains permissions as returned from lonnet::allowed(), +# must evaluate to true in order to activate the link', +# icon => 'icon filename', +# alttext => 'alt text for the icon', +# help => 'Name of the corresponding helpfile', +# linktitle => 'Description of the link (used for title tag)' +# }, +# ... +# ] +# }, +# ... +# ) +# +# Outputs: A scalar containing the html markup for the menu. + +# ---- Remove when done ---- +# This routine is part of the redesign of LON-CAPA and it's +# subject to change during this project. +# Don't rely on its current functionality as it might be +# changed or removed. +# -------------------------- +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 @categories; # each element represents the entire markup for a category + + foreach my $category (@menu) { + my @links; # contains the links for the current $category + foreach my $link (@{$$category{items}}) { + next unless $$link{permission}; + + # create the markup for the current $link and push it into @links. + # each entry consists of an image and a text optionally followed + # by a help link. + push @links, $li->( + $a->( + $img->("", { + class => "LC_noBorder LC_middle", + src => "/res/adm/pages/$$link{icon}", + alt => mt(defined($$link{alttext}) ? + $$link{alttext} : $$link{linktext}) + }), { + href => $$link{url}, + title => mt($$link{linktitle}) + }). + $a->(mt($$link{linktext}), { + href => $$link{url}, + title => mt($$link{linktitle}), + class => "LC_menubuttons_link" + }). + (defined($$link{help}) ? + Apache::loncommon::help_open_topic($$link{help}) : ''), + {class => "LC_menubuttons_inline_text"}); + } + + # wrap categorytitle in

, concatenate with + # joined and in
    tags wrapped @links + # and wrap everything in an enclosing
    and push it into + # @categories + # such that each element looks like: + #

    title

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