--- loncom/interface/lonhtmlcommon.pm 2008/12/01 16:33:32 1.187 +++ loncom/interface/lonhtmlcommon.pm 2009/05/16 18:06:41 1.214 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.187 2008/12/01 16:33:32 droeschl Exp $ +# $Id: lonhtmlcommon.pm,v 1.214 2009/05/16 18:06:41 tempelho 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" + .' '."\n" + .$message."\n" + .''."\n"; + } else { + return ''."\n" + .' '."\n" + .$message."\n" + .''."\n"; + } +} ############################################## ############################################## @@ -285,7 +310,7 @@ sub checkbox { $Str .= 'value="'.$value.'"'; } if ($checked) { - $Str .= ' checked="1"'; + $Str .= ' checked="checked"'; } $Str .= ' />'; return $Str; @@ -307,7 +332,7 @@ sub radio { $Str .= 'value="'.$value.'"'; } if ($checked eq $value) { - $Str .= ' checked="1"'; + $Str .= ' checked="checked"'; } $Str .= ' />'; return $Str; @@ -467,7 +492,7 @@ document.$formname.$dname\_year.value, } ENDJS - $result .= ' '; + $result .= ' '; my $monthselector = qq{}; # Month my @Months = qw/January February March April May June @@ -955,7 +980,7 @@ sub Create_PrgWin { popwin=open(\'\',\'popwin\',\'width=400,height=100\');". "popwin.document.writeln(\'".$start_page. "".&mt("$heading")."<\/h4>". - "". + "". '<\\/form>'.$end_page. "\');". @@ -1278,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 @@ -1303,17 +1330,23 @@ returns: nothing my @Crumbs; sub breadcrumbs { - my ($component,$component_help,$menulink,$helplink,$css_class) = @_; + my ($component,$component_help,$menulink,$helplink,$css_class,$no_mt, $no_realBreadcrumb) = @_; # $css_class ||= 'LC_breadcrumbs'; - my $Str = "\n".''; + my $Str1 = ''; + + if($no_realBreadcrumb){ + $Str1 = ''; + } + + my $Str = ''; # # Make the faq and bug data cascade my $faq = ''; my $bug = ''; my $help=''; # Crumb Symbol - my $crumbsymbol = ' ▶ '; + my $crumbsymbol = '» '; # The last breadcrumb does not have a link, so handle it separately. my $last = pop(@Crumbs); # @@ -1336,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'})); @@ -1346,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'}.''; @@ -1355,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'})); @@ -1380,23 +1420,33 @@ returns: nothing $faq,$bug); } # - $Str .= $links.''; + + + if($no_realBreadcrumb){ + $Str1 .= $links.''; + } else { + $Str1 .= $links.''; + } # if (defined($component)) { - $Str .= ''. - &mt($component); + $Str .= "\n".'' + .''; + if ($no_mt) { + $Str .= $component; + } else { + $Str .= &mt($component); + } if ($icons ne '') { $Str .= ' '.$icons; } - $Str .= ''; + $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 { @@ -1465,6 +1515,9 @@ returns: nothing # routines, but can also be called directly to start and end rows which have # needs that are not accommodated by the *_select_row() routines. +{ # Start: row_count block for pick_box +my @row_count; + sub start_pick_box { my ($css_class) = @_; if (defined($css_class)) { @@ -1472,6 +1525,7 @@ sub start_pick_box { } else { $css_class= 'class="LC_pick_box"'; } + unshift(@row_count,0); my $output = <<"END"; END @@ -1479,6 +1533,7 @@ END } sub end_pick_box { + shift(@row_count); my $output = <<"END"; END @@ -1494,11 +1549,12 @@ 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'; $css_title_class ||= 'LC_pick_box_title'; $css_title_class = 'class="'.$css_title_class.'"'; $css_value_class ||= 'LC_pick_box_value'; - $css_value_class = 'class="'.$css_value_class.'"'; if ($title ne '') { $title .= ':'; @@ -1508,7 +1564,7 @@ sub row_title { $title - + ENDONE return $output; } @@ -1530,6 +1586,9 @@ ENDTWO return $output; } +} # End: row_count block for pick_box + + sub role_select_row { my ($roles,$title,$css_class,$show_separate_custom,$cdom,$cnum) = @_; my $output; @@ -1537,7 +1596,7 @@ sub role_select_row { $output = &row_title($title,$css_class); } $output .= qq| - \n|; + \n|; foreach my $role (@$roles) { my $plrole; if ($role eq 'ow') { @@ -1664,7 +1723,7 @@ sub status_select_row { $output = &row_title($title,$css_class,'LC_pick_box_select'); } $output .= qq| - \n|; + \n|; foreach my $status_type (sort(keys(%{$types}))) { $output .= ' '.$$types{$status_type}.''; } @@ -1750,7 +1809,7 @@ sub topic_bar { return ' + ' "src="/res/adm/pages/bl_step'.$imgnum.'.gif" /> '.$title.' '; @@ -2016,10 +2075,11 @@ END # 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', +# { +# 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', +# 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', @@ -2038,42 +2098,74 @@ END # subject to change during this project. # Don't rely on its current functionality as it might be # changed or removed. -# TODO: -# check for empty values # -------------------------- - sub generate_menu { my @menu = @_; - my $menu_html = qq||; - foreach my $category (@menu) { #FIXME: insert appropriate classnames for styles when they're finished. - $menu_html .=' - '.$category->{'categorytitle'}.' - '; - foreach my $item ( @{ $category->{items} } ) { - next unless $item->{'permission'}; - $menu_html .= qq||; - if($item->{'icon'}){ - $menu_html .= qq||; - } else { #use linktext as alt text for the icon - $menu_html .= qq|$item->{'linktext'}"/>|; - } - } - $menu_html .= qq||; - $menu_html .= &mt($item->{'linktext'}).''; - if (exists($item->{'help'})) { - $menu_html .= &Apache::loncommon::help_open_topic($item->{'help'}); - } - $menu_html .= ''; - } - $menu_html .= ''; + # 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]$_[0]>| : 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); } - $menu_html .= qq||; - return $menu_html; -} + # wrap the joined @categories in another (column layout) + return $div->(join('', @categories), {class => "LC_columnSection"}); +} 1;