[LON-CAPA-cvs] cvs: loncom /interface lonhelpmenu.pm

albertel lon-capa-cvs@mail.lon-capa.org
Sat, 03 Jul 2004 20:25:52 -0000


albertel		Sat Jul  3 16:25:52 2004 EDT

  Modified files:              
    /loncom/interface	lonhelpmenu.pm 
  Log:
  - disable the noTopic link for now, the JS throws errors cause of JS security model
  - fix quting bugs in noTopic link
  
  
Index: loncom/interface/lonhelpmenu.pm
diff -u loncom/interface/lonhelpmenu.pm:1.5 loncom/interface/lonhelpmenu.pm:1.6
--- loncom/interface/lonhelpmenu.pm:1.5	Sat Jul  3 15:44:53 2004
+++ loncom/interface/lonhelpmenu.pm	Sat Jul  3 16:25:51 2004
@@ -120,11 +120,12 @@
         if ($component_url) {
             $r->print("
             <td align=\"center\">&nbsp;<b><a href=\"$component_url\" target=\"bodyframe\">");
-        } elsif ($ENV{'user.adv'}) {
+	    $r->print('
+   <image src="/adm/help/gif/smallHelp.gif" border="0" alt="(Topic help)" valign="middle" />&nbsp;Topic help</a></b>&nbsp;</td>');
+        } elsif (0 && $ENV{'user.adv'}) {
+	    #FIXME doing this in JS is problematic since JS can't control frames that go to outside sites
             $r->print('<td align="center">&nbsp;<b><a href="javascript:noTopic()" target="bodyframe">');
         }
-        $r->print('
-   <image src="/adm/help/gif/smallHelp.gif" border="0" alt="(Topic help)" valign="middle" />&nbsp;Topic help</a></b>&nbsp;</td>');
     }
     if ($requestmail) {
         $r->print('
@@ -174,7 +175,7 @@
   <title>Help Content</title>
   <script type="text/javascript">
 function noTopic() {
-    bodyframe.document.write("<html><head><title>Topic Page</title></head>$bodytag")
+    bodyframe.document.write('<html><head><title>Topic Page</title></head>$bodytag')
     bodyframe.document.write("The LON-CAPA help system does not currently include a specific pop-up help item for this topic. You may wish to consult the LON-CAPA <a href='/adm/help/author.manual.pdf'>Authoring Manual</a> or the <a href='/adm/help/course.manual.pdf'>Course Coordinator Manual</a>.")
     bodyframe.document.write("</body></html>")
     body.document.close()