--- loncom/interface/lonhtmlcommon.pm 2006/03/21 20:19:41 1.123
+++ loncom/interface/lonhtmlcommon.pm 2006/07/03 01:02:32 1.139
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.123 2006/03/21 20:19:41 albertel Exp $
+# $Id: lonhtmlcommon.pm,v 1.139 2006/07/03 01:02:32 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -60,6 +60,8 @@ use Time::Local;
use Time::HiRes;
use Apache::lonlocal;
use Apache::lonnet;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
##############################################
##############################################
@@ -93,29 +95,35 @@ sub authorbombs {
sub recent_filename {
my $area=shift;
- return 'nohist_recent_'.&Apache::lonnet::escape($area);
+ return 'nohist_recent_'.&escape($area);
}
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.'&'.&Apache::lonnet::escape($value) });
+ $timestamp.'&'.&escape($value) });
}
sub remove_recent {
@@ -130,11 +138,11 @@ sub select_recent {
my $return="\n<select name='$fieldname'".
($event?" onchange='$event'":'').
">\n<option value=''>--- ".&mt('Recent')." ---</option>";
- foreach (sort keys %recent) {
- unless ($_=~/^error\:/) {
- my $escaped = &Apache::loncommon::escape_url($_);
+ foreach my $value (sort(keys(%recent))) {
+ unless ($value =~/^error\:/) {
+ my $escaped = &Apache::loncommon::escape_url($value);
$return.="\n<option value='$escaped'>".
- &Apache::lonnet::unescape((split(/\&/,$recent{$_}))[1]).
+ &unescape((split(/\&/,$recent{$value}))[1]).
'</option>';
}
}
@@ -147,24 +155,45 @@ sub get_recent {
my %recent=&Apache::lonnet::dump(&recent_filename($area));
# Create hash with key as time and recent as value
+# Begin filling return_hash with any 'always_include' option
my %time_hash = ();
- foreach (keys %recent) {
- my $thistime=(split(/\&/,$recent{$_}))[0];
- $time_hash{$thistime} = $_;
+ my %return_hash = ();
+ foreach my $item (keys %recent) {
+ my ($thistime,$thisvalue)=(split(/\&/,$recent{$item}));
+ if ($thistime eq 'always_include') {
+ $return_hash{$item} = &unescape($thisvalue);
+ $n--;
+ } else {
+ $time_hash{$thistime} = $item;
+ }
}
# Sort by decreasing time and return key value pairs
- my %return_hash = ();
my $idx = 1;
- foreach (reverse sort keys %time_hash) {
- $return_hash{$time_hash{$_}} =
- &Apache::lonnet::unescape((split(/\&/,$recent{$_}))[1]);
+ foreach my $item (reverse(sort(keys(%time_hash)))) {
+ $return_hash{$time_hash{$item}} =
+ &unescape((split(/\&/,$recent{$time_hash{$item}}))[1]);
if ($n && ($idx++ >= $n)) {last;}
}
return %return_hash;
}
+sub get_recent_frozen {
+ my ($area) = @_;
+ my %recent=&Apache::lonnet::dump(&recent_filename($area));
+
+# Create hash with all 'frozen' items
+ my %return_hash = ();
+ foreach my $item (keys(%recent)) {
+ my ($thistime,$thisvalue)=(split(/\&/,$recent{$item}));
+ if ($thistime eq 'always_include') {
+ $return_hash{$item} = &unescape($thisvalue);
+ }
+ }
+ return %return_hash;
+}
+
=pod
@@ -178,6 +207,7 @@ sub get_recent {
sub textbox {
my ($name,$value,$size,$special) = @_;
$size = 40 if (! defined($size));
+ $value = &HTML::Entities::encode($value,'<>&"');
my $Str = '<input type="text" name="'.$name.'" size="'.$size.'" '.
'value="'.$value.'" '.$special.' />';
return $Str;
@@ -280,7 +310,7 @@ The method used to restrict user input w
##############################################
sub date_setter {
my ($formname,$dname,$currentvalue,$special,$includeempty,$state,
- $no_hh_mm_ss,$defhour,$defmin,$defsec) = @_;
+ $no_hh_mm_ss,$defhour,$defmin,$defsec,$nolink) = @_;
my $wasdefined=1;
if (! defined($state) || $state ne 'disabled') {
$state = '';
@@ -322,7 +352,7 @@ sub date_setter {
}
my $result = "\n<!-- $dname date setting form -->\n";
$result .= <<ENDJS;
-<script language="Javascript">
+<script type="text/javascript">
function $dname\_checkday() {
var day = document.$formname.$dname\_day.value;
var month = document.$formname.$dname\_month.value;
@@ -385,7 +415,7 @@ document.$formname.$dname\_year.value,
}
</script>
ENDJS
- $result .= ' <nobr>';
+ $result .= ' <span style="white-space: nowrap;">';
my $monthselector = qq{<select name="$dname\_month" $special $state onchange="javascript:$dname\_checkday()" >};
# Month
my @Months = qw/January February March April May June
@@ -428,19 +458,26 @@ ENDJS
$hourselector .= " </select>\n";
my $minuteselector = qq{<input type="text" name="$dname\_minute" $special $state value="$min" size="3" />};
my $secondselector= qq{<input type="text" name="$dname\_second" $special $state value="$sec" size="3" />};
- my $cal_link = qq{<a href="javascript:$dname\_opencalendar()">};
+ my $cal_link;
+ if (!$nolink) {
+ $cal_link = qq{<a href="javascript:$dname\_opencalendar()">};
+ }
#
if ($no_hh_mm_ss) {
- $result .= &mt('[_1] [_2] [_3] [_4]Select Date[_5]',
- $monthselector,$dayselector,$yearselector,
- $cal_link,'</a>');
+ $result .= &mt('[_1] [_2] [_3] ',
+ $monthselector,$dayselector,$yearselector);
+ if (!$nolink) {
+ $result .= &mt('[_4]Select Date[_5]',$cal_link,'</a>');
+ }
} else {
- $result .= &mt('[_1] [_2] [_3] [_4] [_5]m [_6]s [_7]Select Date[_8]',
- $monthselector,$dayselector,$yearselector,
- $hourselector,$minuteselector,$secondselector,
- $cal_link,'</a>');
+ $result .= &mt('[_1] [_2] [_3] [_4] [_5]m [_6]s ',
+ $monthselector,$dayselector,$yearselector,
+ $hourselector,$minuteselector,$secondselector);
+ if (!$nolink) {
+ $result .= &mt('[_7]Select Date[_8]',$cal_link,'</a>');
+ }
}
- $result .= "</nobr>\n<!-- end $dname date setting form -->\n";
+ $result .= "</span>\n<!-- end $dname date setting form -->\n";
return $result;
}
@@ -524,7 +561,7 @@ sub get_date_from_form {
if (($year<70) || ($year>137)) { return undef; }
if (defined($sec) && defined($min) && defined($hour) &&
defined($day) && defined($month) && defined($year) &&
- eval(&timelocal($sec,$min,$hour,$day,$month,$year))) {
+ eval('&timelocal($sec,$min,$hour,$day,$month,$year)')) {
return &timelocal($sec,$min,$hour,$day,$month,$year);
} else {
return undef;
@@ -817,10 +854,10 @@ sub Create_PrgWin {
function openpopwin () {
popwin=open(\'\',\'popwin\',\'width=400,height=100\');".
"popwin.document.writeln(\'".$start_page.
- "<h4>$heading</h4>".
- "<form name=popremain>".
+ "<h4>$heading<\/h4>".
+ "<form name=\"popremain\" method=\"post\">".
'<input type="text" size="'.$width.'" name="remaining" value="'.
- &mt('Starting').'"></form>'.$end_page.
+ &mt('Starting').'" /><\\/form>'.$end_page.
"\');".
"popwin.document.close();}".
"\nwindow.setTimeout(openpopwin,0)</script>");
@@ -945,7 +982,7 @@ sub r_print {
# ------------------------------------------------------- Puts directory header
sub crumbs {
- my ($uri,$target,$prefix,$form,$size,$noformat)=@_;
+ my ($uri,$target,$prefix,$form,$size,$noformat,$skiplast)=@_;
if (! defined($size)) {
$size = '+2';
}
@@ -961,7 +998,14 @@ sub crumbs {
foreach my $dir (split('/',$uri)) {
if (! $dir) { next; }
$path .= $dir;
- unless ($path eq $uri) { $path.='/'; }
+ if ($path eq $uri) {
+ if ($skiplast) {
+ $output.=$dir;
+ last;
+ }
+ } else {
+ $path.='/';
+ }
my $linkpath = &Apache::loncommon::escape_single($path);
if ($form) {
$linkpath=
@@ -995,7 +1039,7 @@ var checkwin;
function spellcheckerwindow() {
checkwin=window.open($nothing,'spellcheckwin','height=320,width=280,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
- checkwin.document.writeln('$start_page<form name="spellcheckform" action="/adm/spellcheck" method="post"><input type="hidden" name="text" value="" /></form>$end_page');
+ checkwin.document.writeln('$start_page<form name="spellcheckform" action="/adm/spellcheck" method="post"><input type="hidden" name="text" value="" /><\/form>$end_page');
checkwin.document.close();
}
// END LON-CAPA Internal -->
@@ -1015,6 +1059,22 @@ ENDLINK
# ------------------------------------------------- Output headers for HTMLArea
+{
+ my @htmlareafields;
+ sub init_htmlareafields {
+ undef(@htmlareafields);
+ }
+
+ sub add_htmlareafields {
+ my (@newfields) = @_;
+ push(@htmlareafields,@newfields);
+ }
+
+ sub get_htmlareafields {
+ return @htmlareafields;
+ }
+}
+
sub htmlareaheaders {
if (&htmlareablocked()) { return ''; }
unless (&htmlareabrowser()) { return ''; }
@@ -1062,7 +1122,7 @@ sub disablelink {
if (defined($#fields)) {
unless ($#fields>=0) { return ''; }
}
- return '<a href="'.&HTML::Entities::encode('/adm/preferences?action=set_wysiwyg&wysiwyg=off&returnurl=','<>&"').&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'">'.&mt('Disable WYSIWYG Editor').'</a>';
+ return '<a href="'.&HTML::Entities::encode('/adm/preferences?action=set_wysiwyg&wysiwyg=off&returnurl=','<>&"').&escape($ENV{'REQUEST_URI'}).'">'.&mt('Disable WYSIWYG Editor').'</a>';
}
sub enablelink {
@@ -1070,7 +1130,7 @@ sub enablelink {
if (defined($#fields)) {
unless ($#fields>=0) { return ''; }
}
- return '<a href="'.&HTML::Entities::encode('/adm/preferences?action=set_wysiwyg&wysiwyg=on&returnurl=','<>&"').&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'">'.&mt('Enable WYSIWYG Editor').'</a>';
+ return '<a href="'.&HTML::Entities::encode('/adm/preferences?action=set_wysiwyg&wysiwyg=on&returnurl=','<>&"').&escape($ENV{'REQUEST_URI'}).'">'.&mt('Enable WYSIWYG Editor').'</a>';
}
# ----------------------------------------- Script to activate only some fields
@@ -1118,13 +1178,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
@@ -1149,20 +1207,10 @@ returns: nothing
my @Crumbs;
sub breadcrumbs {
- my ($color,$component,$component_help,$function,$domain,$menulink,
- $helplink) = @_;
- if (! defined($color)) {
- if (! defined($function)) {
- $function = &Apache::loncommon::get_users_function();
- }
- $color = &Apache::loncommon::designparm($function.'.tabbg',
- $domain);
- }
+ my ($component,$component_help,$menulink,$helplink,$css_class) = @_;
#
- my $Str = "\n".
- '<table width="100%" border="0" cellpadding="0" cellspacing="0">'.
- '<tr><td bgcolor="'.$color.'">'.
- '<font size="-1">';
+ $css_class ||= 'LC_breadcrumbs';
+ my $Str = "\n".'<table class="'.$css_class.'"><tr><td>';
#
# Make the faq and bug data cascade
my $faq = '';
@@ -1217,17 +1265,19 @@ returns: nothing
# $icons .= &Apache::loncommon::help_open_bug($bug);
# }
if ($helplink ne 'nohelp') {
- $icons .= &Apache::loncommon::help_open_menu($color,$component,$component_help,$function,$faq,$bug);
+ $icons .= &Apache::loncommon::help_open_menu($component,
+ $component_help,
+ $faq,$bug);
}
if ($icons ne '') {
$Str .= $icons.' ';
}
#
- $Str .= $links.'</font></td>';
+ $Str .= $links.'</td>';
#
if (defined($component)) {
- $Str .= '<td align="right" bgcolor="'.$color.'">'.
- '<font size="+1">'.&mt($component).'</font></td>';
+ $Str .= '<td class="'.$css_class.'_component">'.
+ &mt($component).'</td>';
}
$Str .= '</tr></table>'."\n";
#
@@ -1422,11 +1472,11 @@ sub course_select_row {
|;
my $courseform='<b>'.&Apache::loncommon::selectcourse_link
($formname,'pickcourse','pickdomain','coursedesc','',1).'</b>';
+ $output .= '<input type="radio" name="coursepick" value="all" onclick="coursePick(this.form)" />'.&mt('All courses').'<br />';
if ($totcodes > 0) {
- $output .= '<input type="radio" name="coursepick" value="all" onclick="coursePick(this.form)" />'.&mt('All courses');
my $numtitles = @$codetitles;
if ($numtitles > 0) {
- $output .= '<br /><input type="radio" name="coursepick" value="category" onclick="coursePick(this.form);alert('."'".&mt('Choose categories, from left to right')."'".')" />'.&mt('Pick courses by category:').' <br />';
+ $output .= '<input type="radio" name="coursepick" value="category" onclick="coursePick(this.form);alert('."'".&mt('Choose categories, from left to right')."'".')" />'.&mt('Pick courses by category:').' <br />';
$output .= '<table><tr><td>'.$$codetitles[0].'<br />'."\n".
'<select name="'.$$codetitles[0].
'" onChange="setPick(this.form);courseSet('."'$$codetitles[0]'".')">'."\n".