--- loncom/interface/lonhtmlcommon.pm 2010/01/22 13:54:06 1.182.4.9 +++ loncom/interface/lonhtmlcommon.pm 2008/12/06 17:29:34 1.193 @@ -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.193 2008/12/06 17:29:34 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -62,31 +62,6 @@ 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"; - } -} ############################################## ############################################## @@ -130,13 +105,11 @@ sub dragmath_js { my ($popup) = @_; return < - // ENDDRAGMATHJS @@ -312,7 +285,7 @@ sub checkbox { $Str .= 'value="'.$value.'"'; } if ($checked) { - $Str .= ' checked="checked"'; + $Str .= ' checked="1"'; } $Str .= ' />'; return $Str; @@ -334,7 +307,7 @@ sub radio { $Str .= 'value="'.$value.'"'; } if ($checked eq $value) { - $Str .= ' checked="checked"'; + $Str .= ' checked="1"'; } $Str .= ' />'; return $Str; @@ -432,7 +405,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{\n|; + '.$allcrs.'
'; + ($formname,'pickcourse','pickdomain','coursedesc','',1).''; + $output .= ''.&mt('All courses').'
'; if ($totcodes > 0) { my $numtitles = @$codetitles; if ($numtitles > 0) { @@ -1731,7 +1662,7 @@ sub course_selection { $output .= '
'; } } - $output .= ''.$pickspec.' '.$courseform.'  selected.
'."\n"; + $output .= ''.&mt('Pick specific course(s):').' '.$courseform.'  selected.
'."\n"; return $output; } @@ -1742,7 +1673,7 @@ sub status_select_row { $output = &row_title($title,$css_class,'LC_pick_box_select'); } $output .= qq| - \n|; foreach my $status_type (sort(keys(%{$types}))) { $output .= ' '; } @@ -1786,6 +1717,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 +1759,8 @@ sub topic_bar { return '
'.&mt('Step [_1]',$imgnum). - ' '.$title.' + '"src="/res/adm/pages/bl_step'.$imgnum.'.gif" />  + '.$title.'
'; } @@ -1964,7 +1897,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 +1932,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 +1973,6 @@ sub set_form_elements { } } $output .= " - return; }\n"; return $output; } @@ -2084,6 +2014,74 @@ 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. +# 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 .='
+

'.mt($category->{'categorytitle'}).'

+
    '; + foreach my $item ( @{ $category->{items} } ) { + next unless $item->{'permission'}; + $menu_html .= qq|
  • '; + if($item->{'icon'}){ + $menu_html .= qq||; + if($item->{'alttext'}){ + $menu_html .= $item->{'alttext'}.''; + } 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 .= '
'; + } + $menu_html .= qq|
|; + return $menu_html; +} 1;