--- loncom/homework/structuretags.pm	2010/02/10 21:06:07	1.444.4.6
+++ loncom/homework/structuretags.pm	2009/05/15 14:48:35	1.445
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.444.4.6 2010/02/10 21:06:07 raeburn Exp $
+# $Id: structuretags.pm,v 1.445 2009/05/15 14:48:35 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -225,7 +225,7 @@ sub page_start {
        	if ($bgcolor eq '' ) { $bgcolor = '#FFFFFF'; }
 
 	$body_args{'bgcolor'}        = $bgcolor;
-	$body_args{'no_title'}       = 1;
+#	$body_args{'no_title'}       = 1;
 	$body_args{'force_register'} = 1;
 	$body_args{'add_entries'}    = \%add_entries;	
 	if ($env{'environment.remote'} eq 'off'
@@ -243,10 +243,10 @@ sub page_start {
 
 	my ($symb,undef,undef,undef,$publicuser)= &Apache::lonnet::whichuser();
 	if ($symb eq '' && !$publicuser) {
-            $page_start .= '<p class="LC_info">'
-                          .&mt('Browsing resource, all submissions are temporary.')
-                          .'</p>';
-        }
+	    my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference");
+	    $help=&mt("Browsing resource, all submissions are temporary.")."<br />";
+	    $page_start .= $help;
+	}
     }
 
     if (!defined($found{'body'}) && $env{'request.state'} ne 'construct') {
@@ -256,9 +256,7 @@ sub page_start {
     my $form_tag_start;
     if (!defined($found{'form'})) {
 	$form_tag_start='<form name="lonhomework" enctype="multipart/form-data" method="post" action="';
-        my $uri = Apache::loncommon::inhibit_menu_check(
-                &Apache::lonenc::check_encrypt($env{'request.uri'}));
-        $uri = &HTML::Entities::encode($uri,'<>&"');
+	my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
 	$form_tag_start.=$uri.'" ';
 	if ($target eq 'edit') {
 	    $form_tag_start.=&Apache::edit::form_change_detection();
@@ -420,16 +418,14 @@ sub problem_web_to_edit_header {
 	    '</div>';
     }
     
-    my $show_all_foils_text =
-        ($Apache::lonhomework::parsing_a_task) ?
-        &mt('Show All Instances')
-        : &mt('Show All Foils');
+    my $show_all_foils_text = 
+	($Apache::lonhomework::parsing_a_task) ?
+	&mt('&nbsp;Show&nbsp;All&nbsp;Instances')
+	: &mt('&nbsp;Show&nbsp;All&nbsp;Foils');
 
-    my $show_all= '<span class="LC_nobreak"><label for="showallfoils">'
-                 .'<input type="checkbox" name="showallfoils"';
+    my $show_all= '<span class="LC_nobreak"><label><input type="checkbox" name="showallfoils"';
     if (defined($env{'form.showallfoils'})) { $show_all.=' checked="checked"'; }
-    $show_all.= ' /> '.$show_all_foils_text
-               .'</label></span>';
+    $show_all.= ' />'.$show_all_foils_text.'</label></span>';
 
 
 
@@ -678,7 +674,9 @@ sub checkout_msg {
     return (<<ENDCHECKOUT);
 <h2>$lt{'resource'}</h2>
     <p>$lt{'id_expln'}</p>
-<p class="LC_warning">$lt{'warning'}</p>
+<font color="red">
+<p>$lt{'warning'}</p>
+</font>
 <form name="checkout" method="post" action="$uri">
 <input type="hidden" name="doescheckout" value="yes" />
 <input type="button" name="checkoutbutton" value="$lt{'checkout'}" onClick="javascript:if (confirm('$lt{'checkout?'}')) { document.checkout.submit(); }" />
@@ -904,16 +902,14 @@ sub start_problem {
 		    '<input type="hidden" name="username"
                              value="'.$env{'form.username'}.'" />';
 	    }
-            if ($env{'request.role.adv'}) {
-                $form_tag_start.= ' <label class="LC_nobreak">'
-                         .'<input type="checkbox" name="showallfoils"';
-                if (defined($env{'form.showallfoils'})) {
-                    $form_tag_start.=' checked="checked"';
-                }
-                $form_tag_start.= ' /> '
-                                 .&mt('Show All Foils')
-                                 .'</label>';
-
+	    if ($env{'request.role.adv'}) {
+		$form_tag_start.=
+		    ' <label><input type="checkbox" name="showallfoils"';
+		if (defined($env{'form.showallfoils'})) {
+		    $form_tag_start.=' checked="checked"';
+		}
+		$form_tag_start.= ' />'.&mt('&nbsp;Show&nbsp;All&nbsp;Foils').
+		    '</label>';
 	    }
             if ($Apache::lonhomework::type eq 'practice') {
                 $form_tag_start.=&practice_problem_header();
@@ -1070,10 +1066,8 @@ sub end_problem {
 	#  it in the problem header.  We have been logging the
 	#  last due date written to file. 
 	
-	my $duetime = &Apache::lonnet::EXT("resource.$id.duedate");
+	my $duetime = &Apache::lonnet::EXT("resource.$id.duedate"); 
 	my $duedate = POSIX::strftime("%c",localtime($duetime));
-        my $duedate_text = &mt('Due date: [_1]'
-                              ,&Apache::lonlocal::locallocaltime($duetime));
 	my $temp_file;
 	my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";
 	
@@ -1105,22 +1099,18 @@ sub end_problem {
 	    if (not $env{'request.symb'} =~ m/\.page_/) {
 		if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') {
 		    $frontmatter .= $begin_doc.
-			'\textit{'.$duedate_text.'} '.$toc_line;
+			'\textit{Due date: '.$duedate.'} '.$toc_line;
 		} else {
 		    $frontmatter.= $begin_doc.$toc_line;
-                    if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) {
-                        $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';
-                    }
+		    if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';}
 		}
 	    } else {
-		$frontmatter .= '\vskip 1mm\textit{'.$duedate_text.'} \\\\\\\\'.$startminipage;
+		$frontmatter .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\'.$startminipage;
 	    }
 	} else {
 	    if (not $env{'request.symb'} =~ m/\.page_/) {
 		$frontmatter .= $begin_doc.$toc_line;
-                if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) {
-                    $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';
-                }
+		if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';}
 	    } else {
 		$frontmatter .= '\vskip 1mm \\\\\\\\'.$startminipage;
 	    }
@@ -1762,9 +1752,7 @@ sub start_part {
 				    '.disableexampointprint'}) eq 'yes') {
 			$allow_print_points=0;
 		    }
-                    if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { 
-                        $result .= '\vskip 10mm\fbox{\textit{'.$weight.' pt}}';
-                    }
+		    if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
 		} elsif ($target eq 'web') {
 		    $result.='<a name="'.&escape($Apache::inputtags::part).'" />';
 		}
@@ -2051,9 +2039,10 @@ sub start_simpleeditbutton {
 #              .&mt('Note: it can take up to 10 minutes for changes to take effect for all users.')
 #              .&Apache::loncommon::help_open_topic('Caching')
 #              .'</p>';
-        $result .= '<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>'.
-                   '<a href="'.$url.'/smpedit?symb='.&escape($symb).'">'.
-                   &mt('Edit').'</a></td></tr></table><br />';
+        $result.=&Apache::lontemplate::start_functionslist()
+                .&Apache::lontemplate::item_functionslist(
+                     '<a href="'.$url.'/smpedit?symb='.&escape($symb).'">'.&mt('Edit').'</a>')
+                .&Apache::lontemplate::end_functionslist();
 
     }
     return $result;