Index: supernav.module
===================================================================
--- supernav.module	(revision 53)
+++ supernav.module	(working copy)
@@ -12,7 +12,7 @@
 $help_text = '
   <div onclick="$(\'.supernav-help\').fadeOut(\'slow\');" class="supernav-pointer">
   <div style="text-align:center;font-style:italic">Click the help icon again to hide help</div>
-    <table><tr><td><img src="'. drupal_get_path('module', 'supernav') .'/images/tool-icon-help.gif" alt="Help" /></td><td style="width:100%"><strong>Navigation Frame Help</strong></td></tr></table>
+    <table><tr><td><img src="'. base_path().drupal_get_path('module', 'supernav') .'/images/tool-icon-help.gif" alt="Help" /></td><td style="width:100%"><strong>Navigation Frame Help</strong></td></tr></table>
 
     <p>Welcome to your navigation frame. This frame will provide a central location for you to browse through your site. There are a couple of features to help you get around:</p>
     <ol>
@@ -20,27 +20,27 @@
       <li>Use bookmarks to save your most commonly used locations.</li>
     </ol> 
     
-    <table><tr><td><img src="'. drupal_get_path('module', 'supernav') .'/images/search-icon.gif" alt="Search" /></td><td style="width:100%"><strong>Search</strong></td></tr></table>
+    <table><tr><td><img src="'. base_path().drupal_get_path('module', 'supernav') .'/images/search-icon.gif" alt="Search" /></td><td style="width:100%"><strong>Search</strong></td></tr></table>
     <p>Search is probably the most useful navigation tool. By default, your search will return results from both your navigation and pages (navigation first, pages next). You can be more specific about your search by clicking the search icon, and checking the options you wish to search for, including content types.</p>
     <p><strong>Hotkeys:</strong> Click <strong>SPACE+S</strong> to jump to the search input. Type your search and press <strong>ENTER</strong>. To load the first search result automatically, press <strong>TAB</strong>.
 
 
-    <table><tr><td><img src="'. drupal_get_path('module', 'supernav') .'/images/tool-icon-bookmark.gif" alt="Bookmarks" /></td><td style="width:100%"> <strong>Bookmarks</strong></td></tr></table>
+    <table><tr><td><img src="'. base_path().drupal_get_path('module', 'supernav') .'/images/tool-icon-bookmark.gif" alt="Bookmarks" /></td><td style="width:100%"> <strong>Bookmarks</strong></td></tr></table>
     <p>Using the bookmark feature can help you keep track of your most commonly visited pages.</strong> When you\'ve browsed to a page you would like to bookmark, just click the star, choose a title and submit it. You can add as many bookmarks as you like,and the bookmarks can be re-ordered at any time.</p>
     <p><strong>Hotkeys</strong>: You can load your top 9 bookmarks by holding down "B" and the number of bookmark you want to jump to.</p>
 
    
-    <table><tr><td><img src="'. drupal_get_path('module', 'supernav') .'/images/tool-icon-minimize.gif" alt="Minimize" /></td><td style="width:100%"><strong>Minimize</strong></td></tr></table>
+    <table><tr><td><img src="'. base_path().drupal_get_path('module', 'supernav') .'/images/tool-icon-minimize.gif" alt="Minimize" /></td><td style="width:100%"><strong>Minimize</strong></td></tr></table>
     <p>Click the minimize icon to minimize the navigation. It will still display in a thin bar which you can click to return it to its original size, but will be out of your way while you browse through the site.</p>
    
-    <table><tr><td><img src="'. drupal_get_path('module', 'supernav') .'/images/tool-icon-settings.gif" alt="Settings" /></td><td style="width:100%"><strong>Settings</strong></td></tr></table>
+    <table><tr><td><img src="'. base_path().drupal_get_path('module', 'supernav') .'/images/tool-icon-settings.gif" alt="Settings" /></td><td style="width:100%"><strong>Settings</strong></td></tr></table>
     <p>There are several configuration settings available to you to customize your navigating experience. Click the settings icon to reveal your options. Hover over your the options to display more information about them.</p>
 
    
-    <table><tr><td><img src="'. drupal_get_path('module', 'supernav') .'/images/tool-icon-refresh.gif" alt="Refresh" /></td><td style="width:100%"><strong>Refresh</strong></td></tr></table>
+    <table><tr><td><img src="'. base_path().drupal_get_path('module', 'supernav') .'/images/tool-icon-refresh.gif" alt="Refresh" /></td><td style="width:100%"><strong>Refresh</strong></td></tr></table>
     <p>Clicking the refresh icon will refresh the page in the right frame. To automatically reload any data that might have changed since the last refresh, see the "Force CSS and JS refreshing" and "Force image refreshing" options under your settings.</p>
    
-    <table><tr><td><img src="'. drupal_get_path('module', 'supernav') .'/images/tool-icon-info.gif" alt="Info" /></td><td style="width:100%"><strong>Info</strong></td></tr></table>
+    <table><tr><td><img src="'. base_path().drupal_get_path('module', 'supernav') .'/images/tool-icon-info.gif" alt="Info" /></td><td style="width:100%"><strong>Info</strong></td></tr></table>
     <p>Clicking the info icon will display the URL of the page in the right frame, as well as an icon to open it in a new window. This is useful mostly for testing.</p>
     
        <table><tr><td style="width:100%"><strong>Problems?</strong></td></tr></table>
@@ -724,7 +724,7 @@
     </head>
     <body>
       <noscript><div class="noscript">It looks like you have javacript disabled, so Super Nav is not going to work very well, as it uses ajax and jQuery to do most of its heavy lifting.</div></noscript>
-      <div class="supernav-close-box"><img src="'. drupal_get_path('module', 'supernav') .'/images/close-small.gif" alt="Close" title="Close" onclick="supernav_frame_toggle()" /></div>
+      <div class="supernav-close-box"><img src="'. base_path().drupal_get_path('module', 'supernav') .'/images/close-small.gif" alt="Close" title="Close" onclick="supernav_frame_toggle()" /></div>
       <div id="supernav_loading">Loading...</div>
       ';
       
@@ -755,7 +755,7 @@
     $icon = '<div class="supernav-search-icon supernav-pointer" onclick="$(\'.supernav-search-settings\').slideToggle(\'slow\')" alt="Search" title="Click to display advanced search settings"></div>';
   } 
   else {
-    $icon = '<div class="supernav-search-icon" src="'. drupal_get_path('module', 'supernav') .'/images/search-icon.gif" alt="Search" title="Search your navigation using this form"></div>';
+    $icon = '<div class="supernav-search-icon" src="'. base_path().drupal_get_path('module', 'supernav') .'/images/search-icon.gif" alt="Search" title="Search your navigation using this form"></div>';
   }
   $page .= '
     <div class="supernav-form-box">
@@ -764,7 +764,7 @@
           <td class="supernav-half-width"></td>
           <td>'. $icon .'</td>
           <td><input type="text" onkeydown="if (event.which == 13 || event.keyCode == 13) {supernav_search();return false;} else if (event.which == 9 || event.keyCode == 9) {supernav_search_jump();return false;}" id="supernav_search_input" onfocus="this.select();" class="text-input"></td>
-          <td><img src="'. drupal_get_path('module', 'supernav') .'/images/button-go.gif" class="supernav-pointer" onclick="supernav_search();" alt="Go" title="Click to search, or just press enter" /></td>
+          <td><img src="'. base_path().drupal_get_path('module', 'supernav') .'/images/button-go.gif" class="supernav-pointer" onclick="supernav_search();" alt="Go" title="Click to search, or just press enter" /></td>
           <td class="supernav-half-width"></td>
         </tr>
       </table>
@@ -787,7 +787,7 @@
   $type_list = '<table><tr>'. $type_list .'</tr></table>';
   $page .= '
     <div class="supernav-form-box supernav-settings-table supernav-search-settings  hidden">
-    <div style="float:right;"><img src="'. drupal_get_path('module', 'supernav') .'/images/close-small.gif" alt="Close" title="Close" onclick="$(\'.supernav-search-settings\').slideToggle(\'slow\')" /></div>
+    <div style="float:right;"><img src="'. base_path().drupal_get_path('module', 'supernav') .'/images/close-small.gif" alt="Close" title="Close" onclick="$(\'.supernav-search-settings\').slideToggle(\'slow\')" /></div>
       <table class="supernav-search-node-types">
         <tr>
           <td colspan="2">Search <input checked="checked" type="checkbox" id="search_nav" name="search_nav" value="nav" /> <span title="Searches through your navigation">Navigation<span> | <input type="checkbox" checked="checked" id="search_pages" name="search_pages" value="node" /> <span title="Searches through the titles all pages/nodes that are of the types you specified">Nodes</span></td>
@@ -877,13 +877,13 @@
   $page .= '
     <div class="supernav-add-bookmark supernav-form-box hidden">
     
-    <div style="float:right;"><img src="'. drupal_get_path('module', 'supernav') .'/images/close-small.gif" alt="Close" title="Close" onclick="$(\'.supernav-add-bookmark\').slideToggle(\'slow\')" /></div>
+    <div style="float:right;"><img src="'. base_path().drupal_get_path('module', 'supernav') .'/images/close-small.gif" alt="Close" title="Close" onclick="$(\'.supernav-add-bookmark\').slideToggle(\'slow\')" /></div>
       <table>
         <tr>
           <td class="supernav-half-width"></td>
           <td>Title:</td>
           <td><input type="text" onkeypress="if (event.which == 13 || event.keyCode == 13) {supernav_bookmark();}" onfocus="this.select();" class="supernav-bookmark-input text-input"></td>
-          <td><img src="'. drupal_get_path('module', 'supernav') .'/images/button-go.gif" class="supernav-pointer" onclick="supernav_bookmark();" alt="Go" title="Click to search, or just press enter" /></td>
+          <td><img src="'. base_path().drupal_get_path('module', 'supernav') .'/images/button-go.gif" class="supernav-pointer" onclick="supernav_bookmark();" alt="Go" title="Click to search, or just press enter" /></td>
           <td class="supernav-half-width"></td>
         </tr>
       </table>
@@ -912,7 +912,7 @@
     $page .= '
         <div class="supernav-form-box supernav-settings-table supernav-settings hidden">
         
-    <div style="float:right;"><img src="'. drupal_get_path('module', 'supernav') .'/images/close-small.gif" alt="Close" title="Close" onclick="$(\'.supernav-settings\').slideToggle(\'slow\')" /></div>
+    <div style="float:right;"><img src="'. base_path().drupal_get_path('module', 'supernav') .'/images/close-small.gif" alt="Close" title="Close" onclick="$(\'.supernav-settings\').slideToggle(\'slow\')" /></div>
       <form action="'. url('supernav_save_settings') .'" method="post"> 
         <input type="hidden" name="action" value="save_settings" />
           <table>
@@ -971,7 +971,7 @@
   
   // Show / Hide links
   $page .= '
-  <div class="supernav-collapsed hidden" onclick="supernav_frame_toggle();"><img src="'. drupal_get_path('module', 'supernav') .'/images/collapsed.gif" alt="Collapsed" title="Click to expand" /></div>
+  <div class="supernav-collapsed hidden" onclick="supernav_frame_toggle();"><img src="'. base_path().drupal_get_path('module', 'supernav') .'/images/collapsed.gif" alt="Collapsed" title="Click to expand" /></div>
   <script>
     var frame_toggled;
     function supernav_frame_toggle() {
@@ -997,7 +997,7 @@
   $page .= '
   
     <div class="supernav-info supernav-form-box hidden">
-    <div style="float:right;"><img src="'. drupal_get_path('module', 'supernav') .'/images/close-small.gif" alt="Close" title="Close" onclick="$(\'.supernav-info\').slideToggle(\'slow\')" /></div>
+    <div style="float:right;"><img src="'. base_path().drupal_get_path('module', 'supernav') .'/images/close-small.gif" alt="Close" title="Close" onclick="$(\'.supernav-info\').slideToggle(\'slow\')" /></div>
       <table>
         <tr>
           <td class="supernav-half-width"></td>
@@ -1054,7 +1054,7 @@
   $page .= '
     <div class="supernav-help" style="display:none">
     
-    <div style="float:right;"><img src="'. drupal_get_path('module', 'supernav') .'/images/close-small.gif" alt="Close" title="Close" onclick="parent.frames[\'supernav_left\'].load_help();" /></div>
+    <div style="float:right;"><img src="'. base_path().drupal_get_path('module', 'supernav') .'/images/close-small.gif" alt="Close" title="Close" onclick="parent.frames[\'supernav_left\'].load_help();" /></div>
       '. drupal_eval($help) .'
     </div>';
     
@@ -1066,8 +1066,8 @@
             <td style="width:100%">Navigation</td>
             <td style="white-space:nowrap">      
               <span id="treecontrol">
-                <a title="Collapse the navigation" href="#"><img src="'. drupal_get_path('module', 'supernav') .'/images/tool_contract.gif" /></a>
-                <a title="Expand the entire tree below" href="#"><img src="'. drupal_get_path('module', 'supernav') .'/images/tool_expand.gif" /></a>
+                <a title="Collapse the navigation" href="#"><img src="'. base_path().drupal_get_path('module', 'supernav') .'/images/tool_contract.gif" /></a>
+                <a title="Expand the entire tree below" href="#"><img src="'. base_path().drupal_get_path('module', 'supernav') .'/images/tool_expand.gif" /></a>
               </span>
             </td>
           </tr>