--- loncom/interface/lonhtmlcommon.pm	2006/06/16 22:37:10	1.134
+++ loncom/interface/lonhtmlcommon.pm	2006/06/26 22:31:56	1.137
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.134 2006/06/16 22:37:10 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.137 2006/06/26 22:31:56 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -99,25 +99,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 +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'>".
-		&unescape((split(/\&/,$recent{$_}))[1]).
+		&unescape((split(/\&/,$recent{$value}))[1]).
 		'</option>';
 	}
     }
@@ -149,29 +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 = ();
-    my $nfrozen = 0;
-    foreach (keys %recent) {
-        my ($thistime,$thisvalue)=(split(/\&/,$recent{$_}));
-        if (($thisvalue eq 'role_frozen') && ($area='roles')) {
-            $thistime=time+$nfrozen;
-            $nfrozen++;
+    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;
         }
-        $time_hash{$thistime} = $_;
     }
 
 # 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{$_}} =
-                  &unescape((split(/\&/,$recent{$time_hash{$_}}))[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
@@ -330,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;
@@ -393,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 
@@ -455,7 +477,7 @@ ENDJS
             $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;
 }
 
@@ -1244,9 +1266,9 @@ returns: nothing
 #            $icons .= &Apache::loncommon::help_open_bug($bug);
 #        }
 	if ($helplink ne 'nohelp') {
-	    $icons .= &Apache::loncommon::help_open_menu(undef,$component,
+	    $icons .= &Apache::loncommon::help_open_menu($component,
 							 $component_help,
-							 undef,$faq,$bug);
+							 $faq,$bug);
 	}
         if ($icons ne '') {
             $Str .= $icons.'&nbsp;';