--- loncom/homework/lonhomework.pm	2015/04/20 01:22:58	1.344.2.2
+++ loncom/homework/lonhomework.pm	2015/01/19 15:35:53	1.347
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.344.2.2 2015/04/20 01:22:58 raeburn Exp $
+# $Id: lonhomework.pm,v 1.347 2015/01/19 15:35:53 goltermann Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -469,6 +469,7 @@ sub check_access {
 	if ( $tries eq '' ) { $tries = '0'; }
 	if ( $maxtries eq '' && 
 	     $env{'request.state'} ne 'construct') { $maxtries = '2'; } 
+	$Apache::lonhomework::results{'resource.'.$id.'.maxtries'}=$maxtries;
 	if ($maxtries && $tries >= $maxtries) { $status = 'CANNOT_ANSWER'; }
 	# if (correct and show prob status) or excused then CANNOT_ANSWER
 	if ( ($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/)
@@ -767,8 +768,7 @@ sub analyze_header {
        .&Apache::loncommon::head_subbox(
                 &Apache::loncommon::CSTR_pageheader());
     $result .= 
-	&Apache::lonxml::message_location().'
-            <form name="lonhomework" method="post" action="'.
+	    '<form name="lonhomework" method="post" action="'.
 	    &HTML::Entities::encode($env{'request.uri'},'<>&"').'">'.
             '<input type="hidden" name="problemmode" value="'.
             $env{'form.problemmode'}.'" />'.
@@ -782,8 +782,9 @@ sub analyze_header {
             <input type="button" name="submitmode" value="'.&mt("View").'" '.
             'onclick="javascript:setmode(this.form,'."'view'".')" />
             <hr />
-            </div>
-            </form>';
+            </div>'
+            .&Apache::lonxml::message_location().
+            '</form>';
     &Apache::lonxml::add_messages(\$result);
     $request->print($result);
     $request->rflush();
@@ -962,9 +963,8 @@ sub editxmlmode {
 
 	$problem='';
     }
-
     if (($env{'form.problemmode'} eq 'saveeditxml') ||
-        ($env{'form.problemmode'} eq 'saveviewxml') || 
+        ($env{'form.problemmode'} eq 'saveviewxml') ||
         ($env{'form.problemmode'} eq 'undoxml')) {
 	my $error=&handle_save_or_undo($request,\$problem,
 				       \$env{'form.editxmltext'});
@@ -1010,27 +1010,73 @@ sub editxmlmode {
             '<form '.&Apache::edit::form_change_detection().' name="lonhomework" method="post" action="'.
 	    &HTML::Entities::encode($env{'request.uri'},'<>&"').'">'.
 	    &Apache::structuretags::remember_problem_state().'
-            <div class="LC_edit_problem_editxml_header">
-              <table class="LC_edit_problem_header_title"><tr><td>
-               <h2>'.&mt('Problem Editing').' '.&Apache::loncommon::help_open_topic('Problem_Editor_XML_Index').'</h2>
-                </td><td align="right">
-                  '.&Apache::loncommon::helpLatexCheatsheet('Problem_LON-CAPA_Functions','Script Functions').'
-                </td></tr>
-              </table>';
-
-         $result.='<input type="hidden" name="problemmode" value="saveedit" />'.
-                  &Apache::structuretags::problem_edit_buttons('editxml');
+            <div class="LC_edit_problem_header">
+              <div class="LC_edit_problem_header_title">'.
+                &mt('Problem Editing').' '.&Apache::loncommon::help_open_topic('Problem_Editor_XML_Index').
+              '</div><div class="LC_edit_actionbar" id="actionbar">';
+
+        $result.='<input type="hidden" name="problemmode" value="saveedit" />'.
+                  &Apache::structuretags::problem_actionbar_buttons('editxml');
+        $result.='<div class="LC_edit_problem_discards">';
+
+		unless ($env{'environment.nocodemirror'}) {
+		# dropdown menues
+    		$result .= '<ol class="LC_primary_menu LC_floatleft">'.
+    		&Apache::lonmenu::create_submenu("#", "", &mt("Insert Menu"), &Apache::structuretags::insert_menu_datastructure(),"").'</ol>';
+		}
+    $result .= '<ol class="LC_primary_menu LC_floatleft">'.
+    Apache::lonmenu::create_submenu("#", "", &mt("Help"), &Apache::structuretags::helpmenu_datastructure(),"").'</ol>';
+    $result.="</div>";
          
-         $result.='<hr style="clear:both;" />'.&Apache::lonxml::message_location().'</div>'.  
-                  '<textarea '.&Apache::edit::element_change_detection().
+         $result.='<hr style="clear:both;visibility:hidden" /></div></div>'.&Apache::lonxml::message_location().
+                  &Apache::loncommon::xmleditor_js().
+		  '<textarea '.&Apache::edit::element_change_detection().
 	              ' rows="'.$rows.'" cols="'.$cols.'" style="width:100%" '.
 		      ' name="editxmltext" id="LC_editxmltext">'.
 		      &HTML::Entities::encode($problem,'<>&"').'</textarea>
             <div id="LC_aftertextarea">
             </div>
-            </form>'.&Apache::loncommon::end_page();
-	&Apache::lonxml::add_messages(\$result);
-	$request->print($result);
+	        </form>';
+	    my $resource = $env{'request.ambiguous'};
+	    unless($env{'environment.nocodemirror'}){
+	        
+	        $result .= '<link rel="stylesheet" href="/adm/codemirror/codemirror-combined-xml.css">
+	        <script src="/adm/codemirror/codemirror-compressed-xml.js"></script>
+	        <script>
+	            CodeMirror.defineMode("mixedmode", function(config) {
+	                return CodeMirror.multiplexingMode(
+	                    CodeMirror.getMode(config, "xml"),
+	                    {
+	                        open: "\<script type=\"loncapa/perl\"\>", close: "\</script\>",
+	                        mode: CodeMirror.getMode(config, "perl"),
+	                        delimStyle: "tag",
+	                    }
+	              );
+	            });
+	            var cm = CodeMirror.fromTextArea(document.getElementById("LC_editxmltext"),
+	            {
+	                mode: "mixedmode",
+	                lineWrapping: true,
+	                lineNumbers: true,
+	                tabSize: 4,
+	                indentUnit: 4,
+
+	                autoCloseTags: true,
+	                autoCloseBrackets: true,
+	                height: "auto",
+	                styleActiveLine: true,
+	                
+	                extraKeys: {
+	                    "Tab": "indentMore",
+	                    "Shift-Tab": "indentLess",
+	                }
+	            });
+	            restoreScrollPosition("'.$resource.'");
+	        </script>';
+	    }
+        $result .= &Apache::loncommon::end_page();
+        &Apache::lonxml::add_messages(\$result);
+        $request->print($result);
     }
     return '';
 }
@@ -1065,8 +1111,10 @@ sub renderpage {
 	    $problem='';
 	    my $filename=(split('/',$file))[-1];
 	    my $error =
-                &mt('Unable to find [_1]',
-			   '<span class="LC_filename">'.$filename.'</span>');
+		'<p class="LC_error">'
+               .&mt('Unable to find [_1]',
+			   '<span class="LC_filename">'.$filename.'</span>')
+		."</p>";
 	    $result.=
 		&Apache::loncommon::simple_error_page($request,'Not available',
 						      $error,{'no_auto_mt_msg' => 1});
@@ -1117,7 +1165,25 @@ sub finished_parsing {
     undef($Apache::lonhomework::parsing_a_task);
 }
 
-sub get_template_list {
+# function extracted from get_template_html
+# returns "key" -> list
+# key: path of template
+# value 1: title
+# value 2: category
+# value 3: name of help topic ???
+sub get_template_list{
+    my ($extension) = @_;
+    
+    my @files = glob($Apache::lonnet::perlvar{'lonIncludes'}.
+                     '/templates/*.'.$extension);
+    @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);
+    return @files;
+}
+
+sub get_template_html {
     my ($extension) = @_;
     my $result;
     my @allnames;
@@ -1126,12 +1192,7 @@ sub get_template_list {
     if ($extension eq 'survey' || $extension eq 'exam') {
 	$glob_extension = 'problem';
     }
-    my @files = glob($Apache::lonnet::perlvar{'lonIncludes'}.
-		     '/templates/*.'.$glob_extension);
-    @files = map {[$_,&mt(&Apache::lonnet::metadata($_, 'title')),
-                      (&Apache::lonnet::metadata($_, 'category')?&mt(&Apache::lonnet::metadata($_, 'category')):&mt('Miscellaneous')),
-                      &Apache::lonnet::metadata($_, 'help')]} (@files);
-    @files = sort {$a->[2].$a->[1] cmp $b->[2].$b->[1]} (@files);
+    my @files = &get_template_list($extension);
     my ($midpoint,$seconddiv,$numfiles);
     my @noexamplelink = ('blank.problem','blank.library','script.library');
     $numfiles = 0;
@@ -1193,6 +1254,12 @@ sub get_template_list {
 sub newproblem {
     my ($request) = @_;
 
+	if ($env{'form.mode'} eq 'blank'){
+        my $dest = &Apache::lonnet::filelocation("",$request->uri);
+        &File::Copy::copy('/home/httpd/html/res/adm/includes/templates/blank.problem',$dest);
+        &renderpage($request,$dest);
+        return;
+    }
     if ($env{'form.template'}) {
 	my $file = $env{'form.template'};
 	my $dest = &Apache::lonnet::filelocation("",$request->uri);
@@ -1203,7 +1270,7 @@ sub newproblem {
 
     my ($extension) = ($request->uri =~ m/\.(\w+)$/);
     &Apache::lonxml::debug("Looking for :$extension:");
-    my $templatelist=&get_template_list($extension);
+    my $templatelist=&get_template_html($extension);
     if ($env{'form.newfile'} && !$templatelist) {
 	# no templates found
 	my $templatefilename =
@@ -1277,7 +1344,7 @@ sub handler {
     my $file=&Apache::lonnet::filelocation("",$request->uri);
 
     #check if we know where we are
-    if ($env{'request.course.fn'} && !&Apache::lonnet::symbread('','',1,1)) { 
+    if ($env{'request.course.fn'} && !&Apache::lonnet::symbread()) { 
 	# if we are browsing we might not be able to know where we are
 	if ($Apache::lonhomework::browse ne 'F' && 
 	    $env{'request.state'} ne "construct") {
@@ -1315,6 +1382,8 @@ sub handler {
 		&renderpage($request,$file);
 	    }
 	} else {
+		&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+						    ['mode']);
 	    # requested file doesn't exist in contruction space
 	    &newproblem($request);
 	}