--- loncom/homework/lonhomework.pm	2008/03/12 02:46:53	1.291
+++ loncom/homework/lonhomework.pm	2008/07/28 05:26:00	1.296
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.291 2008/03/12 02:46:53 raeburn Exp $
+# $Id: lonhomework.pm,v 1.296 2008/07/28 05:26:00 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -935,8 +935,11 @@ sub editxmlmode {
 	my $js =
 	    &Apache::edit::js_change_detection(). 
 	    &Apache::loncommon::resize_textarea_js().
-            &Apache::structuretags::setmode_javascript();
+            &Apache::structuretags::setmode_javascript().
+            &Apache::lonhtmlcommon::dragmath_js();
 	my $only_body =  ($env{'environment.remote'} eq 'off')? 0 : 1;
+	my $dragmath_button = 
+            &Apache::lonhtmlcommon::dragmath_button("LC_editxmltext",1);
 	my $start_page = 
 	    &Apache::loncommon::start_page(&mt("EditXML [_1]",$file),$js,
 					   {'no_auto_mt_title' => 1,
@@ -959,10 +962,12 @@ sub editxmlmode {
               </table>
               <div class="LC_edit_problem_discards">
                 <input type="hidden" name="problemmode" value="editxml" />
+
                 <input type="button" name="submitmode" accesskey="d" value="'.&mt('Discard Edits and View').'" '.
                 'onclick="javascript:setmode(this.form,'."'discard'".')" />
                 <input type="button" '.&Apache::edit::submit_ask_anyway('setmode(this.form,'."'edit'".')').'name="submitmode" accesskey="e" value="'.&mt('Edit').'" />
                 <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" />
+                '.$dragmath_button.'
               </div>
               <div class="LC_edit_problem_saves">
                 <input type="submit" name="submitbutton" accesskey="s" value="'.&mt('Save').'"  />
@@ -1079,8 +1084,10 @@ sub get_template_list {
     }
     my @files = glob($Apache::lonnet::perlvar{'lonIncludes'}.
 		     '/templates/*.'.$glob_extension);
-    @files = map {[$_,&mt(&Apache::lonnet::metadata($_, 'title'))]} (@files);
-    @files = sort {$a->[1] cmp $b->[1]} (@files);
+    @files = map {[$_,&mt(&Apache::lonnet::metadata($_, 'title')),
+                      (&Apache::lonnet::metadata($_, 'category')?&mt(&Apache::lonnet::metadata($_, 'category')):&mt('Miscellaneous')),
+                      &mt(&Apache::lonnet::metadata($_, 'help'))]} (@files);
+    @files = sort {$a->[2].$a->[1] cmp $b->[2].$b->[1]} (@files);
     my ($midpoint,$seconddiv,$numfiles);
     $numfiles = 0;
     foreach my $file (@files) {
@@ -1095,16 +1102,28 @@ sub get_template_list {
         }
     }
     my $count = 0;
+    my $currentcategory='';
     foreach my $file (@files) {
 	next if ($file->[1] !~ /\S/);
+        if ($file->[2] ne $currentcategory) {
+           $currentcategory=$file->[2];
+           if ((!$seconddiv) && ($count >= $midpoint)) {
+               $result .= '</div>'."\n".'<div class="LC_left_float">'."\n";
+               $seconddiv = 1;
+           }
+           $result.='<h3>'.$currentcategory.'</h3>';
+           $count++;
+        }
 	$result .=
 	    '<label><input type="radio" name="template" value="'.$file->[0].'" />'.
-	    $file->[1].'</label><br />'."\n";
-        $count ++;
-        if ((!$seconddiv) && ($count >= $midpoint)) {
-            $result .= '</div>'."\n".'<div class="LC_left_float">'."\n";
-            $seconddiv = 1;
+	    $file->[1].'</label>';
+        if ($file->[3]) {
+           $result.=&Apache::loncommon::help_open_topic($file->[3]);
         }
+        my $filename=$file->[0];
+        $filename=~s/^\/home\/httpd\/html//;
+        $result.=' <font size="-2"><a href="'.$filename.'" target="sample">'.&mt('Example').'</font></a><br />'."\n";
+        $count ++;
     }
     if ($numfiles > 0) {
         $result .= '</div>'."\n".'<div class="LC_clear_float_footer"></div>'."\n";