--- loncom/interface/lonhtmlcommon.pm 2006/06/14 18:34:46 1.133 +++ loncom/interface/lonhtmlcommon.pm 2006/12/05 02:55:53 1.155 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.133 2006/06/14 18:34:46 albertel Exp $ +# $Id: lonhtmlcommon.pm,v 1.155 2006/12/05 02:55:53 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -60,7 +60,6 @@ use Time::Local; use Time::HiRes; use Apache::lonlocal; use Apache::lonnet; -use lib '/home/httpd/lib/perl/'; use LONCAPA; ############################################## @@ -78,7 +77,7 @@ use LONCAPA; sub authorbombs { my $url=shift; $url=&Apache::lonnet::declutter($url); - my ($udom,$uname)=($url=~/^(\w+)\/(\w+)\//); + my ($udom,$uname)=($url=~m{^($LONCAPA::domain_re)/($LONCAPA::username_re)/}); my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom); foreach (keys %bombs) { if ($_=~/^$udom\/$uname\//) { @@ -99,25 +98,31 @@ sub recent_filename { } sub store_recent { - my ($area,$name,$value)=@_; + my ($area,$name,$value,$freeze)=@_; my $file=&recent_filename($area); my %recent=&Apache::lonnet::dump($file); if (scalar(keys(%recent))>20) { # remove oldest value - my $oldest=time; + my $oldest=time(); my $delkey=''; - foreach (keys %recent) { - my $thistime=(split(/\&/,$recent{$_}))[0]; - if ($thistime<$oldest) { + foreach my $item (keys(%recent)) { + my $thistime=(split(/\&/,$recent{$item}))[0]; + if (($thistime ne "always_include") && ($thistime<$oldest)) { $oldest=$thistime; - $delkey=$_; + $delkey=$item; } } &Apache::lonnet::del($file,[$delkey]); } # store new value + my $timestamp; + if ($freeze) { + $timestamp = "always_include"; + } else { + $timestamp = time(); + } &Apache::lonnet::put($file,{ $name => - time.'&'.&escape($value) }); + $timestamp.'&'.&escape($value) }); } sub remove_recent { @@ -132,11 +137,11 @@ sub select_recent { my $return="\n}; # Month my @Months = qw/January February March April May June @@ -436,19 +457,26 @@ ENDJS $hourselector .= " \n"; my $minuteselector = qq{}; my $secondselector= qq{}; - my $cal_link = qq{}; + my $cal_link; + if (!$nolink) { + $cal_link = qq{}; + } # if ($no_hh_mm_ss) { - $result .= &mt('[_1] [_2] [_3] [_4]Select Date[_5]', - $monthselector,$dayselector,$yearselector, - $cal_link,''); + $result .= &mt('[_1] [_2] [_3] ', + $monthselector,$dayselector,$yearselector); + if (!$nolink) { + $result .= &mt('[_1]Select Date[_2]',$cal_link,''); + } } else { - $result .= &mt('[_1] [_2] [_3] [_4] [_5]m [_6]s [_7]Select Date[_8]', - $monthselector,$dayselector,$yearselector, - $hourselector,$minuteselector,$secondselector, - $cal_link,''); + $result .= &mt('[_1] [_2] [_3] [_4] [_5]m [_6]s ', + $monthselector,$dayselector,$yearselector, + $hourselector,$minuteselector,$secondselector); + if (!$nolink) { + $result .= &mt('[_1]Select Date[_2]',$cal_link,''); + } } - $result .= "\n\n"; + $result .= "\n\n"; return $result; } @@ -660,14 +688,6 @@ sub StatusOptions { $status = $env{'form.Status'} if (exists($env{'form.Status'})); } - my $OpSel1 = ''; - my $OpSel2 = ''; - my $OpSel3 = ''; - - if($status eq 'Any') { $OpSel3 = ' selected'; } - elsif($status eq 'Expired' ) { $OpSel2 = ' selected'; } - else { $OpSel1 = ' selected'; } - my $Str = ''; $Str .= ''."\n"; } @@ -985,9 +1011,12 @@ sub crumbs { $output.=qq{$dir/}; } } else { - $output.=$uri; + foreach my $dir (split('/',$uri)) { + if (! $dir) { next; } + $output.=$dir.'/'; + } } - unless ($uri=~/\/$/) { $output=~s/\/$//; } + if ($uri !~ m|/$|) { $output=~s|/$||; } return $output.''.($noformat?'':'
'); } @@ -996,9 +1025,14 @@ sub crumbs { sub spellheader { my $start_page= &Apache::loncommon::start_page('Speller Suggestions',undef, - {'only_body' => 1, - 'js_ready' => 1, - 'bgcolor' => '#DDDDDD',}); + {'only_body' => 1, + 'js_ready' => 1, + 'bgcolor' => '#DDDDDD', + 'add_entries' => { + 'onload' => + 'document.forms.spellcheckform.submit()', + } + }); my $end_page= &Apache::loncommon::end_page({'js_ready' => 1}); @@ -1008,9 +1042,10 @@ sub spellheader { // @@ -1024,7 +1059,7 @@ sub spelllink { my ($form,$field)=@_; my $linktext=&mt('Check Spelling'); return (<$linktext +$linktext ENDLINK } @@ -1059,6 +1094,7 @@ _editor_url='/htmlarea/'; _editor_lang='$lang'; + ENDHEADERS } @@ -1149,13 +1185,11 @@ A link to help for the component will be All inputs can be undef without problems. -Inputs: $color (the background color of the table returned), - $component (the large text on the right side of the table), +Inputs: $component (the large text on the right side of the table), $component_help - $function (role to get colors from) - $domain (domian of role) $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) Returns a string containing breadcrumbs for the current page. =item clear_breadcrumbs @@ -1180,9 +1214,10 @@ returns: nothing my @Crumbs; sub breadcrumbs { - my ($component,$component_help,$menulink,$helplink) = @_; + my ($component,$component_help,$menulink,$helplink,$css_class) = @_; # - my $Str = "\n".' - + - +ENDTWO + if (!$no_separator) { + $output .= <<"ENDTWO"; - ENDTWO + } return $output; } sub role_select_row { - my ($roles,$col_width,$tablecolor,$title) = @_; + my ($roles,$title,$css_class,$show_separate_custom,$cdom,$cnum) = @_; my $output; if (defined($title)) { - $output = &row_title($col_width,$tablecolor,$title); + $output = &row_title($title,$css_class); } - $output .= qq| \n|; + $output .= qq| \n|; if (defined($title)) { $output .= &row_closure(); } @@ -1413,11 +1457,11 @@ sub role_select_row { } sub course_select_row { - my ($col_width,$tablecolor,$title,$formname,$totcodes,$codetitles,$idlist,$idlist_titles) = @_; - my $output = &row_title($col_width,$tablecolor,$title); - $output .= "
'; + $css_class ||= 'LC_breadcrumbs'; + my $Str = "\n".''; # if (defined($component)) { - $Str .= ''; + $Str .= ''; } $Str .= '
'; # # Make the faq and bug data cascade my $faq = ''; @@ -1236,20 +1271,21 @@ returns: nothing # if ($bug ne '') { # $icons .= &Apache::loncommon::help_open_bug($bug); # } - if ($helplink ne 'nohelp') { - $icons .= &Apache::loncommon::help_open_menu(undef,$component, + if ($faq ne '' || $component_help ne '' || $bug ne '') { + $icons .= &Apache::loncommon::help_open_menu($component, $component_help, - undef,$faq,$bug); + $faq,$bug); } - if ($icons ne '') { - $Str .= $icons.' '; - } # $Str .= $links.''. - &mt($component).''. + &mt($component); + if ($icons ne '') { + $Str .= ' '.$icons; + } + $Str .= '
'."\n"; # @@ -1327,15 +1363,14 @@ returns: nothing # needs that are not accommodated by the *_select_row() routines. sub start_pick_box { - my ($table_width) = @_; + my ($css_class) = @_; + if (defined($css_class)) { + $css_class = 'class="'.$css_class.'"'; + } else { + $css_class= 'class="LC_pick_box"'; + } my $output = <<"END"; - - - - -
- - - - -
- +
END return $output; } @@ -1343,69 +1378,78 @@ END sub end_pick_box { my $output = <<"END";
-
-
END return $output; } sub row_title { - my ($col_width,$tablecolor,$title) = @_; + my ($title,$css_title_class,$css_value_class) = @_; + $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.'"'; + my $output = <<"ENDONE"; -
- - - - -
$title: -
+
+ $title: - - + -
ENDONE return $output; } sub row_closure { + my ($no_separator) =@_; my $output = <<"ENDTWO"; -
-
+
+ $output .= qq| - \n"; + my ($title,$formname,$totcodes,$codetitles,$idlist,$idlist_titles, + $css_class) = @_; + my $output = &row_title($title,$css_class); $output .= qq| -