--- loncom/homework/structuretags.pm	2016/09/14 19:36:30	1.512.2.11
+++ loncom/homework/structuretags.pm	2017/06/21 19:55:00	1.512.2.13.4.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.512.2.11 2016/09/14 19:36:30 raeburn Exp $
+# $Id: structuretags.pm,v 1.512.2.13.4.1 2017/06/21 19:55:00 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -390,8 +390,10 @@ sub setmode_javascript {
 <script type="text/javascript">
 // <![CDATA[
 function setmode(form,probmode) {
+    var initial = form.problemmode.value;
     form.problemmode.value = probmode;
     form.submit();
+    form.problemmode.value = initial;
 }
 // ]]>
 </script>
@@ -417,9 +419,13 @@ sub page_start {
     $extra_head .= &homework_js().
                    &Apache::lonhtmlcommon::dragmath_js("EditMathPopup");
     if (&Apache::lonhtmlcommon::htmlareabrowser()) {
-        my %textarea_args = (
+        my %textarea_args;
+        if (($env{'request.state'} ne 'construct') ||
+            ($env{'environment.nocodemirror'})) {
+            %textarea_args = (
                                 dragmath => 'math',
                               );
+        }
         $extra_head .= &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args);
     }
     my $is_task = ($env{'request.uri'} =~ /\.task$/);
@@ -1519,7 +1525,8 @@ sub start_problem {
         $target eq 'tex') {
         if ($env{'form.markaccess'}) {
             my @interval=&Apache::lonnet::EXT("resource.0.interval");
-            &Apache::lonnet::set_first_access($interval[1],$interval[0]);
+            my ($timelimit) = ($interval[0] =~ /^(\d+)/);
+            &Apache::lonnet::set_first_access($interval[1],$timelimit);
         }
 
         ($status,$accessmsg,$slot_name,$slot) =
@@ -2933,9 +2940,13 @@ sub end_startouttext {
                  .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
                  .&Apache::edit::deletelist($target,$token)
                  .'</span></td>'
-	         .'<td><span id="math_'.$areaid.'">'
-		 .&Apache::lonhtmlcommon::dragmath_button($areaid,1)
-		 .'</span></td>'
+	         .'<td><span id="math_'.$areaid.'">';
+	if ($env{'environment.nocodemirror'}) {
+	    $result.=&Apache::lonhtmlcommon::dragmath_button($areaid,1);
+	} else {
+	    $result.='&nbsp;';
+	}
+	$result.='</span></td>'
 		 .'<td>'
 		 .&Apache::edit::insertlist($target,$token)
 		 .'</td>'