--- loncom/homework/structuretags.pm	2013/01/28 18:17:31	1.511
+++ loncom/homework/structuretags.pm	2014/09/16 13:28:30	1.522
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.511 2013/01/28 18:17:31 bisitz Exp $
+# $Id: structuretags.pm,v 1.522 2014/09/16 13:28:30 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -254,6 +254,55 @@ function image_response_click (which, e)
     input_element.value = click;
     img_element.src = '/adm/randomlabel.png?token='+token+'&clickdata='+click;
 }
+
+var submithandled = 0;
+var keypresshandled = 0;
+
+$(document).ready(function(){
+
+    $(document).keypress(function(event){
+        var keycode = (event.keyCode ? event.keyCode : event.which);
+        if ((keycode == '13') && (keypresshandled == 0)) {
+            if ( $( document.activeElement ).hasClass("LC_textline") ) {
+                keypresshandled = 1;
+                var idsArray = $( document.activeElement ).attr("id").split(/HWVAL_/);
+                if (idsArray.length) {
+                    event.preventDefault();
+                    var itemsArray = idsArray[1].split(/_/);
+                    var buttonId = idsArray[0]+'submit_'+itemsArray[0];
+                    $("#"+buttonId).trigger("click");
+                }
+            }
+        }
+    });
+
+    $(document).delegate('form :submit', 'click', function( event ) {
+        if ( $( this ).hasClass( "LC_hwk_submit" ) ) {
+            var buttonId = this.id;
+            if (submithandled == 0) {
+                submithandled = 1;
+                $( "#msg_"+buttonId ).css({"display": "inline","background-color": "#87cefa",
+                                           "color": "black","padding": "2px"}) ;
+                if (( $(this.form).id == "LC_page" ) && ($('input[name="all_submit"]').length )) {
+                    if (buttonId != "all_submit") {
+                        $( ".LC_status_"+buttonId ).hide();
+                        if (( "#"+buttonId+"_pressed" ).length) {
+                            $( "#"+buttonId+"_pressed" ).val( "1" );
+                        }
+                    }
+                } else {
+                    $( ".LC_status_"+buttonId ).hide();
+                }
+                $(this.form).submit();
+                $( ".LC_hwk_submit" ).prop( "disabled", true);
+                $( ".LC_textline" ).prop( "readonly", "readonly");
+                event.preventDefault();
+                return true;
+            }
+        }
+    });
+});
+
 // ]]>
 </script>
 JS
@@ -379,10 +428,10 @@ sub page_start {
     } elsif (!defined($found{'body'}) 
 	     && $env{'request.state'} eq 'construct') {
 	if ($target eq 'web' || $target eq 'edit') {
-        # Breadcrumbs for Construction Space
+        # Breadcrumbs for Authoring Space
         &Apache::lonhtmlcommon::clear_breadcrumbs();
         &Apache::lonhtmlcommon::add_breadcrumb({
-            'text'  => 'Construction Space',
+            'text'  => 'Authoring Space',
             'href'  => &Apache::loncommon::authorspace($env{'request.uri'}),
         });
         # breadcrumbs (and tools) will be created 
@@ -414,6 +463,8 @@ sub page_start {
         $body_args{'add_entries'}    = \%add_entries;
         if ( $env{'request.state'} eq   'construct') {
             $body_args{'only_body'}  = 1;
+        } elsif ($target eq 'web') {
+            $body_args{'print_suppress'} = 1;
         }
     }
     $body_args{'no_auto_mt_title'} = 1;
@@ -637,7 +688,7 @@ sub problem_edit_header {
 '.&Apache::lonxml::message_location().'
 </div>
 '.
-       '<table border="0" width="100%"><tr><td bgcolor="#F8F8F8">';
+       '<table id="LC_edit_problem_colorful" border="0" width="100%"><tr><td bgcolor="#F8F8F8">';
 }
 
 sub problem_edit_footer {
@@ -728,7 +779,7 @@ $show_all
 <select name='problemstatus'>
   <option value=''></option>
   ".&option('yes','problemstatus').&mt("Show Feedback")."</option>
-  ".&option('no', 'problemstatus').&mt("Don't Show Incorect/Correct Feedback")."</option>
+  ".&option('no', 'problemstatus').&mt("Don't Show Incorrect/Correct Feedback")."</option>
   ".&option('no_feedback_ever', 'problemstatus').&mt("Don't Show Any Feedback")."</option>
 </select>
 </span>
@@ -975,7 +1026,7 @@ sub checkout_msg {
 <p class="LC_warning">$lt{'warning'}</p>
 <form name="checkout" method="post" action="$uri">
 <input type="hidden" name="doescheckout" value="yes" />
-<input type="button" name="checkoutbutton" value="$lt{'checkout'}" onClick="javascript:if (confirm('$lt{'checkout?'}')) { document.checkout.submit(); }" />
+<input type="button" name="checkoutbutton" value="$lt{'checkout'}" onclick="javascript:if (confirm('$lt{'checkout?'}')) { document.checkout.submit(); }" />
 </form>
 ENDCHECKOUT
 }
@@ -1009,7 +1060,7 @@ sub firstaccess_msg {
     $result .= (<<ENDCHECKOUT);
 <form name="markaccess" method="post" action="$uri">
 <input type="hidden" name="markaccess" value="yes" />
-<input type="button" name="accessbutton" value="$buttontext" onClick="javascript:if (confirm('$timertext')) { document.markaccess.submit(); }" />
+<input type="button" name="accessbutton" value="$buttontext" onclick="javascript:if (confirm('$timertext')) { document.markaccess.submit(); }" />
 </form>
 ENDCHECKOUT
     return $result;
@@ -1168,7 +1219,7 @@ 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]);
+            &Apache::lonnet::set_first_access($interval[1],$interval[0]);
         }
 
         ($status,$accessmsg,$slot_name,$slot) =
@@ -2057,9 +2108,15 @@ sub end_while {
 	    }
 	    $return = &Apache::run::run($code,$safeeval);
 	}
-	if ($error) {
-	    &Apache::lonxml::error('<pre>'.&mt('Code ran too long. It ran for more than').' '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' '.&mt('seconds occurred while running &lt;while&gt; on line').' '.$line.'</pre>');
-	}
+        if ($error) {
+            &Apache::lonxml::error(
+                '<pre>'
+               .&mt('Code ran too long. It ran for more than [_1] seconds.',
+                        $Apache::lonnet::perlvar{'lonScriptTimeout'})
+               .&mt('This occurred while running &lt;while&gt; on line [_1].',
+                        $line)
+               .'</pre>');
+        }
     } elsif ($target eq "edit") {
 	$result.= &Apache::edit::tag_end($target,$token,'');
     }
@@ -2543,13 +2600,13 @@ sub end_startouttext {
                  .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
                  .&Apache::edit::deletelist($target,$token)
                  .'</span></td>'
-	         .'<td align="left"><span id="math_'.$areaid.'" />'
+	         .'<td><span id="math_'.$areaid.'">'
 		 .&Apache::lonhtmlcommon::dragmath_button($areaid,1)
-		 .'<span></td>'
+		 .'</span></td>'
 		 .'<td>'
 		 .&Apache::edit::insertlist($target,$token)
 		 .'</td>'
-	         .'<td align="right" valign="top">' .
+	         .'<td class="LC_edit_problem_latexhelper">' .
 	         &Apache::loncommon::helpLatexCheatsheet().
 		 &Apache::edit::end_row().
                  &Apache::edit::start_spanning_row()."\n".