--- loncom/interface/lonhtmlcommon.pm	2012/05/28 13:09:17	1.314
+++ loncom/interface/lonhtmlcommon.pm	2012/06/04 16:59:00	1.318
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.314 2012/05/28 13:09:17 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.318 2012/06/04 16:59:00 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -95,7 +95,7 @@ sub direct_parm_link {
     $filter=&entity_encode($filter);
     $part=&entity_encode($part);
     if (($symb) && (&Apache::lonnet::allowed('opa')) && ($target ne 'tex')) {
-       return "<a target='_top' href='/adm/parmset?symb=$symb&filter=$filter&part=$part'><span class='LC_setting'>$linktext</span></a>";
+       return "<a target='_top' href='/adm/parmset?symb=$symb&amp;filter=$filter&amp;part=$part'><span class='LC_setting'>$linktext</span></a>";
     } else {
        return $linktext;
     }
@@ -1453,7 +1453,7 @@ sub show_return_link {
 
     unless ($env{'request.course.id'}) { return 0; }
     if ($env{'request.noversionuri'}=~m{^/priv/} ||
-        $env{'request.uri'}=~m{^/~}) { return 1; }
+        $env{'request.uri'}=~m{^/priv/}) { return 1; }
 
     if (($env{'request.noversionuri'} =~ m{^/adm/(viewclasslist|navmaps)($|\?)})
         || ($env{'request.noversionuri'} =~ m{^/adm/.*/aboutme($|\?)})) {
@@ -1492,8 +1492,9 @@ sub set_due_date {
     # The code should correct for gross differences between the server
     # and client's time setting
 
-    my $js = "
-<script type='text/javascript'>
+     return <<"END";
+
+<script type="text/javascript">
   //<![CDATA[
 var serverDueDate = $duems;
 var serverTime    = $now;
@@ -1502,9 +1503,8 @@ var dueDate       = new Date(serverDueDa
 
   //]]>
 </script>
-";
 
-    return $js;
+END
 }
 ##
 # Sets the time at which the problem finished computing.
@@ -1516,17 +1516,16 @@ var dueDate       = new Date(serverDueDa
 sub set_compute_end_time {
 
     my $now = time()*1000;	# Javascript times are in ms.
-    my $js = "
-<script type='text/javascript'>
+    return <<"END";
+
+<script type="text/javascript">
 //<![CDATA[
 serverTime = $now;
 clientTime = (new Date()).getTime();
 //]]>
 </script>
 
-";
-    return $js;
-    
+END
 }
 
 ############################################################
@@ -1618,9 +1617,11 @@ returns: nothing
         my $links;
         if ((&show_return_link) && (!$CourseBreadcrumbs)) {
             my $alttext = &mt('Go Back');
-            $links=&htmltag( 'a',"<img src='/res/adm/pages/reload.png' border='0' style='vertical-align:middle;' alt='$alttext' />",
+            $links=&htmltag( 'a','<img src="/res/adm/pages/tolastloc.png" alt="'.$alttext.'" class="LC_icon" />',
                             { href => '/adm/flip?postdata=return:',
-                              title => &mt("Back to most recent content resource") });
+                              title => &mt('Back to most recent content resource'),
+                              class => 'LC_menubuttons_link',
+                            });
             $links=&htmltag('li',$links);
         }
         $links.= join "",