--- loncom/publisher/lonpubdir.pm	2014/10/13 14:50:42	1.161
+++ loncom/publisher/lonpubdir.pm	2014/10/17 13:00:39	1.162
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Authoring Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.161 2014/10/13 14:50:42 goltermann Exp $
+# $Id: lonpubdir.pm,v 1.162 2014/10/17 13:00:39 goltermann Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -187,20 +187,20 @@ sub handler {
         } else { $idx = 2; } # No arrow if column is not sorted
         $output .= (($columns{$key}{order}) ?
             '<th'.($columns{$key}{colspan} ? ' colspan="'.$columns{$key}{colspan}.'"' : '')
-            .'><a href="'.$linkdir.'/?sortby='.$key.'&sortorder='
+            .'><a href="'.$linkdir.'/?sortby='.$key.'&amp;sortorder='
             .((($sortby eq $key) && ($sortorder ne 'rev')) ? 'rev' : '').'">'
             .$columns{$key}{text}.$arrows[$idx].'</a></th>' :
             '<th>'.$columns{$key}{text}.'</th>');
     }
 
-my $result = "<script>
+my $result = "<script type=\"text/javascript\">
     sessionStorage.setItem('CSTRcache','".&prepareJsonData($uname,$udom,$thisdisfn)."');
     localStorage.setItem('CSTRtrans', '".&prepareJsonTranslations()."');
 </script>";
     $r->print($result);
 
     $r->print('<div id="currentFolder">'.&Apache::loncommon::start_data_table()
-        .'<th colspan=8 id="searchtitle" style="display:none"></th>'
+        .'<tr><th colspan="8" id="searchtitle" style="display:none"></th></tr>'
         .&Apache::loncommon::start_data_table_header_row() . $output
         .&Apache::loncommon::end_data_table_header_row()
     );
@@ -310,7 +310,7 @@ my $result = "<script>
   $r->print(&Apache::loncommon::end_data_table()
            .'</div><div id="otherplaces" style="display:none">'
            .&Apache::loncommon::start_data_table()
-           .'<th colspan=7>'.&mt('Results in other directories:').'</th>'
+           .'<tr><th colspan="7">'.&mt('Results in other directories:').'</th></tr>'
            .'<tr class="LC_header_row" id="otherplacestable">'
            .'<th>'.&mt('Type').'</th>'
            .'<th>'.&mt('Directory').'</th>'
@@ -319,6 +319,7 @@ my $result = "<script>
            .'<th colspan="2">'.&mt('Status').'</th>'
            .'<th>'.&mt('Last Modified').'</th>'
            .'</tr>'
+           .&Apache::loncommon::end_data_table()
            .'</div>'
            .&Apache::loncommon::end_page()
   );
@@ -591,18 +592,16 @@ sub dircontrols {
     </form>
     </div>
     <div>
-        <form>
-          <fieldset style="display:inline">
-                <legend>$lt{'qs'}</legend>
-                    <script src="/adm/quicksearch/quicksearch.js"></script>
-                    <input type="text" id="quickfilter" placeholder="Enter search term" onkeyup="applyFilter()"/>
-                    <input type="button" value="Clear" onclick="document.getElementById(\'quickfilter\').value=\'\'; applyFilter()" />
-                    %s
-                    <br />
-                    <label><input type="checkbox" id="casesens" onchange="applyFilter()"/>$lt{'cs'}&nbsp;&nbsp;</label>
-                    <label><input type="checkbox" id="regex" onchange="applyFilter()"/>$lt{'re'}&nbsp;&nbsp;</label>
-            </fieldset>
-        </form>
+      <fieldset style="display:inline">
+            <legend>$lt{'qs'}</legend>
+                <script type="text/javascript" src="/adm/quicksearch/quicksearch.js"></script>
+                <input type="text" id="quickfilter" placeholder="Enter search term" onkeyup="applyFilter()"/>
+                <input type="button" value="Clear" onclick="document.getElementById(\'quickfilter\').value=\'\'; applyFilter()" />
+                %s
+                <br />
+                <label><input type="checkbox" id="casesens" onchange="applyFilter()"/>$lt{'cs'}&nbsp;&nbsp;</label>
+                <label><input type="checkbox" id="regex" onchange="applyFilter()"/>$lt{'re'}&nbsp;&nbsp;</label>
+        </fieldset>
   </div>
 </div>
 END